Honor PKG_SYSCONFDIR, as requested in PR pkg/19289 by Thomas T. Thai.

Bump PKGREVISION to 1.

5 files changed, 64 insertions, 7 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index a814f993652..cba703d3c5f 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/23 08:49:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/21 17:31:36 jmmv Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
 DISTNAME=	ezmlm-idx-0.40
+PKGREVISION=	1
 MASTER_SITES+=	http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
 		ftp://ftp.ezmlm.org/pub/patches/
 
@@ -16,10 +17,26 @@ CONFLICTS=	ezmlm-[0-9]*
 DISTFILES+=	${EZMLM_VERS}.tar.gz
 PLIST_SRC+=	PLIST.idx
 
-do-patch:
+USE_PKGINSTALL=	YES
+
+PKG_SYSCONFSUBDIR=	ezmlm
+CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\"\\\"
+
+EGDIR=		${PREFIX}/share/examples/ezmlm-idx
+CONF_FILES=	${EGDIR}/ezcgirc ${PKG_SYSCONFDIR}/ezcgirc
+CONF_FILES+=	${EGDIR}/ezmlmrc ${PKG_SYSCONFDIR}/ezmlmrc
+
+pre-patch:
 	@${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS}
 	@${RMDIR} ${WRKSRC}
 	@${MV} ${WRKDIR}/${EZMLM_VERS} ${WRKSRC}
 	@cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < idx.patch
 
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/ezcgirc ${EGDIR}/ezcgirc
+	${INSTALL_DATA} ${WRKSRC}/ezmlmrc ${EGDIR}/ezmlmrc
+	${INSTALL_DATA} ${WRKSRC}/ezmlmglrc ${EGDIR}/ezmlmglrc
+	${INSTALL_DATA} ${WRKSRC}/ezmlmsubrc ${EGDIR}/ezmlmsubrc
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm-idx/PLIST.idx b/mail/ezmlm-idx/PLIST.idx
index 39480ea9bab..2ac4f4e8a6e 100644
--- a/mail/ezmlm-idx/PLIST.idx
+++ b/mail/ezmlm-idx/PLIST.idx
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.idx,v 1.1.1.1 2002/07/23 08:49:46 schmonz Exp $
+@comment $NetBSD: PLIST.idx,v 1.2 2003/03/21 17:31:37 jmmv Exp $
 bin/ezmlm-accept
 bin/ezmlm-archive
 bin/ezmlm-check
@@ -16,9 +16,6 @@ bin/ezmlm-request
 bin/ezmlm-split
 bin/ezmlm-store
 bin/ezmlm-tstdig
-bin/ezmlmglrc
-bin/ezmlmrc
-bin/ezmlmsubrc
 man/cat1/ezmlm-accept.0
 man/cat1/ezmlm-archive.0
 man/cat1/ezmlm-check.0
@@ -59,3 +56,8 @@ man/man1/ezmlm-tstdig.1
 man/man5/ezmlmglrc.5
 man/man5/ezmlmrc.5
 man/man5/ezmlmsubrc.5
+share/examples/ezmlm-idx/ezcgirc
+share/examples/ezmlm-idx/ezmlmglrc
+share/examples/ezmlm-idx/ezmlmrc
+share/examples/ezmlm-idx/ezmlmsubrc
+@dirrm share/examples/ezmlm-idx
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index 9018304c754..61a7ea1003c 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/23 08:49:46 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2003/03/21 17:31:37 jmmv Exp $
 
 SHA1 (ezmlm-idx-0.40.tar.gz) = 8a4db55624e6949e57ac8f243f0078b46516cf77
 Size (ezmlm-idx-0.40.tar.gz) = 553974 bytes
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
+SHA1 (patch-aa) = 648a8123596b486832ea9cebf01dedf9b2a3edd5
+SHA1 (patch-ab) = 3d51bc1ab750f5c9324815070f392f6f6aaa2da1
diff --git a/mail/ezmlm-idx/patches/patch-aa b/mail/ezmlm-idx/patches/patch-aa
new file mode 100644
index 00000000000..59f2df2dd41
--- /dev/null
+++ b/mail/ezmlm-idx/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2003/03/21 17:31:37 jmmv Exp $
+
+--- idx.h.orig	1999-12-24 21:15:01.000000000 +0100
++++ idx.h
+@@ -238,7 +238,7 @@
+ /* ezmlm-make looks first (unless the -c switch is specified) before  */
+ /* falling back to the (usually unchanged) version in the ezmlm bin   */
+ /* directory. */
+-#define TXT_ETC_EZMLMRC "/etc/ezmlm/ezmlmrc"
++#define TXT_ETC_EZMLMRC PKG_SYSCONFDIR "/ezmlmrc"
+ 
+ /* same name added to auto_bin. Note leading slash! */
+ #define TXT_EZMLMRC "/ezmlmrc"
+@@ -253,7 +253,7 @@
+ #define TXT_LOOPNUM "loopnum"
+ 
+ /* ezmlm-cgi config file for normal SUID root install */
+-#define EZ_CGIRC "/etc/ezmlm/ezcgirc"
++#define EZ_CGIRC PKG_SYSCONFDIR "/ezcgirc"
+ 
+ /* ezmlm-cgi config file for local install we expect to find the file in PWD */
+ #define EZ_CGIRC_LOC ".ezcgirc"
diff --git a/mail/ezmlm-idx/patches/patch-ab b/mail/ezmlm-idx/patches/patch-ab
new file mode 100644
index 00000000000..c3b422638e5
--- /dev/null
+++ b/mail/ezmlm-idx/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2003/03/21 17:31:37 jmmv Exp $
+
+--- BIN.orig	2003-03-21 18:19:14.000000000 +0100
++++ BIN
+@@ -21,9 +21,6 @@ c:::755:/:ezmlm-split:
+ c:::755:/:ezmlm-moderate:
+ c:::755:/:ezmlm-sub:
+ c:::755:/:ezmlm-unsub:
+-c:::644:/:ezmlmrc:
+-c:::644:/:ezmlmglrc:
+-c:::644:/:ezmlmsubrc:
+ c:::755:/:ezmlm-idx:
+ c:::755:/:ezmlm-check:
+ c:::755:/:ezmlm-gate: