diff options
28 files changed, 359 insertions, 219 deletions
diff --git a/audio/libao/Makefile b/audio/libao/Makefile index 0ce4072564ec..84fa2ddc3008 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -6,11 +6,9 @@ # PORTNAME= libao -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ \ - http://home.student.utwente.nl/t.vanklaveren/distfiles/ +MASTER_SITES= http://www.vorbis.com/files/rc1/unix/ MAINTAINER= naddy@mips.inka.de @@ -19,6 +17,12 @@ WANT_ESOUND= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +.if defined(NOPORTDOCS) +MAKE_ENV= DOC="" +.else +MAKE_ENV= DOC=doc +.endif + .include <bsd.port.pre.mk> .if defined(HAVE_ESOUND) diff --git a/audio/libao/distinfo b/audio/libao/distinfo index 9ed5c20e399d..046c6eaf525c 100644 --- a/audio/libao/distinfo +++ b/audio/libao/distinfo @@ -1 +1 @@ -MD5 (libao-0.6.0.tar.gz) = bab8b209a9440c8426d340ee8d4238ec +MD5 (libao-0.7.0.tar.gz) = f4708f76c18cadc781ecbe0b9131d050 diff --git a/audio/libao/files/patch-Makefile.in b/audio/libao/files/patch-Makefile.in new file mode 100644 index 000000000000..6346c48cb12d --- /dev/null +++ b/audio/libao/files/patch-Makefile.in @@ -0,0 +1,12 @@ +$FreeBSD$ +--- Makefile.in.orig Tue Jul 17 02:31:20 2001 ++++ Makefile.in Tue Jul 17 02:31:31 2001 +@@ -87,7 +87,7 @@ plugindir = @plugindir@ + + AUTOMAKE_OPTIONS = foreign dist-zip + +-SUBDIRS = src include doc debian ++SUBDIRS = src include $(DOC) debian + + m4datadir = $(datadir)/aclocal + m4data_DATA = ao.m4 diff --git a/audio/libao/files/patch-configure b/audio/libao/files/patch-configure index 2967f72fada6..782e7d6eaeea 100644 --- a/audio/libao/files/patch-configure +++ b/audio/libao/files/patch-configure @@ -1,29 +1,25 @@ $FreeBSD$ ---- configure.orig Wed Mar 21 16:27:24 2001 -+++ configure Wed Mar 21 16:28:57 2001 -@@ -1501,9 +1501,9 @@ if test -z "$GCC"; then - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" +--- configure.orig Mon Jun 18 18:05:25 2001 ++++ configure Tue Jul 17 12:38:04 2001 +@@ -1510,7 +1510,7 @@ if test -z "$GCC"; then PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; *) -- DEBUG="-g" + DEBUG="-g" - CFLAGS="-O" -- PROFILE="-g -p" ;; -+ DEBUG="$CFLAGS -g" -+ CFLAGS="$CFLAGS" -+ PROFILE="$CFLAGS -g -p" ;; ++ CFLAGS="" + PROFILE="-g -p" ;; esac else - -@@ -1517,9 +1517,9 @@ else +@@ -1525,9 +1525,9 @@ else CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8" PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;; *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; -+ DEBUG="$CFLAGS -g -Wall -fsigned-char" -+ CFLAGS="$CFLAGS -fsigned-char" -+ PROFILE="$CFLAGS -g -pg -fsigned-char" ;; ++ DEBUG="-g -Wall" ++ CFLAGS="" ++ PROFILE="-g -pg" ;; esac fi - + CFLAGS="$CFLAGS $cflags_save" diff --git a/audio/libao/files/patch-src_plugins_arts_Makefile.in b/audio/libao/files/patch-src_plugins_arts_Makefile.in new file mode 100644 index 000000000000..496b49a06519 --- /dev/null +++ b/audio/libao/files/patch-src_plugins_arts_Makefile.in @@ -0,0 +1,26 @@ +$FreeBSD$ +--- src/plugins/arts/Makefile.in.orig Tue Jul 17 02:29:03 2001 ++++ src/plugins/arts/Makefile.in Tue Jul 17 02:29:34 2001 +@@ -93,13 +93,12 @@ AUTOMAKE_OPTIONS = foreign + @HAVE_ARTS_TRUE@artssources = ao_arts.c + @HAVE_ARTS_FALSE@artssources = + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include @ARTS_CFLAGS@ + + libdir = $(plugindir) + lib_LTLIBRARIES = $(artsltlibs) + + libarts_la_LDFLAGS = $(artsldflags) +-CFLAGS = @ARTS_CFLAGS@ + libarts_la_LIBADD = @ARTS_LIBS@ + libarts_la_SOURCES = $(artssources) + +@@ -116,6 +115,7 @@ LIBS = @LIBS@ + libarts_la_DEPENDENCIES = + @HAVE_ARTS_FALSE@libarts_la_OBJECTS = + @HAVE_ARTS_TRUE@libarts_la_OBJECTS = ao_arts.lo ++CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index e083a9262683..cea06884bf04 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -6,15 +6,20 @@ # PORTNAME= libogg -PORTVERSION= 1.0b4 -PORTEPOCH= 1 +PORTVERSION= 1.0.r1 +PORTEPOCH= 2 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ \ - http://home.student.utwente.nl/t.vanklaveren/distfiles/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} +MASTER_SITES= http://www.vorbis.com/files/rc1/unix/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= naddy@mips.inka.de USE_LIBTOOL= yes +.if defined(NOPORTDOCS) +MAKE_ENV= DOC="" +.else +MAKE_ENV= DOC=doc +.endif + .include <bsd.port.mk> diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo index 9a08c94a004b..835409663f7c 100644 --- a/audio/libogg/distinfo +++ b/audio/libogg/distinfo @@ -1 +1 @@ -MD5 (libogg-1.0beta4.tar.gz) = 1ffd9d6c02f824e50345920bd07366e9 +MD5 (libogg-1.0rc1.tar.gz) = fe25d090de826bc6f364240412cf1998 diff --git a/audio/libogg/files/patch-Makefile.in b/audio/libogg/files/patch-Makefile.in new file mode 100644 index 000000000000..af5b7bbd07fd --- /dev/null +++ b/audio/libogg/files/patch-Makefile.in @@ -0,0 +1,12 @@ +$FreeBSD$ +--- Makefile.in.orig Tue Jul 17 02:36:25 2001 ++++ Makefile.in Tue Jul 17 02:36:39 2001 +@@ -85,7 +85,7 @@ VERSION = @VERSION@ + + AUTOMAKE_OPTIONS = foreign dist-zip + +-SUBDIRS = src include doc win32 debian ++SUBDIRS = src include $(DOC) win32 debian + + m4datadir = $(datadir)/aclocal + m4data_DATA = ogg.m4 diff --git a/audio/libogg/files/patch-configure b/audio/libogg/files/patch-configure index df95503486ee..81c57023e8d0 100644 --- a/audio/libogg/files/patch-configure +++ b/audio/libogg/files/patch-configure @@ -1,29 +1,25 @@ $FreeBSD$ ---- configure.orig Mon Feb 26 05:30:03 2001 -+++ configure Wed Mar 21 16:32:28 2001 -@@ -1489,9 +1489,9 @@ - PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" +--- configure.orig Mon Jun 18 18:08:30 2001 ++++ configure Tue Jul 17 03:07:30 2001 +@@ -1492,7 +1492,7 @@ if test -z "$GCC"; then ;; *) -- DEBUG="-g" + DEBUG="-g" - CFLAGS="-O" -- PROFILE="-g -p" -+ DEBUG="$CFLAGS -g" -+ CFLAGS="$CFLAGS" -+ PROFILE="$CFLAGS -g -p" ++ CFLAGS="" + PROFILE="-g -p" ;; esac - else -@@ -1512,9 +1512,9 @@ +@@ -1514,9 +1514,9 @@ else PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math" ;; *) - DEBUG="-g -Wall -fsigned-char" - CFLAGS="-O20 -fsigned-char" - PROFILE="-O20 -g -pg -fsigned-char" -+ DEBUG="$CFLAGS -g -Wall -fsigned-char" -+ CFLAGS="$CFLAGS -fsigned-char" -+ PROFILE="$CFLAGS -g -pg -fsigned-char" ++ DEBUG="-g -Wall" ++ CFLAGS="" ++ PROFILE="-g -pg" ;; esac fi diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist index 8d8eaf86c418..d80cb4612be5 100644 --- a/audio/libogg/pkg-plist +++ b/audio/libogg/pkg-plist @@ -4,7 +4,7 @@ include/ogg/ogg.h include/ogg/os_types.h lib/libogg.a lib/libogg.so -lib/libogg.so.1 +lib/libogg.so.2 share/aclocal/ogg.m4 %%PORTDOCS%%share/doc/libogg/framing.html %%PORTDOCS%%share/doc/libogg/index.html diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 803bdc97acb2..e5695df9c610 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -6,21 +6,25 @@ # PORTNAME= libvorbis -PORTVERSION= 1.0b4 -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 1.0.r1 +PORTEPOCH= 2 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ \ - http://home.student.utwente.nl/t.vanklaveren/distfiles/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} +MASTER_SITES= http://www.vorbis.com/files/rc1/unix/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= naddy@mips.inka.de -LIB_DEPENDS= ogg.1:${PORTSDIR}/audio/libogg +LIB_DEPENDS= ogg.2:${PORTSDIR}/audio/libogg USE_LIBTOOL= yes CONFIGURE_ARGS= --with-ogg-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.if defined(NOPORTDOCS) +MAKE_ENV= DOC="" +.else +MAKE_ENV= DOC=doc +.endif + .include <bsd.port.mk> diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo index f2a994281a0c..7524d6c28ef3 100644 --- a/audio/libvorbis/distinfo +++ b/audio/libvorbis/distinfo @@ -1 +1 @@ -MD5 (libvorbis-1.0beta4.tar.gz) = 6954d72386cbf88c613e1ffebb7b4bac +MD5 (libvorbis-1.0rc1.tar.gz) = 95b34a6a4f2b037fc6cca78a7ebe9758 diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in new file mode 100644 index 000000000000..34617ba89d39 --- /dev/null +++ b/audio/libvorbis/files/patch-Makefile.in @@ -0,0 +1,12 @@ +$FreeBSD$ +--- Makefile.in.orig Tue Jul 17 02:38:23 2001 ++++ Makefile.in Tue Jul 17 02:40:02 2001 +@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@ + + AUTOMAKE_OPTIONS = foreign dist-zip + +-SUBDIRS = lib include doc examples win32 debian vq ++SUBDIRS = lib include $(DOC) examples win32 debian vq + + m4datadir = $(datadir)/aclocal + m4data_DATA = vorbis.m4 diff --git a/audio/libvorbis/files/patch-configure b/audio/libvorbis/files/patch-configure index bc1c134bfd43..b7ea0b4a7bf6 100644 --- a/audio/libvorbis/files/patch-configure +++ b/audio/libvorbis/files/patch-configure @@ -1,40 +1,36 @@ $FreeBSD$ ---- configure.orig Mon Feb 26 14:34:27 2001 -+++ configure Wed Mar 21 15:45:36 2001 -@@ -1617,9 +1617,9 @@ - CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" +--- configure.orig Mon Jun 18 18:12:43 2001 ++++ configure Tue Jul 17 00:26:16 2001 +@@ -1621,7 +1621,7 @@ if test -z "$GCC"; then PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;; *) -- DEBUG="-g" + DEBUG="-g" - CFLAGS="-O" -- PROFILE="-g -p" ;; -+ DEBUG="$CFLAGS -g" -+ CFLAGS="$CFLAGS" -+ PROFILE="$CFLAGS -g -p" ;; ++ CFLAGS="" + PROFILE="-g -p" ;; esac else - -@@ -1709,9 +1709,9 @@ +@@ -1712,9 +1712,9 @@ rm -f conftest* CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char" PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";; *) - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; -+ DEBUG="$CFLAGS -g -Wall -D__NO_MATH_INLINES -fsigned-char" -+ CFLAGS="$CFLAGS -fsigned-char" -+ PROFILE="$CFLAGS -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; ++ DEBUG="-g -Wall" ++ CFLAGS="" ++ PROFILE="-g -pg" esac fi - -@@ -1795,14 +1795,14 @@ + CFLAGS="$CFLAGS $cflags_save" +@@ -1800,14 +1800,14 @@ else LIBS="" fi -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 --echo "configure:1800: checking for pthread_create in -lpthread" >&5 +-echo "configure:1805: checking for pthread_create in -lpthread" >&5 +echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 -+echo "configure:1800: checking for pthread_create in -pthread" >&5 ++echo "configure:1805: checking for pthread_create in -pthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -43,9 +39,9 @@ $FreeBSD$ -LIBS="-lpthread $LIBS" +LIBS="-pthread $LIBS" cat > conftest.$ac_ext <<EOF - #line 1808 "configure" + #line 1813 "configure" #include "confdefs.h" -@@ -1830,7 +1830,7 @@ +@@ -1835,7 +1835,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/audio/libvorbis/files/patch-lib_psy.c b/audio/libvorbis/files/patch-lib_psy.c deleted file mode 100644 index c736d2bc7b4d..000000000000 --- a/audio/libvorbis/files/patch-lib_psy.c +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ ---- lib/psy.c.orig Mon Feb 26 05:37:59 2001 -+++ lib/psy.c Wed Mar 21 15:50:10 2001 -@@ -191,7 +191,7 @@ - p->total_octave_lines=maxoc-p->firstoc+1; - - p->ath=_ogg_malloc(n*sizeof(float)); -- p->octave=_ogg_malloc(n*sizeof(int)); -+ p->octave=_ogg_malloc(n*sizeof(long)); - p->bark=_ogg_malloc(n*sizeof(float)); - p->vi=vi; - p->n=n; diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist index c97b7db6375e..ae959e455619 100644 --- a/audio/libvorbis/pkg-plist +++ b/audio/libvorbis/pkg-plist @@ -10,66 +10,66 @@ lib/libvorbisenc.so lib/libvorbisenc.so.0 lib/libvorbisfile.a lib/libvorbisfile.so -lib/libvorbisfile.so.0 +lib/libvorbisfile.so.1 share/aclocal/vorbis.m4 -share/doc/libvorbis/programming.html -share/doc/libvorbis/v-comment.html -share/doc/libvorbis/vorbis-clip.txt -share/doc/libvorbis/vorbis-errors.txt -share/doc/libvorbis/vorbis.html -share/doc/libvorbis/vorbisenc/index.html -share/doc/libvorbis/vorbisenc/overview.html -share/doc/libvorbis/vorbisenc/reference.html -share/doc/libvorbis/vorbisenc/style.css -share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html -share/doc/libvorbis/vorbisenc/vorbis_encode_init.html -share/doc/libvorbis/vorbisenc/vorbis_info.html -share/doc/libvorbis/vorbisfile/OggVorbis_File.html -share/doc/libvorbis/vorbisfile/chaining_example_c.html -share/doc/libvorbis/vorbisfile/chainingexample.html -share/doc/libvorbis/vorbisfile/datastructures.html -share/doc/libvorbis/vorbisfile/decoding.html -share/doc/libvorbis/vorbisfile/example.html -share/doc/libvorbis/vorbisfile/exampleindex.html -share/doc/libvorbis/vorbisfile/fileinfo.html -share/doc/libvorbis/vorbisfile/index.html -share/doc/libvorbis/vorbisfile/initialization.html -share/doc/libvorbis/vorbisfile/ov_bitrate.html -share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html -share/doc/libvorbis/vorbisfile/ov_callbacks.html -share/doc/libvorbis/vorbisfile/ov_clear.html -share/doc/libvorbis/vorbisfile/ov_comment.html -share/doc/libvorbis/vorbisfile/ov_info.html -share/doc/libvorbis/vorbisfile/ov_open.html -share/doc/libvorbis/vorbisfile/ov_open_callbacks.html -share/doc/libvorbis/vorbisfile/ov_pcm_seek.html -share/doc/libvorbis/vorbisfile/ov_pcm_tell.html -share/doc/libvorbis/vorbisfile/ov_pcm_total.html -share/doc/libvorbis/vorbisfile/ov_raw_seek.html -share/doc/libvorbis/vorbisfile/ov_raw_tell.html -share/doc/libvorbis/vorbisfile/ov_raw_total.html -share/doc/libvorbis/vorbisfile/ov_read.html -share/doc/libvorbis/vorbisfile/ov_seekable.html -share/doc/libvorbis/vorbisfile/ov_serialnumber.html -share/doc/libvorbis/vorbisfile/ov_streams.html -share/doc/libvorbis/vorbisfile/ov_time_seek.html -share/doc/libvorbis/vorbisfile/ov_time_tell.html -share/doc/libvorbis/vorbisfile/ov_time_total.html -share/doc/libvorbis/vorbisfile/overview.html -share/doc/libvorbis/vorbisfile/reference.html -share/doc/libvorbis/vorbisfile/seekexample.html -share/doc/libvorbis/vorbisfile/seeking.html -share/doc/libvorbis/vorbisfile/seeking_test_c.html -share/doc/libvorbis/vorbisfile/style.css -share/doc/libvorbis/vorbisfile/seekingexample.html -share/doc/libvorbis/vorbisfile/vorbis_comment.html -share/doc/libvorbis/vorbisfile/vorbis_info.html -share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html -share/doc/libvorbis/vorbisword2.png -share/doc/libvorbis/wait.png -share/doc/libvorbis/white-ogg.png -share/doc/libvorbis/white-xifish.png +%%PORTDOCS%%share/doc/libvorbis/programming.html +%%PORTDOCS%%share/doc/libvorbis/v-comment.html +%%PORTDOCS%%share/doc/libvorbis/vorbis-clip.txt +%%PORTDOCS%%share/doc/libvorbis/vorbis-errors.txt +%%PORTDOCS%%share/doc/libvorbis/vorbis.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/index.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/overview.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/reference.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/style.css +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_encode_init.html +%%PORTDOCS%%share/doc/libvorbis/vorbisenc/vorbis_info.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/OggVorbis_File.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chaining_example_c.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/chainingexample.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/datastructures.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/decoding.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/example.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/exampleindex.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/fileinfo.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/index.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/initialization.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_bitrate_instant.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_callbacks.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_clear.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_comment.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_info.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_open_callbacks.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_seek.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_tell.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_pcm_total.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_seek.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_tell.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_raw_total.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_read.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_seekable.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_serialnumber.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_streams.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_seek.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_tell.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/ov_time_total.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/overview.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/reference.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekexample.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seeking_test_c.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/style.css +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/seekingexample.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_comment.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbis_info.html +%%PORTDOCS%%share/doc/libvorbis/vorbisfile/vorbisfile_example_c.html +%%PORTDOCS%%share/doc/libvorbis/vorbisword2.png +%%PORTDOCS%%share/doc/libvorbis/wait.png +%%PORTDOCS%%share/doc/libvorbis/white-ogg.png +%%PORTDOCS%%share/doc/libvorbis/white-xifish.png @dirrm include/vorbis -@dirrm share/doc/libvorbis/vorbisenc -@dirrm share/doc/libvorbis/vorbisfile -@dirrm share/doc/libvorbis +%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisenc +%%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisfile +%%PORTDOCS%%@dirrm share/doc/libvorbis diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 24307d124f57..6a9b0be81cbd 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -6,18 +6,16 @@ # PORTNAME= vorbis-tools -PORTVERSION= 1.0b4 -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 1.0.r1 +PORTEPOCH= 2 CATEGORIES= audio -MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ \ - http://home.student.utwente.nl/t.vanklaveren/distfiles/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} +MASTER_SITES= http://www.vorbis.com/files/rc1/unix/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= naddy@mips.inka.de LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao \ - ogg.1:${PORTSDIR}/audio/libogg \ + ogg.2:${PORTSDIR}/audio/libogg \ vorbis.0:${PORTSDIR}/audio/libvorbis USE_AUTOCONF= yes @@ -27,6 +25,11 @@ CONFIGURE_ARGS= --with-ao=${LOCALBASE} \ --with-ogg=${LOCALBASE} \ --with-vorbis=${LOCALBASE} -MAN1= ogg123.1 oggenc.1 +MAN1= ogg123.1 oggenc.1 ogginfo.1 + +post-extract: + @(cd ${WRKSRC}/ogg123 ;\ + ${MV} ogg123rc-example ogg123rc ;\ + ${PERL} -pi.orig -e 's/
//' ogg123.1) .include <bsd.port.mk> diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index c33a6eeb7125..f3cb45479ee0 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1 +1 @@ -MD5 (vorbis-tools-1.0beta4.tar.gz) = 5222a18972276f0bf42256c221453d0e +MD5 (vorbis-tools-1.0rc1.tar.gz) = 40f19902e7b31571615952c29fce8389 diff --git a/audio/vorbis-tools/files/patch-aclocal.m4 b/audio/vorbis-tools/files/patch-aclocal.m4 index 4c0783fe9e0b..3758df37c8c6 100644 --- a/audio/vorbis-tools/files/patch-aclocal.m4 +++ b/audio/vorbis-tools/files/patch-aclocal.m4 @@ -1,16 +1,7 @@ $FreeBSD$ ---- aclocal.m4.orig Mon Feb 26 06:51:03 2001 -+++ aclocal.m4 Wed Mar 21 15:31:39 2001 -@@ -222,7 +222,7 @@ - AO_LIBS="-L$ao_prefix/lib" - fi - -- AO_LIBS="$AO_LIBS -lao -ldl" -+ AO_LIBS="$AO_LIBS -lao" - - AC_MSG_CHECKING(for ao) - no_ao="" -@@ -293,6 +293,68 @@ +--- aclocal.m4.orig Mon Jun 18 06:43:11 2001 ++++ aclocal.m4 Tue Jul 17 01:38:36 2001 +@@ -313,6 +313,68 @@ int main () rm -f conf.aotest ]) @@ -79,22 +70,3 @@ $FreeBSD$ # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. -@@ -398,15 +460,15 @@ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \ - || AC_MSG_ERROR([libtool configure failed]) - - # Reload cache, that may have been modified by ltconfig - AC_CACHE_LOAD - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.am b/audio/vorbis-tools/files/patch-ogg123_Makefile.am index 678a353c6f1e..7b39cc2b74a8 100644 --- a/audio/vorbis-tools/files/patch-ogg123_Makefile.am +++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.am @@ -1,14 +1,15 @@ $FreeBSD$ ---- ogg123/Makefile.am.orig Mon Feb 19 23:27:52 2001 -+++ ogg123/Makefile.am Wed Mar 21 16:04:07 2001 +--- ogg123/Makefile.am.orig Sun Mar 25 17:59:31 2001 ++++ ogg123/Makefile.am Tue Jul 17 03:22:47 2001 @@ -3,9 +3,8 @@ AUTOMAKE_OPTIONS = foreign bin_PROGRAMS = ogg123 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -+docdir = $(datadir)/doc/$(PACKAGE) - doc_DATA = ogg123rc-example +-doc_DATA = ogg123rc-example -mandir = $(datadir)/man ++docdir = $(datadir)/examples/$(PACKAGE) ++doc_DATA = ogg123rc man_MANS = ogg123.1 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ diff --git a/audio/vorbis-tools/files/patch-ogg123_Makefile.in b/audio/vorbis-tools/files/patch-ogg123_Makefile.in index 83525219f514..93bad3091e39 100644 --- a/audio/vorbis-tools/files/patch-ogg123_Makefile.in +++ b/audio/vorbis-tools/files/patch-ogg123_Makefile.in @@ -1,15 +1,23 @@ $FreeBSD$ ---- ogg123/Makefile.in.orig Mon Feb 26 12:02:14 2001 -+++ ogg123/Makefile.in Wed Mar 21 16:04:22 2001 -@@ -83,9 +83,9 @@ +--- ogg123/Makefile.in.orig Mon Jun 18 18:18:19 2001 ++++ ogg123/Makefile.in Tue Jul 17 03:23:27 2001 +@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ ++mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include + +@@ -83,9 +84,8 @@ VORBIS_LIBS = @VORBIS_LIBS@ AUTOMAKE_OPTIONS = foreign bin_PROGRAMS = ogg123 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) -+docdir = $(datadir)/doc/$(PACKAGE) - doc_DATA = ogg123rc-example +-doc_DATA = ogg123rc-example -mandir = $(datadir)/man -+mandir = $(prefix)/man ++docdir = $(datadir)/examples/$(PACKAGE) ++doc_DATA = ogg123rc man_MANS = ogg123.1 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ diff --git a/audio/vorbis-tools/files/patch-ogg123_buffer.c b/audio/vorbis-tools/files/patch-ogg123_buffer.c index 9c89a82719de..56d0403daff2 100644 --- a/audio/vorbis-tools/files/patch-ogg123_buffer.c +++ b/audio/vorbis-tools/files/patch-ogg123_buffer.c @@ -1,7 +1,7 @@ $FreeBSD$ ---- ogg123/buffer.c.orig Tue Jan 30 11:42:48 2001 -+++ ogg123/buffer.c Sat Mar 17 17:12:02 2001 -@@ -6,17 +6,16 @@ +--- ogg123/buffer.c.orig Sat Jun 30 13:57:20 2001 ++++ ogg123/buffer.c Sat Jun 30 14:01:55 2001 +@@ -6,16 +6,16 @@ */ #include <sys/types.h> @@ -10,7 +10,6 @@ $FreeBSD$ +#else #include <sys/ipc.h> #include <sys/shm.h> --#include <sys/stat.h> +#endif #include <sys/time.h> #include <unistd.h> /* for fork and pipe*/ @@ -23,7 +22,7 @@ $FreeBSD$ #include "ogg123.h" #include "buffer.h" -@@ -73,10 +72,26 @@ buf_t *fork_writer (long size, devices_t +@@ -72,6 +72,22 @@ buf_t *fork_writer (long size, devices_t int childpid; buf_t *buf; @@ -46,21 +45,11 @@ $FreeBSD$ /* Get the shared memory segment. */ int shmid = shmget (IPC_PRIVATE, sizeof(buf_t) + sizeof (chunk_t) * (size - 1), -- IPC_CREAT|S_IREAD|S_IWRITE); -+ IPC_CREAT|SHM_R|SHM_W); +@@ -94,6 +110,7 @@ buf_t *fork_writer (long size, devices_t - if (shmid == -1) - { -@@ -92,7 +107,11 @@ buf_t *fork_writer (long size, devices_t - perror ("shmat"); - exit (1); - } -- -+ -+ /* Remove segment after last process detaches it or terminates. */ -+ shmctl(shmid, IPC_RMID, 0); + /* Remove segment after last process detaches it or terminates. */ + shmctl(shmid, IPC_RMID, 0); +#endif /* HAVE_SMMAP */ -+ + buffer_init (buf, size); - /* Create a pipe for communication between the two processes. Unlike diff --git a/audio/vorbis-tools/files/patch-ogg123_ogg123.1 b/audio/vorbis-tools/files/patch-ogg123_ogg123.1 new file mode 100644 index 000000000000..360bd101d6e5 --- /dev/null +++ b/audio/vorbis-tools/files/patch-ogg123_ogg123.1 @@ -0,0 +1,74 @@ +$FreeBSD$ +--- ogg123/ogg123.1.orig Sat Jun 30 14:48:43 2001 ++++ ogg123/ogg123.1 Sat Jun 30 15:02:46 2001 +@@ -76,7 +76,7 @@ written to + output overhead. + + .IP oss +-Open Sound System driver for Linux and {Net,Free,Open}BSD. ++Open Sound System driver for Linux and FreeBSD. + .RS + Options: + .RS +@@ -86,6 +86,17 @@ DSP device for soundcard. Defaults to + .RE + .RE + ++.IP sun ++Sun Audio driver for NetBSD, OpenBSD, and Solaris. ++.RS ++Options: ++.RS ++.IP dev ++Audio device for soundcard. Defaults to ++.B /dev/audio. ++.RE ++.RE ++ + .IP alsa + Advanced Linux Sound Architecture. + .RS +@@ -100,6 +111,14 @@ Override the default buffer size (in byt + .RE + .RE + ++.IP irix ++IRIX audio driver. Note that this driver has ++.B not ++been tested! ++ ++.IP arts ++aRts Sound Daemon. ++ + .IP esd + Enlightened Sound Daemon. + .RS +@@ -111,15 +130,19 @@ after a colon, as in "whizbang.com:555". + .RE + .RE + +-.IP solaris +-Solaris audio driver. Note that this driver has +-.B not +-been tested! +- +-.IP irix +-IRIX audio driver. Note that this driver has +-.B not +-been tested! ++.IP raw ++Raw sample output. Writes raw audio samples to a file. ++.RS ++Options: ++.RS ++.IP file ++Sets the output file. (Default = "output.raw") ++.RE ++.RS ++.IP byteorder ++Choose big endian, little endian, or native byte order. (Default = "native") ++.RE ++.RE + + .IP wav + WAV file output. Writes the sound data to disk in uncompressed form. diff --git a/audio/vorbis-tools/files/patch-ogg123_ogg123.c b/audio/vorbis-tools/files/patch-ogg123_ogg123.c index 994a3afc34a1..b67b088396b4 100644 --- a/audio/vorbis-tools/files/patch-ogg123_ogg123.c +++ b/audio/vorbis-tools/files/patch-ogg123_ogg123.c @@ -1,6 +1,6 @@ $FreeBSD$ ---- ogg123/ogg123.c.orig Sat Feb 24 01:52:22 2001 -+++ ogg123/ogg123.c Wed Mar 21 15:30:42 2001 +--- ogg123/ogg123.c.orig Mon Jun 18 18:16:50 2001 ++++ ogg123/ogg123.c Tue Jul 17 01:43:22 2001 @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdio.h> @@ -9,3 +9,16 @@ $FreeBSD$ #include <netinet/in.h> #include <sys/socket.h> #include <errno.h> +@@ -85,8 +86,10 @@ void usage(void) + " -V, --version display Ogg123 version\n" + " -d, --device=d uses 'd' as an output device\n" + " Possible devices are (some may not be compiled):\n" +- " null (output nothing), oss (for Linux and *BSD),\n" +- " irix, solaris, wav (write to a .WAV file)\n" ++ " null (output nothing), oss (for Linux and FreeBSD),\n" ++ " alsa (for Linux), sun (for NetBSD, OpenBSD, Solaris),\n" ++ " irix, arts (aRts sound daemon), esd (ESounD daemon),\n" ++ " raw (write to a file), wav (write to a .WAV file)\n" + " -k n, --skip n Skip the first 'n' seconds\n" + " -o, --device-option=k:v passes special option k with value\n" + " v to previously specified device (with -d). See\n" diff --git a/audio/vorbis-tools/files/patch-ogginfo_Makefile.am b/audio/vorbis-tools/files/patch-ogginfo_Makefile.am new file mode 100644 index 000000000000..1523395fa550 --- /dev/null +++ b/audio/vorbis-tools/files/patch-ogginfo_Makefile.am @@ -0,0 +1,10 @@ +--- ogginfo/Makefile.am.orig Tue Jul 17 01:23:47 2001 ++++ ogginfo/Makefile.am Tue Jul 17 01:24:00 2001 +@@ -3,7 +3,6 @@ + AUTOMAKE_OPTIONS = foreign + + bin_PROGRAMS = ogginfo +-mandir = $(datadir)/man + man_MANS = ogginfo.1 + + INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ diff --git a/audio/vorbis-tools/files/patch-ogginfo_Makefile.in b/audio/vorbis-tools/files/patch-ogginfo_Makefile.in new file mode 100644 index 000000000000..0cc9192e8fef --- /dev/null +++ b/audio/vorbis-tools/files/patch-ogginfo_Makefile.in @@ -0,0 +1,18 @@ +--- ogginfo/Makefile.in.orig Tue Jul 17 01:23:50 2001 ++++ ogginfo/Makefile.in Tue Jul 17 01:24:14 2001 +@@ -28,6 +28,7 @@ sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ + infodir = @infodir@ ++mandir = @mandir@ + includedir = @includedir@ + oldincludedir = /usr/include + +@@ -83,7 +84,6 @@ VORBIS_LIBS = @VORBIS_LIBS@ + AUTOMAKE_OPTIONS = foreign + + bin_PROGRAMS = ogginfo +-mandir = $(datadir)/man + man_MANS = ogginfo.1 + + INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist index 827a3f99e876..e98e931a0f33 100644 --- a/audio/vorbis-tools/pkg-plist +++ b/audio/vorbis-tools/pkg-plist @@ -1,6 +1,7 @@ @comment $FreeBSD$ bin/ogg123 bin/oggenc +bin/ogginfo bin/vorbiscomment -share/doc/vorbis-tools/ogg123rc-example -@dirrm share/doc/vorbis-tools +share/examples/vorbis-tools/ogg123rc +@dirrm share/examples/vorbis-tools diff --git a/audio/vorbis/Makefile b/audio/vorbis/Makefile index 0cad562290ce..673d9516cd7d 100644 --- a/audio/vorbis/Makefile +++ b/audio/vorbis/Makefile @@ -6,8 +6,8 @@ # PORTNAME= vorbis -PORTVERSION= 1.0b4 -PORTEPOCH= 1 +PORTVERSION= 1.0.r1 +PORTEPOCH= 2 CATEGORIES= audio MASTER_SITES= # empty DISTFILES= # none @@ -16,7 +16,7 @@ EXTRACT_ONLY= # empty MAINTAINER= naddy@mips.inka.de LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao \ - ogg.1:${PORTSDIR}/audio/libogg \ + ogg.2:${PORTSDIR}/audio/libogg \ vorbis.0:${PORTSDIR}/audio/libvorbis RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools @@ -26,7 +26,7 @@ PLIST= ${WRKDIR}/pkg-plist SUBPORTS= libao libogg libvorbis vorbis-tools pre-install: - ${ECHO} "@comment intentionally left empty" > ${PLIST} + @${ECHO} "@comment intentionally left empty" > ${PLIST} do-install: # empty |