From lapo@deepie.home.lapo.it  Thu Jan 23 23:05:18 2014
Return-Path: <lapo@deepie.home.lapo.it>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id D7168A20
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 23 Jan 2014 23:05:18 +0000 (UTC)
Received: from smtp1.ngi.it (smtp1.ngi.it [IPv6:2001:4c91::112])
	by mx1.freebsd.org (Postfix) with ESMTP id 695C41704
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 23 Jan 2014 23:05:17 +0000 (UTC)
Received: from deepie.home.lapo.it (unknown [81.174.22.4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp1.ngi.it (Postfix) with ESMTPS id 87A65212A8;
	Fri, 24 Jan 2014 00:05:05 +0100 (CET)
Received: (from lapo@localhost)
	by deepie.home.lapo.it (8.14.7/8.14.7/Submit) id s0NN52sU004035;
	Fri, 24 Jan 2014 00:05:02 +0100 (CET)
	(envelope-from lapo)
Message-Id: <201401232305.s0NN52sU004035@deepie.home.lapo.it>
Date: Fri, 24 Jan 2014 00:05:02 +0100 (CET)
From: Lapo Luchini <lapo@lapo.it>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Lapo Luchini <lapo@lapo.it>
Subject: [MAINTAINER] devel/monotone: fixes on FreeBSD 10
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         186060
>Category:       ports
>Synopsis:       [MAINTAINER] devel/monotone: fixes on FreeBSD 10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 23 23:10:00 UTC 2014
>Closed-Date:    Sat Jan 25 18:06:15 UTC 2014
>Last-Modified:  Sat Jan 25 18:30:01 UTC 2014
>Originator:     Lapo Luchini
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD deepie.home.lapo.it 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC
>Description:
- Un-break on FreeBSD 10's clang
- Support staging
- Improve library detection patch with a cleaner one
- Mark jobs safe

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- monotone-1.0_4.patch begins here ---
diff -ruN /usr/ports/devel/monotone/Makefile ./Makefile
--- /usr/ports/devel/monotone/Makefile	2013-09-20 19:13:42.000000000 +0200
+++ ./Makefile	2014-01-23 23:38:00.965301216 +0100
@@ -3,7 +3,7 @@
 
 PORTNAME=	monotone
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.monotone.ca/downloads/${PORTVERSION}/
 
@@ -24,6 +24,7 @@
 USES=		iconv pkgconfig gmake perl5
 USE_PERL5=	build
 USE_LUA=	5.1+
+MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
@@ -50,13 +51,12 @@
 		"@dirrm share/monotone"
 .if !defined(NO_INSTALL_MANPAGES)
 INFO=		monotone
-MAN1=		mtn.1 \
-		mtn-cleanup.1 \
-		mtnopt.1
+PLIST_FILES+=	man/man1/mtn.1.gz \
+		man/man1/mtn-cleanup.1.gz \
+		man/man1/mtnopt.1.gz
 .endif
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -82,19 +82,20 @@
 	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
 	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
 .endif
-	${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \
-		-e "s/\"idn/\"libidn/g" \
-		-e "s/\"pcre/\"libpcre/g" \
-		-e "s/\"botan/\"botan-1.10/g" \
+	${REINPLACE_CMD} \
 		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
+		-e "s/std::tr1::/std::/g" \
 		${WRKSRC}/configure
+	${REINPLACE_CMD} \
+		-e "s/std::tr1::/std::/g" \
+		${WRKSRC}/src/hash_map.hh
 
 post-install:
-	${MKDIR} ${PREFIX}/share/zsh/site-functions
-	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
+	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN /usr/ports/devel/monotone/files/patch-configure ./files/patch-configure
--- /usr/ports/devel/monotone/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-configure	2014-01-22 01:06:15.409034034 +0100
@@ -0,0 +1,13 @@
+--- configure.orig	2014-01-22 00:48:12.855108408 +0100
++++ configure	2014-01-22 00:48:54.244105202 +0100
+@@ -4594,9 +4594,7 @@ fi
+ 
+ # The dummy "pkg-config" package is guaranteed to exist.
+ if test -n "$PKG_CONFIG"; then
+-  mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 |
+-    sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" |
+-    tr "$as_nl" ':' | sed 's/:$//'`
++  mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 | sed 's/:.*$//'`
+   #AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path])
+ fi
+ 
diff -ruN /usr/ports/devel/monotone/files/patch-src_automate_reader.hh ./files/patch-src_automate_reader.hh
--- /usr/ports/devel/monotone/files/patch-src_automate_reader.hh	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-src_automate_reader.hh	2014-01-22 01:04:48.764041738 +0100
@@ -0,0 +1,10 @@
+--- src/automate_reader.hh.orig	2014-01-22 01:04:27.675051506 +0100
++++ src/automate_reader.hh	2014-01-22 01:04:41.682040341 +0100
+@@ -13,6 +13,7 @@
+ #define __AUTOMATE_READER_HH__
+ 
+ #include <vector>
++#include <iostream>
+ 
+ class automate_reader
+ {
--- monotone-1.0_4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Fri Jan 24 15:24:37 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186060 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Sat Jan 25 18:06:14 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186060: commit references a PR
Date: Sat, 25 Jan 2014 18:06:17 +0000 (UTC)

 Author: madpilot
 Date: Sat Jan 25 18:06:08 2014
 New Revision: 341070
 URL: http://svnweb.freebsd.org/changeset/ports/341070
 QAT: https://qat.redports.org/buildarchive/r341070/
 
 Log:
   - Fix build on 10 and head with clang
   - Convert to staging
   - Improve library detection patch with a cleaner one
   - Mark jobs safe
   
   PR:		ports/186060
   Submitted by:	Lapo Luchini <lapo@lapo.it> (maintainer)
 
 Added:
   head/devel/monotone/files/patch-configure   (contents, props changed)
   head/devel/monotone/files/patch-src_automate_reader.hh   (contents, props changed)
 Modified:
   head/devel/monotone/Makefile
 
 Modified: head/devel/monotone/Makefile
 ==============================================================================
 --- head/devel/monotone/Makefile	Sat Jan 25 17:49:05 2014	(r341069)
 +++ head/devel/monotone/Makefile	Sat Jan 25 18:06:08 2014	(r341070)
 @@ -24,6 +24,7 @@ USE_BZIP2=	yes
  USES=		iconv pkgconfig gmake perl5
  USE_PERL5=	build
  USE_LUA=	5.1+
 +MAKE_JOBS_SAFE=	yes
  
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 @@ -50,13 +51,12 @@ PLIST_FILES=	bin/mtn bin/mtn-cleanup bin
  		"@dirrm share/monotone"
  .if !defined(NO_INSTALL_MANPAGES)
  INFO=		monotone
 -MAN1=		mtn.1 \
 -		mtn-cleanup.1 \
 -		mtnopt.1
 +PLIST_FILES+=	man/man1/mtn.1.gz \
 +		man/man1/mtn-cleanup.1.gz \
 +		man/man1/mtnopt.1.gz
  .endif
  PORTDOCS=	*
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MNLS}
 @@ -82,19 +82,20 @@ post-patch:
  	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
  	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
  .endif
 -	${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \
 -		-e "s/\"idn/\"libidn/g" \
 -		-e "s/\"pcre/\"libpcre/g" \
 -		-e "s/\"botan/\"botan-1.10/g" \
 +	${REINPLACE_CMD} \
  		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
 +		-e "s/std::tr1::/std::/g" \
  		${WRKSRC}/configure
 +	${REINPLACE_CMD} \
 +		-e "s/std::tr1::/std::/g" \
 +		${WRKSRC}/src/hash_map.hh
  
  post-install:
 -	${MKDIR} ${PREFIX}/share/zsh/site-functions
 -	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 +	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
  .if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
 +	${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
  .endif
  	@${CAT} ${PKGMESSAGE}
  
 
 Added: head/devel/monotone/files/patch-configure
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/monotone/files/patch-configure	Sat Jan 25 18:06:08 2014	(r341070)
 @@ -0,0 +1,13 @@
 +--- configure.orig	2014-01-22 00:48:12.855108408 +0100
 ++++ configure	2014-01-22 00:48:54.244105202 +0100
 +@@ -4594,9 +4594,7 @@ fi
 + 
 + # The dummy "pkg-config" package is guaranteed to exist.
 + if test -n "$PKG_CONFIG"; then
 +-  mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 |
 +-    sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" |
 +-    tr "$as_nl" ':' | sed 's/:$//'`
 ++  mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 | sed 's/:.*$//'`
 +   #AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path])
 + fi
 + 
 
 Added: head/devel/monotone/files/patch-src_automate_reader.hh
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/devel/monotone/files/patch-src_automate_reader.hh	Sat Jan 25 18:06:08 2014	(r341070)
 @@ -0,0 +1,10 @@
 +--- src/automate_reader.hh.orig	2014-01-22 01:04:27.675051506 +0100
 ++++ src/automate_reader.hh	2014-01-22 01:04:41.682040341 +0100
 +@@ -13,6 +13,7 @@
 + #define __AUTOMATE_READER_HH__
 + 
 + #include <vector>
 ++#include <iostream>
 + 
 + class automate_reader
 + {
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186060: commit references a PR
Date: Sat, 25 Jan 2014 18:20:09 +0000 (UTC)

 Author: madpilot
 Date: Sat Jan 25 18:20:01 2014
 New Revision: 341072
 URL: http://svnweb.freebsd.org/changeset/ports/341072
 QAT: https://qat.redports.org/buildarchive/r341072/
 
 Log:
   MFH: r341070
   
   - Fix build on 10 and head with clang
   - Convert to staging
   - Improve library detection patch with a cleaner one
   - Mark jobs safe
   
   PR:		ports/186060
   Submitted by:	Lapo Luchini <lapo@lapo.it> (maintainer)
   
   Approved by:	portmgr
 
 Added:
   branches/2014Q1/devel/monotone/files/patch-configure
      - copied unchanged from r341070, head/devel/monotone/files/patch-configure
   branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh
      - copied unchanged from r341070, head/devel/monotone/files/patch-src_automate_reader.hh
 Modified:
   branches/2014Q1/devel/monotone/Makefile
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/devel/monotone/Makefile
 ==============================================================================
 --- branches/2014Q1/devel/monotone/Makefile	Sat Jan 25 18:11:42 2014	(r341071)
 +++ branches/2014Q1/devel/monotone/Makefile	Sat Jan 25 18:20:01 2014	(r341072)
 @@ -24,6 +24,7 @@ USE_BZIP2=	yes
  USES=		iconv pkgconfig gmake perl5
  USE_PERL5=	build
  USE_LUA=	5.1+
 +MAKE_JOBS_SAFE=	yes
  
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 @@ -50,13 +51,12 @@ PLIST_FILES=	bin/mtn bin/mtn-cleanup bin
  		"@dirrm share/monotone"
  .if !defined(NO_INSTALL_MANPAGES)
  INFO=		monotone
 -MAN1=		mtn.1 \
 -		mtn-cleanup.1 \
 -		mtnopt.1
 +PLIST_FILES+=	man/man1/mtn.1.gz \
 +		man/man1/mtn-cleanup.1.gz \
 +		man/man1/mtnopt.1.gz
  .endif
  PORTDOCS=	*
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MNLS}
 @@ -82,19 +82,20 @@ post-patch:
  	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
  	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
  .endif
 -	${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \
 -		-e "s/\"idn/\"libidn/g" \
 -		-e "s/\"pcre/\"libpcre/g" \
 -		-e "s/\"botan/\"botan-1.10/g" \
 +	${REINPLACE_CMD} \
  		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
 +		-e "s/std::tr1::/std::/g" \
  		${WRKSRC}/configure
 +	${REINPLACE_CMD} \
 +		-e "s/std::tr1::/std::/g" \
 +		${WRKSRC}/src/hash_map.hh
  
  post-install:
 -	${MKDIR} ${PREFIX}/share/zsh/site-functions
 -	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn
 +	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 +	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
  .if ${PORT_OPTIONS:MDOCS}
 -	${MKDIR} ${DOCSDIR}
 -	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}
 +	${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
  .endif
  	@${CAT} ${PKGMESSAGE}
  
 
 Copied: branches/2014Q1/devel/monotone/files/patch-configure (from r341070, head/devel/monotone/files/patch-configure)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/devel/monotone/files/patch-configure	Sat Jan 25 18:20:01 2014	(r341072, copy of r341070, head/devel/monotone/files/patch-configure)
 @@ -0,0 +1,13 @@
 +--- configure.orig	2014-01-22 00:48:12.855108408 +0100
 ++++ configure	2014-01-22 00:48:54.244105202 +0100
 +@@ -4594,9 +4594,7 @@ fi
 + 
 + # The dummy "pkg-config" package is guaranteed to exist.
 + if test -n "$PKG_CONFIG"; then
 +-  mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 |
 +-    sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" |
 +-    tr "$as_nl" ':' | sed 's/:$//'`
 ++  mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 | sed 's/:.*$//'`
 +   #AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path])
 + fi
 + 
 
 Copied: branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh (from r341070, head/devel/monotone/files/patch-src_automate_reader.hh)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/devel/monotone/files/patch-src_automate_reader.hh	Sat Jan 25 18:20:01 2014	(r341072, copy of r341070, head/devel/monotone/files/patch-src_automate_reader.hh)
 @@ -0,0 +1,10 @@
 +--- src/automate_reader.hh.orig	2014-01-22 01:04:27.675051506 +0100
 ++++ src/automate_reader.hh	2014-01-22 01:04:41.682040341 +0100
 +@@ -13,6 +13,7 @@
 + #define __AUTOMATE_READER_HH__
 + 
 + #include <vector>
 ++#include <iostream>
 + 
 + class automate_reader
 + {
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
