Date: Sun, 7 Sep 2008 13:41:16 +0200 From: Bernhard Froehlich <decke@bluelife.at> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/127175: [MAINTAINER] audio/vagalume: update to 0.7 Message-ID: <20080907134116.42f27349@chii.bluelife.at> Resent-Message-ID: <200809071150.m87Bo1Vi016567@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127175
>Category: ports
>Synopsis: [MAINTAINER] audio/vagalume: update to 0.7
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 07 11:50:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Bernhard Fr__hlich
>Release: FreeBSD 7.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD chii.bluelife.at 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #1: Tue Sep 2 20:58:26 CEST
>Description:
- Update to 0.7
- WITHOUT_NLS support (Thanks to Denise H. G. <darcsis@gmail.com>)
- DBUS support: configure patch from upstream (Thanks to Alberto Garcia <agarcia@igalia.com>)
Added file(s):
- files/patch-configure.ac
- files/patch-scripst-vagalumectl
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- vagalume-0.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/vagalume.orig/Makefile /usr/ports/audio/vagalume/Makefile
--- /usr/ports/audio/vagalume.orig/Makefile 2008-06-29 13:10:29.000000000 +0200
+++ /usr/ports/audio/vagalume/Makefile 2008-09-07 13:15:51.000000000 +0200
@@ -6,7 +6,7 @@
#
PORTNAME= vagalume
-PORTVERSION= 0.6
+PORTVERSION= 0.7
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
MASTER_SITE_SUBDIR= pool/main/v/vagalume/
@@ -21,26 +21,35 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:15
-USE_GETTEXT= yes
+USE_AUTOTOOLS= libtool:15 autoconf:262
USE_GNOME= pkgconfig gtk20
USE_GSTREAMER= good mad
INSTALLS_ICONS= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
MAN1= vagalume.1
-OPTIONS= IMSTATUS "Build with IM status support" off \
- TRAY "Build with tray icon and libnotify support" on
+OPTIONS= DBUS "Build with DBUS support" on \
+ TRAY "Build with tray icon and libnotify support" on
.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_IMSTATUS)
-CONFIGURE_ARGS+=--enable-im-status
-LIB_DEPEND+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB+= NLS=""
+.else
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.if !defined(WITHOUT_DBUS)
+CONFIGURE_ARGS+=--enable-dbus --enable-im-status
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+PLIST_SUB+= DBUS=""
+MAN1+= vagalumectl.1
.else
-CONFIGURE_ARGS+=--disable-im-status
+CONFIGURE_ARGS+=--disable-dbus --disable-im-status
+PLIST_SUB+= DBUS="@comment "
.endif
.if !defined(WITHOUT_TRAY)
@@ -56,4 +65,8 @@
CONFIGURE_ARGS+=--enable-gconf
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|serviceentrydir = @serviceentrydir@|serviceentrydir = ${PREFIX}/share/dbus-1/services|' \
+ ${WRKSRC}/Makefile.in
+
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/audio/vagalume.orig/distinfo /usr/ports/audio/vagalume/distinfo
--- /usr/ports/audio/vagalume.orig/distinfo 2008-06-29 13:10:29.000000000 +0200
+++ /usr/ports/audio/vagalume/distinfo 2008-09-01 18:28:36.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (vagalume_0.6.orig.tar.gz) = c46e2cc182f7f427196a5bb682f10428
-SHA256 (vagalume_0.6.orig.tar.gz) = bd9b6d1689fc01b186f160ed1f2bb813826a20d4118d525122c446fbf0ab3dd8
-SIZE (vagalume_0.6.orig.tar.gz) = 555331
+MD5 (vagalume_0.7.orig.tar.gz) = 97e1497eed21ef0ac82514ead94c5ee4
+SHA256 (vagalume_0.7.orig.tar.gz) = 82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
+SIZE (vagalume_0.7.orig.tar.gz) = 607507
diff -ruN --exclude=CVS /usr/ports/audio/vagalume.orig/files/patch-configure.ac /usr/ports/audio/vagalume/files/patch-configure.ac
--- /usr/ports/audio/vagalume.orig/files/patch-configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/vagalume/files/patch-configure.ac 2008-09-06 17:08:17.000000000 +0200
@@ -0,0 +1,66 @@
+--- configure.ac 2008/08/30 00:00:58 400
++++ configure.ac 2008/09/04 11:41:50 409
+@@ -124,6 +124,19 @@
+ fi
+ PLATFORMVERS=""
+
++# Check whether to use dbus-glib
++AC_ARG_ENABLE(dbus, [
++ --enable-dbus Compile with D-BUS support (default if available)
++ --disable-dbus Don't compile with D-BUS support],
++ use_dbus_glib=$enableval, use_dbus_glib=$have_dbus_glib)
++
++if test "$use_dbus_glib" = "yes" -a "$have_dbus_glib" = "no"; then
++ AC_MSG_ERROR([dbus-glib not found, install it or use --disable-dbus])
++elif test "$use_dbus_glib" = "yes"; then
++ EXTRA_CFLAGS="$EXTRA_CFLAGS $dbus_glib_CFLAGS"
++ EXTRA_LIBS="$EXTRA_LIBS $dbus_glib_LIBS"
++fi
++
+ # Check whether to use libgcrypt
+ AC_ARG_ENABLE(libgcrypt, [
+ --enable-libgcrypt use libgcrypt if glib doesn't support MD5
+@@ -164,14 +177,12 @@
+ AC_ARG_ENABLE(im-status, [
+ --enable-im-status Enable "Set IM status" feature (default if available)
+ --disable-im-status Disable "Set IM status" feature],
+- set_im_status=$enableval, set_im_status=$have_dbus_glib)
++ set_im_status=$enableval, set_im_status=$use_dbus_glib)
+
+-if test "$set_im_status" = "yes" -a "$have_dbus_glib" = "no"; then
++if test "$set_im_status" = "yes" -a "$use_dbus_glib" = "no"; then
+ AC_MSG_ERROR([dbus-glib not found, install it or use --disable-im-status])
+ elif test "$set_im_status" = "yes"; then
+ AC_DEFINE([SET_IM_STATUS],[1],[Defined if "Set IM Status" is enabled])
+- EXTRA_CFLAGS="$EXTRA_CFLAGS $dbus_glib_CFLAGS"
+- EXTRA_LIBS="$EXTRA_LIBS $dbus_glib_LIBS"
+ echo "\"Set IM status\" feature enabled"
+ else
+ echo "\"Set IM status\" feature disabled"
+@@ -304,7 +315,7 @@
+ # Desktop screen resolution
+ scr_resolution=desktop
+
+- if test "$have_dbus_glib" = "yes"; then
++ if test "$use_dbus_glib" = "yes"; then
+ serviceentrydir=`$PKG_CONFIG dbus-1 --variable=session_bus_services_dir`
+ AC_DEFINE([HAVE_GSD_MEDIA_PLAYER_KEYS], [1],
+ [Media player keys in some keyboards])
+@@ -333,7 +344,7 @@
+ # Disable tray icon support on Moblin
+ have_tray_icon="no"
+
+- if test "$have_dbus_glib" = "yes"; then
++ if test "$use_dbus_glib" = "yes"; then
+ serviceentrydir=`$PKG_CONFIG dbus-1 --variable=session_bus_services_dir`
+ fi
+ desktopentrydir="\${datadir}/applications"
+@@ -447,7 +458,7 @@
+ echo "Maemo status bar plugin enabled: $have_sb_plugin"
+ echo "Libconic support: $have_conic"
+ fi
+-echo "D-Bus Support enabled:" $have_dbus_glib
++echo "D-Bus Support enabled:" $use_dbus_glib
+ echo "Target display: $scr_resolution"
+ echo ""
+ echo "Type 'make' to compile Vagalume"
diff -ruN --exclude=CVS /usr/ports/audio/vagalume.orig/files/patch-scripst-vagalumectl /usr/ports/audio/vagalume/files/patch-scripst-vagalumectl
--- /usr/ports/audio/vagalume.orig/files/patch-scripst-vagalumectl 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/audio/vagalume/files/patch-scripst-vagalumectl 2008-09-07 13:22:32.000000000 +0200
@@ -0,0 +1,11 @@
+--- scripts/vagalumectl 2008-08-06 16:53:19.000000000 +0200
++++ scripts/vagalumectl 2008-08-06 16:53:39.000000000 +0200
+@@ -151,7 +151,7 @@
+ fi
+
+ # Check whether vagalume is or not already running
+-if ! pidof vagalume > /dev/null; then
++if ! pgrep -x vagalume > /dev/null; then
+ if [ ${COMMAND} = "close" ]; then
+ # Exit cleanly without executing the 'close' command when Vagalume is not running
+ echo "Vagalume not running: no need to close it";
diff -ruN --exclude=CVS /usr/ports/audio/vagalume.orig/pkg-plist /usr/ports/audio/vagalume/pkg-plist
--- /usr/ports/audio/vagalume.orig/pkg-plist 2008-06-29 13:10:29.000000000 +0200
+++ /usr/ports/audio/vagalume/pkg-plist 2008-09-07 13:04:35.000000000 +0200
@@ -1,14 +1,9 @@
+@comment $FreeBSD$
bin/vagalume
+%%DBUS%%bin/vagalumectl
share/applications/vagalume.desktop
+%%DBUS%%share/dbus-1/services/vagalume.service
share/icons/hicolor/48x48/apps/vagalume.png
-share/locale/de/LC_MESSAGES/vagalume.mo
-share/locale/es/LC_MESSAGES/vagalume.mo
-share/locale/es_MX/LC_MESSAGES/vagalume.mo
-share/locale/fi/LC_MESSAGES/vagalume.mo
-share/locale/gl/LC_MESSAGES/vagalume.mo
-share/locale/it/LC_MESSAGES/vagalume.mo
-share/locale/pt/LC_MESSAGES/vagalume.mo
-share/locale/pt_BR/LC_MESSAGES/vagalume.mo
share/pixmaps/vagalume.xpm
%%DATADIR%%/cover.png
%%DATADIR%%/icons/hicolor/scalable/actions/accessories-text-editor.svg
@@ -20,6 +15,15 @@
%%DATADIR%%/icons/hicolor/scalable/actions/media-playback-stop.svg
%%DATADIR%%/icons/hicolor/scalable/actions/media-skip-forward.svg
%%DATADIR%%/icons/hicolor/scalable/actions/process-stop.svg
+%%NLS%%share/locale/de/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/es/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/it/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/vagalume.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/vagalume.mo
@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
@dirrm %%DATADIR%%/icons/hicolor/scalable
@dirrm %%DATADIR%%/icons/hicolor
@@ -29,4 +33,23 @@
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/gl
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale
@dirrmtry share/applications
--- vagalume-0.7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080907134116.42f27349>