diff options
author | sf <sf@FreeBSD.org> | 2001-03-01 17:36:40 +0800 |
---|---|---|
committer | sf <sf@FreeBSD.org> | 2001-03-01 17:36:40 +0800 |
commit | 1b0b41de0edfe9faf3117aead0050a39b7e7fc87 (patch) | |
tree | 8f2ca1ae765486367d28895255cc726d5adbf92d | |
parent | cd7ad25c970aa8432b07cb1d32d5d543d883259a (diff) | |
download | freebsd-ports-gnome-1b0b41de0edfe9faf3117aead0050a39b7e7fc87.tar.gz freebsd-ports-gnome-1b0b41de0edfe9faf3117aead0050a39b7e7fc87.tar.zst freebsd-ports-gnome-1b0b41de0edfe9faf3117aead0050a39b7e7fc87.zip |
update to 1.0 beta4.
PR: 25415
Submitted by: maintainer
-rw-r--r-- | audio/vorbis-tools/Makefile | 42 | ||||
-rw-r--r-- | audio/vorbis-tools/distinfo | 2 | ||||
-rw-r--r-- | audio/vorbis-tools/files/patch-aa | 23 | ||||
-rw-r--r-- | audio/vorbis-tools/files/patch-ab | 14 | ||||
-rw-r--r-- | audio/vorbis-tools/files/patch-ac | 11 | ||||
-rw-r--r-- | audio/vorbis-tools/files/patch-ad | 8 | ||||
-rw-r--r-- | audio/vorbis-tools/files/patch-oggenc_audio_c | 11 | ||||
-rw-r--r-- | audio/vorbis-tools/pkg-plist | 2 |
8 files changed, 64 insertions, 49 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index 18b146e14635..e49da22929ba 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -6,45 +6,37 @@ # PORTNAME= vorbis-tools -PORTVERSION= 20001018 +PORTVERSION= 1.0b4 +PORTEPOCH= 1 CATEGORIES= audio -MASTER_SITES= http://home.student.utwente.nl/t.vanklaveren/distfiles/ -DISTNAME= vorbis-tools-${PORTVERSION} +MASTER_SITES= http://www.vorbis.com/files/beta4/unix/ \ + http://home.student.utwente.nl/t.vanklaveren/distfiles/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/} MAINTAINER= t.vanklaveren@student.utwente.nl -LIB_DEPENDS= ao.0:${PORTSDIR}/audio/libao \ - ogg.0:${PORTSDIR}/audio/libogg \ +LIB_DEPENDS= ao.1:${PORTSDIR}/audio/libao \ + ogg.1:${PORTSDIR}/audio/libogg \ vorbis.0:${PORTSDIR}/audio/libvorbis GNU_CONFIGURE= yes USE_GMAKE= yes USE_LIBTOOL= yes -USE_AUTOMAKE= yes -WRKSRC= ${WRKDIR}/vorbis-tools -ACLOCAL?= ${LOCALBASE}/bin/aclocal -AUTOHEADER?= ${LOCALBASE}/bin/autoheader CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \ --with-ao=${LOCALBASE} -AUTOMAKE_ARGS= --add-missing -MAN1= ogg123.1 +MAN1= ogg123.1 oggenc.1 -post-build: +#post-build: # This is probably evil, and should be in a Makefile. - cd ${WRKSRC}/oggenc && ${CC} ${CFLAGS} -c getopt1.c - cd ${WRKSRC}/ogg123 && ${CC} ${CFLAGS} -c ogg123.c -I../oggenc -I${LOCALBASE}/include - cd ${WRKSRC}/ogg123 && ${CC} ${LDFLAGS} -o ogg123 ogg123.o ../oggenc/getopt.o ../oggenc/getopt1.o -L${LOCALBASE}/lib -logg -lvorbis -lao -lvorbisfile - -post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ogg123/ogg123 ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/ogg123/ogg123.1 ${PREFIX}/man/man1/ - -post-patch: - cd ${WRKSRC} && ${ACLOCAL} - cd ${WRKSRC} && ${AUTOHEADER} - cd ${WRKSRC} && ${AUTOMAKE} --add-missing - cd ${WRKSRC} && ${AUTOCONF} +# cd ${WRKSRC}/oggenc && ${CC} ${CFLAGS} -c getopt1.c +# cd ${WRKSRC}/ogg123 && ${CC} ${CFLAGS} -c ogg123.c -I../oggenc -I${LOCALBASE}/include +# cd ${WRKSRC}/ogg123 && ${CC} ${LDFLAGS} -o ogg123 ogg123.o ../oggenc/getopt.o ../oggenc/getopt1.o -L${LOCALBASE}/lib -logg -lvorbis -lao -lvorbisfile +# +#post-install: +# ${INSTALL_PROGRAM} ${WRKSRC}/ogg123/ogg123 ${PREFIX}/bin/ +# ${INSTALL_MAN} ${WRKSRC}/ogg123/ogg123.1 ${PREFIX}/man/man1/ .include <bsd.port.mk> diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index 4a70a9597183..c33a6eeb7125 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1 +1 @@ -MD5 (vorbis-tools-20001018.tar.gz) = 20d4a7aa7c7598538fbf4cb2771bd45f +MD5 (vorbis-tools-1.0beta4.tar.gz) = 5222a18972276f0bf42256c221453d0e diff --git a/audio/vorbis-tools/files/patch-aa b/audio/vorbis-tools/files/patch-aa index aef108c712dc..5f927e6b5100 100644 --- a/audio/vorbis-tools/files/patch-aa +++ b/audio/vorbis-tools/files/patch-aa @@ -1,12 +1,11 @@ ---- ogg123/ogg123.c.orig Wed Oct 11 06:19:51 2000 -+++ ogg123/ogg123.c Wed Oct 18 23:02:20 2000 -@@ -27,8 +27,8 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <sys/socket.h> /* !!! */ - #include <sys/types.h> -+#include <sys/socket.h> /* !!! */ - #include <unistd.h> - #include <netdb.h> - #include <netinet/in.h> +--- configure.old Tue Feb 27 14:55:50 2001 ++++ configure Tue Feb 27 14:55:57 2001 +@@ -1822,7 +1822,7 @@ + AO_LIBS="-L$ao_prefix/lib" + fi + +- AO_LIBS="$AO_LIBS -lao -ldl" ++ AO_LIBS="$AO_LIBS -lao" + + echo $ac_n "checking for ao""... $ac_c" 1>&6 + echo "configure:1829: checking for ao" >&5 diff --git a/audio/vorbis-tools/files/patch-ab b/audio/vorbis-tools/files/patch-ab new file mode 100644 index 000000000000..fa97832d41fb --- /dev/null +++ b/audio/vorbis-tools/files/patch-ab @@ -0,0 +1,14 @@ +--- ogg123/buffer.c.orig Tue Feb 27 14:57:30 2001 ++++ ogg123/buffer.c Tue Feb 27 14:58:25 2001 +@@ -14,7 +14,11 @@ + #include <fcntl.h> + + #ifndef DARWIN ++#ifdef __FreeBSD__ ++#include <stdlib.h> ++#else + #include <malloc.h> ++#endif + #endif + + #include "ogg123.h" diff --git a/audio/vorbis-tools/files/patch-ac b/audio/vorbis-tools/files/patch-ac new file mode 100644 index 000000000000..3f5eec7db1f6 --- /dev/null +++ b/audio/vorbis-tools/files/patch-ac @@ -0,0 +1,11 @@ +--- ogg123/Makefile.in.orig Mon Feb 26 12:02:14 2001 ++++ ogg123/Makefile.in Tue Feb 27 15:02:56 2001 +@@ -85,7 +85,7 @@ + bin_PROGRAMS = ogg123 + docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) + doc_DATA = ogg123rc-example +-mandir = $(datadir)/man ++mandir = $(prefix)/man + man_MANS = ogg123.1 + + INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ diff --git a/audio/vorbis-tools/files/patch-ad b/audio/vorbis-tools/files/patch-ad new file mode 100644 index 000000000000..8175c5f454f3 --- /dev/null +++ b/audio/vorbis-tools/files/patch-ad @@ -0,0 +1,8 @@ +--- ogg123/ogg123.c.orig Sat Feb 24 09:52:22 2001 ++++ ogg123/ogg123.c Thu Mar 1 17:51:28 2001 +@@ -25,4 +25,5 @@ + #include <stdio.h> + #include <netdb.h> ++#include <sys/types.h> + #include <netinet/in.h> + #include <sys/socket.h> diff --git a/audio/vorbis-tools/files/patch-oggenc_audio_c b/audio/vorbis-tools/files/patch-oggenc_audio_c deleted file mode 100644 index 2b82e78c08ea..000000000000 --- a/audio/vorbis-tools/files/patch-oggenc_audio_c +++ /dev/null @@ -1,11 +0,0 @@ ---- oggenc/audio.c.orig Wed Sep 6 17:57:46 2000 -+++ oggenc/audio.c Thu Nov 2 12:42:46 2000 -@@ -14,7 +14,7 @@ - #include <stdio.h> - #include <string.h> - #include <sys/types.h> --#include <malloc.h> -+#include <stdlib.h> - #include "audio.h" - - #define WAV_HEADER_SIZE 44 diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist index 6af826e73739..9bec82fd1344 100644 --- a/audio/vorbis-tools/pkg-plist +++ b/audio/vorbis-tools/pkg-plist @@ -1,3 +1,5 @@ bin/ogg123 bin/oggenc bin/vorbiscomment +share/doc/vorbis-tools-1.0beta4/ogg123rc-example +@dirrm share/doc/vorbis-tools-1.0beta4 |