pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/postgrey Simplify PLIST handling. PLIST_SUBST isn...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e60cd1d29e72
branches:  trunk
changeset: 508428:e60cd1d29e72
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 19 01:01:39 2006 +0000

description:
Simplify PLIST handling. PLIST_SUBST isn't necessary for static paths.
Remove OWN_DIRS to fix CHECK_FILES build. Some pkglint cleanup while here.

diffstat:

 mail/postgrey/Makefile |  12 ++++--------
 mail/postgrey/PLIST    |  14 ++++++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diffs (68 lines):

diff -r 683c7da28937 -r e60cd1d29e72 mail/postgrey/Makefile
--- a/mail/postgrey/Makefile    Sun Feb 19 00:56:02 2006 +0000
+++ b/mail/postgrey/Makefile    Sun Feb 19 01:01:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/01/06 15:10:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/19 01:01:39 wiz Exp $
 #
 
 DISTNAME=      postgrey-1.21
@@ -38,17 +38,11 @@
                        ${PKG_SYSCONFDIR}/${i}
 .endfor
 
-OWN_DIRS+=             ${PREFIX}/${DOCDIR}
-OWN_DIRS+=             ${PREFIX}/${EGDIR}
-
 OWN_DIRS_PERMS+=       ${POSTGREY_DBDIR} \
                        ${POSTGREY_USER} ${POSTGREY_GROUP} 0775
 
 FILES_SUBST+=          PERL=${PERL5:Q}
 
-PLIST_SUBST+=          DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+=          EGDIR=${EGDIR:Q}
-
 SUBST_CLASSES+=                postgrey
 
 SUBST_STAGE.postgrey=  pre-build
@@ -67,7 +61,7 @@
 # Config
 SUBST_SED.postgrey+=   -e 's,/etc/postfix,${PKG_SYSCONFDIR},g'
 #
-SUBST_MESSAGE.postgrey=        "Fixing defaults"
+SUBST_MESSAGE.postgrey=        Fixing defaults.
 
 INSTALLATION_DIRS=     sbin
 
@@ -75,9 +69,11 @@
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/sbin/postgrey
+       ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
 .for i in COPYING Changes README
        ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}/${i}
 .endfor
+       ${INSTALL_DATA_DIR} ${PREFIX}/${EGDIR}
 .for i in postgrey_whitelist_clients postgrey_whitelist_recipients
        ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${EGDIR}/${i}
 .endfor
diff -r 683c7da28937 -r e60cd1d29e72 mail/postgrey/PLIST
--- a/mail/postgrey/PLIST       Sun Feb 19 00:56:02 2006 +0000
+++ b/mail/postgrey/PLIST       Sun Feb 19 01:01:39 2006 +0000
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/19 01:01:39 wiz Exp $
 sbin/postgrey
-${DOCDIR}/COPYING
-${DOCDIR}/Changes
-${DOCDIR}/README
-${EGDIR}/postgrey_whitelist_clients
-${EGDIR}/postgrey_whitelist_recipients
+share/doc/postgrey/COPYING
+share/doc/postgrey/Changes
+share/doc/postgrey/README
+share/examples/postgrey/postgrey_whitelist_clients
+share/examples/postgrey/postgrey_whitelist_recipients
 share/examples/rc.d/postgrey
+@dirrm share/examples/postgrey
+@dirrm share/doc/postgrey



Home | Main Index | Thread Index | Old Index