4 files changed, 87 insertions, 14 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 1185736ec053..e1d2e120f09b 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.98 2006/09/04 15:30:37 ahze Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.105 2007/03/12 12:00:20 ahze Exp $
 #
 
 PORTNAME=	gnome-media
-PORTVERSION=	2.16.1
-PORTREVISION=	2
+PORTVERSION=	2.18.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 5a5e63e2dc61..cd941224e7b6 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.16.1.tar.bz2) = 4fa1e8e8bd31e2db1cb49679170a98a8
-SHA256 (gnome2/gnome-media-2.16.1.tar.bz2) = a8f343b772c509c7e44bf792b2df97378b91e6cd85f8b4c82d8d7937bae6d007
-SIZE (gnome2/gnome-media-2.16.1.tar.bz2) = 2973824
+MD5 (gnome2/gnome-media-2.18.0.tar.bz2) = a472d8c7733b119376bc6127ee55a82d
+SHA256 (gnome2/gnome-media-2.18.0.tar.bz2) = 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
+SIZE (gnome2/gnome-media-2.18.0.tar.bz2) = 3007639
diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure
new file mode 100644
index 000000000000..c907f2fa56e7
--- /dev/null
+++ b/audio/gnome-media/files/patch-configure
@@ -0,0 +1,74 @@
+--- configure.orig	Mon Feb 12 16:07:48 2007
++++ configure	Mon Feb 12 16:08:23 2007
+@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
+ else
+   enable_cddbslave=yes
+ fi;
+-if test "x$enable_cddbslave" == "xyes"; then
++if test "x$enable_cddbslave" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
+@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
+ else
+   enable_profiles=yes
+ fi;
+-if test "x$enable_profiles" == "xyes"; then
++if test "x$enable_profiles" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GMP" >&5
+@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
+   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
+ fi
+ 
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
++if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
+   PROGRAMS_GRECORD="grecord"
+ 
+   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
+ else
+   enable_vumeter=yes
+ fi;
+-if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
++if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for VUMETER" >&5
+@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
+ else
+   enable_gnomecd=yes
+ fi;
+-if test "x$enable_gnomecd" == "xyes"; then
++if test "x$enable_gnomecd" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GNOMECD" >&5
+@@ -24640,7 +24640,7 @@ fi
+ 
+ 
+ 
+-if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
++if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
+   cdrom_header=""
+ 
+ for ac_header in linux/cdrom.h
+@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
+ else
+   enable_gstprops=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
+ then
+       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
+ 
+@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
+ else
+   enable_gstmix=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
++if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
+ then
+ 
+ pkg_failed=no
diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
index fadbb049d0e2..dee1aa98903d 100644
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
+++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
@@ -1,9 +1,9 @@
---- gnome-cd/gst-cdrom.c.orig	Tue Dec 12 00:18:40 2006
-+++ gnome-cd/gst-cdrom.c	Tue Dec 12 00:23:17 2006
-@@ -41,13 +41,17 @@
+--- gnome-cd/gst-cdrom.c.orig	Mon Jan 22 09:01:38 2007
++++ gnome-cd/gst-cdrom.c	Mon Feb 12 15:59:18 2007
+@@ -44,13 +44,17 @@
  #endif
  
- #if defined(__FreeBSD__)
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 -# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCCAPABILITY
 +# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCGETVOL
 +struct ioc_vol vol_value;
@@ -19,10 +19,10 @@
  # define GST_CDROM_IOCTL_EJECT_REQUEST         CDROMEJECT
  #endif
  
-@@ -184,7 +188,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * 
- 
-     fd = open (device, O_RDONLY | O_NONBLOCK);
-     if (fd >= 0) {
+@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * 
+ #ifdef __sun
+       res = TRUE;
+ #else
 -      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) {
 +      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) {
          res = TRUE;