summaryrefslogtreecommitdiff
path: root/wm/pwm/patches
diff options
context:
space:
mode:
authorjlam <jlam>2002-01-31 04:07:59 +0000
committerjlam <jlam>2002-01-31 04:07:59 +0000
commit168148a5f56588ea595e6492109eff965fd38203 (patch)
tree1317d60821986db4483a535dc5ebe6714c335781 /wm/pwm/patches
parentd7510d91dbf71c6c5a73da1713e495c28f278a0e (diff)
downloadpkgsrc-168148a5f56588ea595e6492109eff965fd38203.tar.gz
Honor PKG_SYSCONFDIR and use the general INSTALL/DEINSTALL scripts.
Diffstat (limited to 'wm/pwm/patches')
-rw-r--r--wm/pwm/patches/patch-aa18
-rw-r--r--wm/pwm/patches/patch-ah19
2 files changed, 31 insertions, 6 deletions
diff --git a/wm/pwm/patches/patch-aa b/wm/pwm/patches/patch-aa
index 526a68ba696..3f4646a4903 100644
--- a/wm/pwm/patches/patch-aa
+++ b/wm/pwm/patches/patch-aa
@@ -1,19 +1,25 @@
-$NetBSD: patch-aa,v 1.3 2001/08/21 08:17:39 abs Exp $
+$NetBSD: patch-aa,v 1.4 2002/01/31 04:08:00 jlam Exp $
---- Makefile.orig Sat Jul 1 15:48:50 2000
+--- Makefile.orig Sat Jul 1 11:48:50 2000
+++ Makefile
-@@ -12,7 +12,7 @@
+@@ -10,9 +10,9 @@
+ SUBDIRS=libtu
+ LIBS += -L./libtu -ltu -lm $(X11_LIBS) -lX11
INCLUDES += -I./libtu/include $(X11_INCLUDES)
- DEFINES += -DPREFIX=\"$(PREFIX)\"
+-DEFINES += -DPREFIX=\"$(PREFIX)\"
++DEFINES += -DSYSCONFDIR=\"$(SYSCONFDIR)\"
CFLAGS += $(XOPEN_SOURCE)
-TO_REALCLEAN += pwm.1x
+TO_REALCLEAN += pwm.1
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 @@
+@@ -21,9 +21,9 @@
+ binding.o winlist.o mwmhints.o signal.o winprops.o
+
BINDIR=$(PREFIX)/bin
- ETCDIR=$(PREFIX)/etc
+-ETCDIR=$(PREFIX)/etc
++ETCDIR=$(PREFIX)/share/examples
MANDIR=$(PREFIX)/man/man1
-DOCDIR=$(PREFIX)/doc
+DOCDIR=$(PREFIX)/share/doc
diff --git a/wm/pwm/patches/patch-ah b/wm/pwm/patches/patch-ah
new file mode 100644
index 00000000000..3606496f115
--- /dev/null
+++ b/wm/pwm/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1 2002/01/31 04:08:00 jlam Exp $
+
+--- config.h.orig Sat Jun 3 18:12:54 2000
++++ config.h
+@@ -60,11 +60,11 @@
+ #define PWM_VERSION ""
+ #endif
+
+-#ifndef PREFIX
+-#define PREFIX ""
++#ifndef SYSCONFDIR
++#define SYSCONFDIR "/etc/pwm"
+ #endif
+
+-#define CF_SYS_CONFIG_LOCATION PREFIX"/etc/pwm/"
++#define CF_SYS_CONFIG_LOCATION 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"