Commit graph

55 commits

Author SHA1 Message Date
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
398301ef04 No longer used. 2004-05-09 06:50:29 +00:00
jlam
e8132b3fbf Relinquish maintainership of packages to tech-pkg@NetBSD.org. 2004-04-24 22:46:08 +00:00
hubertf
56df84767b Make this file usable outside of pkgsrc/graphics. 2004-04-19 23:08:55 +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
326169077a USE_BUILDLINK3 must be set to "yes" or "no", not defined/undefined. 2004-03-23 04:40:59 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +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
9ff0e10340 Reorder location and setting of BUILDLINK_PACKAGES to match template
buildlink3.mk file in revision 1.101 of bsd.buildlink3.mk.
2004-03-05 19:25:06 +00:00
jlam
a7d877ca6a Append to BUILDLINK_DEPENDS.<pkg> instead of setting a default value. In
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files.  In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
2004-01-24 03:26:45 +00:00
jlam
02eb6f1e19 bl3ify 2004-01-05 20:38:34 +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
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
adam
1e8ceb0abc Added a patch to make freetype-utils compile with gcc-3.x (PR#22444) 2003-09-16 11:56:59 +00:00
grant
4083b24390 s/netbsd.org/NetBSD.org/ 2003-07-17 21:31:04 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +00:00
jmmv
f1446ddf2b Drop trailing whitespace. Ok'ed by wiz. 2003-05-06 17:40:18 +00:00
cjep
5b8c845234 USE_PKGLOCALEDIR=yes 2003-01-10 07:39:46 +00:00
wiz
6a514432f7 Unused. 2002-10-10 00:06:08 +00:00
jlam
d756b84f47 Move USE_BUILDLINK2 definition into the common Makefile as we need to
include buildlink2.mk files from there.
2002-09-11 08:52:57 +00:00
jlam
e2afa97f51 Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
2002-08-25 18:38:05 +00:00
zuntum
d038a73ebd Move pkg/ files into package's toplevel directory 2001-10-31 22:52:58 +00:00
jlam
a64726316f Move inclusion of bsd.pkg.mk from Makefile.common into the individual
package Makefiles.  The idiom is to define any variables, include
Makefile.common, then any additional targets, then include bsd.pkg.mk.
2001-09-09 04:06:08 +00:00
jlam
99c293f270 Move USE_BUILDLINK_ONLY definition out of Makefile.common and into the
individual package Makefiles.
2001-09-09 03:37:00 +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
cb76bd5efc Move inclusion of bsd.buildlink.mk to start of file. 2001-07-01 22:59:08 +00:00
jlam
eebb8986f6 Mark as USE_BUILDLINK_ONLY. 2001-06-25 20:03:54 +00:00
jlam
34d11d8a0f Generalize how the dependency pattern may be specified. Instead of just
FOO_REQD=1.0 being converted to foo>=1.0, one can now directly specify
the dependency pattern as FOO_DEPENDS=foo>=1.0.  This allows things like
JPEG_DEPENDS=jpeg-6b, or fancier expressions like for postgresql-lib.
Change existing FOO_REQD definitions in Makefiles to FOO_DEPENDS.
2001-06-23 19:26:48 +00:00
jlam
328a35f96f LIBS is automatically added to CONFIGURE_ENV by bsd.pkg.mk if
GNU_CONFIGURE is defined, so simply set LIBS to the appropriate value.
2001-06-12 20:33:00 +00:00
jlam
c4e71c5e7a CPPFLAGS is now passed to MAKE_ENV and CONFIGURE_ENV by bsd.pkg.mk, so
adapt by moving CPPFLAGS settings to top-level, and removing explicit
inclusion of CPPFLAGS into MAKE_ENV and CONFIGURE_ENV.
2001-06-11 06:34:17 +00:00
jlam
dbfde59b14 The buildlink include and lib directories are added to CFLAGS, CPPFLAGS,
CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra
definitions to add them from the package Makefiles.  As advised by the
bsd.buildlink.mk file, also ensure that the buildlink.mk files are
included prior to defining any package-specific CFLAGS/LDFLAGS to ensure
that the buildlink directories are at the head of the compiler search
paths.
2001-06-11 02:05:07 +00:00
jlam
072be2ad69 Use bsd.buildlink.mk instead of duplicating code all over the place. 2001-06-11 01:59:33 +00:00
jlam
5d02f04b3a Use cookies (.*_done) to determine whether headers and libs have been
linked from a particular package, and add a pre-configure target to
the buildlink.mk file to more painlessly use buildlink.mk files.  A
${BUILDLINK_TARGETS} variable still exists in case a package _must_
define NO_CONFIGURE.
2001-06-10 00:09:29 +00:00
jlam
3bc5e40254 Remove dependency on ${BUILDLINK_TARGETS} in pre-configure and pre-build
targets as the buildlink.mk files now add the dependency automatically.
Remove any NO_CONFIGURE definitions as they seem to be useless.
2001-06-10 00:08:41 +00:00
wiz
5be454e29d ' '->'\t' 2001-06-09 15:25:18 +00:00
jlam
f97c2600f4 Add conflict with freetype<1.3.1 to freetype-lib and freetype-utils.
Fixes pkg/13084 by Bill Squier <groo@old-ones.com>.
2001-06-07 16:07:12 +00:00
jlam
88a22cb3bd Rework build to use buildlink.mk files so that it won't pick up installed
headers and libraries during a "make build".
2001-05-28 03:16:44 +00:00
jlam
3fff674009 Add buildlink.mk file to link appropriate libraries and headers into
${BUILDLINK_INCDIR} and ${BUILDLINK_LIBDIR}, to be used by other packages.
2001-05-28 03:09:10 +00:00
jlam
4acac02ea9 Install locale files under ${PKGLOCALEDIR} instead of always under share.
Cosmetic file changes to Makefile.common.
2001-05-03 04:28:25 +00:00
jlam
c662685ee8 Share a common distinfo file between freetype-lib and freetype-utils. 2001-05-03 04:24:35 +00:00
wiz
a4f21a5507 Move to sha1 digests, and/or add distfile sizes. 2001-04-21 09:54:06 +00:00
agc
fb467f5ac2 + move the distfile digest/checksum value from files/md5 to distinfo
+ move the patch digest/checksum values from files/patch-sum to distinfo
2001-04-17 11:22:34 +00:00
hubertf
e32afb6fea Change BUILD_DEPENDS semantics:
first component is now a package name+version/pattern, no more
executable/patchname/whatnot.

While there, introduce BUILD_USES_MSGFMT as shorthand to pull in
devel/gettext unless /usr/bin/msgfmt exists (i.e. on post-1.5 -current).

Patch by Alistair Crooks <agc@netbsd.org>
2001-03-27 03:19:43 +00:00
wiz
95e76ac1d4 Add a test if an older version of freetype-lib is installed before building,
since this breaks builds (much too often).
2001-03-16 13:28:38 +00:00
wiz
a2a4d06c6f Update to new COMMENT style: COMMENT var in Makefile instead of pkg/COMMENT. 2001-02-16 15:22:13 +00:00
agc
9c2d582fc9 The way that shared objects were handled in the PLISTs and bsd.pkg.mk was
out of date - it was based on a.out OBJECT_FMT, and added entries in the
generated PLISTs to reflect the symlinks that ELF packages uses. It also
tried to be clever, and removed and recreated any symbolic links that were
created, which has resulted in some fun, especially with packages which
use dlopen(3) to load modules. Some recent changes to our ld.so to bring
it more into line with other Operating Systems also exposed some cracks.

+ Modify bsd.pkg.mk and its shared object handling, so that PLISTs now contain
the ELF symlinks.
+ Don't mess about with file system entries when handling shared objects in
bsd.pkg.mk, since it's likely that libtool and the BSD *.mk processing will
have got it right, and have a much better idea than we do.
+ Modify PLISTs to contain "ELF symlinks"
+ On a.out platforms, delete any "ELF symlinks" from the generated PLISTs
+ On ELF platforms, no extra processing needs to be done in bsd.pkg.mk
+ Modify print-PLIST target in bsd.pkg.mk to add dummy symlink entries on
a.out platforms
+ Update the documentation in Packages.txt

With many thanks to Thomas Klausner for keeping me honest with this.
2001-01-04 15:10:17 +00:00
itojun
00df3db5a9 use USE_LIBINTL. 2000-11-04 07:05:09 +00:00
jlam
b371751250 Bump dependency on gettext to >=0.10.35nb1. For some reason, this was
missed in the sweep.
2000-10-06 01:27:38 +00:00