Commit graph

72 commits

Author SHA1 Message Date
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
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
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
snj
e26c9c6b59 Use ${CP} instead of cp. From Georg Schwarz in PR pkg/24634. 2004-03-02 05:01:38 +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
ec993afa1a LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:32 +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
74747843b7 Replace ICONV_IS_GNU with ICONV_TYPE, which can be checked to be either
"gnu" or "native".
2004-02-11 12:17:58 +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
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
tron
1c3192189f Don't use "-Wl" on platforms which define "_USE_RPATH" to "no". This
fixes build problems under Darwin.
2004-01-15 23:04:00 +00:00
grant
1bd16c080f kill leading whitespace, s/Libiconv/libiconv/ 2004-01-13 09:42:05 +00:00
jlam
27458276fc Use l:foo: instead of S:...: to remove a library. 2004-01-06 19:13:13 +00:00
jlam
2c03f435c8 bl3ify 2004-01-05 11:17:10 +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
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
dmcmahill
88f53da752 add a "ICONV_IS_GNU" variable which is set to "YES" when the logic here
says we need the pkgsrc libiconv.  This will let pkgs who need to know
deal appropriately.
2003-10-31 02:09:19 +00:00
xtraeme
b8947ef00d Don't try to link to -liconv in the install process, it fixes build in
FreeBSD. Closes my own PR pkg/22346.
2003-09-16 13:57:18 +00:00
seb
4167694355 NetBSD/sparc64 1.6.1_STABLE's f771 -at least- leaves a nice coredump
in directory conftest during configire run.
So then 'rmdir conftest' fails, then all 'cc -o conftest ...' tests fail,
then ...

So clean up a bit before rmdir'ing conftest hence fix compilation
on said platform.
2003-09-12 13:52:02 +00:00
seb
529e68e4f1 NetBSD-current provide iconv(3) functionality in libc not
libiconv. Some packages insist on adding '-liconv' during link
or assumes the existent of it with they found iconv.h.

BUILDLINK_TRANSFORM can handle that.
Put it in in libiconv/buildlink2.mk for systematic coverage and
remove it from package "Makefile".

BTW this fix the build of chat/centericq - and probably others - on
-current.

