Bug 186060

Summary: [MAINTAINER] devel/monotone: fixes on FreeBSD 10
Product: Ports & Packages Reporter: Lapo Luchini <lapo>
Component: Individual Port(s)Assignee: Guido Falsi <madpilot>
Status: Closed FIXED    
Severity: Affects Only Me CC: lapo
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
monotone-1.0_4.patch none

Description Lapo Luchini 2014-01-23 23:10:00 UTC 
- 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)
Comment 1 Guido Falsi freebsd_committer freebsd_triage 2014-01-24 15:24:37 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->madpilot

I'll take it.
Comment 2 Guido Falsi freebsd_committer freebsd_triage 2014-01-25 18:06:14 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2014-01-25 18:06:17 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"
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-01-25 18:20:09 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"