pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/mailgraph Simplify PLIST handling. PLIST_SUBST is...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/30635c769e88
branches:  trunk
changeset: 508421:30635c769e88
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 19 00:39:06 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/mailgraph/Makefile |  22 +++++++++-------------
 mail/mailgraph/PLIST    |  11 ++++++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diffs (73 lines):

diff -r fd0681cf6f81 -r 30635c769e88 mail/mailgraph/Makefile
--- a/mail/mailgraph/Makefile   Sun Feb 19 00:27:26 2006 +0000
+++ b/mail/mailgraph/Makefile   Sun Feb 19 00:39:06 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/19 00:39:06 wiz Exp $
 #
 
 DISTNAME=      mailgraph-1.12
@@ -22,17 +22,10 @@
 
 MG_SCRIPTS=    mailgraph.cgi mailgraph.pl
 
-REPLACE_PERL=  ${MG_SCRIPTS}
-
-CGIDIR=                libexec/cgi-bin
-DOCDIR=                share/doc/${PKGBASE}
+REPLACE_PERL+= ${MG_SCRIPTS}
 
-OWN_DIRS+=     ${PREFIX}/${DOCDIR}
 RCD_SCRIPTS=   mailgraph
 
-PLIST_SUBST+=  CGIDIR=${CGIDIR:Q}
-PLIST_SUBST+=  DOCDIR=${DOCDIR:Q}
-
 SUBST_CLASSES+=                defs
 
 SUBST_STAGE.defs=      pre-build
@@ -43,20 +36,23 @@
 # Logfile
 SUBST_SED.defs+=       -e 's,/var/log/syslog,${VARBASE}/log/maillog,g'
 #
-SUBST_MESSAGE.defs=    "Fixing defaults"
+SUBST_MESSAGE.defs=    Fixing defaults.
 
-INSTALLATION_DIRS=     ${CGIDIR} sbin
+INSTALLATION_DIRS=     sbin
+
 do-build:
 
 do-configure:
 
 do-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin
        ${INSTALL_SCRIPT} \
-           ${WRKSRC}/mailgraph.cgi ${PREFIX}/${CGIDIR}/mailgraph.cgi
+           ${WRKSRC}/mailgraph.cgi ${PREFIX}/libexec/cgi-bin/mailgraph.cgi
        ${INSTALL_SCRIPT} \
            ${WRKSRC}/mailgraph.pl ${PREFIX}/sbin/mailgraph
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailgraph
 .for i in CHANGES COPYING README
-       ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${DOCDIR}/${i}
+       ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/mailgraph/${i}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r fd0681cf6f81 -r 30635c769e88 mail/mailgraph/PLIST
--- a/mail/mailgraph/PLIST      Sun Feb 19 00:27:26 2006 +0000
+++ b/mail/mailgraph/PLIST      Sun Feb 19 00:39:06 2006 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/19 00:39:06 wiz Exp $
+libexec/cgi-bin/mailgraph.cgi
 sbin/mailgraph
-${CGIDIR}/mailgraph.cgi
-${DOCDIR}/CHANGES
-${DOCDIR}/COPYING
-${DOCDIR}/README
+share/doc/mailgraph/CHANGES
+share/doc/mailgraph/COPYING
+share/doc/mailgraph/README
 share/examples/rc.d/mailgraph
+@dirrm share/doc/mailgraph



Home | Main Index | Thread Index | Old Index