Honor PKG_SYSCONFDIR. Bump PKGREVISION to 1.

Closes PR pkg/20543 by Kimmo Suominen.

6 files changed, 112 insertions, 18 deletions

diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 91564464176..372d3c8e2f6 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/02 12:10:46 jmmv Exp $
 #
 
 DISTNAME=	prayer-1.0.5
+PKGREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
 
@@ -16,6 +17,20 @@ USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
 USE_PERL5=	build
 
+MAKE_ENV+=	EGDIR="${EGDIR}"
+MAKE_ENV+=	PKG_SYSCONFDIR="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	prayer
+EGDIR=		${PREFIX}/share/examples/prayer
+
+CONF_FILES=	${EGDIR}/prayer.cf ${PKG_SYSCONFDIR}/prayer.cf
+CONF_FILES+=	${EGDIR}/prayer-accountd.cf ${PKG_SYSCONFDIR}/prayer-accountd.cf
+CONF_FILES+=	${EGDIR}/motd.html ${PKG_SYSCONFDIR}/motd.html
+CONF_FILES+=	${EGDIR}/welcome.html ${PKG_SYSCONFDIR}/welcome.html
+
+pre-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+
 .include "../../databases/db4/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../lang/perl5/buildlink2.mk"
diff --git a/mail/prayer/PLIST b/mail/prayer/PLIST
index 0d5aae9de9e..66f23d00f4c 100644
--- a/mail/prayer/PLIST
+++ b/mail/prayer/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $
-etc/prayer.cf
-etc/prayer-accountd.cf
-etc/motd.html
-etc/welcome.html
+@comment $NetBSD: PLIST,v 1.2 2003/03/02 12:10:46 jmmv Exp $
 sbin/prayer
+sbin/prayer-cyclog
 sbin/prayer-session
 sbin/prayer-ssl-prune
-sbin/prayer-cyclog
-@dirrm certs
+share/examples/prayer/motd.html
+share/examples/prayer/prayer-accountd.cf
+share/examples/prayer/prayer.cf
+share/examples/prayer/welcome.html
+@dirrm share/examples/prayer
diff --git a/mail/prayer/distinfo b/mail/prayer/distinfo
index c00e4d25fd5..a8e7c51df73 100644
--- a/mail/prayer/distinfo
+++ b/mail/prayer/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $
+$NetBSD: distinfo,v 1.2 2003/03/02 12:10:46 jmmv Exp $
 
 SHA1 (prayer-1.0.5.tar.gz) = 56ab33aab2c1960a28bb59f076869b4ebc4c5f4f
 Size (prayer-1.0.5.tar.gz) = 500762 bytes
-SHA1 (patch-aa) = 187f8c69ce9417c4768030bc60d3b5ee8b3b4fed
+SHA1 (patch-aa) = f4fa9ca6e4bc189bc941fbdbb47b760d19e5a5e7
 SHA1 (patch-ab) = 015dac1b72153c394666e2389339609b3dd9fcb5
-SHA1 (patch-ac) = 5f2cb8083a5b12791a873ca9587cf91c1daa9b4a
+SHA1 (patch-ac) = fc5bf9ed2c250dcf790c29379dc8405a27eacefd
 SHA1 (patch-ad) = b7501587b937767304b8bbe2d84f01663e5d74ad
+SHA1 (patch-ae) = 46ec78e0b7c777db16b187ca012f194638f7855a
diff --git a/mail/prayer/patches/patch-aa b/mail/prayer/patches/patch-aa
index 82737c8ef82..b4dcb0345de 100644
--- a/mail/prayer/patches/patch-aa
+++ b/mail/prayer/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $
+$NetBSD: patch-aa,v 1.2 2003/03/02 12:10:47 jmmv Exp $
 
---- Config.orig	Thu Nov  7 08:50:44 2002
+--- Config.orig	2002-11-07 09:50:44.000000000 +0100
 +++ Config
 @@ -17,9 +17,9 @@ ACCOUNTD_SSL_ENABLE  = false  # Enable S
  DIRECT_ENABLE        = false  # Experimental. Leave this switched off... 
@@ -56,3 +56,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $
  RO_USER   = root
  RO_GROUP  = prayer
  
+@@ -158,6 +158,6 @@ PRIVATE_DIR  = 0750
+ PRIVATE_FILE = 0640
+ 
+ # Location of configuration files and binaries
+-PRAYER_CONFIG_FILE   = ${PREFIX}/etc/prayer.cf
++PRAYER_CONFIG_FILE   = ${PKG_SYSCONFDIR}/prayer.cf
+ BIN_DIR              = ${PREFIX}/sbin
+-ACCOUNTD_CONFIG_FILE = ${PREFIX}/etc/prayer-accountd.cf
++ACCOUNTD_CONFIG_FILE = ${PKG_SYSCONFDIR}/prayer-accountd.cf
diff --git a/mail/prayer/patches/patch-ac b/mail/prayer/patches/patch-ac
index ac369124777..3194b4531fd 100644
--- a/mail/prayer/patches/patch-ac
+++ b/mail/prayer/patches/patch-ac
@@ -1,18 +1,62 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/27 12:52:07 abs Exp $
+$NetBSD: patch-ac,v 1.2 2003/03/02 12:10:47 jmmv Exp $
 
