summaryrefslogtreecommitdiff
path: root/wm/wm2
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-29 22:41:00 +0000
committerjlam <jlam>2001-08-29 22:41:00 +0000
commitb1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /wm/wm2
parent68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff)
downloadpkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.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 'wm/wm2')
-rw-r--r--wm/wm2/Makefile4
-rw-r--r--wm/wm2/distinfo4
-rw-r--r--wm/wm2/patches/patch-aa16
3 files changed, 14 insertions, 10 deletions
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 01cd8b8493f..352c1e34ce8 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/06/30 10:17:53 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2001/08/29 22:41:25 jlam Exp $
DISTNAME= wm2-4
PKGNAME= wm2-4.0
@@ -13,9 +13,11 @@ ALL_TARGET= depend wm2
USE_BUILDLINK_ONLY= YES
USE_X11BASE= YES
+MAKE_ENV+= CCC="${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 60fc0a363cc..8318867ec6d 100644
--- a/wm/wm2/distinfo
+++ b/wm/wm2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:03:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/08/29 22:41:25 jlam Exp $
SHA1 (wm2-4.tar.gz) = dd959e72eedca113b372ddf67b95260e25226a91
Size (wm2-4.tar.gz) = 32807 bytes
-SHA1 (patch-aa) = 12e2fe7b7b74c9b1c666093c156c9b3d96656b29
+SHA1 (patch-aa) = 3abf330bd012205dbb6eeff06b0be28fe27835d3
SHA1 (patch-ab) = 047f72483a5f7d250742a5d53aa8a48ca123558e
diff --git a/wm/wm2/patches/patch-aa b/wm/wm2/patches/patch-aa
index 3f4049eee08..635155a88ba 100644
--- a/wm/wm2/patches/patch-aa
+++ b/wm/wm2/patches/patch-aa
@@ -1,16 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/08/29 22:41:26 jlam Exp $
---- Makefile.orig Sun Sep 26 23:18:49 1999
-+++ Makefile Sun Sep 26 23:19:31 1999
+--- Makefile.orig Fri Mar 21 06:12:30 1997
++++ Makefile
@@ -1,9 +1,9 @@
-LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm
-+LIBS = -Wl,-R,$(X11BASE)/lib -L$(X11BASE)/lib -lXext -lX11 -lXmu -lm
++LIBS = ${LDFLAGS} -lXext -lX11 -lXmu -lm
- CC = gcc
- CCC = gcc
+-CC = gcc
+-CCC = gcc
-CFLAGS = -O2
-+CFLAGS = -O2 -I$(X11BASE)/include
++#CC = gcc
++#CCC = gcc
++#CFLAGS = -O2
OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
.c.o: