summaryrefslogtreecommitdiff
path: root/wm/wm2/patches
diff options
context:
space:
mode:
authorjlam <jlam>2001-08-29 22:41:00 +0000
committerjlam <jlam>2001-08-29 22:41:00 +0000
commitf1323b234ca20824755b76198612200030970f1a (patch)
tree0943c3791afa0b712d3818b69672014acfe55e03 /wm/wm2/patches
parentbe19eefa6c1513ef751e213c6afbe76404f3ced2 (diff)
downloadpkgsrc-f1323b234ca20824755b76198612200030970f1a.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/patches')
-rw-r--r--wm/wm2/patches/patch-aa16
1 files changed, 9 insertions, 7 deletions
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: