- show the menu-icon which disappeared in gnome 2.10

- s/X11BASE/PREFIX/ to respect PREFIX
- Add gnomeprefix to create gnomedirs

PR:		ports/78951
Submitted by:	maintainer

deskutils/splashsetter/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	splashsetter
 PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://webonaut.com/distfiles/${PORTNAME}/
 
@@ -18,10 +18,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
-USE_GNOME=	pygnome2
+USE_GNOME=	pygnome2 gnomeprefix
 
 do-build:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${PREFIX}|g' \
 		${WRKSRC}/*.py
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
@@ -29,19 +29,21 @@ do-build:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	${MKDIR} ${X11BASE}/share/gnome/pixmaps/${PORTNAME}/splash
-	${MKDIR} ${X11BASE}/libexec/${PORTNAME}
+	${MKDIR} ${PREFIX}/share/gnome/pixmaps/${PORTNAME}/splash
+	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
-		${X11BASE}/libexec/${PORTNAME}/
+		${PREFIX}/libexec/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/*.py* \
-		${X11BASE}/libexec/${PORTNAME}/
+		${PREFIX}/libexec/${PORTNAME}/
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
-		${X11BASE}/share/gnome/applications/
+		${PREFIX}/share/gnome/applications/
 	@${INSTALL_DATA} ${WRKSRC}/*.svg \
-		${X11BASE}/share/gnome/pixmaps/${PORTNAME}/
+		${PREFIX}/share/gnome/pixmaps/${PORTNAME}/
+	@${INSTALL_DATA} ${WRKSRC}/splashsetter_icon.svg \
+		${PREFIX}/share/gnome/pixmaps/${PORTNAME}.svg
 	@${INSTALL_DATA} ${WRKSRC}/*.png \
-		${X11BASE}/share/gnome/pixmaps/${PORTNAME}/splash/
-	@${LN} -sf ${X11BASE}/libexec/${PORTNAME}/${PORTNAME} \
-		${X11BASE}/bin/${PORTNAME}
+		${PREFIX}/share/gnome/pixmaps/${PORTNAME}/splash/
+	@${LN} -sf ${PREFIX}/libexec/${PORTNAME}/${PORTNAME} \
+		${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>

deskutils/splashsetter/files/patch-splashsetter.desktop

@@ -0,0 +1,10 @@
+--- splashsetter.desktop.orig	Thu Mar 17 18:07:21 2005
++++ splashsetter.desktop	Thu Mar 17 18:08:20 2005
+@@ -4,6 +4,6 @@
+ Exec=splashsetter
+ Terminal=false
+ Type=Application
+-Icon=splashsetter/splashsetter_icon.svg
++Icon=splashsetter.svg
+ Categories=Application;
+ StartupNotify=true

deskutils/splashsetter/pkg-plist

@@ -10,6 +10,7 @@ libexec/splashsetter/splash_set_gui_lib.pyc
 libexec/splashsetter/splash_set_gui_lib.pyo
 libexec/splashsetter/splashsetter
 share/gnome/applications/splashsetter.desktop
+share/gnome/pixmaps/splashsetter.svg
 share/gnome/pixmaps/splashsetter/splashsetter_icon.svg
 share/gnome/pixmaps/splashsetter/splashsetter_logo.svg
 share/gnome/pixmaps/splashsetter/splash/splashsetter_splash.png