summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-02-19 00:39:06 +0000
committerwiz <wiz@pkgsrc.org>2006-02-19 00:39:06 +0000
commit95cf014fb1e0a1b6a209939fbdb1f65bcdc44181 (patch)
tree355946c05e8f8c1ffec153633f12f1bbcc1431e8
parent652d95563f90deae0581b7a4f54eca99622a2ebd (diff)
downloadpkgsrc-95cf014fb1e0a1b6a209939fbdb1f65bcdc44181.tar.gz
Simplify PLIST handling. PLIST_SUBST isn't necessary for static paths.
Remove OWN_DIRS to fix CHECK_FILES build. Some pkglint cleanup while here.
-rw-r--r--mail/mailgraph/Makefile22
-rw-r--r--mail/mailgraph/PLIST11
2 files changed, 15 insertions, 18 deletions
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index e69f50c3eff..e4cf61a07e7 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -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 @@ DBDIR?= ${VARBASE}/db/${PKGBASE}
MG_SCRIPTS= mailgraph.cgi mailgraph.pl
-REPLACE_PERL= ${MG_SCRIPTS}
+REPLACE_PERL+= ${MG_SCRIPTS}
-CGIDIR= libexec/cgi-bin
-DOCDIR= share/doc/${PKGBASE}
-
-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 @@ SUBST_SED.defs+= -e 's,/var/log$$,${DBDIR},g'
# 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= sbin
-INSTALLATION_DIRS= ${CGIDIR} 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 --git a/mail/mailgraph/PLIST b/mail/mailgraph/PLIST
index 87ff7740c36..ae1a0264880 100644
--- a/mail/mailgraph/PLIST
+++ b/mail/mailgraph/PLIST
@@ -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