Attachment #90083 for bug #127175

View | Details | Raw Unified | Return to bug 127175
Collapse All | Expand All




#

PORTNAME=	vagalume
PORTVERSION=	0.7
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
MASTER_SITE_SUBDIR=	pool/main/v/vagalume/

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig

GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	libtool:15 autoconf:262
USE_GETTEXT=	yes
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=	DBUS "Build with DBUS support" on \
		TRAY "Build with tray icon and libnotify support" on

.include <bsd.port.pre.mk>

.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-dbus --disable-im-status
PLIST_SUB+=	DBUS="@comment "
.endif

.if !defined(WITHOUT_TRAY)

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>

Lines 1-3 Link Here

(-)/usr/ports/audio/vagalume/distinfo (-3 / +3 lines)
1	MD5 (vagalume_0.6.orig.tar.gz) = c46e2cc182f7f427196a5bb682f10428	1	MD5 (vagalume_0.7.orig.tar.gz) = 97e1497eed21ef0ac82514ead94c5ee4
2	SHA256 (vagalume_0.6.orig.tar.gz) = bd9b6d1689fc01b186f160ed1f2bb813826a20d4118d525122c446fbf0ab3dd8	2	SHA256 (vagalume_0.7.orig.tar.gz) = 82b42534276018809aec934b572845e495ea19fc0c6abf6b6ef1e8571b91ccee
3	SIZE (vagalume_0.6.orig.tar.gz) = 555331	3	SIZE (vagalume_0.7.orig.tar.gz) = 607507




--- 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"

Line 0 Link Here

(-)/usr/ports/audio/vagalume/files/patch-scripst-vagalumectl (+11 lines)
	1	--- scripts/vagalumectl 2008-08-06 16:53:19.000000000 +0200
	2	+++ scripts/vagalumectl 2008-08-06 16:53:39.000000000 +0200
	3	@@ -151,7 +151,7 @@
	4	fi
	5
	6	# Check whether vagalume is or not already running
	7	-if ! pidof vagalume > /dev/null; then
	8	+if ! pgrep -x vagalume > /dev/null; then
	9	if [ ${COMMAND} = "close" ]; then
	10	# Exit cleanly without executing the 'close' command when Vagalume is not running
	11	echo "Vagalume not running: no need to close it";




@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

%%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

@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

Return to bug 127175

Lines 6-12 Link Here

(-)/usr/ports/audio/vagalume/Makefile (-11 / +24 lines)
6	#	6	#
7		7
8	PORTNAME= vagalume	8	PORTNAME= vagalume
9	PORTVERSION= 0.6	9	PORTVERSION= 0.7
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	11	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
12	MASTER_SITE_SUBDIR= pool/main/v/vagalume/	12	MASTER_SITE_SUBDIR= pool/main/v/vagalume/
Lines 21-46 Link Here
21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig	21	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig
22		22
23	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
24	USE_AUTOTOOLS= libtool:15	24	USE_AUTOTOOLS= libtool:15 autoconf:262
25	USE_GETTEXT= yes
26	USE_GNOME= pkgconfig gtk20	25	USE_GNOME= pkgconfig gtk20
27	USE_GSTREAMER= good mad	26	USE_GSTREAMER= good mad
28	INSTALLS_ICONS= yes	27	INSTALLS_ICONS= yes
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
30	LDFLAGS="-L${LOCALBASE}/lib"
31		28
32	MAN1= vagalume.1	29	MAN1= vagalume.1
33		30
34	OPTIONS= IMSTATUS "Build with IM status support" off \	31	OPTIONS= DBUS "Build with DBUS support" on \
35	TRAY "Build with tray icon and libnotify support" on	32	TRAY "Build with tray icon and libnotify support" on
36		33
37	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
38		35
39	.if !defined(WITHOUT_IMSTATUS)	36	.if !defined(WITHOUT_NLS)
40	CONFIGURE_ARGS+=--enable-im-status	37	USE_GETTEXT= yes
41	LIB_DEPEND+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib	38	CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
		39	LDFLAGS="-L${LOCALBASE}/lib"
		40	PLIST_SUB+= NLS=""
		41	.else
		42	PLIST_SUB+= NLS="@comment "
		43	.endif
		44
		45	.if !defined(WITHOUT_DBUS)
		46	CONFIGURE_ARGS+=--enable-dbus --enable-im-status
		47	LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
		48	PLIST_SUB+= DBUS=""
		49	MAN1+= vagalumectl.1
