Date: Mon, 19 Dec 2016 09:47:32 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428916 - head/x11/roxterm Message-ID: <201612190947.uBJ9lW4n086753@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Dec 19 09:47:32 2016 New Revision: 428916 URL: https://svnweb.freebsd.org/changeset/ports/428916 Log: - Fix build on 9.x - Simplify installation, cosmetic fixes Modified: head/x11/roxterm/Makefile Modified: head/x11/roxterm/Makefile ============================================================================== --- head/x11/roxterm/Makefile Mon Dec 19 09:15:09 2016 (r428915) +++ head/x11/roxterm/Makefile Mon Dec 19 09:47:32 2016 (r428916) @@ -23,7 +23,8 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USES= gettext libtool:build pkgconfig python:build tar:xz USE_XORG= ice sm x11 -USE_GNOME= cairo librsvg2:run libxslt:build +USE_GNOME= cairo librsvg2:run libxslt:build vte3 +USE_CSTD= c99 INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS @@ -32,10 +33,6 @@ MAITCHFLAGS= DISABLE_GIT=True; MAITCHFLAGS+= CC=${CC};GCC=${CC};CPP=${CC};CFLAGS=${CFLAGS}; MAITCHFLAGS+= PARALLEL=${MAKE_JOBS_NUMBER};PREFIX=${PREFIX}; -.include <bsd.port.options.mk> - -USE_GNOME+= vte3 - post-patch: @${REINPLACE_CMD} -e \ 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/maitch.py @@ -51,42 +48,34 @@ do-build: do-install: .for i in roxterm roxterm-config - (cd ${WRKSRC}/build && ${INSTALL_PROGRAM} ${i} \ - ${STAGEDIR}${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/build/${i} ${STAGEDIR}${PREFIX}/bin .endfor - (cd ${WRKSRC}/build && ${INSTALL_MAN} *.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) + ${INSTALL_MAN} ${WRKSRC}/build/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for i in es fr pt_BR ru uk @${MKDIR} ${STAGEDIR}${MANPREFIX}/man/${i}/man1 - (cd ${WRKSRC}/build/po4a/${i} && ${INSTALL_MAN} *.1 \ - ${STAGEDIR}${MANPREFIX}/man/${i}/man1) + ${INSTALL_MAN} ${WRKSRC}/build/po4a/${i}/*.1 ${STAGEDIR}${MANPREFIX}/man/${i}/man1 .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata - (cd ${WRKSRC}/build && ${INSTALL_DATA} roxterm.appdata.xml \ - ${STAGEDIR}${PREFIX}/share/appdata) - (cd ${WRKSRC} && ${INSTALL_DATA} roxterm.desktop \ - ${STAGEDIR}${DESKTOPDIR}) + ${INSTALL_DATA} ${WRKSRC}/build/roxterm.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata + ${INSTALL_DATA} ${WRKSRC}/roxterm.desktop ${STAGEDIR}${DESKTOPDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - (cd ${WRKSRC} && ${INSTALL_DATA} roxterm.svg \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps) + ${INSTALL_DATA} ${WRKSRC}/roxterm.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps @${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/src && ${INSTALL_DATA} roxterm-config.ui \ - ${STAGEDIR}${DATADIR}) + ${INSTALL_DATA} ${WRKSRC}/src/roxterm-config.ui ${STAGEDIR}${DATADIR} @(cd ${WRKSRC} && ${COPYTREE_SHARE} Config ${STAGEDIR}${DATADIR}) .for i in es fr pt_BR ru uk @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES - (cd ${WRKSRC}/build/po && ${INSTALL_DATA} ${i}.mo \ - ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/roxterm.mo) + ${INSTALL_DATA} ${WRKSRC}/build/po/${i}.mo ${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/roxterm.mo .endfor do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog README - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .for i in en es fr lib pt_BR ru uk @${MKDIR} ${STAGEDIR}${DOCSDIR}/${i} - (cd ${WRKSRC}/Help/${i} && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}/${i}) + ${INSTALL_DATA} ${WRKSRC}/Help/${i}/* ${STAGEDIR}${DOCSDIR}/${i} .endfor .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612190947.uBJ9lW4n086753>