summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-03 08:54:37 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-03 08:54:37 +0800
commitcd2de3068971c87be53e72f392066046a4f4a42d (patch)
treed15f9f10c6db0430096527caab9390b810b4260f /audio
parent5cdf2c2358d1ee9371d9c8a8a3b85b1e09a31348 (diff)
downloadmarcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar.gz
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar.bz2
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar.lz
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar.xz
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.tar.zst
marcuscom-ports-cd2de3068971c87be53e72f392066046a4f4a42d.zip
Sync w/ FreeBSD ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6004 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'audio')
-rw-r--r--audio/goobox/Makefile24
-rw-r--r--audio/goobox/files/patch-src_main.c51
2 files changed, 71 insertions, 4 deletions
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index f8a03f634..417f30075 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,11 +3,12 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/goobox/Makefile,v 1.12 2006/03/02 20:17:12 mezz Exp $
+# $MCom: ports/audio/goobox/Makefile,v 1.13 2006/03/13 19:31:36 mezz Exp $
+#
PORTNAME= goobox
PORTVERSION= 0.9.93
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\.([0-9]+).*/\1.\2/}
@@ -19,9 +20,9 @@ COMMENT= CD player and ripper for GNOME Desktop environment
RUN_DEPENDS= cddb-slave2-properties:${PORTSDIR}/audio/gnomemedia2
USE_X_PREFIX= yes
+USE_GETTEXT= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GETTEXT= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \
gnomedocutils
USE_GSTREAMER80= cdparanoia gconf
@@ -32,4 +33,19 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GCONF_SCHEMAS= goobox.schemas
-.include <bsd.port.mk>
+OPTIONS= NOTIFY "Enable libnotify support" on
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN= does not build on 4.X
+.endif
+
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+= --enable-notification
+.else
+CONFIGURE_ARGS+= --disable-notification
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/goobox/files/patch-src_main.c b/audio/goobox/files/patch-src_main.c
new file mode 100644
index 000000000..eaf098579
--- /dev/null
+++ b/audio/goobox/files/patch-src_main.c
@@ -0,0 +1,51 @@
+--- src/main.c.orig Fri Nov 18 21:20:08 2005
++++ src/main.c Mon Feb 20 22:41:55 2006
+@@ -47,7 +47,6 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+-static NotifyHandle *notify_h = NULL;
+ #endif /* HAVE_LIBNOTIFY */
+
+ GtkWindow *main_window = NULL;
+@@ -193,7 +192,7 @@
+
+ #ifdef HAVE_LIBNOTIFY
+ if (! notify_init ("goobox"))
+- g_error ("Cannot initialize notification system.");
++ g_warning ("Cannot initialize notification system.");
+ #endif /* HAVE_LIBNOTIFY */
+
+ goo_stock_init ();
+@@ -557,27 +556,10 @@
+ int y)
+ {
+ #ifdef HAVE_LIBNOTIFY
+- NotifyIcon *icon = notify_icon_new_from_uri("goobox");
+- NotifyHints *hints = NULL;
+-
+- if ((x >= 0) && (y >= 0)) {
+- hints = notify_hints_new ();
+- notify_hints_set_int (hints, "x", x);
+- notify_hints_set_int (hints, "y", y);
+- }
++ if(!notify_is_initted())
++ return;
++ NotifyNotification *n = notify_notification_new (title,msg,"goobox",GTK_WIDGET (main_window));
++ notify_notification_show(n, NULL);
+
+- notify_h = notify_send_notification (notify_h,
+- "device",
+- NOTIFY_URGENCY_NORMAL,
+- title,
+- msg,
+- icon,
+- TRUE, 0,
+- hints, // no hints
+- NULL, // no user data
+- 0);
+-
+- if (icon != NULL)
+- notify_icon_destroy (icon);
+ #endif /* HAVE_LIBNOTIFY */
+ }