Update to 0.8.8, the latest in the 0.8 tree. USE_LIBTOOL.

2005-11-16 06:39:22 +00:00 · 2005-11-16 06:39:22 +00:00 · 26389cc5d1
commit 26389cc5d1
parent 386cbccada
5 changed files with 39 additions and 89 deletions
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2005/11/15 12:50:36 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2005/11/16 06:39:22 marcm Exp $

 COMMENT=		"Music Management Application"

-DISTNAME=		rhythmbox-0.8.7
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		rhythmbox-0.8.8
 CATEGORIES=		audio

 HOMEPAGE=		http://www.rhythmbox.org
@ -32,10 +31,12 @@ MODULES=		gettext

 BUILD_DEPENDS=  	:pkgconfig-*:devel/pkgconfig \
 			:scrollkeeper-*:textproc/scrollkeeper \
-			:p5-XML-Parser-*:textproc/p5-XML-Parser
+			:p5-XML-Parser-*:textproc/p5-XML-Parser \
+			:gstreamer-gnome-*:devel/gstreamer-plugins,-gnome
 LIB_DEPENDS= 		gstgconf-0.8.0.0::devel/gstreamer-plugins \
 			gnomeui-2::x11/gnome/libgnomeui
-RUN_DEPENDS=		:gstreamer-flac-*:devel/gstreamer-plugins,-flac \
+RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
+			:gstreamer-flac-*:devel/gstreamer-plugins,-flac \
 			:gstreamer-gnome-*:devel/gstreamer-plugins,-gnome \
 			:gstreamer-mad-*:devel/gstreamer-plugins,-mad \
 			:gstreamer-ogg-*:devel/gstreamer-plugins,-ogg \
@ -43,9 +44,11 @@ RUN_DEPENDS=		:gstreamer-flac-*:devel/gstreamer-plugins,-flac \

 USE_X11=		Yes
 USE_GMAKE=		Yes
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/
 CONFIGURE_ARGS+=	--disable-schemas-install
+CONFIGURE_ARGS+=	--enable-nautilus-menu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@ -1,4 +1,4 @@
-MD5 (rhythmbox-0.8.7.tar.gz) = 107850e32d65f9d580fbe5b456cdd29a
-RMD160 (rhythmbox-0.8.7.tar.gz) = c831d45ace7ac026e02927671f3919c3f2d6a298
-SHA1 (rhythmbox-0.8.7.tar.gz) = 3632c090e49fddd1fedca46b9420dd2fbdd1b269
-SIZE (rhythmbox-0.8.7.tar.gz) = 2999624
+MD5 (rhythmbox-0.8.8.tar.gz) = 3b9b918d27dd44e80192e955f8aa3ccb
+RMD160 (rhythmbox-0.8.8.tar.gz) = 7fee9b588b1d336233efe2c8c22bc87f0df0a2f0
+SHA1 (rhythmbox-0.8.8.tar.gz) = 79ad17cc0465afcb7eeb346c3c54011688e740b5
+SIZE (rhythmbox-0.8.8.tar.gz) = 3003728
--- a/audio/rhythmbox/patches/patch-configure
+++ b/audio/rhythmbox/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
--- configure.orig	Wed Sep 29 14:53:05 2004
-+++ configure	Mon Oct 11 17:57:21 2004
-@@ -9016,7 +9016,7 @@ nto-qnx*)
+$OpenBSD: patch-configure,v 1.2 2005/11/16 06:39:23 marcm Exp $
+--- configure.orig	Tue Oct  5 11:11:28 2004
+++ configure	Thu Aug 18 18:09:33 2005
+@@ -9017,7 +9017,7 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-@@ -20863,7 +20863,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -20864,7 +20864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@ -19,7 +19,23 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22242,7 +22242,7 @@ echo $ECHO_N "checking ID3TAG_LIBS... $E
+@@ -21827,15 +21827,9 @@ fi
+   if test "x$GST_INSPECT" != "x"; then
+     echo "$as_me:$LINENO: checking GStreamer element gnomevfssrc" >&5
+ echo $ECHO_N "checking GStreamer element gnomevfssrc... $ECHO_C" >&6
+-    if  $GST_INSPECT gnomevfssrc > /dev/null 2> /dev/null ; then
+       echo "$as_me:$LINENO: result: found." >&5
+ echo "${ECHO_T}found." >&6
+ 
+-    else
+-      echo "$as_me:$LINENO: result: not found." >&5
+-echo "${ECHO_T}not found." >&6
+-      missing_gst_elements="$missing_gst_elements gnomevfssrc"
+-    fi
+   fi
+ 
+ 
+@@ -22243,7 +22237,7 @@ echo $ECHO_N "checking ID3TAG_LIBS... $E
 echo "${ECHO_T}$ID3TAG_LIBS" >&6
         else
             ID3TAG_CFLAGS=""
