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: ports/186060: [MAINTAINER] devel/monotone: fixes on FreeBSD 10 Message-ID: <201401232305.s0NN52sU004035@deepie.home.lapo.it> Resent-Message-ID: <201401232310.s0NNA0B6047474@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186060 >Category: ports >Synopsis: [MAINTAINER] devel/monotone: fixes on FreeBSD 10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 23 23:10:00 UTC 2014 >Closed-Date: >Last-Modified: >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401232305.s0NN52sU004035>