Commit graph

77 commits

Author SHA1 Message Date
wiz
adc1bb3c9d Unused. 2004-05-22 10:04:21 +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
tv
d18750f524 Oops, forgot to bump PKGREVISION. 2004-03-29 01:19:28 +00:00
tv
95b881c6a7 Obey CFLAGS/CPPFLAGS. Link the binaries with the .o's, not the .lo's
(libtool assumes that .lo means PIC, which is wrong for an end binary;
breaks on Interix where PIC in an end binary is broken)
2004-03-29 01:18:41 +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
efa1ab70ba Include "../../mk/compiler.mk" to get the value of CC_VERSION before
testing it.
2004-02-18 13:33:40 +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
7c68eb548f Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not.  If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.
2004-02-11 11:30:49 +00:00
jlam
a1c40fc01e We no longer need to explicitly call ${BUILDLINK_*} for CC, CXX, LIBTOOL,
etc. because the bare variables will point to the correct executables.
2004-02-08 04:03:14 +00:00
jlam
75f431d969 PKGLIBTOOL and PKGSHLIBTOOL are no more. 2004-02-08 03:00:29 +00:00
jlam
7699290f10 If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.
2004-02-06 19:04:24 +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
jlam
01a5abff01 Support BUILDLINK_DEPENDS.<pkg> being a list of values. 2004-01-24 03:12:31 +00:00
jlam
5ee1ccf459 Use PKGLIBTOOL instead of LIBTOOL to call the libtool wrapper. 2004-01-07 01:14:03 +00:00
jlam
01cfaf3bd5 whitespace 2004-01-06 08:17:55 +00:00
jlam
580a53de35 bl3ify 2004-01-05 11:42:20 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00
jlam
5bc310cfaa Sprinkle a few double quotes here and there. 2004-01-05 09:34:23 +00:00
jlam
c9ff27d270 Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables. 2004-01-05 09:31:31 +00:00
jlam
47bb2aae5f Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. 2004-01-04 23:34:04 +00:00
jlam
339cd13cb2 Initial sprinkling of work-in-progress buildlink3.mk files for using the
buildlink3 framework.
2004-01-03 23:06:43 +00:00
cjep
0930a86d32 Add RCS tags 2003-12-30 16:46:03 +00:00
erh
31cd733964 Change the makefile patch to be even more libtool friendly to allow
this to build on AIX.  Essentially: s/.o/.lo/g
2003-12-05 22:58:52 +00:00
erh
20f03a747a Use libtool when installing, and install libbz2 first. 2003-12-03 16:47:25 +00:00
grant
b15b1a80e4 test CC_VERSION rather than doing our own dance to figure out if we're
using gcc or not.
2003-09-25 20:38:45 +00:00
danw
4db7e27536 add Darwin-* to _INCOMPAT_BZ2: it has bzlib.h, but only a static libbz2 2003-09-25 02:30:11 +00:00
wiz
d03ebc6a3a Use libtool with correct --mode argument. From Ron Roskens in PR 22824. 2003-09-18 18:46:28 +00:00
grant
91f00f1cbc s/netbsd.org/NetBSD.org/ 2003-07-17 21:21:03 +00:00
salo
1d2b9308d1 Solaris 9's bzip2 is good enough. 2003-06-23 16:25:45 +00:00
jschauma
e366d0c694 Use tech-pkg@ in favor of packages@ as MAINTAINER for orphaned packages.
Should anybody feel like they could be the maintainer for any of thewe packages,
please adjust.
2003-06-02 01:15:31 +00:00
wiz
92445eb1ed Remove superfluous whitespace. 2003-03-28 20:28:56 +00:00
jschauma
291ecdb5f0 Make this compile on Irix with the MIPSPro compiler by removing gcc-only
CFLAGS from a patch iff CC is not gcc.
2003-03-18 21:53:29 +00:00
jlam
733bab205c Reorder the two targets for aesthetic reasons. 2003-02-04 18:44:52 +00:00
jlam
3c82a3e8ca Create a fake libtool archive since libbz2.la isnt in the base system but
the package creates one.
2003-02-04 18:40:07 +00:00
grant
cdb7914a4c update MASTER_SITES and HOMEPAGE. 2002-10-31 22:08:15 +00:00
wiz
c0cd2110d2 Unused. 2002-10-05 04:08:51 +00:00
jlam
1c57323789 Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
2002-08-25 21:48:57 +00:00
jlam
f21ae53323 Add a catch-all for SunOS to force using the pkgsrc versions of the
software instead of any base system version.  This match is probably too
broad, but better to err on the safe side.  We can narrow down the match
when we have better information.

