Date: Mon, 24 Mar 2014 11:58:01 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348945 - in head/x11-wm/lxmed: . files Message-ID: <201403241158.s2OBw1jL062487@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Mon Mar 24 11:58:01 2014 New Revision: 348945 URL: http://svnweb.freebsd.org/changeset/ports/348945 QAT: https://qat.redports.org/buildarchive/r348945/ Log: - Bump PORTREVISION for pkg-plist change - Add files/lxmed-root and fix Desktop usage for root - Move CP to post-extract - Use for icons PORTNAME instead of full path - Break lines around 80 characters - Simplify desktop files installation handling - Change files/lxmed.sh, remove -Djava.ext.dirs="%%DATADIR%%" - Remove @dirrmtry share/applications from pkg-plist Added: head/x11-wm/lxmed/files/lxmed-root.in (contents, props changed) Modified: head/x11-wm/lxmed/Makefile head/x11-wm/lxmed/files/lxmed.sh.in head/x11-wm/lxmed/pkg-plist Modified: head/x11-wm/lxmed/Makefile ============================================================================== --- head/x11-wm/lxmed/Makefile Mon Mar 24 11:56:55 2014 (r348944) +++ head/x11-wm/lxmed/Makefile Mon Mar 24 11:58:01 2014 (r348945) @@ -3,6 +3,7 @@ PORTNAME= lxmed PORTVERSION= 20120515 +PORTREVISION= 1 CATEGORIES= x11-wm java MASTER_SITES= SF/${PORTNAME}/ DIST_SUBDIR= java @@ -22,27 +23,31 @@ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/${PORTNAME} -SUB_FILES= ${PORTNAME}.sh +SUB_FILES= ${PORTNAME}.sh ${PORTNAME}-root + +post-extract: + @(cd ${WRKSRC}/content/ && ${CP} -a ${PORTNAME}.desktop \ + ${PORTNAME}-root.desktop) post-patch: - @${REINPLACE_CMD} -e 's|/opt/lxmed/${PORTNAME}.png|${PREFIX}/share/pixmaps/${PORTNAME}.png|' \ - -e 's|Main Menu Editor|${COMMENT}|g' \ + @${REINPLACE_CMD} -e 's|/opt/lxmed/${PORTNAME}.png|${PORTNAME}|; \ + s|Main Menu Editor|${COMMENT}|' \ ${WRKSRC}/content/${PORTNAME}.desktop - @(cd ${WRKSRC}/content/ && ${CP} -a ${PORTNAME}.desktop ${PORTNAME}-root.desktop) - @${REINPLACE_CMD} -e 's|Exec=lxmed|Exec=${DATADIR}/pc-su ${PORTNAME}|' \ - -e 's|${COMMENT}|${COMMENT} (as root)|g' \ + @${REINPLACE_CMD} -e 's|/opt/lxmed/${PORTNAME}.png|${PORTNAME}|; \ + s|Exec=lxmed|Exec=${PORTNAME}-root ${PORTNAME}|; \ + s|Main Menu Editor|${COMMENT} (as root)|' \ ${WRKSRC}/content/${PORTNAME}-root.desktop do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-root \ + ${STAGEDIR}${PREFIX}/bin/ @${MKDIR} ${STAGEDIR}${DATADIR} ${CP} -a ${FILESDIR}/pc-su ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/content/LXMenuEditor.jar ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/content/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ - @${MKDIR} ${STAGEDIR}${DESKTOPDIR} - -.for d in ${PORTNAME}.desktop ${PORTNAME}-root.desktop - ${INSTALL_DATA} ${WRKSRC}/content/${d} ${STAGEDIR}${DESKTOPDIR} -.endfor + ${INSTALL_DATA} ${WRKSRC}/content/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/content/*.desktop ${STAGEDIR}${DESKTOPDIR} .include <bsd.port.mk> Added: head/x11-wm/lxmed/files/lxmed-root.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/lxmed/files/lxmed-root.in Mon Mar 24 11:58:01 2014 (r348945) @@ -0,0 +1,6 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +cd "%%DATADIR%%" && exec pc-su "${@}" Modified: head/x11-wm/lxmed/files/lxmed.sh.in ============================================================================== --- head/x11-wm/lxmed/files/lxmed.sh.in Mon Mar 24 11:56:55 2014 (r348944) +++ head/x11-wm/lxmed/files/lxmed.sh.in Mon Mar 24 11:58:01 2014 (r348945) @@ -6,4 +6,4 @@ export JAVA_VERSION="%%JAVA_VERSION%%" cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ --Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/LXMenuEditor.jar" "${@}" +-jar "%%DATADIR%%/LXMenuEditor.jar" "${@}" Modified: head/x11-wm/lxmed/pkg-plist ============================================================================== --- head/x11-wm/lxmed/pkg-plist Mon Mar 24 11:56:55 2014 (r348944) +++ head/x11-wm/lxmed/pkg-plist Mon Mar 24 11:58:01 2014 (r348945) @@ -1,8 +1,8 @@ bin/lxmed +bin/lxmed-root share/applications/lxmed-root.desktop share/applications/lxmed.desktop %%DATADIR%%/LXMenuEditor.jar %%DATADIR%%/pc-su share/pixmaps/lxmed.png @dirrm %%DATADIR%% -@dirrmtry share/applications
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403241158.s2OBw1jL062487>