Commit graph

2514 commits

Author SHA1 Message Date
jlam
bef0ac1b69 Provide a default definition for BUILDLINK_IS_BUILTIN.<pkg> that is yes/no
depending on whether or not the <pkg> is provided in the base system.  Also
tighten the BUILDLINK_PKG_DBDIR.<pkg> definition.
2003-09-04 05:40:25 +00:00
erh
2912824c9a Add an apache.mk, similar to java-vm.mk and emacs.mk, that allows apache
modules that will work with more than one version of the apache web server
to not require a separate package for each version of apache.  This was
originally based on java-vm.mk
	Makefile variables added:
		PKG_APACHE_ACCEPTED : Contains the list of valid versions of apache.
		USE_APR : If set, the package required apr to run.
	User variabled added:
		PKG_APACHE_DEFAULT : The version of apache to install, if there is
		                     none yet.  Defaults to apache13
	Variables set:
		PKG_APACHE : Which version of apache is being used.
2003-09-04 03:00:19 +00:00
jlam
09b844bb4c Fix typo ;; -> :; 2003-09-03 16:35:01 +00:00
tron
9502649c28 The package vulnerability list is now called "pkg-vulnerabilities". 2003-09-03 15:05:43 +00:00
jlam
1c49c25658 Require 20030824 of the pkg_install tools to get the changes for using
pkg_add(1) on non-NetBSD (or more precisely, non-poll) systems.
2003-09-03 14:08:09 +00:00
jlam
1a2276974b Don't restrict the user to only the default view. Also allow user to
customize the default view through setting DEFAULT_VIEW in /etc/mk.conf.
2003-09-03 13:56:28 +00:00
seb
17d17139aa No need to substitute anymore for ${INSTALL_INFO} in PLIST. 2003-09-02 23:38:56 +00:00
seb
99cb24f981 Test for ${PREFIX} existence before mkdir'ing it.
This fix NO_MTREE installation on Solaris when ${PREFIX} already exists
and is a symlink.

Example:

# uname -sr
SunOS 5.9
# cd /tmp
# rm -f foo
# ln -s /etc foo
# /bin/mkdir -p /tmp/foo
mkdir: "/tmp/foo": Exists but is not a directory
#
2003-09-02 12:01:14 +00:00
jlam
841b57441b Merge pkgviews-mk branch into the HEAD by running:
cd pkgsrc/mk
	cvs update -Pd -A
	cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk
