[pkgsrc/trunk]: pkgsrc/net/oinkmaster - Update oinkmaster to nb1

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/81848e34d350
branches:  trunk
changeset: 493276:81848e34d350
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Mon May 02 10:48:16 2005 +0000

description:
- Update oinkmaster to nb1
- Fix SUBST_* to get it working in the right order
- Change location of oinkmaster.conf
- Update MESSAGE to show where oinkmaster.conf is now stored
- Depend on the snort{-pgsql,-mysql} package
- Automagically ${LN} files instead of just telling the user to do it
- Whitespace police

diffstat:

 net/oinkmaster/DESCR    |  12 ++++++------
 net/oinkmaster/MESSAGE  |  12 +++---------
 net/oinkmaster/Makefile |  35 ++++++++++++++++++++++++-----------
 net/oinkmaster/PLIST    |   9 +++++++--
 4 files changed, 40 insertions(+), 28 deletions(-)

diffs (135 lines):

diff -r 181cf65febd0 -r 81848e34d350 net/oinkmaster/DESCR
--- a/net/oinkmaster/DESCR      Mon May 02 08:59:08 2005 +0000
+++ b/net/oinkmaster/DESCR      Mon May 02 10:48:16 2005 +0000
@@ -1,7 +1,7 @@
-Oinkmaster is simple Perl script released under the BSD license to help you 
-update/manage your Snort 2.0+ rules and comment out the unwanted ones after 
-each update (among other things). It will tell you exactly what had changed 
+Oinkmaster is simple Perl script released under the BSD license to help you
+update/manage your Snort 2.0+ rules and comment out the unwanted ones after
+each update (among other things). It will tell you exactly what had changed
 since the last update, hence giving you good control of your rules.
-Oinkmaster can be used to manage the official rules from www.snort.org, but 
-can just as well be used for managing your homemade rules and distribute 
-them between sensors. 
+Oinkmaster can be used to manage the official rules from www.snort.org, but
+can just as well be used for managing your homemade rules and distribute
+them between sensors.
diff -r 181cf65febd0 -r 81848e34d350 net/oinkmaster/MESSAGE
--- a/net/oinkmaster/MESSAGE    Mon May 02 08:59:08 2005 +0000
+++ b/net/oinkmaster/MESSAGE    Mon May 02 10:48:16 2005 +0000
@@ -1,14 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2005/04/27 19:50:48 adrianp Exp $
+$NetBSD: MESSAGE,v 1.3 2005/05/02 10:48:16 adrianp Exp $
 
-You will receive two false positives about classification.config and
-reference.config as oinkmaster expects these files to be in 
-${PREFIX}/share/snort/rules.  To resolve this enter the following
-commands:
+Oinkmaster now stores its configuration file in:
 
- ${LN} -s ${PKG_SYSCONFDIR}/snort/classification.config \
-       ${PREFIX}/share/snort/rules/classification.config
- ${LN} -s ${PKG_SYSCONFDIR}/snort/reference.config \
-       ${PREFIX}/share/snort/rules/reference.config
+       ${PKG_SYSCONFDIR}
 
 ===========================================================================
diff -r 181cf65febd0 -r 81848e34d350 net/oinkmaster/Makefile
--- a/net/oinkmaster/Makefile   Mon May 02 08:59:08 2005 +0000
+++ b/net/oinkmaster/Makefile   Mon May 02 10:48:16 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2005/04/27 19:50:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/02 10:48:16 adrianp Exp $
 
 DISTNAME=      oinkmaster-1.2
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
 
@@ -9,6 +10,7 @@
 COMMENT=       Manage snort rule updates
 
 DEPENDS+=      wget>=1.00:../../net/wget
+DEPENDS+=      snort{,-mysql,-pgsql}-[0-9]*:../../net/snort
 
 USE_PKGINSTALL=        yes
 USE_PERL5=     yes
@@ -17,32 +19,43 @@
 CONF_FILES=    ${PREFIX}/share/examples/oinkmaster/oinkmaster.conf \
                ${PKG_SYSCONFDIR}/oinkmaster.conf
 PERL5_REQD+=   5.6.1
-EGDIR=         ${PREFIX}/share/examples/oinkmaster     
+EGDIR=         ${PREFIX}/share/examples/oinkmaster
 DOCDIR=                ${PREFIX}/share/doc/oinkmaster
 DOCS=          INSTALL LICENSE README README.templates UPGRADING FAQ
 
 REPLACE_PERL+= ${WRKSRC}/oinkmaster.pl
-MESSAGE_SUBST+=        LN=${LN}
+
+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|${PREFIX}|g" \
-                   -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.pub=  "Fixing harcoded paths."
+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_MESSAGE.pub=     "Fixing harcoded paths."
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oinkmaster
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oinkmaster
 
-.      for f in ${DOCS}                  
+.      for f in ${DOCS}
                ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
-.      endfor                               
+.      endfor
 .      undef f
 
        ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR}
        ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/man/man1
        ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster
+       ${LN} -s ${PKG_SYSCONFDIR}/classification.config \
+               ${PREFIX}/share/snort/rules/classification.config
+       ${LN} -s ${PKG_SYSCONFDIR}/reference.config \
+               ${PREFIX}/share/snort/rules/reference.config
+       ${LN} -s ${PKG_SYSCONFDIR}/gen-msg.map \
+               ${PREFIX}/share/snort/rules/gen-msg.map
+       ${LN} -s ${PKG_SYSCONFDIR}/sid-msg.map \
+               ${PREFIX}/share/snort/rules/sid-msg.map
+       ${LN} -s ${PKG_SYSCONFDIR}/unicode.map \
+               ${PREFIX}/share/snort/rules/unicode.map
 
 .include "../../mk/bsd.pkg.mk"
diff -r 181cf65febd0 -r 81848e34d350 net/oinkmaster/PLIST
--- a/net/oinkmaster/PLIST      Mon May 02 08:59:08 2005 +0000
+++ b/net/oinkmaster/PLIST      Mon May 02 10:48:16 2005 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/29 13:53:31 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/05/02 10:48:16 adrianp Exp $
 bin/oinkmaster
+man/man1/oinkmaster.1
 share/doc/oinkmaster/FAQ
 share/doc/oinkmaster/INSTALL
 share/doc/oinkmaster/LICENSE
@@ -8,6 +9,10 @@
 share/doc/oinkmaster/UPGRADING
 share/examples/oinkmaster/oinkmaster.conf
 share/examples/oinkmaster/template-examples.conf
-man/man1/oinkmaster.1
+share/snort/rules/classification.config
+share/snort/rules/gen-msg.map
+share/snort/rules/reference.config
+share/snort/rules/sid-msg.map
+share/snort/rules/unicode.map
 @dirrm share/examples/oinkmaster
 @dirrm share/doc/oinkmaster