Re: flac

["Chavdar Ivanov" <ci4ic4%gmail.com@localhost>]

On Nov 20, 2007 5:57 PM, Matthias Drochner <M.Drochner%fz-juelich.de@localhost> 
wrote:
>
> > Trivial change in the Makefile, make fetch; make distinfo; make patch
> > (sans three existing patches)
>
> Can you send the patches? Just looked at it, and as I see it
> a patch needs to be added (to doc/html/images/hw/Makefile.in).

Attached. I am not quite sure if this was the correct way; I actually
modified the three failing patches as well; they now do so correctly;
the attached patch itself is created using 'cvs diff -u'.

>
> best regards
> Matthias
>
>
>
>
> -----------------------------------------------------------------------------------------
> -----------------------------------------------------------------------------------------
> Forschungszentrum Juelich GmbH
> 52425 Juelich
>
> Sitz der Gesellschaft: Juelich
> Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
> Vorsitzende des Aufsichtsrats: MinDirig'in Baerbel Brumme-Bothe
> Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender), Dr. Ulrich Krafft 
> (stellv.
> Vorsitzender); Dr. Sebastian M. Schmidt
> -----------------------------------------------------------------------------------------
> -----------------------------------------------------------------------------------------
>



-- 
/dev/random says:
        Did you expect mere proof to sway my opinion?
----------------------------------------------------------------
Chavdar Ivanov   | Talbot Way, Small Heath Business Park
Delcam UK        | Birmingham B10 0HJ, United Kingdom
Customer Support | (+44)121-6831014
----------------------------------------------------------------

? audio/flac/README.html
Index: audio/flac/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- audio/flac/Makefile 7 Jan 2007 15:01:52 -0000       1.41
+++ audio/flac/Makefile 21 Nov 2007 00:59:52 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.41 2007/01/07 15:01:52 wiz Exp $
 
-DISTNAME=      flac-1.1.3
-PKGREVISION=   1
+DISTNAME=      flac-1.2.1
+
 CATEGORIES=    audio archivers
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=flac/}
 
Index: audio/flac/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- audio/flac/PLIST    7 Jan 2007 12:25:05 -0000       1.9
+++ audio/flac/PLIST    21 Nov 2007 00:59:52 -0000
@@ -213,7 +213,6 @@
 share/doc/html/flac/features.html
 share/doc/html/flac/flac.css
 share/doc/html/flac/format.html
-share/doc/html/flac/goals.html
 share/doc/html/flac/id.html
 share/doc/html/flac/images/1x1.gif
 share/doc/html/flac/images/cafebug.gif
Index: audio/flac/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- audio/flac/distinfo 22 Feb 2007 19:11:25 -0000      1.16
+++ audio/flac/distinfo 21 Nov 2007 00:59:52 -0000
@@ -1,13 +1,13 @@
 $NetBSD: distinfo,v 1.16 2007/02/22 19:11:25 rillig Exp $
 
-SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295
-RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132
-Size (flac-1.1.3.tar.gz) = 1592699 bytes
+SHA1 (flac-1.2.1.tar.gz) = bd54354900181b59db3089347cc84ad81e410b38
+RMD160 (flac-1.2.1.tar.gz) = bd3223c848054f0a75d11200b30f903bdd375bfc
+Size (flac-1.2.1.tar.gz) = 2009217 bytes
 SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4
-SHA1 (patch-ab) = d7b48e37ca81450d0ffc4a97914d06c1464daf7b
+SHA1 (patch-ab) = c9fb5dafd7fd3aaf8ffb9d902d9193c25f91885e
 SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e
 SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874
 SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3
 SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067