Closes pkg/17775 by Julien T. Letessier <julien.letessier at sun dot com>.
2002-08-07 19:29:29 +00:00
jlam
d88554c247 Create new variables INCOMPAT_ZLIB, INCOMPAT_BZIP2, INCOMPAT_READLINE,
INCOMPAT_GETTEXT that are analogous to INCOMPAT_ICONV and contain lists of
shell wildcards intended to match against ${MACHINE_PLATFORM}.  These
variables are used to note those platforms that have the named packages in
the base system but are incompatible in some way from the pkgsrc version
of the same package.  Change INCOMPAT_CURSES to have the same sematics as
above.  These variables allow much greater precision in specifying which
platforms have broken (for the purposes of pkgsrc) versions of software in
the base system that must be ignored.

The buildlink.mk files for these packages define private _INCOMPAT_*
versions of these variables, and they contain the default lists of
platforms that are known to have incompatible software bits.

This addresses pkg/17775 submitted by Julien T. Letessier
<julien.letessier at sun dot com>.
2002-08-07 06:10:32 +00:00
yyamano
e514110e3f Fix warning.
bmake: "../../archivers/bzip2/../../archivers/bzip2/buildlink.mk" line 30: warning: "0" returned non-zero status
2002-06-09 02:55:06 +00:00
mjl
0890bdc2cc Update bzip2 to 1.0.2
A bug fix release, addressing various minor issues.

* Fix an infinite segfault loop in 1.0.1 when a directory is encountered
  in -f (force) mode.
* Avoid double fclose() of output file on certain I/O error paths.
* Don't fail with internal error 1007 when fed a long stream (> 48MB)
  of byte 251.  Also print useful message suggesting that 1007s may be
  caused by bad memory.
* Fix uninitialised variable silly bug in demo prog dlltest.c.
* Remove 512-MB limitation on recovered file size for bzip2recover
  on selected platforms which support 64-bit ints.
* Copy file access times correctly.
* Dereference symlinks when copying file permissions in -f mode.
* Majorly simplify implementation of uInt64_qrm10.
* Check the input file still exists before deleting the output one,
  when aborting in cleanUpAndFail().
* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
* Spelling changes and minor enhancements in bzip2.1.
* Avoid race condition between creating the output file and setting its
  interim permissions safely, by using fopen_output_safely().
* do not print senseless report with -v when compressing an empty file.
* bzcat -f works on non-bzip2 files.
* do not try to escape shell meta-characters on unix (the shell takes
  care of these).
* added --fast and --best aliases for -1 -9 for gzip compatibility.
2002-03-24 14:02:35 +00:00
zuntum
b427eb87ce Move pkg/ files into package's toplevel directory 2001-10-31 20:24:14 +00:00
jlam
d2eb68d2a6 Add dir_DEFAULT setting used by EVAL_PREFIX logic to set the default
installation directory in case the package isn't installed.
2001-07-27 13:33:18 +00:00
jlam
7b1d3cb465 Mechanical changes to buildlink.mk files to use EVAL_PREFIX to set
BUILDLINK_PREFIX.<pkgname>.  This allows buildlink to find X11BASE packages
regardless of whether they were installed before or after xpkgwedge was
installed.  Idea by Alistair Crooks <agc@pkgsrc.org>.
2001-07-20 01:54:31 +00:00
jlam
13efd165ea Honor CFLAGS passed in from environment during build. 2001-07-14 03:51:13 +00:00
jlam
cb76bd5efc Move inclusion of bsd.buildlink.mk to start of file. 2001-07-01 22:59:08 +00:00