aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-09-23 04:01:43 +0000
committerPhilip M. Gollucci <pgollucci@FreeBSD.org>2010-09-23 04:01:43 +0000
commit30078c2fd6e4e73fd6aa273a6e482a0a4df49616 (patch)
tree6231edc94899a1ec11321e73a5f9ea9fb60ebc6b
parent300d9d981865b3e105a166f684b45a0712ce2383 (diff)
downloadports-30078c2fd6e4e73fd6aa273a6e482a0a4df49616.tar.gz
ports-30078c2fd6e4e73fd6aa273a6e482a0a4df49616.zip
Notes
-rw-r--r--audio/jokosher/Makefile13
-rw-r--r--audio/jokosher/pkg-plist4
2 files changed, 5 insertions, 12 deletions
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index ed30edaf7e35..f79fc6f4073c 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -18,14 +18,10 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
USE_PYTHON= yes
USE_PYDISTUTILS=yes
+USE_GNOME= gnomehier
USE_GSTREAMER= gnonlin good python
INSTALLS_ICONS= yes
-WANT_GNOME= yes
-WANT_GSTREAMER= yes
-
-BROKEN= touches filesystem before make install
-
OPTIONS= DBUS "D-Bus extension" on \
FLAC "Flac export/import" on \
GCONF "Gnome Audio playback/record" on \
@@ -44,10 +40,6 @@ OPTIONS= DBUS "D-Bus extension" on \
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
.endif
-.if defined(WITH_GNOME) || ${HAVE_GNOME:Mgnomehier}!=""
-USE_GNOME+= desktopfileutils gnomehier
-.endif
-
.if defined(WITH_GNOME) || defined(WITH_PROFILES) \
|| ${HAVE_GNOME:Mpygnome2}!=""
USE_GNOME+= pygnome2
@@ -76,7 +68,8 @@ USE_GSTREAMER+=${plugin}
post-patch: .SILENT
${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' -e \
- '\|scrollkeeper-preinstall|s|HELPURI\[fileNum]|"file://" + &|' \
+ '\|scrollkeeper-preinstall|s|HELPURI\[fileNum]|"file://" + &|' -e \
+ 's|"update-desktop-database"|&, "${PREFIX}/share/applications"|' \
${WRKSRC}/bin/${PORTNAME} ${WRKSRC}/${PYSETUP}
.include <bsd.port.post.mk>
diff --git a/audio/jokosher/pkg-plist b/audio/jokosher/pkg-plist
index 7807cacc7e14..37b09488cf8d 100644
--- a/audio/jokosher/pkg-plist
+++ b/audio/jokosher/pkg-plist
@@ -333,7 +333,7 @@ share/pixmaps/jokosher.png
@dirrmtry share/locale/tl/LC_MESSAGES
@dirrmtry share/locale/tl
%%OMF%%@dirrm share/omf/jokosher
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime