aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysutils/gdesklets-multitail/Makefile64
-rw-r--r--sysutils/gdesklets-multitail/pkg-plist4
2 files changed, 29 insertions, 39 deletions
diff --git a/sysutils/gdesklets-multitail/Makefile b/sysutils/gdesklets-multitail/Makefile
index b748433d68df..721aabd57441 100644
--- a/sysutils/gdesklets-multitail/Makefile
+++ b/sysutils/gdesklets-multitail/Makefile
@@ -7,6 +7,7 @@
PORTNAME= multitail
PORTVERSION= 0.1.6
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= http://gdesklets.gnomedesktop.org/files/
PKGNAMEPREFIX= gdesklets-
@@ -15,53 +16,46 @@ DISTNAME= multitail-${PORTVERSION}
MAINTAINER= klammer@webonaut.com
COMMENT= Tail up to 5 files in one gdesklets display
-RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets
+RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gdesklets-core.pc:${PORTSDIR}/deskutils/gdesklets \
+ ${DATADIR}/gdesklets/Sensors/DisplayConstraints/__init__.py:${PORTSDIR}/deskutils/gdesklets-sensor-displayconstraints
-WRKSRC= ${WRKDIR}/${NAME1}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${NAME}-${PORTVERSION}
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_PYTHON= yes
-NAME1= MultiTail
-NAME2= DisplayConstraints
+DATADIR= ${PREFIX}/share/gnome
+NAME= MultiTail
do-build:
- @${WRKSRC}/Install_${NAME1}_Sensor.bin --nomsg ${WRKSRC}
- @${WRKSRC}/Install_${NAME2}_Sensor.bin --nomsg ${WRKSRC}
+ @${WRKSRC}/Install_${NAME}_Sensor.bin --nomsg ${WRKSRC}
@${FIND} ${WRKSRC} -name '*.orig' -delete
do-install:
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/gfx
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/gfx
- @${MKDIR} ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/gfx
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/README \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/dark-theme/*.display \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/dark-theme/gfx/*.png \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/dark-theme/gfx/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/light-theme/*.display \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/light-theme/gfx/*.png \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/light-theme/gfx/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/trans-theme/*.display \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/trans-theme/gfx/*.png \
- ${PREFIX}/share/gnome/gdesklets/Displays/${NAME1}/trans-theme/gfx/
- ${INSTALL_DATA} ${WRKSRC}/${NAME1}/*.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
- ${INSTALL_DATA} ${WRKSRC}/${NAME2}/*.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
+ @${MKDIR} ${DATADIR}/gdesklets/Sensors/${NAME}
+ @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/gfx
+ @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/light-theme/gfx
+ @${MKDIR} ${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/gfx
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/README \
+ ${DATADIR}/gdesklets/Displays/${NAME}/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/dark-theme/*.display \
+ ${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/dark-theme/gfx/*.png \
+ ${DATADIR}/gdesklets/Displays/${NAME}/dark-theme/gfx/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/light-theme/*.display \
+ ${DATADIR}/gdesklets/Displays/${NAME}/light-theme/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/light-theme/gfx/*.png \
+ ${DATADIR}/gdesklets/Displays/${NAME}/light-theme/gfx/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/trans-theme/*.display \
+ ${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/trans-theme/gfx/*.png \
+ ${DATADIR}/gdesklets/Displays/${NAME}/trans-theme/gfx/
+ ${INSTALL_DATA} ${WRKSRC}/${NAME}/*.py \
+ ${DATADIR}/gdesklets/Sensors/${NAME}/
@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
+ ${DATADIR}/gdesklets/Sensors/${NAME}/
@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME1}/
- @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
- @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
- ${PREFIX}/share/gnome/gdesklets/Sensors/${NAME2}/
+ ${DATADIR}/gdesklets/Sensors/${NAME}/
post-install:
@${CAT} ${PKGMESSAGE}
diff --git a/sysutils/gdesklets-multitail/pkg-plist b/sysutils/gdesklets-multitail/pkg-plist
index 23b164e03d0a..fa68930f3bbd 100644
--- a/sysutils/gdesklets-multitail/pkg-plist
+++ b/sysutils/gdesklets-multitail/pkg-plist
@@ -7,9 +7,6 @@ share/gnome/gdesklets/Displays/MultiTail/light-theme/multitail.display
share/gnome/gdesklets/Displays/MultiTail/trans-theme/gfx/border-left.png
share/gnome/gdesklets/Displays/MultiTail/trans-theme/multitail.display
share/gnome/gdesklets/Displays/MultiTail/README
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.py
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.pyc
-share/gnome/gdesklets/Sensors/DisplayConstraints/__init__.pyo
share/gnome/gdesklets/Sensors/MultiTail/__init__.py
share/gnome/gdesklets/Sensors/MultiTail/__init__.pyc
share/gnome/gdesklets/Sensors/MultiTail/__init__.pyo
@@ -23,5 +20,4 @@ share/gnome/gdesklets/Sensors/MultiTail/tailer.pyo
@dirrm share/gnome/gdesklets/Displays/MultiTail/trans-theme/gfx
@dirrm share/gnome/gdesklets/Displays/MultiTail/trans-theme
@dirrm share/gnome/gdesklets/Displays/MultiTail/
-@dirrm share/gnome/gdesklets/Sensors/DisplayConstraints/
@dirrm share/gnome/gdesklets/Sensors/MultiTail/