Honor PKG_SYSCONFDIR and use the general INSTALL/DEINSTALL scripts.

5 files changed, 61 insertions, 18 deletions

diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index f2f167b2012..2f04fa99fdd 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/09/09 03:10:08 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/31 04:07:59 jlam Exp $
 #
 
 DISTNAME=	pwm-1.0
@@ -11,6 +11,24 @@ COMMENT=	Window manager that frames multiple client windows in a single frame
 
 USE_BUILDLINK_ONLY=	YES
 USE_GMAKE=		YES
+MAKE_ENV+=		SYSCONFDIR="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	pwm
+EGDIR=			${PREFIX}/share/examples/pwm
+CONF_FILES=		${EGDIR}/pwm.conf ${PKG_SYSCONFDIR}/pwm.conf
+SUPPS=			buttons-default.conf
+SUPPS+=			keys-default.conf
+SUPPS+=			menus-default.conf
+SUPPS+=			look-beoslike.conf
+SUPPS+=			look-brownsteel.conf
+SUPPORT_FILES=		# empty
+.for FILE in ${SUPPS}
+SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+.endfor
+
+post-install:
+	${RM} -f ${EGDIR}/sample.conf
 
 .include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/pwm/PLIST b/wm/pwm/PLIST
index 980e7e4108a..95735c707be 100644
--- a/wm/pwm/PLIST
+++ b/wm/pwm/PLIST
@@ -1,14 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:21 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/31 04:07:59 jlam Exp $
 bin/pwm
 man/man1/pwm.1
 share/doc/pwm/config.txt
 share/doc/pwm/LICENSE
-etc/pwm/buttons-default.conf
-etc/pwm/keys-default.conf
-etc/pwm/look-beoslike.conf
-etc/pwm/look-brownsteel.conf
-etc/pwm/menus-default.conf
-etc/pwm/pwm.conf
-etc/pwm/sample.conf
-@dirrm etc/pwm
+share/examples/pwm/buttons-default.conf
+share/examples/pwm/keys-default.conf
+share/examples/pwm/look-beoslike.conf
+share/examples/pwm/look-brownsteel.conf
+share/examples/pwm/menus-default.conf
+share/examples/pwm/pwm.conf
+@dirrm share/examples/pwm
 @dirrm share/doc/pwm
diff --git a/wm/pwm/distinfo b/wm/pwm/distinfo
index 17e81ed1d5b..a31ec421cdd 100644
--- a/wm/pwm/distinfo
+++ b/wm/pwm/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.7 2001/09/09 03:10:08 jlam Exp $
+$NetBSD: distinfo,v 1.8 2002/01/31 04:07:59 jlam Exp $
 
 SHA1 (pwm-1.0.tar.gz) = 79c708a2a6260a06bc8dc586110578bf23aa01e7
 Size (pwm-1.0.tar.gz) = 93239 bytes
-SHA1 (patch-aa) = b61460733df13a3367aaa9ab38bf1463642b5356
+SHA1 (patch-aa) = 60491df1f6b259d49958a0be8d5fa32b36e71683
 SHA1 (patch-ab) = 85eeaa8284e82f170e47dba9beb4aec741933463
 SHA1 (patch-ac) = 53b2d849539a533ba03ad18ec2f1831177a8c892
 SHA1 (patch-ad) = ce5e61f7c4011366708b4a7f0b7f2f575def1867
 SHA1 (patch-ae) = 66aab44974a3076fdf72cdbf7b32c9281ff6b04b
 SHA1 (patch-af) = 58d7a96776487f0356120775084fc7d616187fde
 SHA1 (patch-ag) = f60d81c0f92fdff44e50c73b3e7bed57071cfd8c
+SHA1 (patch-ah) = a2ad468be06120abf44790e237aba8c003e61557
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"