@ -28,7 +44,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
             ## If we have a custom action on failure, don't print errors, but
             ## do set a variable so people can do so.
             ID3TAG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "id3tag >= 0.15.0b"`
-@@ -22260,7 +22260,7 @@ echo "${ECHO_T}$ID3TAG_LIBS" >&6
+@@ -22261,7 +22255,7 @@ echo "${ECHO_T}$ID3TAG_LIBS" >&6
   if test $succeeded = yes; then
      enable_mp3=yes
   else
--- a/audio/rhythmbox/patches/patch-ltmain_sh
+++ b/audio/rhythmbox/patches/patch-ltmain_sh
@ -1,59 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
--- ltmain.sh.orig	2004-05-22 14:52:14.000000000 -0700
-+++ ltmain.sh	2004-05-22 14:53:55.000000000 -0700
-@@ -1857,9 +1857,12 @@ EOF
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-+	    continue
- 	  fi
-+	  if test "$linkmode" = "lib"; then
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	  fi
-+	  deplibs="$deplib $deplibs"
- 	  continue
- 	  ;;
- 	-l*)
-@@ -5827,40 +5830,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit $EXIT_SUCCESS
- 
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-     exit $EXIT_SUCCESS
-     ;;
- 
--- a/audio/rhythmbox/pkg/PLIST
+++ b/audio/rhythmbox/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/11/16 06:39:23 marcm Exp $
 bin/rhythmbox
 lib/bonobo/
 lib/bonobo/librb-nautilus-context-menu.a
@ -92,19 +92,13 @@ share/gnome/help/rhythmbox/ja/rhythmbox.xml
 share/gnome/help/rhythmbox/ja/user-guide.xml
 share/idl/
 share/idl/Rhythmbox.idl
-share/locale/am/
-share/locale/am/LC_MESSAGES/
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/
 share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
-share/locale/be/
-share/locale/be/LC_MESSAGES/
 share/locale/be/LC_MESSAGES/rhythmbox.mo
 share/locale/bg/LC_MESSAGES/rhythmbox.mo
-share/locale/ca/
-share/locale/ca/LC_MESSAGES/
 share/locale/ca/LC_MESSAGES/rhythmbox.mo
 share/locale/cs/LC_MESSAGES/rhythmbox.mo
 share/locale/cy/
@ -116,6 +110,8 @@ share/locale/el/LC_MESSAGES/rhythmbox.mo
 share/locale/en_CA/
 share/locale/en_CA/LC_MESSAGES/
 share/locale/en_CA/LC_MESSAGES/rhythmbox.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
 share/locale/en_GB/LC_MESSAGES/rhythmbox.mo
 share/locale/es/LC_MESSAGES/rhythmbox.mo
 share/locale/et/LC_MESSAGES/rhythmbox.mo
@ -124,8 +120,6 @@ share/locale/eu/LC_MESSAGES/
 share/locale/eu/LC_MESSAGES/rhythmbox.mo
 share/locale/fi/LC_MESSAGES/rhythmbox.mo
 share/locale/fr/LC_MESSAGES/rhythmbox.mo
-share/locale/ga/
-share/locale/ga/LC_MESSAGES/
 share/locale/ga/LC_MESSAGES/rhythmbox.mo
 share/locale/he/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
@ -160,20 +154,15 @@ share/locale/ro/LC_MESSAGES/rhythmbox.mo
 share/locale/ru/LC_MESSAGES/rhythmbox.mo
 share/locale/sk/LC_MESSAGES/rhythmbox.mo
 share/locale/sr/LC_MESSAGES/rhythmbox.mo
-share/locale/sr@Latn/
-share/locale/sr@Latn/LC_MESSAGES/
 share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo
 share/locale/sv/LC_MESSAGES/rhythmbox.mo
 share/locale/tr/LC_MESSAGES/rhythmbox.mo
 share/locale/uk/LC_MESSAGES/rhythmbox.mo
-share/locale/vi/
-share/locale/vi/LC_MESSAGES/
 share/locale/vi/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 share/mime-info/
 share/mime-info/rhythmbox.keys
-share/omf/
 share/omf/rhythmbox/
 share/omf/rhythmbox/rhythmbox-C.omf
 share/omf/rhythmbox/rhythmbox-ja.omf
@ -223,6 +212,7 @@ share/rhythmbox/glade/station-new.glade
 share/rhythmbox/glade/station-properties.glade
 share/rhythmbox/glade/uri.glade
 share/rhythmbox/iradio-initial.pls
+share/schemas/
 share/schemas/rhythmbox/
 share/schemas/rhythmbox/rhythmbox.schemas
@exec %D/bin/scrollkeeper-update -q