-SHA1 (patch-ag) = ec37d2e4ce9c0a8d4d638fe08d1f38914029a205
-SHA1 (patch-ah) = 90452d2983aed07a8a0c14926772610ef3799099
+SHA1 (patch-ag) = a810ff0fde1b837730344da0549508f4018ba42a
+SHA1 (patch-ah) = 4bc9c56b28d10bf4b8eeaa2f986f324e40e10002
Index: audio/flac/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/patches/patch-ab,v
retrieving revision 1.5
diff -u -r1.5 patch-ab
--- audio/flac/patches/patch-ab 7 Jan 2007 12:25:05 -0000       1.5
+++ audio/flac/patches/patch-ab 21 Nov 2007 00:59:52 -0000
@@ -1,10 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2007/01/07 12:25:05 wiz Exp $
-
---- doc/html/images/Makefile.in.orig   2006-11-27 06:40:52.000000000 +0000
-+++ doc/html/images/Makefile.in
-@@ -218,7 +218,7 @@ target_alias = @target_alias@
+--- doc/html/images/Makefile.in.orig   2007-11-21 00:32:00.000000000 +0000
++++ doc/html/images/Makefile.in        2007-11-21 00:32:38.000000000 +0000
+@@ -223,7 +223,7 @@
  
- AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = hw
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
 +docdir = $(datadir)/doc/html/$(PACKAGE)/images
Index: audio/flac/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/patches/patch-ag,v
retrieving revision 1.3
diff -u -r1.3 patch-ag
--- audio/flac/patches/patch-ag 7 Jan 2007 15:01:52 -0000       1.3
+++ audio/flac/patches/patch-ag 21 Nov 2007 00:59:52 -0000
@@ -1,16 +1,14 @@
-$NetBSD: patch-ag,v 1.3 2007/01/07 15:01:52 wiz Exp $
-
---- src/libFLAC/Makefile.am.orig       2006-10-13 04:25:26.000000000 +0000
-+++ src/libFLAC/Makefile.am
-@@ -86,9 +86,10 @@ extra_ogg_sources = \
+--- src/libFLAC/Makefile.am.orig       2007-11-21 00:43:11.000000000 +0000
++++ src/libFLAC/Makefile.am    2007-11-21 00:45:49.000000000 +0000
+@@ -94,9 +94,10 @@
        ogg_encoder_aspect.c \
        ogg_helper.c \
        ogg_mapping.c
 +extra_ogg_libs = -logg
  endif
  # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' 
for numbering convention
--libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
-+libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) 
$(extra_ogg_libs)
+-libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS)
++libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) 
$(extra_ogg_libs)
  libFLAC_la_SOURCES = \
-       bitbuffer.c \
        bitmath.c \
+       bitreader.c \
Index: audio/flac/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/audio/flac/patches/patch-ah,v
retrieving revision 1.3
diff -u -r1.3 patch-ah
--- audio/flac/patches/patch-ah 7 Jan 2007 15:01:52 -0000       1.3
+++ audio/flac/patches/patch-ah 21 Nov 2007 00:59:52 -0000
@@ -1,15 +1,14 @@
-$NetBSD: patch-ah,v 1.3 2007/01/07 15:01:52 wiz Exp $
-
---- src/libFLAC/Makefile.in.orig       2006-11-27 06:41:11.000000000 +0000
-+++ src/libFLAC/Makefile.in
-@@ -267,8 +267,9 @@ EXTRA_DIST = \
+--- src/libFLAC/Makefile.in.orig       2007-11-21 00:48:38.000000000 +0000
++++ src/libFLAC/Makefile.in    2007-11-21 00:50:15.000000000 +0000
+@@ -278,8 +278,10 @@
  @FLaC__HAS_OGG_TRUE@  ogg_helper.c \
  @FLaC__HAS_OGG_TRUE@  ogg_mapping.c
  
 +@FLaC__HAS_OGG_TRUE@extra_ogg_libs = -logg
++
  # see 'http://www.gnu.org/software/libtool/manual.html#Libtool-versioning' 
for numbering convention
--libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS)
-+libFLAC_la_LDFLAGS = -version-info 8:0:0 -lm $(LOCAL_EXTRA_LDFLAGS) 
$(extra_ogg_libs)
+-libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS)
++libFLAC_la_LDFLAGS = -version-info 10:0:2 -lm $(LOCAL_EXTRA_LDFLAGS) 
$(extra_ogg_libs)
  libFLAC_la_SOURCES = \
-       bitbuffer.c \
        bitmath.c \
+       bitreader.c \