From nobody@FreeBSD.org  Sun Jul 18 15:26:14 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 158C7106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Jul 2010 15:26:14 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E0A78FC1E
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Jul 2010 15:26:13 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o6IFQDHF039228
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 18 Jul 2010 15:26:13 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o6IFQDew039227;
	Sun, 18 Jul 2010 15:26:13 GMT
	(envelope-from nobody)
Message-Id: <201007181526.o6IFQDew039227@www.freebsd.org>
Date: Sun, 18 Jul 2010 15:26:13 GMT
From: Mikolaj Golub <to.my.trociny@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update devel/mk-configure to 0.17.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         148737
>Category:       ports
>Synopsis:       Update devel/mk-configure to 0.17.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 18 15:30:14 UTC 2010
>Closed-Date:    Sun Jul 18 21:52:00 UTC 2010
>Last-Modified:  Sun Jul 18 21:52:00 UTC 2010
>Originator:     Mikolaj Golub
>Release:        
>Organization:
>Environment:
>Description:
* update to 0.17.0
* add examples
* sort plist
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Nur devel/mk-configure.orig/Makefile devel/mk-configure/Makefile
--- devel/mk-configure.orig/Makefile	2010-07-18 17:41:49.000000000 +0300
+++ devel/mk-configure/Makefile	2010-07-18 18:12:09.000000000 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mk-configure
-PORTVERSION=	0.15.1
+PORTVERSION=	0.17.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -17,11 +17,13 @@
 RUN_DEPENDS=	$(BUILD_DEPENDS)
 
 .if !defined(NOPORTDOCS)
-DOCFILES=	README NEWS TODO COPYRIGHT FAQ
+DOCFILES=	README NEWS TODO COPYRIGHT FAQ doc/presentation.pdf
 .else
 DOCFILES=
 .endif
 
+PORTEXAMPLES=	*
+
 MAN1=		mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \
 		mkc_check_decl.1 mkc_check_prog.1 mkc_check_custom.1 \
 		mkcmake.1
@@ -32,5 +34,8 @@
 
 do-install:
 	bmake -C ${WRKSRC} installdirs install EXTRAFILES="${DOCFILES}"
+.if !defined(NOPORTEXAMPLES)
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff -Nur devel/mk-configure.orig/distinfo devel/mk-configure/distinfo
--- devel/mk-configure.orig/distinfo	2010-07-18 17:41:49.000000000 +0300
+++ devel/mk-configure/distinfo	2010-07-18 17:48:39.000000000 +0300
@@ -1,3 +1,3 @@
-MD5 (mk-configure-0.15.1.tar.gz) = 3c39ad8da73106b815ea94f761a710b9
-SHA256 (mk-configure-0.15.1.tar.gz) = ec4ebea255fd8c85026c1450053427bb982144a79c72baaf709f24427768ba8c
-SIZE (mk-configure-0.15.1.tar.gz) = 218941
+MD5 (mk-configure-0.17.0.tar.gz) = 6ea4a1d23a874b2ebd4d215bd1078724
+SHA256 (mk-configure-0.17.0.tar.gz) = 2cca19e2b45d9e2da9234927ca1398fc854e384644d5c7aa109d99d7a208bb1e
+SIZE (mk-configure-0.17.0.tar.gz) = 186701
diff -Nur devel/mk-configure.orig/pkg-plist devel/mk-configure/pkg-plist
--- devel/mk-configure.orig/pkg-plist	2010-07-18 17:41:49.000000000 +0300
+++ devel/mk-configure/pkg-plist	2010-07-18 17:58:32.000000000 +0300
@@ -1,16 +1,16 @@
-bin/mkcmake
+bin/mkc_check_common.sh
+bin/mkc_check_compiler
+bin/mkc_check_custom
+bin/mkc_check_decl
 bin/mkc_check_funclib
 bin/mkc_check_header
-bin/mkc_check_sizeof
-bin/mkc_check_decl
 bin/mkc_check_prog
-bin/mkc_check_custom
-bin/mkc_which
+bin/mkc_check_sizeof
 bin/mkc_check_version
-bin/mkc_test_helper
-bin/mkc_check_compiler
 bin/mkc_install
-bin/mkc_check_common.sh
+bin/mkc_test_helper
+bin/mkc_which
+bin/mkcmake
 %%DATADIR%%/custom/endianess
 %%DATADIR%%/custom/prog_bison
 %%DATADIR%%/custom/prog_flex
@@ -21,36 +21,41 @@
 share/mkc-mk/configure.mk
 share/mkc-mk/mkc.configure.mk
 share/mkc-mk/mkc.files.mk
+share/mkc-mk/mkc.intexts.mk
 share/mkc-mk/mkc.lib.mk
