Fix PLIST, from joerg at britannica dot bec dot de

4 files changed, 54 insertions, 6 deletions

diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile
index cd37086d931..9c3ee78e940 100644
--- a/mail/jchkmail/Makefile
+++ b/mail/jchkmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/01/08 16:26:22 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/11 11:12:21 manu Exp $
 #
 
 DISTNAME=		jchkmail-1.3.1a
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://j-chkmail.ensmp.fr/download/
 
@@ -12,8 +13,19 @@ COMMENT=		Behavior-based virus and spam milter for Sendmail
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-CONFIGURE_ARGS+=	--with-rc-dir=${PREFIX}/etc/rc.d		\
-			--with-conf-dir=${PREFIX}/etc/jchkmail
+CONFIGURE_ARGS+=	--with-rc-dir=${PREFIX}/share/examples/rc.d	\
+			--with-conf-dir=${PKG_SYSCONFDIR:Q}
+
+EGDIR=			${PREFIX}/share/examples/jchkmail
+PKG_SYSCONFSUBDIR=	jchkmail
+CONF_FILES+=		${EGDIR}/j-chkmail.cf ${PKG_SYSCONFDIR}/j-chkmail.cf
+CONF_FILES+=		${EGDIR}/j-local-users ${PKG_SYSCONFDIR}/j-local-users
+CONF_FILES+=		${EGDIR}/j-error-msg ${PKG_SYSCONFDIR}/j-error-msg
+CONF_FILES+=		${EGDIR}/j-nets ${PKG_SYSCONFDIR}/j-nets
+CONF_FILES+=		${EGDIR}/j-host-access ${PKG_SYSCONFDIR}/j-host-access
+CONF_FILES+=		${EGDIR}/j-user-access ${PKG_SYSCONFDIR}/j-user-access
+CONF_FILES+=		${EGDIR}/j-regex ${PKG_SYSCONFDIR}/j-regex
+RCD_SCRIPTS=		jchkmail
 
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/mail/jchkmail/PLIST b/mail/jchkmail/PLIST
index 1a776cef74d..0128615ad90 100644
--- a/mail/jchkmail/PLIST
+++ b/mail/jchkmail/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/22 14:33:35 manu Exp $
-etc/rc.d/jchkmail
+@comment $NetBSD: PLIST,v 1.2 2006/04/11 11:12:21 manu Exp $
 bin/j-scanfile
 bin/j-printstats
 sbin/j-chkmail
@@ -7,3 +6,12 @@ man/man1/j-printstats.1
 man/man1/j-scanfile.1
 man/man4/j-chkmail.cf.4
 man/man8/j-chkmail.8
+share/examples/jchkmail/j-chkmail.cf
+share/examples/jchkmail/j-local-users
+share/examples/jchkmail/j-error-msg
+share/examples/jchkmail/j-nets
+share/examples/jchkmail/j-host-access
+share/examples/jchkmail/j-user-access
+share/examples/jchkmail/j-regex
+share/examples/rc.d/jchkmail
+@dirrm share/examples/jchkmail
diff --git a/mail/jchkmail/distinfo b/mail/jchkmail/distinfo
index dfd2fad133d..7a19fc93ee1 100644
--- a/mail/jchkmail/distinfo
+++ b/mail/jchkmail/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 09:59:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/04/11 11:12:21 manu Exp $
 
 SHA1 (jchkmail-1.3.1a.tar.gz) = 6cade163151a2c08d42082b971b55a11c33f47c6
 RMD160 (jchkmail-1.3.1a.tar.gz) = b707514f3a04d871f32db660be8b975577e1dbf3
 Size (jchkmail-1.3.1a.tar.gz) = 420432 bytes
 SHA1 (patch-aa) = b0c8c3483c2b65570547d79c59c0974b685d57bb
 SHA1 (patch-ab) = c629836b5dbab9282104a3c2731e379c56c5ea81
+SHA1 (patch-ac) = 8be29408b4fb665d3374fb6232b596d028d69e28
diff --git a/mail/jchkmail/patches/patch-ac b/mail/jchkmail/patches/patch-ac
new file mode 100644
index 00000000000..c652a91966e
--- /dev/null
+++ b/mail/jchkmail/patches/patch-ac
@@ -0,0 +1,27 @@
+$NetBSD: patch-ac,v 1.1 2006/04/11 11:12:21 manu Exp $
+
+--- etc/Makefile.in.orig	2003-07-03 11:54:08.000000000 +0000
++++ etc/Makefile.in
+@@ -125,13 +125,8 @@ uninstall-info-am:
+ sysconfDATA_INSTALL = $(INSTALL_DATA)
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	@list='$(sysconf_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
+-	  $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
+-	done
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/jchkmail
++	for f in ${sysconf_DATA:C/.org//}; do $(BSD_INSTALL_DATA) $$f.org $(DESTDIR)$(PREFIX)/share/examples/jchkmail/$$f; done
+ 
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -218,7 +213,6 @@ info-am:
+ 
+ install-data-am:
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ 
+ install-exec-am: install-sysconfDATA