summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-23 13:14:43 +0000
committerjlam <jlam@pkgsrc.org>2001-10-23 13:14:43 +0000
commitdff59f9ec3fce115212f12209d16f2eb7efc230a (patch)
treec71c5298b558906fd133ec61d9111ec38e51b68d /wm
parent936b41aaa1ea35b5419d2d89a11c464a758ad424 (diff)
downloadpkgsrc-dff59f9ec3fce115212f12209d16f2eb7efc230a.tar.gz
x11.buildlink.mk needs to be included before any buildlink.mk files that
use X11_BUILDLINK_MK as a test value. Generally just reordering the inclusions so that x11.buildlink.mk comes before the other buildlink.mk files will make everthing work.
Diffstat (limited to 'wm')
-rw-r--r--wm/afterstep/Makefile4
-rw-r--r--wm/amaterus/Makefile4
-rw-r--r--wm/enlightenment/Makefile4
-rw-r--r--wm/flwm/Makefile4
-rw-r--r--wm/icewm-gnome/Makefile4
-rw-r--r--wm/icewm/Makefile4
-rw-r--r--wm/windowmaker/Makefile4
-rw-r--r--wm/wmakerconf/Makefile4
8 files changed, 16 insertions, 16 deletions
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index aa343a326ee..7b57e495748 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:48 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/10/23 13:15:04 jlam Exp $
DISTNAME= AfterStep-1.8.9
PKGNAME= afterstep-1.8.9
@@ -40,9 +40,9 @@ pre-configure:
${CHMOD} 755 configure; \
autoheader --localdir=autoconf autoconf/configure.in > autoconf/config.h.in;
+.include "../../mk/x11.buildlink.mk"
.include "../../audio/rplay/buildlink.mk"
.include "../../graphics/jpeg/buildlink.mk"
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/amaterus/Makefile b/wm/amaterus/Makefile
index 281038ef6d1..0be2f9ddaeb 100644
--- a/wm/amaterus/Makefile
+++ b/wm/amaterus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/08/29 22:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:04 jlam Exp $
DISTNAME= amaterus-0.34.1
CATEGORIES= wm
@@ -16,7 +16,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amaterus
${INSTALL_DATA} ${WRKSRC}/README.en ${PREFIX}/share/doc/amaterus
+.include "../../mk/x11.buildlink.mk"
.include "../../textproc/libxml/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index dbee50bd426..505c57789d7 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/08/29 22:41:22 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:04 jlam Exp $
DISTNAME= enlightenment-0.16.4
CATEGORIES= x11 gnome wm
@@ -38,10 +38,10 @@ post-install:
${FIND} ${PREFIX}/share/enlightenment/themes -type f | \
${XARGS} ${CHMOD} ${NONBINMODE}
+.include "../../mk/x11.buildlink.mk"
.include "../../audio/esound/buildlink.mk"
.include "../../graphics/imlib/buildlink.mk"
.include "../../graphics/fnlib/buildlink.mk"
.include "../../graphics/freetype-lib/buildlink.mk"
.include "../../www/libghttp/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index f2c71a2696b..0d99213360f 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/21 12:25:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $
#
DISTNAME= flwm-1.00
@@ -16,6 +16,6 @@ USE_X11BASE= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ENV+= X_LIBS="-lGL"
-.include "../../x11/fltk/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
+.include "../../x11/fltk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index fac6e2efcab..e080e0873ed 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 03:37:02 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/10/23 13:15:05 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
COMMENT= small, fast and light-weight window manager (GNOME version)
@@ -12,6 +12,6 @@ USE_BUILDLINK_ONLY= # defined
CONFIGURE_ARGS+= --with-gnome-menus="${GNOME_CONFIG}"
CONFIGURE_ARGS+= --with-imlib
-.include "../../x11/gnome-libs/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index bd8273f33bb..54d60a0f16c 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/09/09 03:37:02 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/10/23 13:15:05 jlam Exp $
#
COMMENT= small, fast and light-weight window manager
@@ -8,6 +8,6 @@ CONFLICTS+= icewm-gnome-[0-9]*
USE_BUILDLINK_ONLY= # defined
.include "Makefile.common"
-.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/x11.buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 8e29ee44803..dfa8220189b 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/07 13:08:32 rh Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/23 13:15:05 jlam Exp $
DISTNAME= WindowMaker-0.70.0
PKGNAME= windowmaker-0.70.0
@@ -79,6 +79,7 @@ post-install:
FAQ FAQ.I18N \
${PREFIX}/share/doc/WindowMaker
+.include "../../mk/x11.buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../graphics/hermes/buildlink.mk"
.include "../../graphics/libungif/buildlink.mk"
@@ -86,5 +87,4 @@ post-install:
.include "../../graphics/png/buildlink.mk"
.include "../../graphics/tiff/buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmakerconf/Makefile b/wm/wmakerconf/Makefile
index 8bbfd484b32..0359fd6d96d 100644
--- a/wm/wmakerconf/Makefile
+++ b/wm/wmakerconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/10/05 13:23:51 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/10/23 13:15:06 jlam Exp $
#
DISTNAME= wmakerconf-2.8.1
@@ -15,10 +15,10 @@ USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= wraster="${GET_WRASTER_FLAGS}"
+.include "../../mk/x11.buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../devel/libproplist/buildlink.mk"
.include "../../graphics/imlib/buildlink.mk"
.include "../../wm/windowmaker/buildlink.mk"
.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"