summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorgrant <grant>2003-09-17 19:39:58 +0000
committergrant <grant>2003-09-17 19:39:58 +0000
commit064f3d9c6232e31c6822b95e817c86d72a64dcb1 (patch)
tree0fac5bcd059b9978cb00a239158f9a96c183b38c /wm
parent9f566a5759c66fbce132aceab74dcef7d72940d6 (diff)
downloadpkgsrc-064f3d9c6232e31c6822b95e817c86d72a64dcb1.tar.gz
get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or
USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.
Diffstat (limited to 'wm')
-rw-r--r--wm/blackbox/Makefile3
-rw-r--r--wm/bsetroot/Makefile3
-rw-r--r--wm/windowmaker/Makefile10
3 files changed, 7 insertions, 9 deletions
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index b4e9ee29079..7cf35dce658 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/08 08:30:48 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/17 19:41:13 grant Exp $
#
DISTNAME= blackbox-0.65.0
@@ -18,5 +18,4 @@ USE_X11= YES
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink2.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index b5213ed8aae..87ff95839ec 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/08/08 08:30:19 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:41:14 grant Exp $
#
DISTNAME= blackbox-0.65.0
@@ -26,5 +26,4 @@ do-install:
( cd ${WRKSRC}/nls && ${MAKE} install )
.include "../../devel/gettext-lib/buildlink2.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 611c9f7d607..5673aae279e 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/12 20:07:28 grant Exp $
+# $NetBSD: Makefile,v 1.39 2003/09/17 19:41:15 grant Exp $
DISTNAME= WindowMaker-0.80.2
PKGNAME= windowmaker-0.80.2
@@ -31,6 +31,10 @@ INSTALL_TARGET= install-strip
.include "../../mk/bsd.prefs.mk"
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD= 3.0
+.endif
+
PKG_SYSCONFSUBDIR= WindowMaker
EGDIR= ${PREFIX}/share/examples/WindowMaker
CONF_FILES=
@@ -92,7 +96,3 @@ post-install:
.include "../../graphics/xpm/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3= # defined
-.endif