+share/mkc-mk/mkc.minitest.mk
+share/mkc-mk/mkc.own.mk
+share/mkc-mk/mkc.pkg-config.mk
 share/mkc-mk/mkc.prog.mk
 share/mkc-mk/mkc.subdir.mk
 share/mkc-mk/mkc.subprj.mk
 share/mkc-mk/mkc.subprjs.mk
-share/mkc-mk/mkc.own.mk
-share/mkc-mk/mkc.intexts.mk
-share/mkc-mk/mkc.minitest.mk
-share/mkc-mk/mkc.pkg-config.mk
-share/mkc-mk/mkc.ver.mk
 share/mkc-mk/mkc_imp.dep.mk
 share/mkc-mk/mkc_imp.files.mk
+share/mkc-mk/mkc_imp.final.mk
 share/mkc-mk/mkc_imp.inc.mk
 share/mkc-mk/mkc_imp.info.mk
+share/mkc-mk/mkc_imp.init.mk
+share/mkc-mk/mkc_imp.intexts.mk
 share/mkc-mk/mkc_imp.lib.mk
 share/mkc-mk/mkc_imp.links.mk
+share/mkc-mk/mkc_imp.lua.mk
 share/mkc-mk/mkc_imp.man.mk
 share/mkc-mk/mkc_imp.own.mk
+share/mkc-mk/mkc_imp.pkg-config.mk
+share/mkc-mk/mkc_imp.platform.sys.mk
 share/mkc-mk/mkc_imp.prog.mk
+share/mkc-mk/mkc_imp.scripts.mk
 share/mkc-mk/mkc_imp.subdir.mk
 share/mkc-mk/mkc_imp.subprj.mk
 share/mkc-mk/mkc_imp.sys.mk
-share/mkc-mk/mkc_imp.init.mk
-share/mkc-mk/mkc_imp.final.mk
-share/mkc-mk/mkc_imp.platform.sys.mk
+share/mkc-mk/mkc_imp.vars.mk
 share/mkc-mk/sys.mk
 @dirrm share/mkc-mk
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/presentation.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sun Jul 18 17:05:56 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

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

