summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
committerjlam <jlam@pkgsrc.org>2001-08-29 22:41:00 +0000
commit63fc151cb9f15f8bcc66bbeca21050fea30c29d3 (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /devel
parent70004632b203c88d357d29ec8f217d1caa85f9c7 (diff)
downloadpkgsrc-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 'devel')
-rw-r--r--devel/SDL/Makefile4
-rw-r--r--devel/gcvs/Makefile4
-rw-r--r--devel/libdockapp/Makefile4
-rw-r--r--devel/maketool/Makefile5
4 files changed, 8 insertions, 9 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile
index 5652634ce8f..70b306a89c1 100644
--- a/devel/SDL/Makefile
+++ b/devel/SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/07/14 15:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/08/29 22:41:08 jlam Exp $
#
DISTNAME= SDL-1.2.1
@@ -19,7 +19,6 @@ REPLACE_BUILDLINK= sdl-config
GNU_CONFIGURE= YES
USE_GMAKE= YES
-USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
@@ -56,4 +55,5 @@ post-configure:
.include "../../devel/pth/buildlink.mk"
.include "../../graphics/Mesa/buildlink.mk"
.include "../../mk/ossaudio.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 269489687e2..1582a5ac3f8 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 04:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:08 jlam Exp $
DISTNAME= gcvs-1.0a7
CATEGORIES= devel
@@ -11,7 +11,6 @@ COMMENT= GTK interface for CVS
CONFLICTS= cvs-[0-9]*
USE_BUILDLINK_ONLY= yes
-USE_X11= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -25,4 +24,5 @@ post-patch:
.include "../../lang/tcl/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 95e76f11a1c..8592785fc4e 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/29 22:57:41 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:08 jlam Exp $
#
DISTNAME= libdockapp-0.4.0
@@ -13,11 +13,11 @@ USE_BUILDLINK_ONLY= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_X11= YES
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index 9e68539ab0c..f748238ec2c 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/07/13 14:41:19 fredb Exp $
+# $NetBSD: Makefile,v 1.17 2001/08/29 22:41:09 jlam Exp $
#
DISTNAME= maketool-0.6.1
@@ -14,10 +14,9 @@ USE_BUILDLINK_ONLY= YES
BUILD_USES_MSGFMT= YES
USE_GMAKE= yes
-USE_X11= yes
-
GNU_CONFIGURE= yes
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"