- 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

4 files changed, 26 insertions, 15 deletions

diff --git a/x11-wm/lxmed/Makefile b/x11-wm/lxmed/Makefile
index 4e31ee01ea94..93e410fb775f 100644
--- a/x11-wm/lxmed/Makefile
+++ b/x11-wm/lxmed/Makefile
@@ -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>
diff --git a/x11-wm/lxmed/files/lxmed-root.in b/x11-wm/lxmed/files/lxmed-root.in
new file mode 100644
index 000000000000..51553568adfa
--- /dev/null
+++ b/x11-wm/lxmed/files/lxmed-root.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+cd "%%DATADIR%%" && exec pc-su "${@}"
diff --git a/x11-wm/lxmed/files/lxmed.sh.in b/x11-wm/lxmed/files/lxmed.sh.in
index 39c9d9933cd9..f2e7dba1d772 100644
--- a/x11-wm/lxmed/files/lxmed.sh.in
+++ b/x11-wm/lxmed/files/lxmed.sh.in
@@ -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" "${@}"
diff --git a/x11-wm/lxmed/pkg-plist b/x11-wm/lxmed/pkg-plist
index 902e461c6568..1b2aef51ca4f 100644
--- a/x11-wm/lxmed/pkg-plist
+++ b/x11-wm/lxmed/pkg-plist
@@ -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