42	.else	50	.else
43	CONFIGURE_ARGS+=--disable-im-status	51	CONFIGURE_ARGS+=--disable-dbus --disable-im-status
		52	PLIST_SUB+= DBUS="@comment "
44	.endif	53	.endif
45		54
46	.if !defined(WITHOUT_TRAY)	55	.if !defined(WITHOUT_TRAY)
Lines 56-59 Link Here
56	CONFIGURE_ARGS+=--enable-gconf	65	CONFIGURE_ARGS+=--enable-gconf
57	.endif	66	.endif
58		67
		68	post-patch:
		69	@${REINPLACE_CMD} -e 's\|serviceentrydir = @serviceentrydir@\|serviceentrydir = ${PREFIX}/share/dbus-1/services\|' \
		70	${WRKSRC}/Makefile.in
		71
59	.include <bsd.port.post.mk>	72	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/audio/vagalume/files/patch-configure.ac (+66 lines)
		1	--- configure.ac 2008/08/30 00:00:58 400
		2	+++ configure.ac 2008/09/04 11:41:50 409
		3	@@ -124,6 +124,19 @@
		4	fi
		5	PLATFORMVERS=""
		6
		7	+# Check whether to use dbus-glib
		8	+AC_ARG_ENABLE(dbus, [
		9	+ --enable-dbus Compile with D-BUS support (default if available)
		10	+ --disable-dbus Don't compile with D-BUS support],
		11	+ use_dbus_glib=$enableval, use_dbus_glib=$have_dbus_glib)
		12	+
		13	+if test "$use_dbus_glib" = "yes" -a "$have_dbus_glib" = "no"; then
		14	+ AC_MSG_ERROR([dbus-glib not found, install it or use --disable-dbus])
		15	+elif test "$use_dbus_glib" = "yes"; then
		16	+ EXTRA_CFLAGS="$EXTRA_CFLAGS $dbus_glib_CFLAGS"
		17	+ EXTRA_LIBS="$EXTRA_LIBS $dbus_glib_LIBS"
		18	+fi
		19	+
		20	# Check whether to use libgcrypt
		21	AC_ARG_ENABLE(libgcrypt, [
		22	--enable-libgcrypt use libgcrypt if glib doesn't support MD5
		23	@@ -164,14 +177,12 @@
		24	AC_ARG_ENABLE(im-status, [
		25	--enable-im-status Enable "Set IM status" feature (default if available)
		26	--disable-im-status Disable "Set IM status" feature],
		27	- set_im_status=$enableval, set_im_status=$have_dbus_glib)
		28	+ set_im_status=$enableval, set_im_status=$use_dbus_glib)
		29
		30	-if test "$set_im_status" = "yes" -a "$have_dbus_glib" = "no"; then
		31	+if test "$set_im_status" = "yes" -a "$use_dbus_glib" = "no"; then
		32	AC_MSG_ERROR([dbus-glib not found, install it or use --disable-im-status])
		33	elif test "$set_im_status" = "yes"; then
		34	AC_DEFINE([SET_IM_STATUS],[1],[Defined if "Set IM Status" is enabled])
		35	- EXTRA_CFLAGS="$EXTRA_CFLAGS $dbus_glib_CFLAGS"
		36	- EXTRA_LIBS="$EXTRA_LIBS $dbus_glib_LIBS"
		37	echo "\"Set IM status\" feature enabled"
		38	else
		39	echo "\"Set IM status\" feature disabled"
		40	@@ -304,7 +315,7 @@
		41	# Desktop screen resolution
		42	scr_resolution=desktop
		43
		44	- if test "$have_dbus_glib" = "yes"; then
		45	+ if test "$use_dbus_glib" = "yes"; then
		46	serviceentrydir=`$PKG_CONFIG dbus-1 --variable=session_bus_services_dir`
		47	AC_DEFINE([HAVE_GSD_MEDIA_PLAYER_KEYS], [1],
		48	[Media player keys in some keyboards])
		49	@@ -333,7 +344,7 @@
		50	# Disable tray icon support on Moblin
		51	have_tray_icon="no"
		52
		53	- if test "$have_dbus_glib" = "yes"; then
		54	+ if test "$use_dbus_glib" = "yes"; then
		55	serviceentrydir=`$PKG_CONFIG dbus-1 --variable=session_bus_services_dir`
		56	fi
		57	desktopentrydir="\${datadir}/applications"
		58	@@ -447,7 +458,7 @@
		59	echo "Maemo status bar plugin enabled: $have_sb_plugin"
		60	echo "Libconic support: $have_conic"
		61	fi
		62	-echo "D-Bus Support enabled:" $have_dbus_glib
		63	+echo "D-Bus Support enabled:" $use_dbus_glib
		64	echo "Target display: $scr_resolution"
65	echo ""
66	echo "Type 'make' to compile Vagalume"

Lines 1-14 Link Here

(-)/usr/ports/audio/vagalume/pkg-plist (-8 / +31 lines)
		1	@comment $FreeBSD$
1	bin/vagalume	2	bin/vagalume
		3	%%DBUS%%bin/vagalumectl
2	share/applications/vagalume.desktop	4	share/applications/vagalume.desktop
		5	%%DBUS%%share/dbus-1/services/vagalume.service
3	share/icons/hicolor/48x48/apps/vagalume.png	6	share/icons/hicolor/48x48/apps/vagalume.png
4	share/locale/de/LC_MESSAGES/vagalume.mo
5	share/locale/es/LC_MESSAGES/vagalume.mo
6	share/locale/es_MX/LC_MESSAGES/vagalume.mo
7	share/locale/fi/LC_MESSAGES/vagalume.mo
8	share/locale/gl/LC_MESSAGES/vagalume.mo
9	share/locale/it/LC_MESSAGES/vagalume.mo
10	share/locale/pt/LC_MESSAGES/vagalume.mo
11	share/locale/pt_BR/LC_MESSAGES/vagalume.mo
12	share/pixmaps/vagalume.xpm	7	share/pixmaps/vagalume.xpm
13	%%DATADIR%%/cover.png	8	%%DATADIR%%/cover.png
14	%%DATADIR%%/icons/hicolor/scalable/actions/accessories-text-editor.svg	9	%%DATADIR%%/icons/hicolor/scalable/actions/accessories-text-editor.svg
Lines 20-25 Link Here
20	%%DATADIR%%/icons/hicolor/scalable/actions/media-playback-stop.svg	15	%%DATADIR%%/icons/hicolor/scalable/actions/media-playback-stop.svg
21	%%DATADIR%%/icons/hicolor/scalable/actions/media-skip-forward.svg	16	%%DATADIR%%/icons/hicolor/scalable/actions/media-skip-forward.svg
22	%%DATADIR%%/icons/hicolor/scalable/actions/process-stop.svg	17	%%DATADIR%%/icons/hicolor/scalable/actions/process-stop.svg
		18	%%NLS%%share/locale/de/LC_MESSAGES/vagalume.mo
		19	%%NLS%%share/locale/es/LC_MESSAGES/vagalume.mo
		20	%%NLS%%share/locale/fi/LC_MESSAGES/vagalume.mo
		21	%%NLS%%share/locale/fr/LC_MESSAGES/vagalume.mo
		22	%%NLS%%share/locale/gl/LC_MESSAGES/vagalume.mo
		23	%%NLS%%share/locale/it/LC_MESSAGES/vagalume.mo
		24	%%NLS%%share/locale/lv/LC_MESSAGES/vagalume.mo
		25	%%NLS%%share/locale/pt/LC_MESSAGES/vagalume.mo
		26	%%NLS%%share/locale/pt_BR/LC_MESSAGES/vagalume.mo
23	@dirrm %%DATADIR%%/icons/hicolor/scalable/actions	27	@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
24	@dirrm %%DATADIR%%/icons/hicolor/scalable	28	@dirrm %%DATADIR%%/icons/hicolor/scalable
25	@dirrm %%DATADIR%%/icons/hicolor	29	@dirrm %%DATADIR%%/icons/hicolor
Lines 29-32 Link Here
29	@dirrmtry share/icons/hicolor/48x48	33	@dirrmtry share/icons/hicolor/48x48
30	@dirrmtry share/icons/hicolor	34	@dirrmtry share/icons/hicolor
31	@dirrmtry share/icons	35	@dirrmtry share/icons
		36	%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
		37	%%NLS%%@dirrmtry share/locale/de
		38	%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
		39	%%NLS%%@dirrmtry share/locale/es
		40	%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
		41	%%NLS%%@dirrmtry share/locale/fi
		42	%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
		43	%%NLS%%@dirrmtry share/locale/fr
		44	%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
		45	%%NLS%%@dirrmtry share/locale/gl
		46	%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
		47	%%NLS%%@dirrmtry share/locale/it
		48	%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
		49	%%NLS%%@dirrmtry share/locale/lv
		50	%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
		51	%%NLS%%@dirrmtry share/locale/pt
		52	%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
		53	%%NLS%%@dirrmtry share/locale/pt_BR
		54	%%NLS%%@dirrmtry share/locale
32	@dirrmtry share/applications	55	@dirrmtry share/applications