- Update oinkmaster to 1.1

- Tidy up of package
- New homepage on SourceForge
- Install man page, extra examples and extra doco
- Lots of change/bugfixes see:
	http://oinkmaster.sourceforge.net/changelog.shtml

3 files changed, 33 insertions, 22 deletions

diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index c711e645972..6f5a24ac019 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/20 09:36:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/29 13:53:31 adrianp Exp $
 
-DISTNAME=	oinkmaster-0.8
+DISTNAME=	oinkmaster-1.1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.it.su.se/pub/users/andreas/oinkmaster/ \
-		http://www.algonet.se/~nitzer/oinkmaster/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
 
-MAINTAINER=	adrianp@stindustries.net
-HOMEPAGE= 	http://www.algonet.se/~nitzer/oinkmaster/
+MAINTAINER=	adrianp@NetBSD.org
+HOMEPAGE= 	http://oinkmaster.sourceforge.net/
 COMMENT=	Manage snort rule updates
 
 DEPENDS+=	wget>=1.00:../../net/wget
@@ -18,25 +17,32 @@ NO_BUILD=	yes
 
 CONF_FILES=	${PREFIX}/share/examples/oinkmaster/oinkmaster.conf \
 		${PKG_SYSCONFDIR}/oinkmaster.conf
+PERL5_REQD+=	5.6.1
+EGDIR=		${PREFIX}/share/examples/oinkmaster	
+DOCDIR=		${PREFIX}/share/doc/oinkmaster
+DOCS=		INSTALL LICENSE README README.templates UPGRADING FAQ
 
 REPLACE_PERL+=	${WRKSRC}/oinkmaster.pl
 
+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."
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oinkmaster
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oinkmaster
 
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/oinkmaster
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/oinkmaster
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/oinkmaster
-	${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf \
-		${PREFIX}/share/examples/oinkmaster
-	${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster
+.	for f in ${DOCS}                  
+		${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+.	endfor                               
+.	undef f
 
-SUBST_CLASSES=	    pub
-SUBST_STAGE.pub=    post-patch
-SUBST_FILES.pub=    oinkmaster.pl oinkmaster.conf
-SUBST_SED.pub=	    -e "s|/usr/local|${PREFIX}|g" \
-		    -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
-SUBST_MESSAGE.pub=  "Fixing harcoded PATH."
+	${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
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/oinkmaster/PLIST b/net/oinkmaster/PLIST
index 89370715adf..52734acd2e8 100644
--- a/net/oinkmaster/PLIST
+++ b/net/oinkmaster/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/20 09:36:09 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/29 13:53:31 adrianp Exp $
 bin/oinkmaster
+share/doc/oinkmaster/FAQ
 share/doc/oinkmaster/INSTALL
 share/doc/oinkmaster/LICENSE
 share/doc/oinkmaster/README
+share/doc/oinkmaster/README.templates
+share/doc/oinkmaster/UPGRADING
 share/examples/oinkmaster/oinkmaster.conf
+share/examples/oinkmaster/template-examples.conf
+man/man1/oinkmaster.1
 @dirrm share/examples/oinkmaster
 @dirrm share/doc/oinkmaster
diff --git a/net/oinkmaster/distinfo b/net/oinkmaster/distinfo
index dca5879fb18..e3a0075ceb3 100644
--- a/net/oinkmaster/distinfo
+++ b/net/oinkmaster/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/20 09:36:09 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/12/29 13:53:31 adrianp Exp $
 
-SHA1 (oinkmaster-0.8.tar.gz) = 48895c46392f7ac7d5ced26ccb9fb9776e7b6ce4
-Size (oinkmaster-0.8.tar.gz) = 31725 bytes
+SHA1 (oinkmaster-1.1.tar.gz) = be216566653352782615a752993968246c4ee102
+Size (oinkmaster-1.1.tar.gz) = 69947 bytes