Okayed by jlam@.
2003-09-02 18:20:33 +00:00
jmc
dfa0d698ad Export proper link flags to LDFLAGS based on overall config (i.e. whether
libiconv exists/is needed and whether to link it in). This means packages
can avoid hardcoding LDFLAGS+=-liconv and breaking on -current.
Fixes gnomeicu for -current and 1.6.x
2003-08-18 03:37:47 +00:00
jmmv
e794dd2538 Handle installation and removal of the charset.alias file properly in binary
packages, using SUPPORT_FILES from bsd.pkg.install.mk.  Bump PKGREVISION to 1.
2003-07-28 10:11:45 +00:00
martti
e69ab8c365 COMMENT should start with a capital letter. 2003-07-21 16:35:12 +00:00
grant
91f00f1cbc s/netbsd.org/NetBSD.org/ 2003-07-17 21:21:03 +00:00
wiz
9a290ed0df Update to 1.9.1.
* Many more transliterations.
* New configuration option --enable-relocatable.
2003-07-13 13:32:29 +00:00
dillo
9d47c6ba38 use TEST_TARGET instead of custom test target 2003-07-12 13:13:46 +00:00
jlam
342ad4c6f6 Back out previous change and institute another fix for the reported
problem.  The symptoms appear to match the situation where a library exists
in /usr/lib that matches the name of the pkgsrc-installed library, but the
corresponding .la file doesn't exist in /usr/lib.  Fix this by using
building a fake libtool archive if we use the system library.
2003-06-29 19:43:58 +00:00
wiz
7bf4c1f7ad Check for existence of /usr/lib/libiconv.so too, not only for the header
file. Needed for some broken (Linux) installs.
From Sebastian P. on tech-pkg.
2003-06-29 11:19:09 +00:00
jlam
3ef633718c (1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
    worse.

(2) Create a new variable FIX_RPATH that lists variables that should
    be cleansed of -R or -rpath values if ${_USE_RPATH} is "no".  By
    default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
    additional variables may be appended from package Makefiles.
2003-03-14 19:37:30 +00:00
jlam
1eb8468c15 Add a check for /usr/lib/libiconv.* in the case where /usr/include/iconv.h
exists.  Use this check to appropriately assign a value to a new public
variable BUILDLINK_LIBICONV_LDADD that contains the linker options needed
so that the iconv functions resolve correctly.
2003-03-07 05:58:31 +00:00
grant
4d09de3d61 ensure we always install charset.alias and tidy PLIST handling,
improves portability.
2003-02-28 22:15:29 +00:00
wiz
16f56a4b00 Fix test target: do not use csh syntax (|&). Closes PR 19647. 2003-01-03 12:32:59 +00:00
grant
54e690e8f0 don't unnecessarily pass -p to `cp', it causes a fatal error on Darwin
while trying to chown a symlink.
2002-11-26 00:51:02 +00:00
agc
08b342525f At present, gmake has libiconv as a requirement, yet libiconv needs
gmake to build.  Remove the USE_GMAKE for just now - it seems
superfluous, since NetBSD's make(1) works fine, and is causing a
circular dependency.
2002-10-29 14:36:55 +00:00
wiz
5300b56849 Unused. 2002-10-09 17:41:29 +00:00
wiz
80ee491886 Since the major of libiconv was increased during the update to 1.8,
bump dependency to latest libiconv version; recursively also bump all
dependencies of packages depending on libiconv.
Requested by fredb.
2002-09-10 16:06:32 +00:00
tron
d5e2bf0f0a Rejoin NetBSD and Solaris package lists which fixes package list problems
under Solaris.
2002-09-01 20:24:17 +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
wiz
ddf436e92a Update to 1.8.
Changes since 1.7:
* The iconv program has new options -l, -c, -s.
* The iconv program is internationalized.
* Added C99 converter.
* Added KOI8-T converter.
* New configuration option --enable-extra-encodings that enables a bunch of
  additional encodings; see the README for details.
* Updated the ISO-8859-16 converter.
* Upgraded BIG5-HKSCS, EUC-TW, ISO-2022-CN, ISO-2022-CN-EXT converters to
  Unicode 3.2.
* Upgraded EUC-KR, CP949, JOHAB converters to include the Euro sign.
* Changed the ARMSCII-8 converter.
* Extended the EUC-JP encoder so that YEN SIGN characters don't cause failures
  in Shift_JIS to EUC-JP conversion.
* The JAVA converter now handles characters outside the Unicode BMP correctly.
* Fixed a bug in the CP1255, CP1258, TCVN decoders: The base characters of
  combining characters could be dropped at the end of the conversion buffer.
* Fixed a bug in the transliteration that could lead to excessive memory
  allocations in libintl when transliteration was needed.
* Portability to BSD/OS and SCO 3.2.5.
2002-08-20 11:52:10 +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
jlam
3fefb9145b Allow system libiconv to be used if it's provided. If USE_GNU_ICONV is
defined, then we always use the pkgsrc libiconv.  INCOMPAT_ICONV can be
appended to with machine platform style entries, e.g. NetBSD-*-*, to note
when a system libiconv can't be used.  We currently default to needing
pkgsrc libiconv on NetBSD only.  This should fix pkg/17500.
2002-08-05 21:26:04 +00:00
grant
3a2577e59e update MASTER_SITES to use MASTER_SITE_GNU. 2002-07-12 06:37:14 +00:00
wiz
bd42d28342 Add some more charsets to the alias file (see previous revision).
Fixes e.g. the second gtk2 demo in the gtk2 tutorial on the web.
Patch from libiconv CVS via Owen Tayler.

Bump to 1.7nb2, and depend on it in buildlink.mk.
2002-05-14 15:57:55 +00:00