From: Anonymous <swell.k@gmail.com>
To: to.my.trociny@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148737: Update devel/mk-configure to 0.17.0
Date: Sun, 18 Jul 2010 23:23:55 +0400

 - prefer PORTDOCS
 - make do-* targets a bit more like the ones in bsd.port.mk,
   i.e. respect MAKE_ENV, _MAKE_JOBS, etc.
 - mark MAKE_JOBS_UNSAFE
 - use {...} (curly) braces consistently
 --- a.diff begins here ---
 diff --git devel/mk-configure/Makefile devel/mk-configure/Makefile
 index c3ac14d..da47fad 100644
 --- devel/mk-configure/Makefile
 +++ devel/mk-configure/Makefile
 @@ -14,14 +14,15 @@ MAINTAINER=	to.my.trociny@gmail.com
  COMMENT=	Lightweight, easy to use replacement for GNU autotools
  
  BUILD_DEPENDS=	bmake:${PORTSDIR}/devel/bmake
 -RUN_DEPENDS=	$(BUILD_DEPENDS)
 +RUN_DEPENDS=	${BUILD_DEPENDS}
  
 -.if !defined(NOPORTDOCS)
 -DOCFILES=	README NEWS TODO COPYRIGHT FAQ doc/presentation.pdf
 -.else
 -DOCFILES=
 -.endif
 +MAKE_JOBS_UNSAFE=yes
 +
 +BMAKE=		bmake
 +MAKE_ENV+=	EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}"
 +INSTALL_TARGET=	installdirs install
  
 +PORTDOCS=	README NEWS TODO COPYRIGHT FAQ presentation.pdf
  PORTEXAMPLES=	*
  
  MAN1=		mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \
 @@ -30,10 +31,10 @@ MAN1=		mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \
  MAN7=		mk-configure.7
  
  do-build:
 -	bmake -C ${WRKSRC} all
 +	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${BUILD_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
  
  do-install:
 -	bmake -C ${WRKSRC} installdirs install EXTRAFILES="${DOCFILES}"
 +	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${INSTALL_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${INSTALL_TARGET}
  .if !defined(NOPORTEXAMPLES)
  	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
  .endif
 diff --git devel/mk-configure/pkg-plist devel/mk-configure/pkg-plist
 index e0315ea..bd3641a 100644
 --- devel/mk-configure/pkg-plist
 +++ devel/mk-configure/pkg-plist
 @@ -52,10 +52,3 @@ share/mkc-mk/mkc_imp.sys.mk
  share/mkc-mk/mkc_imp.vars.mk
  share/mkc-mk/sys.mk
  @dirrm share/mkc-mk
 -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/presentation.pdf
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 --- a.diff ends here ---

From: Anonymous <swell.k@gmail.com>
To: to.my.trociny@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148737: Update devel/mk-configure to 0.17.0
Date: Sun, 18 Jul 2010 23:30:27 +0400

 Anonymous <swell.k@gmail.com> writes:
 
 > +BMAKE=		bmake
 
 Oops, it should be possible to override BMAKE from make.conf.
 IOW, use `?=' like in bsd.commands.mk.

From: Mikolaj Golub <to.my.trociny@gmail.com>
To: Anonymous <swell.k@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/148737: Update devel/mk-configure to 0.17.0
Date: Sun, 18 Jul 2010 23:10:09 +0300

 --=-=-=
 
 
 Thank you for improvements. So putting all things together here is an updated
 version of the patch.
 
 - update to 0.17.0
 - add examples
 - sort plist
 - prefer PORTDOCS
 - make do-* targets a bit more like the ones in bsd.port.mk,
   i.e. respect MAKE_ENV, _MAKE_JOBS, etc.
 - mark MAKE_JOBS_UNSAFE
 - use {...} (curly) braces consistently 
 
 -- 
 Mikolaj Golub
 
 
 --=-=-=
 Content-Disposition: attachment; filename=mk-configure.ports.patch.txt
 
 diff -Nur devel/mk-configure.orig/Makefile devel/mk-configure/Makefile
 --- devel/mk-configure.orig/Makefile	2010-07-18 17:41:49.000000000 +0300
 +++ devel/mk-configure/Makefile	2010-07-18 23:00:11.000000000 +0300
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	mk-configure
 -PORTVERSION=	0.15.1
 +PORTVERSION=	0.17.0
  CATEGORIES=	devel
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
  
 @@ -14,13 +14,16 @@
  COMMENT=	Lightweight, easy to use replacement for GNU autotools
  
  BUILD_DEPENDS=	bmake:${PORTSDIR}/devel/bmake
 -RUN_DEPENDS=	$(BUILD_DEPENDS)
 +RUN_DEPENDS=	${BUILD_DEPENDS}
  
 -.if !defined(NOPORTDOCS)
 -DOCFILES=	README NEWS TODO COPYRIGHT FAQ
 -.else
 -DOCFILES=
 -.endif
 +MAKE_JOBS_UNSAFE=yes
 +
 +BMAKE?=		bmake
 +MAKE_ENV+=	EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}"
 +INSTALL_TARGET=	installdirs install
 +
 +PORTDOCS=	README NEWS TODO COPYRIGHT FAQ presentation.pdf
 +PORTEXAMPLES=	*
  
  MAN1=		mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \
  		mkc_check_decl.1 mkc_check_prog.1 mkc_check_custom.1 \
 @@ -28,9 +31,14 @@
  MAN7=		mk-configure.7
  
  do-build:
 -	bmake -C ${WRKSRC} all
 +	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${BUILD_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} \
 +		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
  
  do-install:
 -	bmake -C ${WRKSRC} installdirs install EXTRAFILES="${DOCFILES}"
 +	@${SETENV} ${MAKE_ENV} ${BMAKE} -C ${INSTALL_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} \
 +		${_MAKE_JOBS} ${MAKE_ARGS} ${INSTALL_TARGET}
 +.if !defined(NOPORTEXAMPLES)
 +	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 +.endif
  
  .include <bsd.port.mk>
 diff -Nur devel/mk-configure.orig/distinfo devel/mk-configure/distinfo
 --- devel/mk-configure.orig/distinfo	2010-07-18 17:41:49.000000000 +0300
 +++ devel/mk-configure/distinfo	2010-07-18 17:48:39.000000000 +0300
 @@ -1,3 +1,3 @@
 -MD5 (mk-configure-0.15.1.tar.gz) = 3c39ad8da73106b815ea94f761a710b9
 -SHA256 (mk-configure-0.15.1.tar.gz) = ec4ebea255fd8c85026c1450053427bb982144a79c72baaf709f24427768ba8c
 -SIZE (mk-configure-0.15.1.tar.gz) = 218941
 +MD5 (mk-configure-0.17.0.tar.gz) = 6ea4a1d23a874b2ebd4d215bd1078724
 +SHA256 (mk-configure-0.17.0.tar.gz) = 2cca19e2b45d9e2da9234927ca1398fc854e384644d5c7aa109d99d7a208bb1e
 +SIZE (mk-configure-0.17.0.tar.gz) = 186701
 diff -Nur devel/mk-configure.orig/pkg-plist devel/mk-configure/pkg-plist
 --- devel/mk-configure.orig/pkg-plist	2010-07-18 17:41:49.000000000 +0300
 +++ devel/mk-configure/pkg-plist	2010-07-18 22:57:31.000000000 +0300
 @@ -1,16 +1,16 @@
 -bin/mkcmake
 +bin/mkc_check_common.sh
 +bin/mkc_check_compiler
 +bin/mkc_check_custom
 +bin/mkc_check_decl
  bin/mkc_check_funclib
  bin/mkc_check_header
 -bin/mkc_check_sizeof
 -bin/mkc_check_decl
  bin/mkc_check_prog
 -bin/mkc_check_custom
 -bin/mkc_which
 +bin/mkc_check_sizeof
  bin/mkc_check_version
 -bin/mkc_test_helper
 -bin/mkc_check_compiler
  bin/mkc_install
 -bin/mkc_check_common.sh
 +bin/mkc_test_helper
 +bin/mkc_which
 +bin/mkcmake
  %%DATADIR%%/custom/endianess
  %%DATADIR%%/custom/prog_bison
  %%DATADIR%%/custom/prog_flex
 @@ -21,36 +21,34 @@
  share/mkc-mk/configure.mk
  share/mkc-mk/mkc.configure.mk
  share/mkc-mk/mkc.files.mk
 +share/mkc-mk/mkc.intexts.mk
  share/mkc-mk/mkc.lib.mk
 +share/mkc-mk/mkc.minitest.mk
 +share/mkc-mk/mkc.own.mk
 +share/mkc-mk/mkc.pkg-config.mk
  share/mkc-mk/mkc.prog.mk
  share/mkc-mk/mkc.subdir.mk
  share/mkc-mk/mkc.subprj.mk
  share/mkc-mk/mkc.subprjs.mk
 -share/mkc-mk/mkc.own.mk
 -share/mkc-mk/mkc.intexts.mk
 -share/mkc-mk/mkc.minitest.mk
 -share/mkc-mk/mkc.pkg-config.mk
 -share/mkc-mk/mkc.ver.mk
  share/mkc-mk/mkc_imp.dep.mk
  share/mkc-mk/mkc_imp.files.mk
 +share/mkc-mk/mkc_imp.final.mk
  share/mkc-mk/mkc_imp.inc.mk
  share/mkc-mk/mkc_imp.info.mk
 +share/mkc-mk/mkc_imp.init.mk
 +share/mkc-mk/mkc_imp.intexts.mk
  share/mkc-mk/mkc_imp.lib.mk
  share/mkc-mk/mkc_imp.links.mk
 +share/mkc-mk/mkc_imp.lua.mk
  share/mkc-mk/mkc_imp.man.mk
  share/mkc-mk/mkc_imp.own.mk
 +share/mkc-mk/mkc_imp.pkg-config.mk
 +share/mkc-mk/mkc_imp.platform.sys.mk
  share/mkc-mk/mkc_imp.prog.mk
 +share/mkc-mk/mkc_imp.scripts.mk
  share/mkc-mk/mkc_imp.subdir.mk
  share/mkc-mk/mkc_imp.subprj.mk
  share/mkc-mk/mkc_imp.sys.mk
 -share/mkc-mk/mkc_imp.init.mk
 -share/mkc-mk/mkc_imp.final.mk
 -share/mkc-mk/mkc_imp.platform.sys.mk
 +share/mkc-mk/mkc_imp.vars.mk
  share/mkc-mk/sys.mk
  @dirrm share/mkc-mk
 -%%PORTDOCS%%%%DOCSDIR%%/README
 -%%PORTDOCS%%%%DOCSDIR%%/NEWS
 -%%PORTDOCS%%%%DOCSDIR%%/TODO
 -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 -%%PORTDOCS%%%%DOCSDIR%%/FAQ
 -%%PORTDOCS%%@dirrm %%DOCSDIR%%
 
 --=-=-=--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148737: commit references a PR
Date: Sun, 18 Jul 2010 21:28:48 +0000 (UTC)

 makc        2010-07-18 21:28:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/mk-configure   Makefile distinfo pkg-plist 
   Log:
   Update to 0.17.0 [1]
   - add examples [1]
   - sort plist [1]
   - prefer PORTDOCS  [2]
   - make do-* targets a bit more like the ones in bsd.port.mk,
     i.e. respect MAKE_ENV, _MAKE_JOBS, etc. [2]
   - mark MAKE_JOBS_UNSAFE [2]
   - use {...} (curly) braces consistently [2]
   
   PR:             ports/148737
   Submitted by:   Mikolaj Golub (maintainer) [1], Anonymous <swell.k at gmail.com> [2]
   Aprroved by:    maintainer
   
   Revision  Changes    Path
   1.6       +18 -10    ports/devel/mk-configure/Makefile
   1.5       +3 -3      ports/devel/mk-configure/distinfo
   1.4       +20 -22    ports/devel/mk-configure/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"
 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Sun Jul 18 21:51:59 UTC 2010 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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