summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortron <tron>2002-10-30 11:34:40 +0000
committertron <tron>2002-10-30 11:34:40 +0000
commit2fc2af2e4d115ae9bd3b59b6ba323cb412baf9b1 (patch)
tree520af799fc6ec1221f89cf4ce94b7e30def8250e /x11
parentb3fa7d5e5adaa4f301ee35c3c478e1fae22c1bd8 (diff)
downloadpkgsrc-2fc2af2e4d115ae9bd3b59b6ba323cb412baf9b1.tar.gz
Revert last change. It shouldn't be necessary to include
"x11.buildlink2.mk" manually, there is a problem in the framework.
Diffstat (limited to 'x11')
-rw-r--r--x11/gtk/buildlink2.mk3
-rw-r--r--x11/xpmroot/Makefile3
-rw-r--r--x11/xscreensaver/Makefile.common3
3 files changed, 3 insertions, 6 deletions
diff --git a/x11/gtk/buildlink2.mk b/x11/gtk/buildlink2.mk
index 73f52566e6e..515082a7d9a 100644
--- a/x11/gtk/buildlink2.mk
+++ b/x11/gtk/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/10/30 10:50:18 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/10/30 11:34:40 tron Exp $
.if !defined(GTK_BUILDLINK2_MK)
GTK_BUILDLINK2_MK= # defined
@@ -17,7 +17,6 @@ BUILDLINK_FILES.gtk+= lib/libgtk.*
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/glib/buildlink2.mk"
-.include "../../mk/x11.buildlink2.mk"
BUILDLINK_TARGETS+= gtk-buildlink
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index ea797f63380..ed526b9e4d5 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2002/10/30 10:34:54 tron Exp $
+# $NetBSD: Makefile,v 1.34 2002/10/30 11:34:41 tron Exp $
#
DISTNAME= fvwm-${PKG_VERSION}
@@ -32,5 +32,4 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/utils/xpmroot.1 ${PREFIX}/man/man1
.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/x11.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 7aa0dbd2efa..07edefbd4f0 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.39 2002/10/30 10:44:27 tron Exp $
+# $NetBSD: Makefile.common,v 1.40 2002/10/30 11:34:41 tron Exp $
#
DISTNAME= xscreensaver-4.06
@@ -53,4 +53,3 @@ CONFIGURE_ARGS+= --without-kerberos
.include "../../graphics/gle/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../mk/x11.buildlink2.mk"