[pkgsrc/trunk]: pkgsrc/net/oinkmaster Oinkmaster can either use external tool...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c80231a996f3
branches:  trunk
changeset: 551134:c80231a996f3
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon Dec 08 13:05:22 2008 +0000

description:
Oinkmaster can either use external tools or Perl modules to do it's job
so expose this via options.mk
Silence SUBST_SED pkglint warning
PKGREVISION++

diffstat:

 net/oinkmaster/Makefile   |  10 ++++++----
 net/oinkmaster/options.mk |  18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diffs (60 lines):

diff -r ae38c3347104 -r c80231a996f3 net/oinkmaster/Makefile
--- a/net/oinkmaster/Makefile   Mon Dec 08 12:46:13 2008 +0000
+++ b/net/oinkmaster/Makefile   Mon Dec 08 13:05:22 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/02/22 19:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2008/12/08 13:05:22 adrianp Exp $
 
 DISTNAME=      oinkmaster-2.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
 
@@ -8,7 +9,6 @@
 HOMEPAGE=      http://oinkmaster.sourceforge.net/
 COMMENT=       Manage snort rule updates
 
-DEPENDS+=      wget>=1.00:../../net/wget
 DEPENDS+=      snort{,-mysql,-pgsql}-[0-9]*:../../net/snort
 
 NO_BUILD=      yes
@@ -22,13 +22,15 @@
 USE_TOOLS+=    perl:run
 REPLACE_PERL+= ${WRKSRC}/oinkmaster.pl
 
+.include "options.mk"
+
 PKG_SYSCONFSUBDIR=     snort
 
 SUBST_CLASSES+=                pub
 SUBST_STAGE.pub=       post-patch
 SUBST_FILES.pub=       oinkmaster.pl oinkmaster.conf oinkmaster.1
-SUBST_SED.pub=         -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" \
-                       -e "s|/usr/local|${PREFIX}|g"
+SUBST_SED.pub=         -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
+SUBST_SED.pub+=                -e "s|/usr/local|${PREFIX}|g"
 SUBST_MESSAGE.pub=     Fixing harcoded paths.
 
 INSTALLATION_DIRS=     bin share/snort/rules
diff -r ae38c3347104 -r c80231a996f3 net/oinkmaster/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/oinkmaster/options.mk Mon Dec 08 13:05:22 2008 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2008/12/08 13:05:22 adrianp Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.oinkmaster
+
+PKG_SUPPORTED_OPTIONS= oinkmaster-perl-tools
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Use perl tools for downloading rule files
+###
+.if !empty(PKG_OPTIONS:Moinkmaster-perl-tools)
+DEPENDS+=      p5-Archive-Tar-[0-9]*:../../archivers/p5-Archive-Tar
+DEPENDS+=      p5-IO-Zlib-[0-9]*:../../devel/p5-IO-Zlib
+DEPENDS+=      p5-libwww-[0-9]*:../../www/p5-libwww
+.else
+DEPENDS+=      wget>=1.00:../../net/wget
+.endif