From root@gits.dyndns.org  Mon Jan 22 15:00:18 2001
Return-Path: <root@gits.dyndns.org>
Received: from camus.cybercable.fr (camus.cybercable.fr [212.198.0.200])
	by hub.freebsd.org (Postfix) with SMTP id 5164137B6B5
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Jan 2001 15:00:16 -0800 (PST)
Received: (qmail 38836274 invoked from network); 22 Jan 2001 23:00:13 -0000
Received: from s011.dhcp212-229.cybercable.fr (HELO gits.dyndns.org) ([212.198.229.11]) (envelope-sender <root@gits.dyndns.org>)
          by camus.cybercable.fr (qmail-ldap-1.03) with SMTP
          for <ust@cert.siemens.de>; 22 Jan 2001 23:00:13 -0000
Received: (from root@localhost)
	by gits.dyndns.org (8.11.1/8.11.1) id f0MN06X31749;
	Tue, 23 Jan 2001 00:00:06 +0100 (CET)
	(envelope-from root)
Message-Id: <200101222300.f0MN06X31749@gits.dyndns.org>
Date: Tue, 23 Jan 2001 00:00:06 +0100 (CET)
From: Cyrille Lefevre <clefevre@citeweb.net>
Reply-To: clefevre@citeweb.net
To: FreeBSD-gnats-submit@freebsd.org
Cc: ust@cert.siemens.de
Subject: Updated port: misc/findutils - 4.1
X-Send-Pr-Version: 3.2

>Number:         24561
>Category:       ports
>Synopsis:       Updated port: misc/findutils - 4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 22 15:10:01 PST 2001
>Closed-Date:    Mon Jan 29 10:47:05 PST 2001
>Last-Modified:  Mon Jan 29 10:48:46 PST 2001
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
ACME
>Environment:

FreeBSD gits 4.2-STABLE FreeBSD 4.2-STABLE #5: Thu Jan 18 00:14:29 CET 2001     root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM  i386

>Description:

	Makefile
		revision bumbed.
		LOCALSTATEDIR added (defaulted to /var/db).
		port-extract deletion of info files.
		post-patch added.
		since configure doesn't handle --localstatedir,
		post-configure added.
		post-install is almost the same but rewritten.

	pkg-comment
		updated accordingly to other GNU tools..

	pkg-descr
		WWW added.

	pkg-plist
		extra info-files deleted.

>How-To-Repeat:

	n/a

>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/findutils/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2000/11/23 11:56:08	1.5
+++ Makefile	2001/01/22 22:58:33
@@ -7,28 +7,73 @@
 
 PORTNAME=	findutils
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= findutils
 
 MAINTAINER=	ust@cert.siemens.de
 
+#
+# Global variables
+#
+
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--program-prefix=g
+CONFIGURE_ARGS=	--program-prefix=g # --localstatedir=${LOCALSTATEDIR}
 MAKE_ARGS=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 USE_GMAKE=	yes
 
 MAN1=		gfind.1 gxargs.1 glocate.1 gupdatedb.1
 MAN5=		glocatedb.5
+
+#
+# Local variables
+#
+
+LOCALSTATEDIR?=	/var/db
+
+INSTALL_INFO?=	install-info
+
+#
+# Post-extract
+#
+
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/${PORTNAME:S/utils//}.info*
+
+#
+# Post-patch
+#
+
+post-patch:
+	@${PERL} -pi.fbsd -e 's|makeinfo|makeinfo --no-split|g' \
+		${WRKSRC}/doc/Makefile.in
+
+#
+# Post-configure
+#
+
+# --localstatedir= isn't handled right now, so, do it manually.
+post-configure:
+	@${PERL} -pi.fbsd -e 's|\$$\(prefix\)/var|${LOCALSTATEDIR}|g' \
+		${WRKSRC}/Makefile ${WRKSRC}/locate/Makefile
+
+#
+# Post-install
+#
+
+post-install: install-info remove-catman
+
+install-info:
+	@${INSTALL_INFO} ${PREFIX}/info/${PORTNAME:S/utils//}.info ${PREFIX}/info/dir
 
-post-install:
-	install-info ${PREFIX}/info/find.info ${PREFIX}/info/dir
-	${RM} -f ${PREFIX}/man/cat1/gfind.1
-	${RM} -f ${PREFIX}/man/cat1/gxargs.1
-	${RM} -f ${PREFIX}/man/cat1/glocate.1
-	${RM} -f ${PREFIX}/man/cat1/gupdatedb.1
-	${RM} -f ${PREFIX}/man/cat5/glocatedb.5
+remove-catman:
+.for mansect in 1 5
+.for man in ${MAN${mansect}}
+	@${RM} -f ${MAN1PREFIX}/man/cat${mansect}/${man}
+.endfor
+.endfor
 
 .include <bsd.port.mk>
Index: pkg-comment
===================================================================
RCS file: /home/ncvs/ports/misc/findutils/pkg-comment,v
retrieving revision 1.1
diff -u -r1.1 pkg-comment
--- pkg-comment	2000/06/02 05:35:49	1.1
+++ pkg-comment	2000/10/12 22:19:01
@@ -1 +1 @@
-The FSF's version of find(1), xargs(1), and locate(1)
+The GNU find utilities
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/misc/findutils/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	2000/06/02 05:35:49	1.1
+++ pkg-descr	2000/10/12 22:19:28
@@ -7,3 +7,5 @@
 Note that this port will install these utilities with a `g' prefix,
 eg., glocate, gfind, gxargs, but the texinfo documentation will refer to
 these utilities without the `g' prefix.
+
+WWW: http://www.gnu.org/software/findutils/findutils.html
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/misc/findutils/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	2000/06/02 05:35:49	1.1
+++ pkg-plist	2001/01/22 22:32:55
@@ -7,6 +7,4 @@
 libexec/gbigram
 @unexec install-info --delete %D/info/find.info %D/info/dir
 info/find.info
-info/find.info-1
-info/find.info-2
 @exec install-info %D/info/find.info %D/info/dir

>Release-Note:
>Audit-Trail:

From: Udo Schweigert <ust@cert.siemens.de>
To: freebsd-gnats-submit@FreeBSD.org,
	Cyrille Lefevre <clefevre@citeweb.net>
Cc:  
Subject: Re: ports/24561: Updated port: misc/findutils - 4.1
Date: Wed, 24 Jan 2001 17:53:10 +0100

 On Tue, Jan 23, 2001 at 00:00:06 +0100, Cyrille Lefevre wrote:
 > [UPDATE of misc/findutils deleted]
 
 Cyrille Lefevre <clefevre@citeweb.net> will take MAINTAINERship of this port.
 
 Best regards
 
 --
 Udo Schweigert, Siemens AG   | Voice      : +49 89 636 42170
 CT IC 3, Siemens CERT        | Fax        : +49 89 636 41166
 D-81730 Muenchen / Germany   | email      : ust@cert.siemens.de
 

From: Trevor Johnson <trevor@jpj.net>
To: Udo Schweigert <ust@cert.siemens.de>
Cc: <freebsd-gnats-submit@FreeBSD.org>
Subject: Re: ports/24561: Updated port: misc/findutils - 4.1
Date: Wed, 24 Jan 2001 12:27:25 -0500 (EST)

 >  Cyrille Lefevre <clefevre@citeweb.net> will take MAINTAINERship of this port.
 
 I've changed the MAINTAINER line.
 -- 
 Trevor Johnson
 http://jpj.net/~trevor/gpgkey.txt
 
 
State-Changed-From-To: open->closed 
State-Changed-By: roam 
State-Changed-When: Mon Jan 29 10:47:05 PST 2001 
State-Changed-Why:  
Committed, thanks! 

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