From obrien@NUXI.org  Thu Mar  3 16:39:36 2011
Return-Path: <obrien@NUXI.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CDEB106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Mar 2011 16:39:36 +0000 (UTC)
	(envelope-from obrien@NUXI.org)
Received: from dragon.nuxi.org (trang.nuxi.org [74.95.12.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 23EF38FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Mar 2011 16:39:34 +0000 (UTC)
Received: from dragon.nuxi.org (obrien@localhost [127.0.0.1])
	by dragon.nuxi.org (8.14.4/8.14.4) with ESMTP id p23GdYGT019194
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Mar 2011 08:39:34 -0800 (PST)
	(envelope-from obrien@dragon.nuxi.org)
Received: (from obrien@localhost)
	by dragon.nuxi.org (8.14.4/8.14.4/Submit) id p23GdY46019193;
	Thu, 3 Mar 2011 08:39:34 -0800 (PST)
	(envelope-from obrien)
Message-Id: <201103031639.p23GdY46019193@dragon.nuxi.org>
Date: Thu, 3 Mar 2011 08:39:34 -0800 (PST)
From: "David O'Brien" <obrien@freebsd.org>
Reply-To: "David O'Brien" <obrien@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update bmake to 20110225
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         155233
>Category:       ports
>Synopsis:       Update devel/bmake to 20110225
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    obrien
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 03 16:40:10 UTC 2011
>Closed-Date:    Thu May 05 00:40:44 UTC 2011
>Last-Modified:  Thu May  5 00:50:10 UTC 2011
>Originator:     David O'Brien
>Release:        FreeBSD 9.0-CURRENT i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD dragon.NUXI.org 9.0-CURRENT FreeBSD 9.0-CURRENT #662 r218815:218845M: Tue Feb 22 00:13:31 PST 2011 rootk@dragon.NUXI.org:/sys/i386/compile/DRAGON i386

>Description:
	SJG has updated the portable NetBSD make to 20110225

	Note that a yet to be published update will add several
	share/mk files.  So I changed the port to use the method
	I use in Vim so that I don't have to micromanage the
	pkg-plist file for directories totally owned by the port.

>How-To-Repeat:
	 ncftpls  ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bmake/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile	18 Dec 2010 17:26:38 -0000	1.7
+++ Makefile	3 Mar 2011 16:20:36 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bmake
-PORTVERSION=	20101210
+PORTVERSION=	20110225
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ \
 		http://www.gtlib.cc.gatech.edu/pub/NetBSD/misc/sjg/ \
@@ -32,5 +32,20 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${MAN1PREFIX}/man/man1
 	${SH} ${WRKDIR}/mk/install-mk ${PREFIX}/share/mk
+	cd ${PREFIX} ;						\
+	    ${FIND} share/mk -type f -o -type l			\
+	    	| ${SORT}					\
+	    	>${WRKDIR}/PLIST.share-mk
+	cd ${PREFIX} ;						\
+	    ${FIND} share/mk/${_DATADIR} -type d		\
+	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
+		>>${WRKDIR}/PLIST.share-mk
+	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
+	cd ${WRKDIR} ; ex < ex.script
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/bmake/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo	18 Dec 2010 17:26:38 -0000	1.6
+++ distinfo	3 Mar 2011 15:55:26 -0000
@@ -1,4 +1,4 @@
-SHA256 (bmake-20101210.tar.gz) = 513f61147ee7bd556067a37eb89e8673d4a3a922f9a6af5220b1b7f22f487389
-SIZE (bmake-20101210.tar.gz) = 405481
+SHA256 (bmake-20110225.tar.gz) = fa12c69b1bd1b4ce11d03159014e0fa25ddff05fb0d3b39d6c86b607744f0291
+SIZE (bmake-20110225.tar.gz) = 424923
 SHA256 (mk-20100612.tar.gz) = 37abd0c420f9caec56af27909b8cdda7e81fd4c4eac6a15e4583511693050e7b
 SIZE (mk-20100612.tar.gz) = 46000
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/bmake/pkg-plist,v
retrieving revision 1.4
diff -u -p -r1.4 pkg-plist
--- pkg-plist	19 Aug 2010 12:57:04 -0000	1.4
+++ pkg-plist	3 Mar 2011 16:17:21 -0000
@@ -1,56 +1,4 @@
 bin/bmake
-share/mk/auto.dep.mk
-share/mk/auto.obj.mk
-share/mk/autoconf.mk
-share/mk/autodep.mk
-share/mk/bsd.dep.mk
-share/mk/bsd.doc.mk
-share/mk/bsd.init.mk
-share/mk/bsd.lib.mk
-share/mk/bsd.links.mk
-share/mk/bsd.man.mk
-share/mk/bsd.nls.mk
-share/mk/bsd.obj.mk
-share/mk/bsd.own.mk
-share/mk/bsd.prog.mk
-share/mk/bsd.subdir.mk
-share/mk/dep.mk
-share/mk/doc.mk
-share/mk/dpadd.mk
-share/mk/final.mk
-share/mk/host-target.mk
-share/mk/host.libnames.mk
-share/mk/inc.mk
-share/mk/init.mk
-share/mk/java.mk
-share/mk/lib.mk
-share/mk/libnames.mk
-share/mk/libs.mk
-share/mk/links.mk
-share/mk/man.mk
-share/mk/nls.mk
-share/mk/obj.mk
-share/mk/own.mk
-share/mk/prlist.mk
-share/mk/prog.mk
-share/mk/progs.mk
-share/mk/rst2htm.mk
-share/mk/scripts.mk
-share/mk/subdir.mk
-share/mk/sys.mk
-share/mk/sys/AIX.mk
-share/mk/sys/Darwin.mk
-share/mk/sys/Generic.mk
-share/mk/sys/HP-UX.mk
-share/mk/sys/IRIX.mk
-share/mk/sys/Linux.mk
-share/mk/sys/NetBSD.mk
-share/mk/sys/OSF1.mk
-share/mk/sys/OpenBSD.mk
-share/mk/sys/SunOS.mk
-share/mk/sys/UnixWare.mk
-share/mk/target-flags.mk
-share/mk/warnings.mk
-share/mk/yacc.mk
-@dirrm share/mk/sys
-@dirrmtry share/mk
+@comment Insert PLIST.share-mk here
+@comment -=[ begin PLIST.share-mk ]=-
+@comment -=[ end PLIST.share-mk ]=-


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Mar 4 00:36:47 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155233 
Responsible-Changed-From-To: miwi->obrien 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Mar 4 06:11:29 UTC 2011 
Responsible-Changed-Why:  
submitter have gnats access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155233 

From: Mikolaj Golub <to.my.trociny@gmail.com>
To: bug-followup@FreeBSD.org,obrien@freebsd.org
Cc:  
Subject: Re: ports/155233: Update devel/bmake to 20110225
Date: Mon, 21 Mar 2011 22:30:37 +0200

 Hi, David, are you planning to commit this soon? Because there is already
 newer version of bmake (20110306) and I think there is a sense to commit it.
 
 If you need my (maintainer) approve then you have it. Personally I don't see
 many problems with maintaining static list while having it static has some
 pros. But let it be.
 
 -- 
 Mikolaj Golub

From: Mikolaj Golub <to.my.trociny@gmail.com>
To: bug-followup@FreeBSD.org, obrien@freebsd.org
Cc:  
Subject: Re: ports/155233: Update devel/bmake to 20110225
Date: Sat, 09 Apr 2011 21:41:53 +0300

 --=-=-=
 
 Here is a patch for more recent bmake (20110330). The patch is based on
 David's patch, which adds automatic management of pkg-plist.
 
 If David by some reason can't commit this to ports, could someone from ports
 people do this?
 
 -- 
 Mikolaj Golub
 
 --=-=-=
 Content-Disposition: attachment; filename=bmake.port.patch.txt
 
 diff -Nrpu devel/bmake.orig/Makefile devel/bmake/Makefile
 --- devel/bmake.orig/Makefile	2011-04-09 21:21:59.000000000 +0300
 +++ devel/bmake/Makefile	2011-04-09 21:26:19.000000000 +0300
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	bmake
 -PORTVERSION=	20101210
 +PORTVERSION=	20110330
  CATEGORIES=	devel
  MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg/ \
  		http://www.gtlib.cc.gatech.edu/pub/NetBSD/misc/sjg/ \
 @@ -32,5 +32,20 @@ do-install:
  	${INSTALL_PROGRAM} ${WRKDIR}/obj/bmake ${PREFIX}/bin
  	${INSTALL_MAN} ${WRKDIR}/bmake/bmake.1 ${MAN1PREFIX}/man/man1
  	${SH} ${WRKDIR}/mk/install-mk ${PREFIX}/share/mk
 +	cd ${PREFIX} ;						\
 +	    ${FIND} share/mk -type f -o -type l			\
 +	    	| ${SORT}					\
 +	    	>${WRKDIR}/PLIST.share-mk
 +	cd ${PREFIX} ;						\
 +	    ${FIND} share/mk/${_DATADIR} -type d		\
 +	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
 +		>>${WRKDIR}/PLIST.share-mk
 +	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 +	${ECHO_CMD} "/Insert PLIST.share-mk"		>> ${WRKDIR}/ex.script
 +	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
 +	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-mk"	>> ${WRKDIR}/ex.script
 +	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
 +	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-mk
 +	cd ${WRKDIR} ; ex < ex.script
  
  .include <bsd.port.mk>
 diff -Nrpu devel/bmake.orig/distinfo devel/bmake/distinfo
 --- devel/bmake.orig/distinfo	2011-04-09 21:21:59.000000000 +0300
 +++ devel/bmake/distinfo	2011-04-09 21:26:58.000000000 +0300
 @@ -1,4 +1,4 @@
 -SHA256 (bmake-20101210.tar.gz) = 513f61147ee7bd556067a37eb89e8673d4a3a922f9a6af5220b1b7f22f487389
 -SIZE (bmake-20101210.tar.gz) = 405481
 +SHA256 (bmake-20110330.tar.gz) = 7b9862c2f318f242b8c31f74ff22150d5f1c02e6302accab6910c0b40c2379b5
 +SIZE (bmake-20110330.tar.gz) = 426130
  SHA256 (mk-20100612.tar.gz) = 37abd0c420f9caec56af27909b8cdda7e81fd4c4eac6a15e4583511693050e7b
  SIZE (mk-20100612.tar.gz) = 46000
 diff -Nrpu devel/bmake.orig/pkg-plist devel/bmake/pkg-plist
 --- devel/bmake.orig/pkg-plist	2011-04-09 21:22:00.000000000 +0300
 +++ devel/bmake/pkg-plist	2011-04-09 21:23:47.000000000 +0300
 @@ -1,56 +1,4 @@
  bin/bmake
 -share/mk/auto.dep.mk
 -share/mk/auto.obj.mk
 -share/mk/autoconf.mk
 -share/mk/autodep.mk
 -share/mk/bsd.dep.mk
 -share/mk/bsd.doc.mk
 -share/mk/bsd.init.mk
 -share/mk/bsd.lib.mk
 -share/mk/bsd.links.mk
 -share/mk/bsd.man.mk
 -share/mk/bsd.nls.mk
 -share/mk/bsd.obj.mk
 -share/mk/bsd.own.mk
 -share/mk/bsd.prog.mk
 -share/mk/bsd.subdir.mk
 -share/mk/dep.mk
 -share/mk/doc.mk
 -share/mk/dpadd.mk
 -share/mk/final.mk
 -share/mk/host-target.mk
 -share/mk/host.libnames.mk
 -share/mk/inc.mk
 -share/mk/init.mk
 -share/mk/java.mk
 -share/mk/lib.mk
 -share/mk/libnames.mk
 -share/mk/libs.mk
 -share/mk/links.mk
 -share/mk/man.mk
 -share/mk/nls.mk
 -share/mk/obj.mk
 -share/mk/own.mk
 -share/mk/prlist.mk
 -share/mk/prog.mk
 -share/mk/progs.mk
 -share/mk/rst2htm.mk
 -share/mk/scripts.mk
 -share/mk/subdir.mk
 -share/mk/sys.mk
 -share/mk/sys/AIX.mk
 -share/mk/sys/Darwin.mk
 -share/mk/sys/Generic.mk
 -share/mk/sys/HP-UX.mk
 -share/mk/sys/IRIX.mk
 -share/mk/sys/Linux.mk
 -share/mk/sys/NetBSD.mk
 -share/mk/sys/OSF1.mk
 -share/mk/sys/OpenBSD.mk
 -share/mk/sys/SunOS.mk
 -share/mk/sys/UnixWare.mk
 -share/mk/target-flags.mk
 -share/mk/warnings.mk
 -share/mk/yacc.mk
 -@dirrm share/mk/sys
 -@dirrmtry share/mk
 +@comment Insert PLIST.share-mk here
 +@comment -=[ begin PLIST.share-mk ]=-
 +@comment -=[ end PLIST.share-mk ]=-
 
 --=-=-=--
State-Changed-From-To: open->closed 
State-Changed-By: obrien 
State-Changed-When: Thu May 5 00:40:36 UTC 2011 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155233 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155233: commit references a PR
Date: Thu,  5 May 2011 00:40:43 +0000 (UTC)

 obrien      2011-05-05 00:40:30 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/bmake          Makefile distinfo pkg-plist 
   Log:
   Upgrade Bmake to the 20110411 version (w/META mode).
   
   Also dynamically generate the PLIST for the share/mk files as SJG tells
   me he will be adding several new files.  [method taken from the Vim port]
   
   PR:             155233
   Submitted by:   obrien
   Approved by:    Mikolaj Golub <to.my.trociny@gmail.com>
   
   Revision  Changes    Path
   1.8       +16 -1     ports/devel/bmake/Makefile
   1.7       +2 -2      ports/devel/bmake/distinfo
   1.5       +3 -55     ports/devel/bmake/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
