Commit graph

102 commits

Author SHA1 Message Date
tv
82b2f0a381 Use $(INSTALL), not $(INSTALL_DATA), to install a library. Some platforms
(e.g., Interix) still expect a shlib to be executable, and INSTALL_DATA
installs with mode 644 (non-executable).
2004-04-20 19:50:35 +00:00
reed
41235e4fdd Do not assume that if /usr/lib/libintl.* does not exist
that it can not be builtin.  So also check for "This file is part
of the GNU C Library".

This helps with systems that have gettext(3) functionality
included in their glibc.

This also fixes build problem under Linux where devel/popt didn't
build "because some functions are defined both in gettext-lib and
in the native libc" as reported by minskim to tech-pkg on 21/Mar/2004.
2004-04-06 01:29:25 +00:00
jmmv
cf490c2b62 Add a script to workaround uses of msgid_plural, which is not yet supported
by our native libintl.  While it is not implemented, this allows us to build
programs against the native libintl, loosing very few functionality (some
translations of plural messages on few languages), and avoiding runtime
conflicts between native libintl and the gnu one (coming from the gettext
package).

Packages including .po files with uses of msgid_plural should define the
USE_MSGFMT_PLURALS variable to 'yes', so that the msgfmt wrapper is used.
(Do not use it when not really needed, as it will pull in perl5 as a build
dependancy).
2004-04-01 18:33:20 +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
ec6193ca9d Assume that the native gettext implementation will satisfy GNU gettext
dependencies unless USE_GNU_GETTEXT is defined or IMCOMPAT_GETTEXT is set
appropriately.  This should allow packages to use the glibc gettext
routines on Linux.
2004-03-22 20:57:38 +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
59fad5b9f8 Manipulate the buildlink depth so that libiconv and Xfixes aren't added
to BUILDLINK_DEPENDS unless their respective buildlink3.mk files are
included by the top-level Makefile.
2004-03-16 17:40:54 +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
reed
491c5d65f1 Improvements for DESCRiption and COMMENT.
(The DESCRiption was same as the other gettext package,
and the COMMENT mentioned "Tools".)
2004-03-08 18:14:33 +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
7788e26d45 USE_BUILDLINK should be "yes", not just defined. 2004-02-14 16:17:02 +00:00
grant
52f1b46a37 remove unneeded CONFIG_{GUESS,SUB}_OVERRIDE, as bsd.pkg.mk does this
automatically now.
2004-02-14 00:54:44 +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
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
jlam
5997a8acaf Add some double quotes and move a section into a protected region so we
don't keep re-evaluating it.
2004-01-11 06:29:38 +00:00
jlam
27458276fc Use l:foo: instead of S:...: to remove a library. 2004-01-06 19:13:13 +00:00
jlam
2a243f33ac It's "overwrite" not "overview"!! 2004-01-06 04:37:52 +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
83a20f5433 Don't need to set BUILDLINK_PREFIX.gettext explicitly as bsd.buildlink3.mk
does it correctly for us.
2004-01-05 09:37:05 +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
danw
e06a3e973e add -DSTATIC=static to the Darwin-specific defines so that libintl
doesn't completely gratuitously export a symbol that conflicts with
libiconv
2003-09-25 03:00:57 +00:00
wiz
b6a06da843 Undo last. While it may make live easier, it's not good for binary
packages.
2003-08-02 09:25:44 +00:00
grant
924e3daff6 when determining whether iconv is required, don't require gettext-lib
0.11.5nb1 or higher, 0.11.5 is good enough.

fixes build with slightly older installation of gettext-lib.
2003-08-02 05:59:20 +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
1f6effdcaf Only depend on gettext-lib>=0.11.5nb1 if iconv is needed.
Noted by Matthias Scheler.
2003-07-14 09:32:43 +00:00
wiz
43fa0c7cb6 PKGREVISION bump for libiconv update. 2003-07-13 13:50:19 +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
jschauma
39c404f625 Revert last after libtool now behaves as expected. 2003-03-27 18:59:37 +00:00
jschauma
f0c026d2f4 Make this install using the correct major under Irix. Oddly, libtool determines
the right version for most other packages (AFAICT), but this package seems
to be different.
2003-03-27 15:39:38 +00:00
jmmv
fc675ae0c8 Fix build on Darwin, using patch in PR pkg/20396 by Yves de Champlain. 2003-03-22 11:35:44 +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
a0020ab00f Use BUILDLINK_LIBICONV_LDADD instead of hard-coding "-liconv". This should
fix the problem where gettext-lib on certain OSes that already have iconv
functions in libc don't need to link against libiconv.
2003-03-07 05:59:48 +00:00
jlam
d2939d01fe Avoid a conditional based on the value of GNU_CONFIGURE. This allows
gettext-lib/buildlink2.mk to be included anywhere in a Makefile instead
of only after where GNU_CONFIGURE may be defined.
2003-01-05 22:16:53 +00:00
jlam
db5abc6f54 Remove -no-undefined from libtool arguments as it causes gettext-lib to
not build a shared library on platforms that libtool thinks can't handle
inter-library dependencies, e.g. OpenBSD and Solaris.
2002-12-23 14:54:22 +00:00
jlam
c3eb9a3255 These packages are no longer needed to bootstrap buildlink2. Simplify the
building of these packages by using buildlink2.
2002-12-22 19:04:07 +00:00
jlam
efefdc43bd Add "-liconv" along with "-lintl" to LIBS if we are using a newish (0.11.x)
gettext.
2002-12-20 07:11:42 +00:00