diff options
| author | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-08-29 22:41:00 +0000 |
| commit | 63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /sysutils | |
| parent | 70004632b203c88d357d29ec8f217d1caa85f9c7 (diff) | |
| download | pkgsrc-63fc151cb9f15f8bcc66bbeca21050fea30c29d3.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/asapm/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/gkrellm/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/xps/Makefile | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 7b184e1029d..1075abf8229 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/07/15 10:50:07 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:20 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -18,9 +18,11 @@ IGNORE+= "APM is not available for ${MACHINE_PLATFORM}" USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES -USE_X11= YES CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm +CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_DIR}/include +CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_DIR}/lib .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 872c4a9c234..15ee0774195 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/08/23 19:11:36 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:21 jlam Exp $ # DISTNAME= gkrellm-1.2.1 @@ -34,4 +34,5 @@ do-install: .include "../../devel/pth/buildlink.mk" .include "../../graphics/imlib/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile index 4325538a1a8..be2e2ccf483 100644 --- a/sysutils/xps/Makefile +++ b/sysutils/xps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/07/03 01:46:07 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/08/29 22:41:21 jlam Exp $ DISTNAME= xps-3.14 CATEGORIES= sysutils @@ -15,7 +15,8 @@ USE_X11BASE= # defined USE_BUILDLINK_ONLY= # defined GNU_CONFIGURE= # defined -CONFIGURE_ENV+= XINCLUDES="-I${X11BASE}/include" +CONFIGURE_ENV+= XINCLUDES="-I${BUILDLINK_X11_DIR}/include" .include "../../x11/lesstif/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |