diff options
| author | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
| commit | b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /wm/ion | |
| parent | 68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff) | |
| download | pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.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 'wm/ion')
| -rw-r--r-- | wm/ion/Makefile | 3 | ||||
| -rw-r--r-- | wm/ion/distinfo | 4 | ||||
| -rw-r--r-- | wm/ion/patches/patch-ab | 14 |
3 files changed, 15 insertions, 6 deletions
diff --git a/wm/ion/Makefile b/wm/ion/Makefile index b5825de64e8..f7f66cf3eb3 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/06/30 09:01:34 zuntum Exp $ +# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:24 jlam Exp $ # DISTNAME= ion-20010523 @@ -13,4 +13,5 @@ USE_BUILDLINK_ONLY= YES USE_X11BASE= YES USE_GMAKE= YES +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ion/distinfo b/wm/ion/distinfo index b5edddf2d1e..9de3ed20b43 100644 --- a/wm/ion/distinfo +++ b/wm/ion/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/06/30 09:01:34 zuntum Exp $ +$NetBSD: distinfo,v 1.5 2001/08/29 22:41:24 jlam Exp $ SHA1 (ion-20010523.tar.gz) = d2eb29d8cd193d4b2bf1e630f4bbac7bd47979d6 Size (ion-20010523.tar.gz) = 146376 bytes SHA1 (patch-aa) = ae5fd844f89bf11d64f1f977219d70e8f868289c -SHA1 (patch-ab) = 736e1dd6d2ba3fca8932abed69e6e44a0f02f8c0 +SHA1 (patch-ab) = 1cb5844d831db2c205142f8fe295002b646b66e8 SHA1 (patch-ac) = 302f20d54304164612d04636642a88d0565da75d diff --git a/wm/ion/patches/patch-ab b/wm/ion/patches/patch-ab index e2e7edd9911..95a4b611f9e 100644 --- a/wm/ion/patches/patch-ab +++ b/wm/ion/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2001/08/29 22:41:24 jlam Exp $ ---- system.mk.orig Mon Mar 5 17:16:01 2001 +--- system.mk.orig Mon Mar 5 11:16:01 2001 +++ system.mk @@ -7,13 +7,13 @@ ## Installation paths @@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $ # Not used INCDIR=$(PREFIX)/include LIBDIR=$(PREFIX)/lib -@@ -24,7 +24,7 @@ +@@ -24,14 +24,14 @@ ## #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT @@ -27,6 +27,14 @@ $NetBSD: patch-ab,v 1.2 2001/06/16 00:29:30 wiz Exp $ ## + ## X libraries, includes and options + ## + +-X11_PREFIX=/usr/X11R6 ++X11_PREFIX=${BUILDLINK_X11_DIR} + + # SunOS/Solaris + #X11_PREFIX=/usr/openwin @@ -59,7 +59,6 @@ ## C compiler ## |