Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2016 16:12:36 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r405300 - head/devel/monotone
Message-ID:  <201601051612.u05GCaI3084385@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601051612.u05GCaI3084385>