Unbreak this support on 4.X now that there is an available UUID generating

tool in ports.

PR:		64030
Requested by:	marcus
Submitted by:	maintainer

4 files changed, 42 insertions, 22 deletions

diff --git a/deskutils/gdesklets-starterbar/Makefile b/deskutils/gdesklets-starterbar/Makefile
index 98830a3e499b..bfe2a9b6ccca 100644
--- a/deskutils/gdesklets-starterbar/Makefile
+++ b/deskutils/gdesklets-starterbar/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	starterbar
 PORTVERSION=	0.22.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
-PKGNAMEPREFIX= gdesklets-
+PKGNAMEPREFIX=	gdesklets-
 DISTNAME=	starterbar-desklet-${PORTVERSION}
 
 MAINTAINER=	mezz7@cox.net
@@ -19,17 +19,19 @@ COMMENT=	An icon bar for GNOME 2.x where you can put starters into
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
 
 USE_BZIP2=	yes
+USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 
 NAME=		StarterBar
 DATADIR=	${PREFIX}/share/gnome
+PKGMESSAGE=	${WRKDIR}/pkg-message
 LANG=		de fr pt sq sr sr@Latn sv
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-IGNORE=		"Requires FreeBSD 5.0 or later, because of uuidgen command first appeared in FreeBSD 5.0"
+RUN_DEPENDS+=	uuid:${PORTSDIR}/misc/ossp-uuid
 .endif
 
 do-build:
@@ -39,6 +41,10 @@ do-build:
 	@${PATCH} ${WRKSRC}/${NAME}/__init__.py < ${FILESDIR}/${NAME}::__init__.py
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/${NAME}/IconTheme.py
+.if ${OSVERSION} < 500000
+	@${REINPLACE_CMD} -e 's|uuidgen|uuid|g' \
+		${WRKSRC}/${NAME}/IconSet.py
+.endif
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
@@ -60,6 +66,10 @@ do-install:
 		${DATADIR}/gdesklets/Sensors/${NAME}/README
 
 post-install:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME}
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; s|%%NAME%%|${NAME}|g' \
+		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/gdesklets-starterbar/files/pkg-message.in b/deskutils/gdesklets-starterbar/files/pkg-message.in
new file mode 100644
index 000000000000..1fd55993f83d
--- /dev/null
+++ b/deskutils/gdesklets-starterbar/files/pkg-message.in
@@ -0,0 +1,17 @@
+##
+To view the README:
+
+	cat %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/README
+	cat %%PREFIX%%/share/gnome/gdesklets/Sensors/%%NAME%%/README
+
+To view the installed applets:
+
+	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+
+To use those applets:
+
+	gdesklets %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/starterbar.display
+
+NOTE: Be sure to login as your user when you use the gdesklets command,
+      as the configuration will be stored in the ~/.gdesklets/ directory.
+##
diff --git a/deskutils/gdesklets-starterbar/pkg-message b/deskutils/gdesklets-starterbar/pkg-message
deleted file mode 100644
index a36c141299e1..000000000000
--- a/deskutils/gdesklets-starterbar/pkg-message
+++ /dev/null
@@ -1,19 +0,0 @@
-##
-To view the README:
-
-	cat ${PREFIX}/share/gnome/gdesklets/Displays/${name}/README
-	cat ${PREFIX}/share/gnome/gdesklets/Sensors/${name}/README
-
-To view the installed applets:
-
-	ls ${PREFIX}/share/gnome/gdesklets/Displays
-
-To use those applets:
-
-	gdesklets ${PREFIX}/share/gnome/gdesklets/Displays/${name}/${name}.display
-
-Replace the ${name} with the correct name to what you want to use applets.
-
-NOTE: Be sure to login as your user when you use the gdesklets command,
-      as the configuration will be stored in the ~/.gdesklets/ directory.
-##
diff --git a/deskutils/gdesklets-starterbar/pkg-plist b/deskutils/gdesklets-starterbar/pkg-plist
index 11de36a069d3..d78283255c6e 100644
--- a/deskutils/gdesklets-starterbar/pkg-plist
+++ b/deskutils/gdesklets-starterbar/pkg-plist
@@ -13,13 +13,25 @@ share/gnome/gdesklets/Displays/StarterBar/gfx/waterbath.png
 share/gnome/gdesklets/Displays/StarterBar/starterbar.display
 share/gnome/gdesklets/Sensors/StarterBar/.order
 share/gnome/gdesklets/Sensors/StarterBar/Animator.py
+share/gnome/gdesklets/Sensors/StarterBar/Animator.pyc
+share/gnome/gdesklets/Sensors/StarterBar/Animator.pyo
 share/gnome/gdesklets/Sensors/StarterBar/ChangeLog
 share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.py
+share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.pyc
+share/gnome/gdesklets/Sensors/StarterBar/DesktopReader.pyo
 share/gnome/gdesklets/Sensors/StarterBar/Icon.py
+share/gnome/gdesklets/Sensors/StarterBar/Icon.pyc
+share/gnome/gdesklets/Sensors/StarterBar/Icon.pyo
 share/gnome/gdesklets/Sensors/StarterBar/IconSet.py
+share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyc
+share/gnome/gdesklets/Sensors/StarterBar/IconSet.pyo
 share/gnome/gdesklets/Sensors/StarterBar/IconTheme.py
+share/gnome/gdesklets/Sensors/StarterBar/IconTheme.pyc
+share/gnome/gdesklets/Sensors/StarterBar/IconTheme.pyo
 share/gnome/gdesklets/Sensors/StarterBar/README
 share/gnome/gdesklets/Sensors/StarterBar/__init__.py
+share/gnome/gdesklets/Sensors/StarterBar/__init__.pyc
+share/gnome/gdesklets/Sensors/StarterBar/__init__.pyo
 share/gnome/gdesklets/Sensors/StarterBar/home.desktop
 share/gnome/gdesklets/Sensors/StarterBar/locale/de/LC_MESSAGES/gdesklets.mo
 share/gnome/gdesklets/Sensors/StarterBar/locale/fr/LC_MESSAGES/gdesklets.mo