Aleksander Piotrowski [Fri Jul 01, 2005 at 10:25:41AM +0200] wrote:
>> +share/doc/vorbis-tools-1.1.1/
>> +share/doc/vorbis-tools-1.1.1/ogg123rc-example
>
>This looks strange ...
>
Yes, one line from the old patch was missing in the new one.
>> share/examples/vorbis-tools/
>> share/examples/vorbis-tools/ogg123rc
>
>... isn't that the same file?
>
Yep, fixed.
>> +share/locale/
>> share/locale/be/
>> share/locale/be/LC_MESSAGES/
>> share/locale/be/LC_MESSAGES/vorbis-tools.mo
>> +share/locale/cs/
>> +share/locale/cs/LC_MESSAGES/
>> share/locale/cs/LC_MESSAGES/vorbis-tools.mo
>> +share/locale/da/
>> +share/locale/da/LC_MESSAGES/
>> share/locale/da/LC_MESSAGES/vorbis-tools.mo
>[...]
>
>I'm also not sure if adding these dirs is correct.
>
These dirs are in gettext already.
- I don't know why vcut now is disabled by default. (There's no
ChangeLog available. :( ) I've enabled it with --enable-vcut again.
- I've changed
@cwd ${SYSCONFDIR}
@extra ogg123rc
to
@extra ${SYSCONFDIR}/ogg123rc
We save one PLIST line with this. Or are there problems with that?
Updated diff attached.
Bernd
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 21 Nov 2004 17:51:47 -0000 1.24
+++ Makefile 1 Jul 2005 10:17:21 -0000
@@ -2,7 +2,7 @@
COMMENT= "play, encode, and manage Ogg Vorbis files"
-DISTNAME= vorbis-tools-1.0.1
+DISTNAME= vorbis-tools-1.1.1
CATEGORIES= audio
HOMEPAGE= http://www.xiph.org/ogg/vorbis/
@@ -15,7 +15,7 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m ogg pthread ssl z
-MASTER_SITES= http://www.vorbis.com/files/1.0.1/unix/
+MASTER_SITES= http://downloads.xiph.org/releases/vorbis/
MODULES= devel/gettext
LIB_DEPENDS= ao.3::audio/libao \
@@ -25,6 +25,7 @@
vorbis.2,vorbisenc.2,vorbisfile.3::audio/libvorbis
CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --enable-vcut
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
PTHREAD_CFLAGS="-pthread" PTHREAD_LIBS="-pthread"
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Jan 2005 15:47:09 -0000 1.4
+++ distinfo 1 Jul 2005 10:17:21 -0000
@@ -1,4 +1,4 @@
-MD5 (vorbis-tools-1.0.1.tar.gz) = 80d3ae3bbae2a488d433d86b8fd64777
-RMD160 (vorbis-tools-1.0.1.tar.gz) = 78a53430311c45463369ae6f836ca68ce900d741
-SHA1 (vorbis-tools-1.0.1.tar.gz) = 5555a55acd643fcca7020b7de4900aeb706725e5
-SIZE (vorbis-tools-1.0.1.tar.gz) = 717697
+MD5 (vorbis-tools-1.1.1.tar.gz) = 47845fd76f5f2354a3619c4097575487
+RMD160 (vorbis-tools-1.1.1.tar.gz) = ed38929b8a81f833f726e489e55e9f62d5ed69ec
+SHA1 (vorbis-tools-1.1.1.tar.gz) = a1394b39905b389d72f12c2a9f0c86a33d07a487
+SIZE (vorbis-tools-1.1.1.tar.gz) = 948837
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 14 Dec 2003 00:52:22 -0000 1.4
+++ patches/patch-configure 1 Jul 2005 10:17:21 -0000
@@ -1,7 +1,6 @@
-$OpenBSD: patch-configure,v 1.4 2003/12/14 00:52:22 naddy Exp $
---- configure.orig 2003-12-14 00:29:16.000000000 +0100
-+++ configure 2003-12-14 00:30:52.000000000 +0100
-@@ -10361,7 +10361,7 @@ if test -z "$GCC"; then
+--- configure.orig Mon Jun 27 11:29:29 2005
++++ configure Fri Jul 1 12:07:42 2005
+@@ -25122,7 +25122,7 @@ if test -z "$GCC"; then
;;
*)
DEBUG="-g"
@@ -10,7 +9,7 @@
PROFILE="-g -p"
;;
esac
-@@ -10384,8 +10384,8 @@ else
+@@ -25145,8 +25145,8 @@ else
;;
*)
DEBUG="-g -Wall -fsigned-char"
Index: patches/patch-ogg123_Makefile_in
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/patches/patch-ogg123_Makefile_in,v
retrieving revision 1.6
diff -u -r1.6 patch-ogg123_Makefile_in
--- patches/patch-ogg123_Makefile_in 14 Dec 2003 00:52:22 -0000 1.6
+++ patches/patch-ogg123_Makefile_in 1 Jul 2005 10:17:21 -0000
@@ -1,16 +1,15 @@
-$OpenBSD: patch-ogg123_Makefile_in,v 1.6 2003/12/14 00:52:22 naddy Exp $
---- ogg123/Makefile.in.orig 2003-11-17 17:50:56.000000000 +0100
-+++ ogg123/Makefile.in 2003-12-14 00:51:43.000000000 +0100
-@@ -135,7 +135,7 @@ install_sh = @install_sh@
-
- AUTOMAKE_OPTIONS = foreign
- localedir = $(datadir)/locale
+--- ogg123/Makefile.in.orig Mon Jun 27 11:29:11 2005
++++ ogg123/Makefile.in Fri Jul 1 12:08:46 2005
+@@ -129,7 +129,7 @@ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG = @DEBUG@
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
-
- docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-
-@@ -486,7 +486,7 @@ info: info-am
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+@@ -599,7 +599,7 @@ info: info-am
info-am:
Index: patches/patch-ogg123_cfgfile_options_c
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/patches/patch-ogg123_cfgfile_options_c,v
retrieving revision 1.1
diff -u -r1.1 patch-ogg123_cfgfile_options_c
--- patches/patch-ogg123_cfgfile_options_c 30 Sep 2003 00:21:42 -0000
1.1
+++ patches/patch-ogg123_cfgfile_options_c 1 Jul 2005 10:17:21 -0000
@@ -1,6 +1,5 @@
-$OpenBSD: patch-ogg123_cfgfile_options_c,v 1.1 2003/09/30 00:21:42 naddy Exp $
---- ogg123/cfgfile_options.c.orig 2003-09-30 02:15:22.000000000 +0200
-+++ ogg123/cfgfile_options.c 2003-09-30 02:15:39.000000000 +0200
+--- ogg123/cfgfile_options.c.orig Fri Jun 3 12:15:09 2005
++++ ogg123/cfgfile_options.c Fri Jul 1 12:07:42 2005
@@ -441,7 +441,7 @@ void parse_std_configs (file_option_t op
char filename[FILENAME_MAX];
char *homedir = getenv("HOME");
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/vorbis-tools/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 14 Sep 2004 23:16:55 -0000 1.9
+++ pkg/PLIST 1 Jul 2005 10:17:21 -0000
@@ -26,5 +26,5 @@
share/locale/ro/LC_MESSAGES/vorbis-tools.mo
share/locale/ru/LC_MESSAGES/vorbis-tools.mo
share/locale/sv/LC_MESSAGES/vorbis-tools.mo
[EMAIL PROTECTED] ${SYSCONFDIR}
[EMAIL PROTECTED] ogg123rc
+share/locale/uk/LC_MESSAGES/vorbis-tools.mo
[EMAIL PROTECTED] ${SYSCONFDIR}/ogg123rc
