Date: Sun, 16 Dec 2001 00:32:16 -0500 (EST) From: Alan E <alane@geeksrus.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/32893: MAINTAINER UPDATE of freeamp to 2.1.1 Message-ID: <200112160532.fBG5WGj99375@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 32893 >Category: ports >Synopsis: MAINTAINER UPDATE of freeamp to 2.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 15 21:40:00 PST 2001 >Closed-Date: >Last-Modified: >Originator: Alan E >Release: FreeBSD 4.4-STABLE i386 >Organization: Geeksrus.NET >Environment: System: FreeBSD wwweasel.geeksrus.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sun Dec 2 19:14:12 EST 2001 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386 >Description: Update to 2.1.1. Patch submitted by "KATO Tsuguru" <tkato@prontomail.com>. Modified so ogg/vorbis is not mandatory. >How-To-Repeat: n/a >Fix: Index: audio/freeamp/Makefile =================================================================== RCS file: /home/alane/cvsroot/ports/audio/freeamp/Makefile,v retrieving revision 1.9 diff -u -3 -r1.9 Makefile --- audio/freeamp/Makefile 13 Dec 2001 05:30:22 -0000 1.9 +++ audio/freeamp/Makefile 15 Dec 2001 07:00:19 -0000 @@ -6,8 +6,7 @@ # PORTNAME= freeamp -PORTVERSION= 2.1.0 -PORTREVISION= 2 +PORTVERSION= 2.1.1 CATEGORIES= audio MASTER_SITES= http://www.freeamp.org/download/src/ @@ -36,7 +35,7 @@ CFLAGS+= "-D_M_ALPHA" .endif -.if defined(HAVE_ESOUND) +.if defined(HAVE_ESOUND) && ${HAVE_ESOUND} == yes USE_ESOUND= yes PLIST_SUB+= ESOUND="" .else @@ -44,12 +43,30 @@ PLIST_SUB+= ESOUND="@comment " .endif -.if defined(WITH_LIBARTS) +.if defined(WITH_LIBARTS) && ${WITH_LIBARTS} == yes LIB_DEPENDS= libartsc.0:${PORTSDIR}/x11/kdelibs2 PLIST_SUB+= LIBARTS="" .else CONFIGURE_ARGS+= --disable-arts PLIST_SUB+= LIBARTS="@comment " +.endif + +.if exists(${LOCALBASE}/include/ogg/ogg.h) \ + || exists(${LOCALBASE}/include/vorbis/vorbisfile.h) +WITH_OGGVORBIS= yes +.endif + +.if defined(WITH_OGGVORBIS) && ${WITH_OGGVORBIS} == yes +LIB_DEPENDS+= ogg.2:${PORTSDIR}/audio/libogg \ + vorbis.0:${PORTSDIR}/audio/libvorbis +PLIST_SUB+= OGGVORBIS="" +.else +PLIST_SUB+= OGGVORBIS="@comment " +pre-everything:: + @${ECHO_MSG} + @${ECHO_MSG} "If you want to compile with ogg/vorbis support," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_OGGVORBIS=yes\"" + @${ECHO_MSG} .endif post-install: Index: audio/freeamp/distinfo =================================================================== RCS file: /home/alane/cvsroot/ports/audio/freeamp/distinfo,v retrieving revision 1.4 diff -u -3 -r1.4 distinfo --- audio/freeamp/distinfo 2 Jul 2001 08:24:04 -0000 1.4 +++ audio/freeamp/distinfo 15 Dec 2001 06:50:53 -0000 @@ -1 +1 @@ -MD5 (freeamp-2.1.0.tar.bz2) = 58d4bfe12a58abc4ef33bbfc19e8b4a7 +MD5 (freeamp-2.1.1.tar.bz2) = 56720f823f84c3505aeab474c9a6a836 Index: audio/freeamp/pkg-plist =================================================================== RCS file: /home/alane/cvsroot/ports/audio/freeamp/pkg-plist,v retrieving revision 1.3 diff -u -3 -r1.3 pkg-plist --- audio/freeamp/pkg-plist 3 Jul 2001 12:46:56 -0000 1.3 +++ audio/freeamp/pkg-plist 15 Dec 2001 07:04:11 -0000 @@ -26,8 +26,9 @@ lib/freeamp/plugins/rmp.dlf lib/freeamp/plugins/signature.pmo lib/freeamp/plugins/soundcard.pmo -lib/freeamp/plugins/vorbis.lmc -lib/freeamp/plugins/vorbis.mdf +%%OGGVORBIS%%lib/freeamp/plugins/vorbis.lmc +%%OGGVORBIS%%lib/freeamp/plugins/vorbis.mdf +lib/freeamp/plugins/wav.lmc lib/freeamp/plugins/wavout.pmo lib/freeamp/plugins/winamp.ftf lib/freeamp/plugins/winamp_theme.xml @@ -205,4 +206,4 @@ @dirrm lib/freeamp/plugins @dirrm lib/freeamp @unexec rmdir %D/etc/sdr/plugins 2>/dev/null || true -@unexec rmdir %D/etc/sdr 2&>/dev/null || true +@unexec rmdir %D/etc/sdr 2>/dev/null || true Index: audio/freeamp/files/patch-aa =================================================================== RCS file: /home/alane/cvsroot/ports/audio/freeamp/files/patch-aa,v retrieving revision 1.2 diff -u -3 -r1.2 patch-aa --- audio/freeamp/files/patch-aa 3 Jul 2001 12:46:58 -0000 1.2 +++ audio/freeamp/files/patch-aa 15 Dec 2001 07:14:20 -0000 @@ -1,6 +1,6 @@ ---- configure.in.orig Sat Apr 14 02:44:47 2001 -+++ configure.in Mon Jul 2 21:43:50 2001 -@@ -174,8 +174,8 @@ +--- configure.in.orig Mon Dec 10 16:42:31 2001 ++++ configure.in Sat Dec 15 02:12:43 2001 +@@ -179,8 +179,8 @@ ;; freebsd*) host_os="freebsd" @@ -11,7 +11,7 @@ ;; netbsd*) host_os="freebsd" -@@ -326,9 +326,9 @@ +@@ -331,9 +331,9 @@ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` @@ -23,7 +23,7 @@ LIBS="$LIBS $ESD_LIBS" rm -f conf.esdtest AC_MSG_CHECKING(for ESD - version >= $min_esd_version) -@@ -387,7 +387,7 @@ +@@ -392,7 +392,7 @@ } ],, have_esound=false, have_esound=false) @@ -32,7 +32,7 @@ LIBS="$ac_save_LIBS" AC_LANG_RESTORE rm -f conf.esdtest -@@ -460,9 +460,9 @@ +@@ -465,9 +465,9 @@ gtk_config_major=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` gtk_config_minor=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` gtk_config_micro=`$GTK_CONFIG --version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` @@ -44,7 +44,7 @@ LIBS="$GTK_LIBS $LIBS" AC_TRY_RUN([ -@@ -489,7 +489,7 @@ +@@ -494,7 +494,7 @@ gtk_major_version, gtk_minor_version, gtk_micro_version); return 1; }], , have_gtk=false, have_gtk=false]) @@ -53,7 +53,7 @@ LIBS="$ac_save_LIBS" if test "$have_gtk" = "false"; then AC_MSG_RESULT(no) -@@ -510,7 +510,7 @@ +@@ -515,7 +515,7 @@ OSINC="$OSINC -I$srcdir/ui/download/unix/include" OSINC="$OSINC -I$srcdir/ui/musicbrowser/include" OSINC="$OSINC -I$srcdir/ftc/kjofol" @@ -62,7 +62,7 @@ AC_DEFINE(HAVE_GTK) elif test "$host_os" = "beos"; then OSDEPPLUGINS="$OSDEPPLUGINS plugins/musicbrowser.ui" -@@ -536,7 +536,7 @@ +@@ -541,7 +541,7 @@ AC_SUBST(GTK_LIBS) AC_SUBST(EXTRALIBS) @@ -71,7 +71,7 @@ dnl orbit crap save_CPPFLAGS="$CPPFLAGS" -@@ -656,7 +656,7 @@ +@@ -661,7 +661,7 @@ alsa_min_major_version=0 alsa_min_minor_version=5 alsa_min_micro_version=0 @@ -80,7 +80,7 @@ ac_save_LIBS="$LIBS" LIBS="$LIBS -lasound" -@@ -701,7 +701,7 @@ +@@ -706,7 +706,7 @@ ], , have_alsa=false, have_alsa=false ) AC_LANG_RESTORE @@ -89,35 +89,30 @@ LIBS="$ac_save_LIBS" if test "$have_alsa" = "false"; then AC_MSG_RESULT(no) -@@ -748,13 +748,21 @@ - have_arts="false") - fi +@@ -749,6 +749,14 @@ + dnl Partly taken from SDL's configure.in + dnl ------------------------------------------------------------- +AC_ARG_ENABLE(arts, [ --disable-arts Don't compile the libArts output plugin], enable_arts=no, enable_arts=yes) + +if test "x$enable_arts" = "xno"; then -+ have_arts="false"; ++ have_arts="false" +fi + - ARTS_LIBS="" --AC_CHECK_LIB(artsc, arts_init, -- OSDEPPLUGINS="$OSDEPPLUGINS plugins/arts.pmo"; -- OSINC="$OSINC -I$srcdir/io/arts/include" -- ARTS_LIBS="-lartsc -laudiofile" -- AC_MSG_RESULT([compiling arts pmo plugin]) --) ++ARTS_LIBS="" +if test "$have_arts" = "true"; then -+ AC_CHECK_LIB(artsc, arts_init, -+ OSDEPPLUGINS="$OSDEPPLUGINS plugins/arts.pmo"; -+ OSINC="$OSINC -I$srcdir/io/arts/include" -+ ARTS_LIBS="-lartsc -laudiofile" -+ AC_MSG_RESULT([compiling arts pmo plugin]) -+ ) + AC_PATH_PROG(ARTSCCONFIG, artsc-config) + if test x$ARTSCCONFIG = x -o x$ARTSCCONFIG = x'"$ARTSCCONFIG"'; then + : # arts isn't installed +@@ -765,6 +773,7 @@ + AC_MSG_RESULT([compiling arts pmo plugin]) + ]) + fi +fi AC_SUBST(ARTS_LIBS) AC_SUBST(EXTRALIBS) -@@ -808,9 +816,9 @@ +@@ -819,9 +828,9 @@ gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_gdk_pixbuftest" = "xyes" ; then @@ -129,7 +124,7 @@ LIBS="$LIBS $GDK_PIXBUF_LIBS" dnl dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity -@@ -872,7 +880,7 @@ +@@ -883,7 +892,7 @@ } ],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) @@ -138,7 +133,7 @@ LIBS="$ac_save_LIBS" fi fi -@@ -891,7 +899,7 @@ +@@ -902,7 +911,7 @@ : else echo "*** Could not run GDK_PIXBUF test program, checking why..." @@ -147,7 +142,7 @@ LIBS="$LIBS $GDK_PIXBUF_LIBS" AC_TRY_LINK([ #include <stdio.h> -@@ -910,7 +918,7 @@ +@@ -921,7 +930,7 @@ echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed" echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you" echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ]) @@ -156,7 +151,7 @@ LIBS="$ac_save_LIBS" fi fi -@@ -922,13 +930,13 @@ +@@ -933,8 +942,8 @@ AC_SUBST(GDK_PIXBUF_LIBS) rm -f conf.gdk_pixbuftest @@ -167,9 +162,12 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS - AC_CHECK_LIB(musicbrainz, mb_New, , -- AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.]),-ldl) -+ AC_MSG_ERROR([FreeAmp requires that the MusicBrainz client library be installed.])) +@@ -944,7 +953,7 @@ + echo "*** Download the library from " + echo "*** http://www.musicbrainz.org/download.html" + echo "***" +- AC_MSG_ERROR(Cannot continue.)],-ldl -lm -lstdc++) ++ AC_MSG_ERROR(Cannot continue.)],-lm -lstdc++) AC_LANG_RESTORE AC_CONFIG_HEADER(config/config.h) Index: audio/freeamp/files/patch-ad =================================================================== RCS file: audio/freeamp/files/patch-ad diff -N audio/freeamp/files/patch-ad --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/freeamp/files/patch-ad 15 Dec 2001 06:50:53 -0000 @@ -0,0 +1,11 @@ +--- Makefile-plugins.in.orig Tue Oct 16 13:31:05 2001 ++++ Makefile-plugins.in Wed Dec 12 03:25:45 2001 +@@ -232,7 +232,7 @@ + UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKPreferenceWindow.o + UNIXFREEAMPUIOBJ += ui/freeamp/unix/src/GTKFileSelector.o + UNIXFREEAMPUIOBJ += ui/musicbrowser/unix/src/gtkmessagedialog.o +-UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS) ++UNIXFREEAMPUILIBS = $(TTF_LIBS) $(GDK_PIXBUF_LIBS) $(GTK_LIBS) + + BEOSFREEAMPUIOBJ = ui/freeamp/beos/src/BeOSWindow.o + BEOSFREEAMPUIOBJ += ui/freeamp/beos/src/BeOSBitmap.o >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112160532.fBG5WGj99375>