Thu Nov 26 14:11:44 2009 UTC ()
Fix PLIST. Create necessary directories.


(joerg)
diff -r1.1.1.1 -r1.2 pkgsrc/net/vnstat/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/vnstat/PLIST
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/vnstat/Makefile (expand / switch to unified diff)

--- pkgsrc/net/vnstat/Makefile 2009/11/19 15:48:19 1.1.1.1
+++ pkgsrc/net/vnstat/Makefile 2009/11/26 14:11:44 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1.1.1 2009/11/19 15:48:19 sborrill Exp $ 1# $NetBSD: Makefile,v 1.2 2009/11/26 14:11:44 joerg Exp $
2 2
3DISTNAME= vnstat-1.9 3DISTNAME= vnstat-1.9
 4PKGREVISION= 1
4CATEGORIES= net 5CATEGORIES= net
5MASTER_SITES= http://humdi.net/vnstat/ 6MASTER_SITES= http://humdi.net/vnstat/
6#DISTFILES=${DISTNAME}.tar.gz 7#DISTFILES=${DISTNAME}.tar.gz
7 8
8MAINTAINER= sborrill@NetBSD.org 9MAINTAINER= sborrill@NetBSD.org
9HOMEPAGE= http://humdi.net/vnstat/ 10HOMEPAGE= http://humdi.net/vnstat/
10COMMENT= Small network traffic monitor 11COMMENT= Small network traffic monitor
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15USE_TOOLS+= gmake 16USE_TOOLS+= gmake
16 17
@@ -29,36 +30,39 @@ SUBST_CLASSES+= fix-etcpath @@ -29,36 +30,39 @@ SUBST_CLASSES+= fix-etcpath
29SUBST_STAGE.fix-etcpath= pre-configure 30SUBST_STAGE.fix-etcpath= pre-configure
30SUBST_MESSAGE.fix-etcpath= Fixing path to configuration files 31SUBST_MESSAGE.fix-etcpath= Fixing path to configuration files
31SUBST_FILES.fix-etcpath= src/cfg.c 32SUBST_FILES.fix-etcpath= src/cfg.c
32SUBST_FILES.fix-etcpath+= man/vnstat.1 man/vnstatd.1 33SUBST_FILES.fix-etcpath+= man/vnstat.1 man/vnstatd.1
33SUBST_FILES.fix-etcpath+= man/vnstati.1 34SUBST_FILES.fix-etcpath+= man/vnstati.1
34SUBST_SED.fix-etcpath= -e 's,/etc/,${PKG_SYSCONFDIR}/,g' 35SUBST_SED.fix-etcpath= -e 's,/etc/,${PKG_SYSCONFDIR}/,g'
35 36
36CONF_FILES= ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG} 37CONF_FILES= ${VNSTAT_EGDIR}/vnstat.conf ${VNSTAT_CONFIG}
37 38
38RCD_SCRIPTS= vnstatd 39RCD_SCRIPTS= vnstatd
39 40
40BUILD_DEFS+= VARBASE 41BUILD_DEFS+= VARBASE
41 42
 43INSTALLATION_DIRS= bin ${VNSTAT_EGDIR} ${PKGMANDIR}/man1 \
 44 ${PKGMANDIR}/man5
 45
42.include "options.mk" 46.include "options.mk"
43 47
44do-install: 48do-install:
45 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstat \ 49 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstat \
46 ${DESTDIR}${PREFIX}/bin/vnstat 50 ${DESTDIR}${PREFIX}/bin/vnstat
47 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstatd \ 51 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstatd \
48 ${DESTDIR}${PREFIX}/bin/vnstatd 52 ${DESTDIR}${PREFIX}/bin/vnstatd
49 ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf \ 53 ${INSTALL_DATA} ${WRKSRC}/cfg/vnstat.conf \
50 ${DESTDIR}${VNSTAT_EGDIR}/vnstat.conf 54 ${DESTDIR}${VNSTAT_EGDIR}/vnstat.conf
51 ${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 \ 55 ${INSTALL_MAN} ${WRKSRC}/man/vnstat.1 \
52 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man1/vnstat.1 56 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vnstat.1
53 ${INSTALL_MAN} ${WRKSRC}/man/vnstatd.1 \ 57 ${INSTALL_MAN} ${WRKSRC}/man/vnstatd.1 \
54 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man1/vnstatd.1 58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vnstatd.1
55 ${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 \ 59 ${INSTALL_MAN} ${WRKSRC}/man/vnstat.conf.5 \
56 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man5/vnstat.conf.5 60 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/vnstat.conf.5
57 if [ "${PLIST.gd}" = "yes" ]; then \ 61 if [ "${PLIST.gd}" = "yes" ]; then \
58 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstati \ 62 ${INSTALL_PROGRAM} ${WRKSRC}/src/vnstati \
59 ${DESTDIR}${PREFIX}/bin/vnstati; \ 63 ${DESTDIR}${PREFIX}/bin/vnstati; \
60 ${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 \ 64 ${INSTALL_MAN} ${WRKSRC}/man/vnstati.1 \
61 ${DESTDIR}${PREFIX}/${PKGMANDIR:Q}/man1/vnstati.1; \ 65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/vnstati.1; \
62 fi  66 fi
63 67
64.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/vnstat/PLIST (expand / switch to unified diff)

--- pkgsrc/net/vnstat/PLIST 2009/11/19 15:48:19 1.1.1.1
+++ pkgsrc/net/vnstat/PLIST 2009/11/26 14:11:44 1.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/19 15:48:19 sborrill Exp $ 1@comment $NetBSD: PLIST,v 1.2 2009/11/26 14:11:44 joerg Exp $
2bin/vnstat 2bin/vnstat
3bin/vnstatd 3bin/vnstatd
4${PLIST.gd}bin/vnstati 4${PLIST.gd}bin/vnstati
5man/man1/vnstat.1 5man/man1/vnstat.1
6man/man1/vnstatd.1 6man/man1/vnstatd.1
7${PLIST.gd}man/man1/vnstati.1 7${PLIST.gd}man/man1/vnstati.1
 8man/man5/vnstat.conf.5
8share/examples/vnstat.conf 9share/examples/vnstat.conf
9share/examples/rc.d/vnstatd 10share/examples/rc.d/vnstatd