From 1bf85a33a7f0af352174332dac11865971217df5 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 Jan 2006 20:19:02 +0000 Subject: Backport a change from 1.5.22 to 1.5.18 that fixes some issues with temp dir creation when using relink-based finalization. --- wm/pwm/patches/patch-aa | 47 -------------------------------- wm/pwm/patches/patch-ac | 13 --------- wm/pwm/patches/patch-af | 34 ----------------------- wm/pwm/patches/patch-ag | 72 ------------------------------------------------- wm/pwm/patches/patch-ah | 13 --------- 5 files changed, 179 deletions(-) delete mode 100644 wm/pwm/patches/patch-aa delete mode 100644 wm/pwm/patches/patch-ac delete mode 100644 wm/pwm/patches/patch-af delete mode 100644 wm/pwm/patches/patch-ag delete mode 100644 wm/pwm/patches/patch-ah (limited to 'wm/pwm/patches') diff --git a/wm/pwm/patches/patch-aa b/wm/pwm/patches/patch-aa deleted file mode 100644 index 76dd7827d76..00000000000 --- a/wm/pwm/patches/patch-aa +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2003/08/12 06:44:37 jlam Exp $ - ---- Makefile.orig Wed May 28 14:58:16 2003 -+++ Makefile Wed Jul 16 03:44:16 2003 -@@ -32,32 +32,18 @@ - $(CC) $(OBJS) $(LDFLAGS) -o $@ - - pwm.1x: pwm.1x.in -- sed 's#PREFIX#$(PREFIX)#g' pwm.1x.in > pwm.1x -+ sed -e 's#PREFIX#$(PREFIX)#g' -e 's#PKG_SYSCONFDIR#$(PKG_SYSCONFDIR)#g' pwm.1x.in > pwm.1x - - _install: -- $(INSTALLDIR) $(BINDIR) -- $(INSTALL) -m $(BIN_MODE) pwm $(BINDIR) -- $(STRIP) $(BINDIR)/pwm -- -- $(INSTALLDIR) $(MANDIR)/man1 -- $(INSTALL) -m $(DATA_MODE) pwm.1x $(MANDIR)/man1 -- -- $(INSTALLDIR) $(DOCDIR) -- $(INSTALLDIR) $(DOCDIR)/pwm -- $(INSTALL) -m $(DATA_MODE) config.txt $(DOCDIR)/pwm -- $(INSTALL) -m $(DATA_MODE) LICENSE $(DOCDIR)/pwm -- -- $(INSTALLDIR) $(ETCDIR) -- $(INSTALLDIR) $(ETCDIR)/pwm -- for i in etc/pwm/*.conf; do \ -- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/pwm; \ -- done -- @ if test -f $(ETCDIR)/pwm/pwm.conf ; then \ -- echo "$(ETCDIR)/pwm/pwm.conf already exists. Not installing one."; \ -- else \ -- echo "Installing sample configuration file $(ETCDIR)/pwm/pwm.conf"; \ -- $(INSTALL) -m $(DATA_MODE) etc/pwm/sample.conf $(ETCDIR)/pwm/pwm.conf; \ -- fi -+ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR) -+ $(BSD_INSTALL_PROGRAM) pwm $(BINDIR) -+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1 -+ $(BSD_INSTALL_MAN) pwm.1x $(MANDIR)/man1/pwm.1 -+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)/pwm -+ $(BSD_INSTALL_DATA) config.txt LICENSE $(DOCDIR)/pwm -+ $(BSD_INSTALL_DATA_DIR) $(ETCDIR)/pwm -+ $(BSD_INSTALL_DATA) etc/pwm/*-*.conf $(ETCDIR)/pwm -+ $(BSD_INSTALL_DATA) etc/pwm/sample.conf $(ETCDIR)/pwm/pwm.conf.default - - - # Disclaimer: I don't have either Gnome or KDE. diff --git a/wm/pwm/patches/patch-ac b/wm/pwm/patches/patch-ac deleted file mode 100644 index dd05d60921a..00000000000 --- a/wm/pwm/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2003/06/01 16:17:01 salo Exp $ - ---- libtu/numparser2.h.orig 2003-05-28 23:48:15.000000000 +0200 -+++ libtu/numparser2.h 2003-06-01 17:30:54.000000000 +0200 -@@ -29,7 +29,7 @@ - - static int npnum_mulbase_add(NPNum *num, long base, long v) - { -- double iold=num->ival; -+ ulong iold=num->ival; - - num->fval=num->fval*base+(double)v; - diff --git a/wm/pwm/patches/patch-af b/wm/pwm/patches/patch-af deleted file mode 100644 index 6cabc3379b6..00000000000 --- a/wm/pwm/patches/patch-af +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-af,v 1.2 2003/06/01 16:17:02 salo Exp $ - ---- pwm.1x.in.orig 2003-05-28 23:55:08.000000000 +0200 -+++ pwm.1x.in 2003-06-01 17:42:00.000000000 +0200 -@@ -168,16 +168,16 @@ - - .SH FILES - .TP --.B /usr/local/etc/pwm/pwm.conf -+.B PKG_SYSCONFDIR/pwm.conf - System default configuration file - .TP --.B /usr/local/etc/pwm/look-*.conf -+.B PKG_SYSCONFDIR/look-*.conf - Color scheme configuration files - .TP --.B /usr/local/etc/pwm/keys-*.conf -+.B PKG_SYSCONFDIR/keys-*.conf - Key binding configuration files - .TP --.B /usr/local/etc/pwm/buttons-*.conf -+.B PKG_SYSCONFDIR/buttons-*.conf - Pointer (mouse) button binding configuration files - .TP - .B ~/.pwm/pwm.conf -@@ -186,7 +186,7 @@ - .SH SEE ALSO - The PWM home page, http://iki.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-ag b/wm/pwm/patches/patch-ag deleted file mode 100644 index f95fee48c94..00000000000 --- a/wm/pwm/patches/patch-ag +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2004/04/10 20:42:11 salo Exp $ - ---- system.mk.orig Thu Dec 28 15:08:05 2000 -+++ system.mk Thu Jul 10 21:30:50 2003 -@@ -7,13 +7,13 @@ - ## Installation paths - ## - --PREFIX=/usr/local -+#PREFIX=/usr/local - - # No need to modify these usually - BINDIR=$(PREFIX)/bin --ETCDIR=$(PREFIX)/etc -+ETCDIR=$(PREFIX)/share/examples - MANDIR=$(PREFIX)/man --DOCDIR=$(PREFIX)/doc -+DOCDIR=$(PREFIX)/share/doc - # Not used - INCDIR=$(PREFIX)/include - LIBDIR=$(PREFIX)/lib -@@ -23,7 +23,7 @@ - ## X libraries, includes and options - ## - --X11_PREFIX=/usr/X11R6 -+X11_PREFIX=$(X11BASE) - - # SunOS/Solaris - #X11_PREFIX=/usr/openwin -@@ -40,7 +40,7 @@ - ## C compiler - ## - --CC=gcc -+#CC=gcc - - # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary, - # they're mainly for development use. So, if they cause trouble (not -@@ -49,7 +49,7 @@ - - # libtu/ uses POSIX_SOURCE - --POSIX_SOURCE=-ansi -D_POSIX_SOURCE -+POSIX_SOURCE=-D_POSIX_SOURCE -D_ISOC99_SOURCE - - # and . (ion) XOPEN_SOURCE. - # There is variation among systems what should be used and how they interpret -@@ -56,19 +56,19 @@ - # it so it is perhaps better not using anything at all. - - # Most systems --#XOPEN_SOURCE=-ansi -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -+XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D__EXTENSIONS__ - # sunos, (irix) - #XOPEN_SOURCE=-ansi -D__EXTENSIONS__ - - # Same as '-Wall -pedantic-errors' without '-Wunused' as callbacks often - # have unused variables. --WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ -+#WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ - -Wtrigraphs -Wformat -Wchar-subscripts \ - -Wparentheses -pedantic-errors -Wuninitialized - - --CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) --LDFLAGS=-g $(LIBS) $(EXTRA_LIBS) -+CFLAGS+=-g $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -+LDFLAGS+=-g $(LIBS) $(EXTRA_LIBS) - - - ## diff --git a/wm/pwm/patches/patch-ah b/wm/pwm/patches/patch-ah deleted file mode 100644 index 3bd8dfecb75..00000000000 --- a/wm/pwm/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2003/06/13 03:55:17 jlam Exp $ - ---- config.h.orig 2003-05-28 23:55:08.000000000 +0200 -+++ config.h 2003-06-01 17:44:22.000000000 +0200 -@@ -79,7 +79,7 @@ - #define ETCDIR "/etc" - #endif - --#define CF_SYS_CONFIG_LOCATION ETCDIR"/pwm/" -+#define CF_SYS_CONFIG_LOCATION PKG_SYSCONFDIR"/" - #define CF_GLOBAL_CFGFILE CF_SYS_CONFIG_LOCATION"pwm.conf" - #define CF_USER_CONFIG_LOCATION ".pwm/" - #define CF_USER_CFGFILE CF_USER_CONFIG_LOCATION"pwm.conf" -- cgit v1.2.3