diff options
| -rw-r--r-- | wm/pwm/distinfo | 9 | ||||
| -rw-r--r-- | wm/pwm/patches/patch-aa | 61 | ||||
| -rw-r--r-- | wm/pwm/patches/patch-ab | 52 | ||||
| -rw-r--r-- | wm/pwm/patches/patch-ac | 21 | ||||
| -rw-r--r-- | wm/pwm/patches/patch-ad | 31 |
5 files changed, 95 insertions, 79 deletions
diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo index df3bf883f9d..768da382a35 100644 --- a/wm/pwm/distinfo +++ b/wm/pwm/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/05/07 12:12:07 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2001/07/11 07:58:48 abs Exp $ SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7 Size (pwm-1.0.tar.gz) = 93239 bytes -SHA1 (patch-aa) = 08d7996cf6bdd3783fb868086bdfc57e723df4df -SHA1 (patch-ab) = 0f9f9329cfa2b0a8a9eb178ec19e92935aa2c823 -SHA1 (patch-ac) = d2d5f2df47e416ecd7d1c0e80346cb5ea733669a +SHA1 (patch-aa) = de9c7048a60bf232e60bfa6d8557f22a5afca5f4 +SHA1 (patch-ab) = ab1c23cab95bd60876b7905f0d9634f11bf2964e +SHA1 (patch-ac) = 8dc9752805bf1bb45340ba5d5eeb3cb7c995d9dc +SHA1 (patch-ad) = f2b28252a584d8f2dfbe100741b6bd1b45613034 diff --git a/wm/pwm/patches/patch-aa b/wm/pwm/patches/patch-aa index c5a95c4b14c..35296565349 100644 --- a/wm/pwm/patches/patch-aa +++ b/wm/pwm/patches/patch-aa @@ -1,31 +1,46 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/04/15 20:35:57 agc Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/11 07:58:48 abs Exp $ ---- system.mk.orig Sat Jul 1 07:37:50 2000 -+++ system.mk Thu Apr 5 09:25:26 2001 -@@ -7,7 +7,7 @@ - ## Installation directory prefix - ## +--- Makefile.orig Sat Jul 1 16:48:50 2000 ++++ Makefile +@@ -12,7 +12,7 @@ + INCLUDES += -I./libtu/include $(X11_INCLUDES) + DEFINES += -DPREFIX=\"$(PREFIX)\" + CFLAGS += $(XOPEN_SOURCE) +-TO_REALCLEAN += pwm.1x ++TO_REALCLEAN += pwm.1 --PREFIX=/usr/local -+#PREFIX=/usr/local + OBJS= main.o draw.o font.o frame.o event.o clientwin.o thing.o \ + property.o pointer.o key.o moveres.o cursor.o function.o \ +@@ -23,7 +23,7 @@ + BINDIR=$(PREFIX)/bin + ETCDIR=$(PREFIX)/etc + MANDIR=$(PREFIX)/man/man1 +-DOCDIR=$(PREFIX)/doc ++DOCDIR=$(PREFIX)/share/doc - #EXTRA_INCLUDES = -I$(PREFIX)/include - #EXTRA_LIBS = -L$(PREFIX)/lib -@@ -17,7 +17,7 @@ - ## X libraries, includes and options - ## + TARGETS=pwm --X11_PREFIX=/usr/X11R6 -+X11_PREFIX=${X11BASE} +@@ -33,11 +33,11 @@ - # SunOS/Solaris - #X11_PREFIX=/usr/openwin -@@ -58,7 +58,7 @@ - -Wparentheses -pedantic-errors + ###################################### - CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) --LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) -+LDFLAGS+=$(LIBS) +-pwm: $(OBJS) pwm.1x ++pwm: $(OBJS) pwm.1 + $(CC) $(OBJS) $(LDFLAGS) -o $@ +-pwm.1x: pwm.1x.in +- sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x ++pwm.1: pwm.1x.in ++ sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1 - ## + _install: + $(INSTALL) -d $(BINDIR) +@@ -45,7 +45,7 @@ + $(STRIP) $(BINDIR)/pwm + + $(INSTALL) -d $(MANDIR) +- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR) ++ $(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR) + + $(INSTALL) -d $(DOCDIR) + $(INSTALL) -d $(DOCDIR)/pwm diff --git a/wm/pwm/patches/patch-ab b/wm/pwm/patches/patch-ab index c2f59272c44..d296c40370c 100644 --- a/wm/pwm/patches/patch-ab +++ b/wm/pwm/patches/patch-ab @@ -1,46 +1,12 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/04/15 20:35:57 agc Exp $ +$NetBSD: patch-ab,v 1.2 2001/07/11 07:58:48 abs Exp $ ---- Makefile.orig Sat Jul 1 10:48:50 2000 -+++ Makefile Sun Apr 1 16:23:07 2001 -@@ -12,7 +12,7 @@ - INCLUDES += -I./libtu/include $(X11_INCLUDES) - DEFINES += -DPREFIX=\"$(PREFIX)\" - CFLAGS += $(XOPEN_SOURCE) --TO_REALCLEAN += pwm.1x -+TO_REALCLEAN += pwm.1 +--- event.c.orig Sat Jul 1 13:37:50 2000 ++++ event.c +@@ -6,6 +6,7 @@ + */ - OBJS= main.o draw.o font.o frame.o event.o clientwin.o thing.o \ - property.o pointer.o key.o moveres.o cursor.o function.o \ -@@ -23,7 +23,7 @@ - BINDIR=$(PREFIX)/bin - ETCDIR=$(PREFIX)/etc - MANDIR=$(PREFIX)/man/man1 --DOCDIR=$(PREFIX)/doc -+DOCDIR=$(PREFIX)/share/doc + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <sys/time.h> - TARGETS=pwm - -@@ -33,11 +33,11 @@ - - ###################################### - --pwm: $(OBJS) pwm.1x -+pwm: $(OBJS) pwm.1 - $(CC) $(OBJS) $(LDFLAGS) -o $@ - --pwm.1x: pwm.1x.in -- sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x -+pwm.1: pwm.1x.in -+ sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1 - - _install: - $(INSTALL) -d $(BINDIR) -@@ -45,7 +45,7 @@ - $(STRIP) $(BINDIR)/pwm - - $(INSTALL) -d $(MANDIR) -- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR) -+ $(INSTALL) -m $(DATA_MODE) pwm.1 $(MANDIR) - - $(INSTALL) -d $(DOCDIR) - $(INSTALL) -d $(DOCDIR)/pwm diff --git a/wm/pwm/patches/patch-ac b/wm/pwm/patches/patch-ac index d7390748f03..1b6a359d9e9 100644 --- a/wm/pwm/patches/patch-ac +++ b/wm/pwm/patches/patch-ac @@ -1,10 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2001/05/07 12:12:07 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2001/07/11 07:58:48 abs Exp $ ---- event.c.orig Sat Jul 1 08:37:50 2000 -+++ event.c Mon May 7 08:09:23 2001 -@@ -7,4 +7,5 @@ - - #include <stdlib.h> -+#include <string.h> - #include <unistd.h> - #include <sys/time.h> +--- pwm.1x.in.orig Sat Jul 1 15:11:03 2000 ++++ pwm.1x.in +@@ -48,7 +48,7 @@ + .SH SEE ALSO + The PWM home page, http://www.students.tut.fi/~tuomov/pwm/ + .PP +-.BR PREFIX/doc/pwm/config.txt ++.BR PREFIX/share/doc/pwm/config.txt + .PP + .BR X (1x) + .SH AUTHOR diff --git a/wm/pwm/patches/patch-ad b/wm/pwm/patches/patch-ad new file mode 100644 index 00000000000..4761953998e --- /dev/null +++ b/wm/pwm/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.1 2001/07/11 07:58:49 abs Exp $ + +--- system.mk.orig Sat Jul 1 13:37:50 2000 ++++ system.mk +@@ -7,7 +7,7 @@ + ## Installation directory prefix + ## + +-PREFIX=/usr/local ++#PREFIX=/usr/local + + #EXTRA_INCLUDES = -I$(PREFIX)/include + #EXTRA_LIBS = -L$(PREFIX)/lib +@@ -17,7 +17,7 @@ + ## X libraries, includes and options + ## + +-X11_PREFIX=/usr/X11R6 ++X11_PREFIX=${X11BASE} + + # SunOS/Solaris + #X11_PREFIX=/usr/openwin +@@ -58,7 +58,7 @@ + -Wparentheses -pedantic-errors + + CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) +-LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) ++LDFLAGS+=$(LIBS) + + + ## |