diff --git a/audio/gdesklets-cornerxmms/Makefile b/audio/gdesklets-cornerxmms/Makefile index adb1e3be9cf0..3834a40a4f7e 100644 --- a/audio/gdesklets-cornerxmms/Makefile +++ b/audio/gdesklets-cornerxmms/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cornerxmms -PORTVERSION= 0.0.5 -PORTREVISION= 2 +PORTVERSION= 0.1.0 CATEGORIES= audio gnome MASTER_SITES= http://gdesklets.gnomedesktop.org/files/ PKGNAMEPREFIX= gdesklets- @@ -19,7 +18,6 @@ COMMENT= A fancy desklet that allows you to control XMMS from the desktop RUN_DEPENDS= gdesklets:${PORTSDIR}/deskutils/gdesklets \ ${PYTHON_SITELIBDIR}/xmms/__init__.py:${PORTSDIR}/audio/py-xmms -USE_BZIP2= yes USE_PYTHON= yes USE_X_PREFIX= yes @@ -28,21 +26,17 @@ DATADIR= ${PREFIX}/share/gnome WRKSRC= ${WRKDIR}/${NAME}-${PORTVERSION} do-build: - @${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC} - @${FIND} ${WRKSRC} -name '*.orig' -delete + @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} + @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} do-install: - @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME} + @${MKDIR} ${DATADIR}/gdesklets/Controls/KIconAnim + @${MKDIR} ${DATADIR}/gdesklets/Controls/KXmms @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME} @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/gfx - @${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py ${DATADIR}/gdesklets/Sensors/${NAME}/ - @${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}/gdesklets/Sensors/${NAME}/ - @${INSTALL_DATA} ${WRKSRC}/*.display ${DATADIR}/gdesklets/Displays/${NAME}/ - @${INSTALL_DATA} ${WRKSRC}/gfx/*.png ${DATADIR}/gdesklets/Displays/${NAME}/gfx/ - -post-install: - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${DATADIR}/gdesklets/Sensors/${NAME} - @${CAT} ${PKGMESSAGE} + @${INSTALL_DATA} ${WRKSRC}/Controls/KIconAnim/* ${DATADIR}/gdesklets/Controls/KIconAnim/ + @${INSTALL_DATA} ${WRKSRC}/Controls/KXmms/* ${DATADIR}/gdesklets/Controls/KXmms/ + @${INSTALL_DATA} ${WRKSRC}/Displays/${NAME}/*.display ${DATADIR}/gdesklets/Displays/${NAME}/ + @${INSTALL_DATA} ${WRKSRC}/Displays/${NAME}/gfx/*.png ${DATADIR}/gdesklets/Displays/${NAME}/gfx/ .include diff --git a/audio/gdesklets-cornerxmms/distinfo b/audio/gdesklets-cornerxmms/distinfo index cfeba0b21ed7..3198d209913e 100644 --- a/audio/gdesklets-cornerxmms/distinfo +++ b/audio/gdesklets-cornerxmms/distinfo @@ -1,2 +1,3 @@ -MD5 (CornerXMMS-0.0.5.tar.bz2) = 2714260a2a82005a814db703cf2ea854 -SIZE (CornerXMMS-0.0.5.tar.bz2) = 48846 +MD5 (CornerXMMS-0.1.0.tar.gz) = 6e12a6e5224d0902ec6ac3cc7b73ffd3 +SHA256 (CornerXMMS-0.1.0.tar.gz) = 4da58821166ca64164b1d6e73f3f31b98183366dc5fb945b3dcb9b74b79f3f26 +SIZE (CornerXMMS-0.1.0.tar.gz) = 91828 diff --git a/audio/gdesklets-cornerxmms/files/patch-Install_CornerXMMS_Sensor.bin b/audio/gdesklets-cornerxmms/files/patch-Install_CornerXMMS_Sensor.bin deleted file mode 100644 index f92d2ce0e304..000000000000 --- a/audio/gdesklets-cornerxmms/files/patch-Install_CornerXMMS_Sensor.bin +++ /dev/null @@ -1,19 +0,0 @@ ---- Install_CornerXMMS_Sensor.bin.orig Mon Dec 22 20:12:09 2003 -+++ Install_CornerXMMS_Sensor.bin Mon Dec 22 20:13:06 2003 -@@ -75,15 +75,9 @@ - else: - cmd = "mkdir -p %(destination)s; cd %(destination)s; " \ - "LANG=C tar -xzvf %(tmp)s 2>&1" -- fail, out = commands.getstatusoutput(cmd % vars()) -+ commands.getstatusoutput(cmd % vars()) - os.unlink(tmp) - -- if (fail): -- if (no_message): print ERROR_TAR + out -- else: message(ERROR_TAR + out, "error") -- sys.exit(1) -- -- print out - if (not list_only): - if (no_message): print SUCCESS - else: message(SUCCESS, "info") diff --git a/audio/gdesklets-cornerxmms/pkg-message b/audio/gdesklets-cornerxmms/pkg-message deleted file mode 100644 index 31e577b1e979..000000000000 --- a/audio/gdesklets-cornerxmms/pkg-message +++ /dev/null @@ -1,17 +0,0 @@ -## -To view the README: - - cat ${PREFIX}/share/gnome/gdesklets/Sensors/CornerXMMS/README - -To view the installed Displays: - - ls ${PREFIX}/share/gnome/gdesklets/Displays - -To use those desklet: - - gdesklets open ${PREFIX}/share/gnome/gdesklets/Displays/CornerXMMS/cornerxmms-bottomright.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 - and/or gconf database. -## diff --git a/audio/gdesklets-cornerxmms/pkg-plist b/audio/gdesklets-cornerxmms/pkg-plist index 883cf38eb1aa..aed094f84dc7 100644 --- a/audio/gdesklets-cornerxmms/pkg-plist +++ b/audio/gdesklets-cornerxmms/pkg-plist @@ -1,3 +1,15 @@ +share/gnome/gdesklets/Controls/KIconAnim/IKIconAnim.py +share/gnome/gdesklets/Controls/KIconAnim/IKIconAnim.pyc +share/gnome/gdesklets/Controls/KIconAnim/IKIconAnim.pyo +share/gnome/gdesklets/Controls/KIconAnim/__init__.py +share/gnome/gdesklets/Controls/KIconAnim/__init__.pyc +share/gnome/gdesklets/Controls/KIconAnim/__init__.pyo +share/gnome/gdesklets/Controls/KXmms/IKXmms.py +share/gnome/gdesklets/Controls/KXmms/IKXmms.pyc +share/gnome/gdesklets/Controls/KXmms/IKXmms.pyo +share/gnome/gdesklets/Controls/KXmms/__init__.py +share/gnome/gdesklets/Controls/KXmms/__init__.pyc +share/gnome/gdesklets/Controls/KXmms/__init__.pyo share/gnome/gdesklets/Displays/CornerXMMS/cornerxmms-bottomright.display share/gnome/gdesklets/Displays/CornerXMMS/gfx/bar0.png share/gnome/gdesklets/Displays/CornerXMMS/gfx/bar1.png @@ -24,10 +36,8 @@ share/gnome/gdesklets/Displays/CornerXMMS/gfx/rnd1.png share/gnome/gdesklets/Displays/CornerXMMS/gfx/stop0.png share/gnome/gdesklets/Displays/CornerXMMS/gfx/textmask-br0.png share/gnome/gdesklets/Displays/CornerXMMS/gfx/textmask-br1.png -share/gnome/gdesklets/Sensors/CornerXMMS/__init__.py -share/gnome/gdesklets/Sensors/CornerXMMS/__init__.pyc -share/gnome/gdesklets/Sensors/CornerXMMS/__init__.pyo -share/gnome/gdesklets/Sensors/CornerXMMS/README -@dirrm share/gnome/gdesklets/Sensors/CornerXMMS +@dirrm share/gnome/gdesklets/Controls/KIconAnim +@dirrm share/gnome/gdesklets/Controls/KXmms @dirrm share/gnome/gdesklets/Displays/CornerXMMS/gfx @dirrm share/gnome/gdesklets/Displays/CornerXMMS +@unexec rmdir %D/share/gnome/gdesklets/Controls 2>/dev/null || true