2003-09-02 06:59:37 +00:00
jlam
fe1d66ea29 Create new variables PKG_*_CMD that contain just the paths to the various
pkg_install tools.
2003-08-31 11:04:58 +00:00
wiz
893a275787 Add belnet and keihanna sourceforge mirrors; remove switch and osdn.
Addresses PR 22641.
2003-08-31 10:29:16 +00:00
jlam
e4ba59523f bsd.buildlink2.mk says that Solaris 9 works with full caching. 2003-08-31 10:17:16 +00:00
jlam
759dd368bc Remove N/A from this file... it's much easier to read now. 2003-08-31 10:15:42 +00:00
jlam
5ed77489aa Don't allow -R* options in dependency_libs -- rpath info shouldn't be in
there.
2003-08-31 08:56:39 +00:00
jlam
c5621e9ba4 Strip bare -L${BUILDLINK_DIR}, -L${BUILDLINK_X11_DIR} and -L${WRKSRC}, as
well as stripping -L to subdirs of these directories from dependency_libs
lines in *.lai files.  This corrects the changes in revision 1.18 of this
file and restores some functionality accidentally removed in version 1.19
of this file.  Should fix the subversion buildlink/libtool problem
reported on tech-pkg@.
2003-08-31 06:07:33 +00:00
jlam
9d564a4e5e Back out last revision since we modified bsd.pkg.install.mk to require
that {,DE}INSTALL_EXTRA_TMPL to be set if a package Makefile wants to use
them.
2003-08-30 22:57:05 +00:00
jlam
d505acc9c8 No longer assume that a DEINSTALL/INSTALL script in the package directory
is meant for {,DE}INSTALL_EXTRA_TMPL.  Package makefiles should explicitly
set those variables if they want to use them in conjunction with
USE_PKGINSTALL.
2003-08-30 22:53:39 +00:00
jlam
e19b751d03 Reorder the inclusion of bsd.pkg.install.mk so that it appears *before*
texinfo.mk.  This ensures that {,DE}INSTALL_EXTRA_TMPL isn't defined by
texinfo.mk before bsd.pkg.install.mk checks those variables.
2003-08-30 20:52:09 +00:00
jlam
8eeebf165b Add for use by the INSTALL/DEINSTALL scripts. 2003-08-30 18:42:36 +00:00
jlam
30dae47585 GNU make installed from pkgsrc can always be found as
${LOCALBASE}/bin/gmake.  ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}/make
technically works, too, but this covers the (unsupported!!) case where the
user has GNU_PROGRAM_PREFIX="" and has moved the "make" binary directly
over the "gmake" symlink created by pkgsrc (Jeremy Reed reported this
problem on tech-pkg@ because he uses this a a debugging technique to find
out whether GNU make is actually needed by a package or not).
2003-08-27 20:03:44 +00:00
jlam
8d5649cbcd Correct the glob so that we actually match -L${BUILDLINK_DIR}/* and
-L${BUILDLINK_X11_DIR} and discard them.  (from pkgviews-mk).
2003-08-27 12:57:52 +00:00
jlam
e5462ca730 (*) Nuke the _BUILDLINK_SUBST_USE target now that subst.mk does the same
thing.

(*) Move the code to adjust Makefiles to refer to the correct
    PKGLOCALEDIR into bsd.pkg.mk and reimplement it using subst.mk so
    that it's non-USE_BUILDLINK2 packages can use it, too.

(*) Reimplement the PKGCONFIG_OVERRIDE code in bsd.pkg.mk using subst.mk.

(*) Reimplement the unbuildlink code in bsd.buildlink2.mk using subst.mk.
2003-08-27 11:29:56 +00:00
jlam
b81c512e4f subst.mk is a Makefile fragment that implements a general text replacement
facility for different classes of files in ${WRKSRC}.  For each class of
files, a target <class>-subst is created to perform the text replacement.

The following variables are used:

SUBST_STAGE.<class>
	"stage" at which we do the text replacement, e.g. pre-configure,
	post-build, etc.

SUBST_MESSAGE.<class>
	message to display, noting what is being substituted

SUBST_FILES.<class>
	files on which to run the substitution; these are relative to
	${WRKSRC}

SUBST_SED.<class>
	sed(1) substitution expression to run on the specified files

This basically extracts a useful piece of code from bsd.buildlink2.mk and
puts it in a place that allows it to be more widely used, and so that the
functionality doesn't depend on USE_BUILDLINK2 being defined.
2003-08-27 11:24:37 +00:00
wiz
1a81ad026e Add ne locale dir for gtk2. 2003-08-27 10:55:50 +00:00
jlam
53001478f3 Cut-n-pasto: s/GREP/GMAKE/ in the GNU make section. (from pkgviews-mk) 2003-08-27 01:58:25 +00:00
jlam
94036bc503 Forgot a USE_GMAKE => USE_GNU_TOOLS+=make. (from pkgviews-mk) 2003-08-27 01:01:25 +00:00
jlam
9fbdc941fe Create a symlink from the "make" requested by the package into
${TOOLS_DIR}/bin/make.  If a package wants GNU make, then it should
set:
	USE_GNU_TOOLS+=	make

in the package Makefile.  Allow for USE_GMAKE to continue to work
until we get a chance to sweep through pkgsrc and remove the usage
of this now-redundant variable.

This change allows us to avoid patching makefiles that use a bare
"make" command to invoke sub-make processes.  Idea suggested by
salo@netbsd.org in pkg/22509.
2003-08-26 20:15:23 +00:00
hubertf
5ae8aa8373 Clean up a few things in /tmp before building 2003-08-26 08:18:09 +00:00
reed
59de24e14c The standard "root" group under Linux is "root" not "wheel".
PR #22566
2003-08-25 15:47:15 +00:00
jlam
0d84a72afe Sanity check that the package is actually installed by running pkg_info(1)
before trying to create the binary package.  This makes:

	cd pkgsrc/category/foo
	make install
	pkg_delete foo
	make package

fail because package "foo" isn't actually installed, so no binary package
can be built.
2003-08-24 08:51:11 +00:00
taca
1a2b56a13f Add description of MYSQL_CHARSET and MYSQL_EXTRA_CHARSET.
Fix PR pkg/22560 by myself, OKed by wiz@.
2003-08-24 01:58:56 +00:00
jschauma
824986cd80 Set GMAKE to /usr/bin/make only of that actually exists, else set it
to ${LOCALBASE}/bin/gmake.  Patch by Soren Jacobsen in PR pkg/22506.
(Not closing that PR, as we should determine a procedure to bootstrap
on a system without any make.)
2003-08-23 16:04:26 +00:00
grant
d309157197 add support for extracting binary/library requires/provides on Darwin,
and simplify the logic to reduce code duplication.

fixes PR pkg/22492 from Julien T. Letessier.
2003-08-23 09:11:19 +00:00
grant
1e09b95da1 add LDD, from Julien T. Letessier in PR pkg/22492. 2003-08-23 09:07:07 +00:00
grant
3e632ea583 fix problem with shlib handling not being done on Darwin for
devel/gettext and other pkgs installing libraries ending in eg.
`x.y.z.so' rather than `.so.x.y.z'.

also fix off-by-one bug in shlib handling awk script causing the
first .so entry to not be commented out in the PLIST when it should
be.

ok'd by jlam.
2003-08-23 08:09:17 +00:00
jlam
f1ebe9c52b Fix a long-standing past-o that was harmless. 2003-08-23 03:57:49 +00:00
seb
c917496107 Use '${_PKG_SILENT}${_PKG_DEBUG}' instead of '@' (as seen on the pkgviews-mk
branch).
2003-08-22 22:04:03 +00:00
seb
783b9f53ba Try to deal with empty or "corrupted" Info directory file: if the
file exist when installing a package and it does not contain  at
least one line starting with '*' then remove it and let install-info
create a new one.

This should address PR pkg/22555 from reed@.
2003-08-22 18:17:03 +00:00
grant
e71e76a726 in check-shlibs, throw away warning from `type ldd' and only attempt
to run ldd if it is executable.

fixes bug where binaries just installed would be run (!) and the
install process possibly "hang" on Darwin because Darwin has no ldd!
2003-08-22 13:32:40 +00:00
gavan
8f1aedda6a Replace [ $A -nt $B ] with a portable equivalent 2003-08-21 16:24:31 +00:00
gavan
58bef710d6 Avoid circular dependency on gcc if USE_GCC[23] is set. 2003-08-21 16:16:46 +00:00
gavan
4de3840eec Fixes PR pkg/22528 2003-08-21 11:59:22 +00:00
gavan
2cf3251b24 Avoid keyword substitution in keyword matching pattern 2003-08-19 15:24:01 +00:00
gavan
44c0f50903 Remove dependence on ident and awk. This aids portability to Solaris. 2003-08-19 09:35:26 +00:00
jklos
bc9344585a Added text describing major.minor-latest directories for binaries built
from pkgsrc current.
2003-08-19 08:55:53 +00:00
cjep
f958dadcb5 Get the OS name from "uname -s" instead of assuming NetBSD.
Observed from Gavan's Solaris bulk build.
2003-08-18 19:19:33 +00:00
minoura
123ee8783e XEmacs is 21.4, not 21.1. 2003-08-18 13:16:24 +00:00
jlam
a8e872425a Avoid circular dependencies if USE_GNU_TOOLS is set unconditionally in
either the environment or in /etc/mk.conf by telling dependencies of the
named GNU tool to ignore any USE_GNU_TOOLS settings when they are built.
2003-08-17 04:06:36 +00:00
jlam
b6231ea0ad If an OS is listed in _TOOLS_REPLACE_OPSYS.<tool>, then we want to make
sure that tool is symlinked into ${TOOLS_DIR}/bin.
2003-08-17 02:03:53 +00:00
grant
bd01fe0985 put SunOS back in _TOOLS_REPLACE_OPSYS.sed. 2003-08-16 23:54:31 +00:00