diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 9ff693053b2b42cd6a29b886e071ad01acdeefe2 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /net/flow-tools | |
| parent | 4a580ef74536ed1f7c6a7ecd5a26e46a93aec9b3 (diff) | |
| download | pkgsrc-9ff693053b2b42cd6a29b886e071ad01acdeefe2.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'net/flow-tools')
| -rw-r--r-- | net/flow-tools/Makefile | 7 | ||||
| -rw-r--r-- | net/flow-tools/PLIST | 14 |
2 files changed, 10 insertions, 11 deletions
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index a843158e1fc..0948a111c44 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:02 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:08 jlam Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 2 @@ -44,19 +44,18 @@ CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX:Q} .endif # Python scripts support. +PLIST_VARS+= python .if !empty(PKG_OPTIONS:Mpython) . include "../../lang/python/application.mk" PYTHON_PATCH_SCRIPTS= bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt -PLIST_SUBST+= PYTHON_OPT="" +PLIST.python= yes post-install: . for s in flow-rpt2rrd flow-log2rrd flow-rptfmt ${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s} ${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/${PKGMANDIR}/man1/${s}.1 . endfor -.else -PLIST_SUBST+= PYTHON_OPT="@comment " .endif # To avoid providing more patch files we do the following... diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST index 8897acec3ab..9cb259e734c 100644 --- a/net/flow-tools/PLIST +++ b/net/flow-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/06/23 14:20:56 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:08 jlam Exp $ bin/flow-capture bin/flow-cat bin/flow-dscan @@ -9,15 +9,15 @@ bin/flow-filter bin/flow-gen bin/flow-header bin/flow-import -${PYTHON_OPT}bin/flow-log2rrd +${PLIST.python}bin/flow-log2rrd bin/flow-mask bin/flow-merge bin/flow-nfilter bin/flow-print bin/flow-receive bin/flow-report -${PYTHON_OPT}bin/flow-rpt2rrd -${PYTHON_OPT}bin/flow-rptfmt +${PLIST.python}bin/flow-rpt2rrd +${PLIST.python}bin/flow-rptfmt bin/flow-send bin/flow-split bin/flow-stat @@ -39,15 +39,15 @@ man/man1/flow-filter.1 man/man1/flow-gen.1 man/man1/flow-header.1 man/man1/flow-import.1 -${PYTHON_OPT}man/man1/flow-log2rrd.1 +${PLIST.python}man/man1/flow-log2rrd.1 man/man1/flow-mask.1 man/man1/flow-merge.1 man/man1/flow-nfilter.1 man/man1/flow-print.1 man/man1/flow-receive.1 man/man1/flow-report.1 -${PYTHON_OPT}man/man1/flow-rpt2rrd.1 -${PYTHON_OPT}man/man1/flow-rptfmt.1 +${PLIST.python}man/man1/flow-rpt2rrd.1 +${PLIST.python}man/man1/flow-rptfmt.1 man/man1/flow-send.1 man/man1/flow-split.1 man/man1/flow-stat.1 |