From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 18:20:02 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C33F359A; Sat, 25 Jan 2014 18:20:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AF1BD166C; Sat, 25 Jan 2014 18:20:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PIK29V032934; Sat, 25 Jan 2014 18:20:02 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PIK2rS032928; Sat, 25 Jan 2014 18:20:02 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201401251820.s0PIK2rS032928@svn.freebsd.org> From: Guido Falsi Date: Sat, 25 Jan 2014 18:20:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341072 - in branches/2014Q1/devel/monotone: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 18:20:02 -0000 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 (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 .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 ++#include + + class automate_reader + {