Update to 3.29 (version extracted from CVS id of main file):

	* mailserv: Fixed bug in displaying send my commands now button.

While here, make this package honour PKG_SYSCONFDIR.

4 files changed, 30 insertions, 31 deletions

diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 01a0df05473..f3e195d8ee1 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:41:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/01 11:59:48 jmmv Exp $
 #
 
 DISTNAME=	mailserv
-PKGNAME=	${DISTNAME}-3.27
+PKGNAME=	${DISTNAME}-3.29
 WRKSRC=		${WRKDIR}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.csicop.org/~fitz/www/mailserv/
@@ -12,8 +12,18 @@ HOMEPAGE=	http://www.csicop.org/~fitz/www/mailserv/
 COMMENT=	WWW interface to several types of mailing list servers
 
 USE_PERL5=	YES
+USE_PKGINSTALL=	YES
 NO_BUILD=	YES
 
+PKG_SYSCONFSUBDIR=	mailserv
+EGDIR=		${PREFIX}/share/examples/mailserv
+CONF_FILES=
+.for cf in listproc listserv mail-list maiser majordomo-admin		\
+	majordomo-share majordomo mlp pmdf smartlist subscribe
+CONF_FILES+=	${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
+.endfor
+.undef cf
+
 do-configure:
 .for file in mailserv cgi-lib.pl
 	cd ${WRKSRC} &&							\
@@ -21,27 +31,28 @@ do-configure:
 	${CP} ${file} ${file}.old &&					\
 	${SED} < ${file}.old > ${file}					\
 		-e "s|@PREFIX@|${PREFIX}|g"				\
+		-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
 		-e "s|/usr/local/bin/perl|${PREFIX}/bin/perl|g"		\
 		-e "s|/usr/bin/perl|${PREFIX}/bin/perl|g"
 .endfor
+.undef file
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cgi-bin/mailserv
 	${INSTALL_SCRIPT} ${WRKSRC}/mailserv ${PREFIX}/libexec/cgi-bin/mailserv
 	${INSTALL_SCRIPT} ${WRKSRC}/cgi-lib.pl ${PREFIX}/libexec/cgi-bin/mailserv
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/mailserv
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailserv
+	${INSTALL_DATA_DIR} ${EGDIR}
 .for cf in listproc listserv mail-list maiser majordomo-admin		\
 	majordomo-share majordomo mlp pmdf smartlist subscribe
-	[ -f ${PREFIX}/etc/mailserv/${cf}.cf ] ||			\
-	${INSTALL_DATA} ${WRKSRC}/${cf}.cf ${PREFIX}/etc/mailserv
-	${INSTALL_DATA} ${WRKSRC}/${cf}.cf ${PREFIX}/share/examples/mailserv
+	${INSTALL_DATA} ${WRKSRC}/${cf}.cf ${EGDIR}
 	cd ${PREFIX}/libexec/cgi-bin/mailserv &&			\
 	${LN} -s mailserv ${cf}
 .endfor
+.undef cf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailserv
 .for doc in ChangeLog LICENSE README
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/mailserv
 .endfor
+.undef doc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailserv/PLIST b/mail/mailserv/PLIST
index 1ce4aa5979d..34bd1f54d43 100644
--- a/mail/mailserv/PLIST
+++ b/mail/mailserv/PLIST
@@ -1,15 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:24 zuntum Exp $
-etc/mailserv/listproc.cf
-etc/mailserv/listserv.cf
-etc/mailserv/mail-list.cf
-etc/mailserv/maiser.cf
-etc/mailserv/majordomo-admin.cf
-etc/mailserv/majordomo-share.cf
-etc/mailserv/majordomo.cf
-etc/mailserv/mlp.cf
-etc/mailserv/pmdf.cf
-etc/mailserv/smartlist.cf
-etc/mailserv/subscribe.cf
+@comment $NetBSD: PLIST,v 1.2 2003/05/01 11:59:49 jmmv Exp $
 libexec/cgi-bin/mailserv/cgi-lib.pl
 libexec/cgi-bin/mailserv/listproc
 libexec/cgi-bin/mailserv/listserv
@@ -40,4 +29,3 @@ share/examples/mailserv/subscribe.cf
 @dirrm share/examples/mailserv
 @dirrm share/doc/mailserv
 @dirrm libexec/cgi-bin/mailserv
-@dirrm etc/mailserv
diff --git a/mail/mailserv/distinfo b/mail/mailserv/distinfo
index 6fe7785b895..a31cb371f0b 100644
--- a/mail/mailserv/distinfo
+++ b/mail/mailserv/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/01 13:54:10 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/05/01 11:59:49 jmmv Exp $
 
-SHA1 (mailserv.tar.gz) = c5fa245c71c5cea73da60f7f340beb81be901e2a
-Size (mailserv.tar.gz) = 25963 bytes
-SHA1 (patch-aa) = dc070d46098100a1947c8e0e477a17103617ffd7
+SHA1 (mailserv.tar.gz) = 3f00cf28775273937dba050a23907c501d3f7fe4
+Size (mailserv.tar.gz) = 26687 bytes
+SHA1 (patch-aa) = 8ee34039096ea7b94a24b87d93e49bf4b682e7d9
diff --git a/mail/mailserv/patches/patch-aa b/mail/mailserv/patches/patch-aa
index fb707749187..4203805ac53 100644
--- a/mail/mailserv/patches/patch-aa
+++ b/mail/mailserv/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/01 13:54:10 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/01 11:59:50 jmmv Exp $
 
---- mailserv.orig	Fri Nov  5 06:02:55 1999
+--- mailserv.orig	2002-10-23 02:59:51.000000000 +0200
 +++ mailserv
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ print "Content-type: text/html\n";
  ## the include files are write-protected, otherwise someone
  ## could add malicious code to them.
  
 -@INC = (".", "./config");
-+@INC = (".", "./config", "@PREFIX@/etc/mailserv");
++@INC = (".", "./config", "@PKG_SYSCONFDIR@");
  &cgiRequire("cgi-lib.pl");
  &ReadParse();
  
-@@ -65,7 +65,7 @@
+@@ -71,7 +71,7 @@ $max = 10;
   # Program into which mail is piped
-  # You can override this with $config::mailer.
+  # You can also override this with $config::mailer.
  
 -$mailer = "/usr/lib/sendmail -t";
 +$mailer = "/usr/sbin/sendmail -t";
  
+  # mailer_accepts_f
   # Use "-f address" for the mailer?
-  # Your sendmail must be configured correctly for this to work.