svn commit: r413438 - in head: audio/milkytracker cad/gerbv editors/komodo-edit finance/jgnash games/bombz games/qgo games/scummvm games/violetland java/icedtea-web multimedia/devede multimedia/xmm...
Alexey Dokuchaev
danfe at FreeBSD.org
Sat Apr 16 12:29:30 UTC 2016
Author: danfe
Date: Sat Apr 16 12:29:27 2016
New Revision: 413438
URL: https://svnweb.freebsd.org/changeset/ports/413438
Log:
Do not attempt to create ${STAGEDIR}${DESKTOPDIR}: `share/applications'
was added to mtree (Templates/BSD.local.dist) in r331266 2.5 years ago,
and fix some minor bogosities nearby.
Modified:
head/audio/milkytracker/Makefile
head/cad/gerbv/Makefile
head/editors/komodo-edit/Makefile
head/finance/jgnash/Makefile
head/games/bombz/Makefile
head/games/qgo/Makefile
head/games/scummvm/Makefile
head/games/violetland/Makefile
head/java/icedtea-web/Makefile
head/multimedia/devede/Makefile
head/multimedia/xmms/Makefile
head/net-p2p/tribler/Makefile
head/net/unison-devel/Makefile
head/net/unison/Makefile
head/net/unison232/Makefile
head/net/unison240/Makefile
head/print/jabref/Makefile
head/sysutils/isomaster/Makefile
head/www/chromium/Makefile
head/www/xpi-conkeror/Makefile
head/x11-fm/doublecmd/Makefile
Modified: head/audio/milkytracker/Makefile
==============================================================================
--- head/audio/milkytracker/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/audio/milkytracker/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -39,7 +39,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/resources/pictures/${f} \
${STAGEDIR}${PREFIX}/share/pixmaps/${f:C/carton/milkytracker/}
.endfor
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
Modified: head/cad/gerbv/Makefile
==============================================================================
--- head/cad/gerbv/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/cad/gerbv/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -41,7 +41,6 @@ post-patch:
${WRKSRC}/src/Makefile.am
post-install:
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
(cd ${WRKSRC}/desktop && ${INSTALL_DATA} gerbv.desktop \
${STAGEDIR}${DESKTOPDIR})
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
Modified: head/editors/komodo-edit/Makefile
==============================================================================
--- head/editors/komodo-edit/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/editors/komodo-edit/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -32,8 +32,7 @@ DESKTOP_ENTRIES="Komodo Edit" \
false
do-install:
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
- cd ${WRKSRC}/INSTALLDIR && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}
+ cd ${WRKSRC}/INSTALLDIR && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/bin/komodo
${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/lib/mozilla/komodo
${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/lib/mozilla/komodo-bin
Modified: head/finance/jgnash/Makefile
==============================================================================
--- head/finance/jgnash/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/finance/jgnash/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -30,7 +30,6 @@ do-install:
@${MKDIR} ${STAGEDIR}${DATADIR}
@${CP} ${WRKSRC}/jgnash2.jar ${STAGEDIR}${DATADIR}
@${CP} -R ${WRKSRC}/lib ${STAGEDIR}${DATADIR}
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
@${CP} ${WRKDIR}/jgnash.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.mk>
Modified: head/games/bombz/Makefile
==============================================================================
--- head/games/bombz/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/games/bombz/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -44,19 +44,17 @@ do-build:
do-install:
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-
.for d in bombz levels pngs sounds FreeSans.ttf
@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
.endfor
.for f in *.py *.pyc *.pyo
${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}
.endfor
-
${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
${STAGEDIR}${PREFIX}/share/pixmaps/
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
Modified: head/games/qgo/Makefile
==============================================================================
--- head/games/qgo/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/games/qgo/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -28,7 +28,6 @@ post-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/qgo ${STAGEDIR}${PREFIX}/bin
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/src/qgo.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/src/ressources/pics/qgo.png \
${STAGEDIR}${PREFIX}/share/pixmaps
Modified: head/games/scummvm/Makefile
==============================================================================
--- head/games/scummvm/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/games/scummvm/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -67,7 +67,6 @@ post-patch:
${WRKSRC}/configure
post-install:
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \
${STAGEDIR}${DESKTOPDIR}
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
Modified: head/games/violetland/Makefile
==============================================================================
--- head/games/violetland/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/games/violetland/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -33,7 +33,6 @@ post-patch:
${WRKSRC}/CMakeLists.txt
post-install:
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/icon-light.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/java/icedtea-web/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -98,7 +98,6 @@ post-patch:
${WRKSRC}/*.desktop.in
post-install:
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${DESKTOPDIR}
.for lang in cs de en pl
.for man in javaws policyeditor
Modified: head/multimedia/devede/Makefile
==============================================================================
--- head/multimedia/devede/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/multimedia/devede/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -34,7 +34,6 @@ IBUS_RUN_DEPENDS= ibus-daemon:textproc/i
NLS_USES= gettext-runtime:run
OPTIONS_SUB= yes
-
USE_GITHUB= yes
GH_ACCOUNT= rastersoft
GH_PROJECT= Devede
@@ -62,13 +61,9 @@ do-install:
# File locations in devede are a mess...
${INSTALL_SCRIPT} ${WRKSRC}/devede.py ${STAGEDIR}${PREFIX}/bin/devede
${INSTALL_SCRIPT} ${WRKSRC}/devede-debug ${STAGEDIR}${PREFIX}/bin/
-#
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/devede
- ${INSTALL_DATA} ${WRKSRC}/devede_*.py \
- ${STAGEDIR}${PREFIX}/lib/devede
-#
+ ${INSTALL_DATA} ${WRKSRC}/devede_*.py ${STAGEDIR}${PREFIX}/lib/devede
${INSTALL_DATA} ${WRKSRC}/devede.desktop ${STAGEDIR}${DESKTOPDIR}
-#
@${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/devedesans.ttf ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/devede.svg ${STAGEDIR}${DATADIR}
Modified: head/multimedia/xmms/Makefile
==============================================================================
--- head/multimedia/xmms/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/multimedia/xmms/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -95,7 +95,6 @@ post-patch:
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/xmms/Skins
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${FILESDIR}/xmms.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.mk>
Modified: head/net-p2p/tribler/Makefile
==============================================================================
--- head/net-p2p/tribler/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/net-p2p/tribler/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -90,11 +90,10 @@ do-install:
${XARGS} -0 ${CHMOD} ${SHAREMODE}
@${FIND} ${STAGEDIR}${TRIBLER_DIR}/Tribler -type d -print0 | \
${XARGS} -0 ${CHMOD} a+rx
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
- (cd ${WRKSRC}/usr/share/applications && ${INSTALL_DATA} \
- *.desktop ${STAGEDIR}${PREFIX}/share/applications)
- (cd ${WRKSRC}/usr/share/pixmaps && ${INSTALL_DATA} \
- *.xpm ${STAGEDIR}${PREFIX}/share/pixmaps)
+ ${INSTALL_DATA} ${WRKSRC}/usr/share/applications/*.desktop \
+ ${STAGEDIR}${DESKTOPDIR}
+ ${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/*.xpm \
+ ${STAGEDIR}${PREFIX}/share/pixmaps
@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
-d ${PYTHONPREFIX_SITELIBDIR} \
-f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;})
Modified: head/net/unison-devel/Makefile
==============================================================================
--- head/net/unison-devel/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/net/unison-devel/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -75,7 +75,6 @@ post-install:
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${STAGEDIR}${PREFIX}/bin
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
.endif
Modified: head/net/unison/Makefile
==============================================================================
--- head/net/unison/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/net/unison/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -69,7 +69,6 @@ post-install:
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
.endif
Modified: head/net/unison232/Makefile
==============================================================================
--- head/net/unison232/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/net/unison232/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -69,9 +69,8 @@ post-install:
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
- @${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
+ ${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
.endif
.include <bsd.port.mk>
Modified: head/net/unison240/Makefile
==============================================================================
--- head/net/unison240/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/net/unison240/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -70,7 +70,6 @@ post-install:
cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${STAGEDIR}${DOCSDIR}
.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-text ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}-text
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/${PORTNAME}${PKGNAMESUFFIX}.desktop
${INSTALL_DATA} ${WRKSRC}/win32rc/U_4_48x48x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
.endif
Modified: head/print/jabref/Makefile
==============================================================================
--- head/print/jabref/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/print/jabref/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -36,7 +36,6 @@ do-install:
${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${DATADIR}/${PORTNAME}.jar
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
${INSTALL_DATA} ${FILESDIR}/JabRef-icon-48.png ${STAGEDIR}${icon}
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.mk>
Modified: head/sysutils/isomaster/Makefile
==============================================================================
--- head/sysutils/isomaster/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/sysutils/isomaster/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -45,8 +45,6 @@ do-install:
(cd ${WRKSRC}/po && ${INSTALL_DATA} ${i}.mo \
${STAGEDIR}${PREFIX}/share/locale/${i}/LC_MESSAGES/isomaster.mo)
.endfor
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} isomaster.desktop \
- ${STAGEDIR}${DESKTOPDIR})
+ ${INSTALL_DATA} ${WRKSRC}/isomaster.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.mk>
Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/www/chromium/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -396,7 +396,6 @@ do-install:
${STAGEDIR}${DATADIR}
cd ${WRKSRC}/out/${BUILDTYPE} && \
${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
${STAGEDIR}${DESKTOPDIR}
${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
Modified: head/www/xpi-conkeror/Makefile
==============================================================================
--- head/www/xpi-conkeror/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/www/xpi-conkeror/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -50,7 +50,6 @@ post-patch-FIREFOX-on:
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/libexec/conkeror
${MKDIR} ${STAGEDIR}${DATADIR}
- ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
${SED} -e "s/BuildID=git/BuildID=$$(${BUILD_ID})/g" \
-e "s/^Version=\(.*\)$$/Version=\1 (FreeBSD-${OSREL})/g" \
Modified: head/x11-fm/doublecmd/Makefile
==============================================================================
--- head/x11-fm/doublecmd/Makefile Sat Apr 16 12:21:38 2016 (r413437)
+++ head/x11-fm/doublecmd/Makefile Sat Apr 16 12:29:27 2016 (r413438)
@@ -290,7 +290,6 @@ pre-install:
@${ECHO_CMD} "man/man1/doublecmd.1.gz" >> ${PLIST}
do-install:
- @${MKDIR} ${STAGEDIR}${DATADIR}/plugins
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx
@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx
@@ -376,8 +375,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${PREFIX}/share/pixmaps/
.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
- @${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/
${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
More information about the svn-ports-head
mailing list