---- files/Makefile.orig	Wed Oct 30 14:08:03 2002
+--- files/Makefile.orig	2002-10-30 15:08:03.000000000 +0100
 +++ files/Makefile
-@@ -54,11 +54,11 @@ install-cert:
+@@ -12,10 +12,10 @@ endif
+ all:	./etc/prayer.cf ./init.d/prayer
+ 
+ ./etc/prayer.cf: ./etc/prayer.cf.SRC
+-	perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&;" < ./etc/prayer.cf.SRC > ./etc/prayer.cf
++	perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PKG_SYSCONFDIR__&${PKG_SYSCONFDIR}&;" < ./etc/prayer.cf.SRC > ./etc/prayer.cf
+ 
+ ./init.d/prayer: ./init.d/prayer.SRC
+-	perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PRAYER_CONFIG_FILE__&${PRAYER_CONFIG_FILE}&;" < ./init.d/prayer.SRC > ./init.d/prayer
++	perl -pe "s&__PREFIX__&${PREFIX}&; s&__VAR_PREFIX__&${VAR_PREFIX}&; s&__BIN_DIR__&${BIN_DIR}&; s&__PKG_SYSCONFDIR__&${PKG_SYSCONFDIR}&; s&__PRAYER_CONFIG_FILE__&${PRAYER_CONFIG_FILE}&;" < ./init.d/prayer.SRC > ./init.d/prayer
+ 
+ 
+ ifeq ($(strip $(SSL_ENABLE)), true)
+@@ -50,24 +50,24 @@ distclean:
+ install-cert:
+ 	if [ -f certs/prayer.pem ]; then \
+ 	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
+-	-m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
++	-m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${EGDIR}/prayer.pem; \
  	fi
  
  install-config: etc/prayer.cf
 -	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+-	etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
 +	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- 	etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
++	etc/prayer.cf ${BROOT}${EGDIR}/prayer.cf
  
  install-aconfig:
 -	$(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+-	etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
 +	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
- 	etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
++	etc/prayer-accountd.cf ${BROOT}${EGDIR}/prayer-accountd.cf
  
  install-motd:
+ 	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+-	etc/motd.html ${BROOT}${PREFIX}/etc
++	etc/motd.html ${BROOT}${EGDIR}/motd.html
+ 
+ install-welcome:
+ 	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+-	etc/welcome.html ${BROOT}${PREFIX}/etc
++	etc/welcome.html ${BROOT}${EGDIR}/welcome.html
+ 
+ install:
+ 	PREFIX=$(BROOT)$(PREFIX) VAR_PREFIX=$(BROOT)$(VAR_PREFIX) \
+@@ -78,11 +78,7 @@ install:
+ 	PUBLIC_EXEC=$(PUBLIC_FILE) PRIVATE_EXEC=$(PRIVATE_EXEC) \
+ 	BIN_DIR=$(BIN_DIR) INSTALL=$(INSTALL) \
+ 	./install.sh
+-	if [ ! -f $(BROOT)$(PREFIX)/certs/prayer.pem ]; then $(MAKE) install-cert; fi
+-	if [ ! -f $(BROOT)$(PRAYER_CONFIG_FILE) ]; then $(MAKE) install-config; fi
+-	if [ ! -f $(BROOT)$(ACCOUNTD_CONFIG_FILE) ]; then $(MAKE) install-aconfig; fi
+-	if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
+-	if [ ! -f $(BROOT)$(PREFIX)/etc/welcome.html ]; then $(MAKE) install-welcome; fi
++	$(MAKE) install-cert install-config install-aconfig install-motd install-welcome
+ 
+ redhat-install-init.d:
+ 	install -D -o root -g root -m 755 \
diff --git a/mail/prayer/patches/patch-ae b/mail/prayer/patches/patch-ae
new file mode 100644
index 00000000000..0cc1ded3031
--- /dev/null
+++ b/mail/prayer/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1 2003/03/02 12:10:47 jmmv Exp $
+
+--- files/etc/prayer.cf.SRC.orig	2002-11-06 11:13:44.000000000 +0100
++++ files/etc/prayer.cf.SRC
+@@ -363,16 +363,16 @@ ispell_path         = /usr/bin/ispell
+ #  <login_suffix_path>
+ 
+ # Login page prefix
+-#login_prefix_path   = "$prefix/etc/login_prefix.html"
++#login_prefix_path   = "__PKG_SYSCONFDIR__/login_prefix.html"
+ 
+ # Message of the day file
+-#motd_path           = "$prefix/etc/motd.html"
++#motd_path           = "__PKG_SYSCONFDIR__/motd.html"
+ 
+ # Login page suffix
+-#login_suffix_path   = "$prefix/etc/login_suffix.html"
++#login_suffix_path   = "__PKG_SYSCONFDIR__/login_suffix.html"
+ 
+ # Welcome text displayed when user first logs in
+-welcome_path        = "$prefix/etc/welcome.html"
++welcome_path        = "__PKG_SYSCONFDIR__/welcome.html"
+ 
+ # Location of help files
+ help_dir            = "$prefix/help"