Date: Mon, 14 Oct 2013 12:00:23 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330307 - head/devel/diffuse Message-ID: <201310141200.r9EC0NtD068256@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Oct 14 12:00:22 2013 New Revision: 330307 URL: http://svnweb.freebsd.org/changeset/ports/330307 Log: devel/diffuse: allow staging - Allow staging - Use options helpers PR: ports/182745 Submitted by: Marco Bröder <marco.broeder gmx.eu> (maintainer) Modified: head/devel/diffuse/Makefile head/devel/diffuse/pkg-plist Modified: head/devel/diffuse/Makefile ============================================================================== --- head/devel/diffuse/Makefile Mon Oct 14 11:58:15 2013 (r330306) +++ head/devel/diffuse/Makefile Mon Oct 14 12:00:22 2013 (r330307) @@ -7,7 +7,7 @@ CATEGORIES= devel python MASTER_SITES= SF MAINTAINER= marco.broeder@gmx.eu -COMMENT= A graphical N-way diff and merge tool written in python +COMMENT= Graphical N-way diff and merge tool written in python LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual @@ -15,41 +15,30 @@ LICENSE_COMB= dual NO_BUILD= yes USE_BZIP2= yes -USE_PYTHON= -2.7 +USE_PYTHON= 2 USE_GNOME= pygtk2 CONFLICTS= tinker-[0-9]* -MAN1= diffuse.1 PORTDOCS= AUTHORS ChangeLog ChangeLog_ru README README_ru OPTIONS_DEFINE= DATA DOCS MENU NLS DATA_DESC= Enable syntax highlighting support MENU_DESC= Enable a desktop program menu entry +OPTIONS_DEFAULT=DATA DOCS MENU NLS +OPTIONS_SUB= yes +MENU_USES= desktop-file-utils +NLS_USES= gettext -OPTIONS_DEFAULT=DATA MENU - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDATA} PORTDATA= syntax .endif -.if ${PORT_OPTIONS:MMENU} -USES+= desktop-file-utils -PLIST_SUB+= MENU="" -.else -PLIST_SUB+= MENU="@comment " -.endif - .if ${PORT_OPTIONS:MNLS} -USES+= gettext TRANSLATIONS= cs de es it ja ko pl ru zh_CN -MANLANG= "" cs it ru -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " +MANUALS= cs it ru .endif post-patch: @@ -61,46 +50,48 @@ post-patch: import ${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \ ${WRKSRC}/src/etc/${PORTNAME}rc .endif - ${REINPLACE_CMD} -e 's|../../etc|${PREFIX}/etc|g' \ - ${WRKSRC}/src/usr/bin/${PORTNAME} + ${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|g; \ + s|../../etc|${PREFIX}/etc|g' ${WRKSRC}/src/usr/bin/${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/ + ${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc \ + ${STAGEDIR}${PREFIX}/etc/ ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \ - ${MANPREFIX}/man/man1/ + ${STAGEDIR}${MANPREFIX}/man/man1/ -post-install: .if ${PORT_OPTIONS:MDATA} - ${MKDIR} ${DATADIR}/${PORTDATA} + @${MKDIR} ${STAGEDIR}${DATADIR}/${PORTDATA} (cd ${WRKSRC}/src/usr/share/${PORTNAME} && \ - ${COPYTREE_SHARE} \* ${DATADIR}) + ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/) .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/) .endif .if ${PORT_OPTIONS:MMENU} ${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \ - ${PREFIX}/share/pixmaps/ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/src/usr/share/applications/*.desktop \ - ${DESKTOPDIR} + ${STAGEDIR}${DESKTOPDIR}/ .endif .if ${PORT_OPTIONS:MNLS} .for x in ${TRANSLATIONS} - ${MKDIR} ${WRKSRC}/translations/${x} + @${MKDIR} ${WRKSRC}/translations/${x} ${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/${x}.po \ -o ${WRKSRC}/translations/${x}/${PORTNAME}.mo ${INSTALL_DATA} ${WRKSRC}/translations/${x}/*.mo \ - ${PREFIX}/share/locale/${x}/LC_MESSAGES/ + ${STAGEDIR}${PREFIX}/share/locale/${x}/LC_MESSAGES/ .endfor -.for y in ${MANLANG} - ${MKDIR} ${MANPREFIX}/man/${y}/man1 +.for y in ${MANUALS} + @${MKDIR} ${STAGEDIR}${MANPREFIX}/man/${y}/man1 ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/${y}/man1/*.1 \ - ${MANPREFIX}/man/${y}/man1/ + ${STAGEDIR}${MANPREFIX}/man/${y}/man1/ .endfor .endif Modified: head/devel/diffuse/pkg-plist ============================================================================== --- head/devel/diffuse/pkg-plist Mon Oct 14 11:58:15 2013 (r330306) +++ head/devel/diffuse/pkg-plist Mon Oct 14 12:00:22 2013 (r330307) @@ -1,7 +1,11 @@ bin/diffuse etc/diffuserc +man/man1/diffuse.1.gz %%MENU%%share/applications/diffuse.desktop %%MENU%%share/pixmaps/diffuse.png +%%NLS%%man/cs/man1/diffuse.1.gz +%%NLS%%man/it/man1/diffuse.1.gz +%%NLS%%man/ru/man1/diffuse.1.gz %%NLS%%share/locale/cs/LC_MESSAGES/diffuse.mo %%NLS%%share/locale/de/LC_MESSAGES/diffuse.mo %%NLS%%share/locale/es/LC_MESSAGES/diffuse.mo @@ -11,9 +15,10 @@ etc/diffuserc %%NLS%%share/locale/pl/LC_MESSAGES/diffuse.mo %%NLS%%share/locale/ru/LC_MESSAGES/diffuse.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/diffuse.mo -@dirrmtry man/cs/man1 -@dirrmtry man/cs -@dirrmtry man/it/man1 -@dirrmtry man/it -@dirrmtry man/ru/man1 -@dirrmtry man/ru +%%MENU%%@dirrmtry share/applications +%%NLS%%@dirrmtry man/cs/man1 +%%NLS%%@dirrmtry man/cs +%%NLS%%@dirrmtry man/it/man1 +%%NLS%%@dirrmtry man/it +%%NLS%%@dirrmtry man/ru/man1 +%%NLS%%@dirrmtry man/ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310141200.r9EC0NtD068256>