From root+utd59514@utdallas.edu  Tue Jan 24 03:54:38 2006
Return-Path: <root+utd59514@utdallas.edu>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 42A8E16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Jan 2006 03:54:38 +0000 (GMT)
	(envelope-from root+utd59514@utdallas.edu)
Received: from smtp1.utdallas.edu (smtp1.utdallas.edu [129.110.10.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 01FE043FE5
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 24 Jan 2006 03:54:37 +0000 (GMT)
	(envelope-from root+utd59514@utdallas.edu)
Received: from utd59514.utdallas.edu (utd59514.utdallas.edu [129.110.3.28])
	by smtp1.utdallas.edu (Postfix) with ESMTP id 890F638917B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Jan 2006 21:54:37 -0600 (CST)
Received: by utd59514.utdallas.edu (Postfix, from userid 0)
	id 6051844482D; Mon, 23 Jan 2006 21:54:37 -0600 (CST)
Message-Id: <20060124035437.6051844482D@utd59514.utdallas.edu>
Date: Mon, 23 Jan 2006 21:54:37 -0600 (CST)
From: Paul Schmehl <pauls@utdallas.edu>
Reply-To: Paul Schmehl <pauls@utdallas.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: security/barnyard, update port and add slave port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         92239
>Category:       ports
>Synopsis:       security/barnyard, update port and add slave port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 24 04:00:21 GMT 2006
>Closed-Date:    Thu Jan 26 10:17:25 GMT 2006
>Last-Modified:  Thu Jan 26 10:17:25 GMT 2006
>Originator:     Paul Schmehl
>Release:        FreeBSD 5.4-SECURITY i386
>Organization:
University of Texas at Dallas
>Environment:
System: FreeBSD hostname.utdallas.edu 5.4-SECURITY FreeBSD 5.4-SECURITY #0: Wed Jul 20 08:57:11 UTC 2005 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update port to add a slave port
	Patch Makefile and pkg-plist
	Move pkg-message to files/pkg-message.in
	Move files/barnyard.sh to files/barnyard.sh.in
>How-To-Repeat:
	
>Fix:

	

--- patch-Makefile begins here ---
--- Makefile.orig	Mon Jan 23 21:42:07 2006
+++ Makefile	Mon Jan 23 21:40:15 2006
@@ -4,13 +4,12 @@
 #
 # $FreeBSD: ports/security/barnyard/Makefile,v 1.5 2005/11/15 06:50:54 ade Exp $
 #
-
 PORTNAME=	barnyard
 PORTVERSION=	0.2.0
-CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	barnyard
-#DISTNAME=	barnyard
+
+CATEGORIES=	security
 
 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	An output system for Snort
@@ -21,16 +20,15 @@
 		POSTGRESQL "Enable PostgreSQL support" off
 
 USE_AUTOTOOLS=	autoheader:259 autoconf:259
-USE_REINPLACE=	yes
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
-
+USE_RC_SUBR=	barnyard.sh
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+SLAVEDIRS=	security/barnyard-sguil6
+SUB_FILES=	pkg-message
 
-DOCS=		AUTHORS COPYING LICENSE.QPL README docs/BUGS docs/ChangeLog \
-		docs/FAQ docs/INSTALL docs/NEWS docs/USAGE
+DOCS=		AUTHORS COPYING LICENSE.QPL README
+PORTDOCS=	BUGS ChangeLog FAQ INSTALL NEWS USAGE
 
 .include <bsd.port.pre.mk>
 
@@ -44,12 +42,8 @@
 CONFIGURE_ARGS+=	--enable-postgres
 .endif
 
-post-patch:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/barnyard.sh > ${WRKDIR}/barnyard.sh
-
 post-install:
-	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/barnyard.sh ${PREFIX}/etc/rc.d/barnyard.sh
+
 .for f in barnyard.conf
 	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${PREFIX}/etc/${f}-sample
 	[ -f ${PREFIX}/etc/${f} ] || \
@@ -58,6 +52,7 @@
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
--- patch-Makefile ends here ---

--- patch-pkg-plist begins here ---
--- pkg-plist.orig	Mon Jan 23 21:42:25 2006
+++ pkg-plist	Mon Jan 23 21:40:15 2006
@@ -1,15 +1,7 @@
-@unexec if [ -f %D/etc/barnyard.conf ] && cmp -s %D/etc/barnyard.conf %D/etc/barnyard.conf-sample; then rm -f %D/etc/barnyard.conf; fi
 bin/barnyard
+@unexec if [ -f %D/etc/barnyard.conf ] && cmp -s %D/etc/barnyard.conf %D/etc/barnyard.conf-sample; then rm -f %D/etc/barnyard.conf; fi
 etc/barnyard.conf-sample
-etc/rc.d/barnyard.sh
-share/doc/barnyard/AUTHORS
-share/doc/barnyard/BUGS
-share/doc/barnyard/COPYING
-share/doc/barnyard/ChangeLog
-share/doc/barnyard/FAQ
-share/doc/barnyard/INSTALL
-share/doc/barnyard/LICENSE.QPL
-share/doc/barnyard/NEWS
-share/doc/barnyard/README
-share/doc/barnyard/USAGE
-@dirrm share/doc/barnyard
+%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/COPYING
+%%DOCSDIR%%/LICENSE.QPL
+%%DOCSDIR%%/README
--- patch-pkg-plist ends here ---


>Release-Note:
>Audit-Trail:

From: Paul Schmehl <pauls@utdallas.edu>
To: bug-followup@FreeBSD.org, pauls@utdallas.edu
Cc:  
Subject: Re: ports/92239: security/barnyard, update port and add slave port
Date: Tue, 24 Jan 2006 20:13:40 -0600

 Please apply this patch to the Makefile, to move CATEGORIES back where it 
 belongs.
 
 --- Makefile.orig       Tue Jan 24 20:12:06 2006
 +++ Makefile    Tue Jan 24 20:12:22 2006
 @@ -7,11 +7,9 @@
 
  PORTNAME=      barnyard
  PORTVERSION=   0.2.0
 -
 +CATEGORIES=    security
  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=    barnyard
 -
 -CATEGORIES=    security
 
  MAINTAINER=    pauls@utdallas.edu
  COMMENT=       An output system for Snort
 
 Paul Schmehl (pauls@utdallas.edu)
 Adjunct Information Security Officer
 University of Texas at Dallas
 AVIEN Founding Member
 http://www.utdallas.edu/

From: Paul Schmehl <pauls@utdallas.edu>
To: bug-followup@FreeBSD.org, pauls@utdallas.edu
Cc:  
Subject: Re: ports/92239: security/barnyard, update port and add slave port
Date: Tue, 24 Jan 2006 20:17:45 -0600

 Ignore the last patch.  This one moves CATEGORIES back where it belongs 
 *and* adds a newline after the commented head so that portlint won't 
 complain.
 
 This patch should be applied *after* the original update is applied.
 
 --- Makefile.orig       Tue Jan 24 20:16:37 2006
 +++ Makefile    Tue Jan 24 20:12:22 2006
 @@ -4,13 +4,12 @@
  #
  # $FreeBSD: ports/security/barnyard/Makefile,v 1.5 2005/11/15 06:50:54 ade 
 Exp $
  #
 +
  PORTNAME=      barnyard
  PORTVERSION=   0.2.0
 -
 +CATEGORIES=    security
  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=    barnyard
 -
 -CATEGORIES=    security
 
  MAINTAINER=    pauls@utdallas.edu
  COMMENT=       An output system for Snort
 
 Paul Schmehl (pauls@utdallas.edu)
 Adjunct Information Security Officer
 University of Texas at Dallas
 AVIEN Founding Member
 http://www.utdallas.edu/
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Jan 26 10:17:18 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=92239 
>Unformatted:
