Commit graph

92 commits

Author SHA1 Message Date
joerg
5911def816 Recursive revision bump / recommended bump for gettext ABI change. 2006-02-05 23:08:03 +00:00
jlam
dc9594e09d Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk
automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.
2005-12-29 06:21:30 +00:00
rillig
579e977969 Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
2005-12-05 23:55:01 +00:00
rillig
b71a1d488b Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
2005-12-05 20:49:47 +00:00
reed
1e99bd67c3 For --enable-mandir use ${PKGMANDIR}. 2005-10-04 18:27:00 +00:00
salo
96779f9d09 Define USE_GETLOGIN for preprocessor instead so it later just DTRT.
Should fix PR pkg/30965

(the same issue was uncovered while working on a pullup ticket #738)
2005-09-08 21:57:56 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
dillo
f81ae835ad Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable.  Set PKG_SUGGESTED_OPTIONS instead.  Also,
make use of PKG_OPTIONS_LEGACY_VARS.

Reviewed by wiz.
2005-05-31 10:01:36 +00:00
jlam
585534220c Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison
2005-05-22 20:07:36 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
jlam
da2fc85390 Don't check for USE_BUILDLINK3 anymore in these files. These are included
by other package Makefiles, and with the deprecation of USE_BUILDLINK3
support in the infrastructure files, these had the potential to break
existing packages.
2005-03-24 22:42:58 +00:00
agc
d81d19f8e0 Add RMD160 digests. 2005-02-24 12:51:41 +00:00
jlam
bff1eecc97 Modify linux-pam and solaris-pam builtin.mk files to be more general
in their tests for built-in versions of the PAM implementations.  The
MacOS X case now collapses nicely into the linux-pam case.  Allow
pam.buildlink3.mk to use solaris-pam as an accepted PAM implementation.
2005-01-14 07:54:20 +00:00
jlam
1b5734f517 Create a pam.buildlink3.mk file that is used by PAM-using packages.
It includes the correct buildlink3.mk file from either Linux-PAM
(security/PAM) or OpenPAM (security/openpam) and eventually will
support solaris-pam.  pam.buildlink3.mk will:

	* set PAMBASE to the base directory of the PAM files;
	* set PAM_TYPE to the PAM implementation used.

There are two variables that can be used to tweak the selection of
the PAM implementation:

PAM_DEFAULT is a user-settable variable whose value is the default
	PAM implementation to use.

PAM_ACCEPTED is a package-settable list of PAM implementations
	that may be used by the package.

Modify most packages that include PAM/buildlink3.mk to include
pam.buildlink3.mk instead.
2005-01-14 05:15:39 +00:00
jlam
fbeaab5d63 Rename the multiple inclusion guard to LINUX_PAM_BUILDLINK3_MK. 2005-01-14 05:10:37 +00:00
jlam
c8dd0743a8 * Rename the buildlink module name associated with the security/PAM
package from "pam" to "linux-pam".

* Rewrite PAM/builtin.mk to check that we have Linux-PAM, and re-classify
  MacOS X's PAM as Linux-PAM because it _is_, according to to Apple.
  Also don't use BUILDLINK_TRANSFORM.* to rewrite header file paths
  -- just use a symlink so that <security/*.h> can be used to find
  <pam/*.h>.
2005-01-14 00:08:46 +00:00
jlam
161c956782 Note conflict with openpam-[0-9]*. 2005-01-13 21:52:26 +00:00
xtraeme
8be448e95e BUILDLINK_TRANSFORM is not enough to buildlink the files when using
OpenPAM (NetBSD/FreeBSD), so use BUILDLINK_FILES to right directory.
2005-01-12 02:27:48 +00:00
jlam
79589a3978 PAM modules are dlopen'ed by the PAM library. 2004-11-25 22:47:15 +00:00
jlam
c28d2d2a48 Fix brokenness I introduced in the conversion of security/PAM to use
libtool: the PAM libraries weren't being built with -DPAM_DYNAMIC, which
made it impossible to dlopen PAM modules.

Bump PKGREVISION.
2004-11-19 14:54:55 +00:00
jlam
96912dd94f Libtoolize security/PAM so that the appropriate options are passed to
the compiler to build shared modules, and so that it builds correctly
across different platforms.  Bump the PKGREVISION.

In particular, this should fix problems building this package on
NetBSD/amd64.
2004-11-16 07:46:57 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
9d5426ff76 Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework.  Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS.  This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.

This fixes PR pkg/26590.
2004-08-22 19:32:51 +00:00
jlam
99aa413714 Whitespace nit. 2004-08-19 20:21:56 +00:00
jlam
bde3c2e8b4 First cut at supporting the built-in PAM on MacOS X. It's not the
same as Linux-PAM, but it's close enough for the purposes of compiling
programs.
2004-08-12 10:09:49 +00:00
jlam
5828f0f1b9 Reorder conditions so that if make does short-circuit boolean evalutation,
then we avoid hitting the disk if we don't need to.
2004-08-06 15:43:09 +00:00
jlam
c4b3ae0830 Accidentally reversed meaning of test. 2004-08-06 15:41:46 +00:00
jlam
7ea57169b7 Redo previous to say what we really want: we don't care if ${LOCALBASE}
is "/usr", what we really want to check is if the pam_appl.h header found
is within the ${LOCALBASE} hierarchy, which implies that it's a
pkgsrc-controlled file, and hence not built-in.
2004-08-06 15:37:20 +00:00
reed
f1d0bf8e92 In the rare case when LOCALBASE is /usr, don't let this think
that /usr/include/security/pam_appl.h means that PAM is builtin.
(This is so a dependency can be registered correctly.)
2004-08-06 03:14:22 +00:00
jlam
86b87ebd21 Document libcrack build option. 2004-08-05 02:42:12 +00:00
jlam
b460ce1ab5 Convert to use bsd.options.mk. The relevant options variable to set
for each package can be determined by invoking:

	make show-var VARNAME=PKG_OPTIONS_VAR

The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).
2004-07-30 21:05:41 +00:00
jlam
b8db9b28ee Accept "yes" or "YES" for USE_LIBCRACK. 2004-07-06 22:49:29 +00:00
seb
00cc0486ea Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
2004-05-17 21:32:33 +00:00
snj
209f99b57d No longer used. 2004-05-11 05:19:10 +00:00
snj
0350fb16cc Remove support for buildlink2. 2004-05-11 04:39:03 +00:00
jlam
6d92080aa2 Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
2004-03-29 05:43:28 +00:00
jlam
426cc1ce72 Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
2004-03-29 05:05:32 +00:00
jlam
faed7092a8 Reverse the use of USE_DB185 in bdb.buildlink3.mk -- it defaults to
"yes" and packages that can't use the DB-1.85 API should set it to "no".
This makes the native DB the preferred DB if it exists.
2004-03-26 18:48:52 +00:00
jlam
59bdf89739 If the ${PKGBASE} of a package doesn't match the token passed to
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.
2004-03-16 18:23:26 +00:00
jlam
bb46710479 Convert to use bdb.buildlink3.mk. 2004-03-10 18:07:16 +00:00
jlam
d0b4c54eb6 Split out the code that deals with checking whether the software is
built-in or not into a separate builtin.mk file.  The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.

The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.

The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
2004-03-10 17:57:14 +00:00
jlam
bf6e059da4 Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
2004-02-18 16:35:27 +00:00
jlam
d2b62c66fb Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC.  Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
2004-02-12 02:35:06 +00:00
jlam
1edfa505ed Reorganize code so that any dependencies are checked as part of deciding
whether the software is built-in or not.  This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.
2004-02-12 01:59:37 +00:00
jlam
317cc72791 Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
2004-02-05 07:17:14 +00:00
jlam
e7133cac25 Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
2004-02-05 07:06:15 +00:00
jlam
07a9d8dfb2 Support a new global variable:
BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.
2004-02-05 06:58:02 +00:00
grant
a07396feb8 replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make. 2004-01-24 15:00:22 +00:00
jlam
01a5abff01 Support BUILDLINK_DEPENDS.<pkg> being a list of values. 2004-01-24 03:12:31 +00:00
jlam
c4dd17d8b7 Update security/PAM to 0.77nb1:
Actually make this package honor PKG_SYSCONFDIR.  This package now looks
for /usr/pkg/etc/pam.conf if PKG_SYSCONFBASE != "/etc".
2004-01-12 04:31:09 +00:00