summaryrefslogtreecommitdiff
path: root/wm/wm2
diff options
context:
space:
mode:
authorjlam <jlam>2002-08-25 21:50:52 +0000
committerjlam <jlam>2002-08-25 21:50:52 +0000
commit4bfcc34161358d51d868f816c923eb93f927a412 (patch)
treef54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /wm/wm2
parent8820d0b0e1e20d3278c7c39632417b4d9ca31899 (diff)
downloadpkgsrc-4bfcc34161358d51d868f816c923eb93f927a412.tar.gz
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'wm/wm2')
-rw-r--r--wm/wm2/Makefile9
-rw-r--r--wm/wm2/distinfo2
-rw-r--r--wm/wm2/patches/patch-ac2
3 files changed, 6 insertions, 7 deletions
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 352c1e34ce8..a76fcb61883 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 21:51:38 jlam Exp $
DISTNAME= wm2-4
PKGNAME= wm2-4.0
@@ -11,13 +11,12 @@ COMMENT= Minimalist window manager for X
ALL_TARGET= depend wm2
-USE_BUILDLINK_ONLY= YES
-USE_X11BASE= YES
-MAKE_ENV+= CCC="${CXX}"
+USE_BUILDLINK2= YES
+USE_X11BASE= YES
+MAKE_ENV+= CCC="${BUILDLINK_CXX}"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0
-.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wm2/distinfo b/wm/wm2/distinfo
index f0f05098e50..9df81737d28 100644
--- a/wm/wm2/distinfo
+++ b/wm/wm2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/05/11 18:10:43 wiz Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 21:51:38 jlam Exp $
SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91
Size (wm2-4.tar.gz) = 32807 bytes
diff --git a/wm/wm2/patches/patch-ac b/wm/wm2/patches/patch-ac
index 5f2f987c25d..44ebef93cb1 100644
--- a/wm/wm2/patches/patch-ac
+++ b/wm/wm2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2002/05/11 18:10:43 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/25 21:51:38 jlam Exp $
--- General.h.orig Fri Mar 21 12:12:30 1997
+++ General.h