From owner-svn-ports-all@freebsd.org Tue Jan 5 16:12:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DEB00A62C65; Tue, 5 Jan 2016 16:12:37 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1FB21A27; Tue, 5 Jan 2016 16:12:37 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u05GCaLc084387; Tue, 5 Jan 2016 16:12:36 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u05GCaI3084385; Tue, 5 Jan 2016 16:12:36 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601051612.u05GCaI3084385@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Tue, 5 Jan 2016 16:12:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405300 - head/devel/monotone X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jan 2016 16:12:38 -0000 Author: pawel Date: Tue Jan 5 16:12:36 2016 New Revision: 405300 URL: https://svnweb.freebsd.org/changeset/ports/405300 Log: - Switch to pkg-plist, PLIST list is too long, remove use of deprecated @dirrm while here - Convert to USES=localbase, options helpers - Silence REINPLACE_CMD's PR: 205885 Submitted by: myself Approved by: maintainer Added: head/devel/monotone/pkg-plist (contents, props changed) Modified: head/devel/monotone/Makefile Modified: head/devel/monotone/Makefile ============================================================================== --- head/devel/monotone/Makefile Tue Jan 5 16:09:32 2016 (r405299) +++ head/devel/monotone/Makefile Tue Jan 5 16:12:36 2016 (r405300) @@ -20,75 +20,43 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/deve libbotan-1.10.so:${PORTSDIR}/security/botan110 SUB_FILES= pkg-message -USES= cpe iconv pkgconfig gmake perl5 lua:51 tar:bzip2 makeinfo +USES= cpe gmake iconv localbase lua:51 makeinfo perl5 \ + pkgconfig tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PLIST_FILES= bin/mtn bin/mtn-cleanup bin/mtnopt \ - share/monotone/hooks/authorize_remote_automate.lua \ - share/monotone/hooks/get_passphrase_from_file.lua \ - share/monotone/hooks/monotone-buildbot.lua \ - share/monotone/hooks/monotone-ciabot.lua \ - share/monotone/hooks/monotone-cluster-push.lua \ - share/monotone/hooks/monotone-cvs-ignore.lua \ - share/monotone/hooks/monotone-mail-notify.lua \ - share/monotone/scripts/monotone-ciabot.py \ - share/monotone/scripts/monotone-mail-notify \ - etc/bash_completion.d/monotone.bash_completion \ - share/zsh/site-functions/_mtn \ - "@unexec [ -f %D/bin/zsh ] || ${RMDIR} %D/share/zsh/site-functions 2>/dev/null || true" \ - "@dirrmtry share/zsh" \ - "@dirrmtry etc/bash_completion.d" \ - "@dirrm share/monotone/hooks" \ - "@dirrmtry share/zsh/site-functions" \ - "@dirrm share/monotone/scripts" \ - "@dirrm share/monotone" INFO= monotone -PLIST_FILES+= man/man1/mtn.1.gz \ - man/man1/mtn-cleanup.1.gz \ - man/man1/mtnopt.1.gz PORTDOCS= * OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_FILES+= share/locale/de/LC_MESSAGES/monotone.mo \ - share/locale/fr/LC_MESSAGES/monotone.mo \ - share/locale/it/LC_MESSAGES/monotone.mo \ - share/locale/pt/LC_MESSAGES/monotone.mo \ - share/locale/sv/LC_MESSAGES/monotone.mo -.else -CONFIGURE_ARGS+= --disable-nls -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls post-extract: @${RM} -f ${WRKSRC}/monotone.info* post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - ${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in -.endif - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \ -e "s/std::tr1::/std::/g" \ ${WRKSRC}/configure - ${REINPLACE_CMD} \ + @${REINPLACE_CMD} \ -e "s/std::tr1::/std::/g" \ ${WRKSRC}/src/hash_map.hh +post-patch-DOCS-off: + @${REINPLACE_CMD} -Ee '/^install-(contrib|examples)-data:/{' -e 'n' -e 'd' -e '}' ${WRKSRC}/Makefile.in + post-install: ${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} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR} -.endif .include Added: head/devel/monotone/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/monotone/pkg-plist Tue Jan 5 16:12:36 2016 (r405300) @@ -0,0 +1,22 @@ +bin/mtn +bin/mtn-cleanup +bin/mtnopt +etc/bash_completion.d/monotone.bash_completion +man/man1/mtn-cleanup.1.gz +man/man1/mtn.1.gz +man/man1/mtnopt.1.gz +%%NLS%%share/locale/de/LC_MESSAGES/monotone.mo +%%NLS%%share/locale/fr/LC_MESSAGES/monotone.mo +%%NLS%%share/locale/it/LC_MESSAGES/monotone.mo +%%NLS%%share/locale/pt/LC_MESSAGES/monotone.mo +%%NLS%%share/locale/sv/LC_MESSAGES/monotone.mo +share/monotone/hooks/authorize_remote_automate.lua +share/monotone/hooks/get_passphrase_from_file.lua +share/monotone/hooks/monotone-buildbot.lua +share/monotone/hooks/monotone-ciabot.lua +share/monotone/hooks/monotone-cluster-push.lua +share/monotone/hooks/monotone-cvs-ignore.lua +share/monotone/hooks/monotone-mail-notify.lua +share/monotone/scripts/monotone-ciabot.py +share/monotone/scripts/monotone-mail-notify +share/zsh/site-functions/_mtn