[cvs] dists/10.4/unstable/main/finkinfo/editors navi2ch.info, 1.5, 1.6 navi2ch.patch, 1.3, 1.4

2008-02-19 Thread Tomoaki Okayama
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23060/10.4/unstable/main/finkinfo/editors

Modified Files:
navi2ch.info navi2ch.patch 
Log Message:
Update to the stable cvs snapshot, 20070510.

Index: navi2ch.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/navi2ch.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- navi2ch.info19 Oct 2007 01:43:42 -  1.5
+++ navi2ch.info19 Feb 2008 13:06:11 -  1.6
@@ -1,20 +1,23 @@
 Package: navi2ch
-Version: 1.7.5
-Revision: 1009
-GCC: 4.0
+Version: 1.7.5+cvs.0.0.20070510-1
+Revision: 1
 Description: 2ch navigator for Emacsen
 License: GPL
 Maintainer: Todai Fink Team [EMAIL PROTECTED]
 BuildDepends: fink (= 0.24.12)
 Depends: emacsen
 Recommends: monafont
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 3187132fbb3e79ffb40eef2d70c743c5
+Source: http://navi2ch.sourceforge.net/snapshot/%n-cvs_0.0.20070510-1.tar.gz
+Source-MD5: ce070394eea1f067b226c6350ea00c3a
+SourceDirectory: navi2ch-cvs-20070510
 PatchFile: %n.patch
-PatchFile-MD5: 7ca8234db7a8453cb4c3c4403f1c6871
-PatchScript: sed 's|@PREFIX@|%p|g'  %{PatchFile} | patch -p1
-ConfigureParams: --infodir='${prefix}/share/info' 
--with-lispdir='${prefix}/share/emacs/site-lisp/%n' 
--with-icondir='${prefix}/share/pixmaps/%n'
-CompileScript: ./configure %c
+PatchFile-MD5: ffee871f261a86d2b7d7109061a7377b
+PatchScript: 
+sed 's|@PREFIX@|%p|g'  %{PatchFile} | patch -p1
+perl -pi -e s|( -batch)|\1 -no-site-file| configure elisp-comp 
doc/Makefile.in
+
+ConfigureParams: --infodir='${prefix}/share/info' 
--with-lispdir='${prefix}/share/emacs/site-lisp/%n' 
--with-icondir='%p/share/pixmaps/%n'
+CompileScript: ./configure %c  make info
 InstallScript: 
  (cd icons  make install DESTDIR=%d)
  (cd docmake install DESTDIR=%d)
@@ -30,7 +33,7 @@
  install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
  install -m 755 fink/%n-remove  %i/lib/emacsen-common/packages/remove/%n
 
-DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
 PostInstScript: 
 if [ $1 = configure ]  [ -x %p/lib/emacsen-common/emacs-package-install ]
 then

Index: navi2ch.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/navi2ch.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- navi2ch.patch   25 Dec 2006 00:01:12 -  1.3
+++ navi2ch.patch   19 Feb 2008 13:06:11 -  1.4
@@ -1,19 +1,7 @@
-diff -Naur navi2ch-1.7.5.orig/elisp-comp navi2ch-1.7.5/elisp-comp
 navi2ch-1.7.5.orig/elisp-comp  Wed Jul 31 19:57:54 2002
-+++ navi2ch-1.7.5/elisp-comp   Sun Apr  3 18:28:06 2005
-@@ -54,7 +54,7 @@
-   (setq load-path (nconc extra-load-path load-path
- (setq load-path (cons nil load-path))
- EOF
--   $EMACS -q -batch -l $compile -f batch-byte-compile $*
-+   $EMACS -q -batch -no-site-file -l $compile -f batch-byte-compile $*
-exit_status=$?
-rm -f $compile
-exit $exit_status
 diff -Naur navi2ch-1.7.5.orig/fink/navi2ch-install 
navi2ch-1.7.5/fink/navi2ch-install
 --- navi2ch-1.7.5.orig/fink/navi2ch-installThu Jan  1 09:00:00 1970
 +++ navi2ch-1.7.5/fink/navi2ch-install Sun Apr  3 18:53:51 2005
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
 +#!/bin/bash -e
 +# @PREFIX@/lib/emacsen-common/packages/install/navi2ch
 +
@@ -41,9 +29,9 @@
 +  navi2ch.el \
 +  navi2ch-head.el navi2ch-mona.el navi2ch-e21.el navi2ch-xmas.el \
 +  navi2ch-splash.el navi2ch-directory.el \
-+  navi2ch-multibbs.el \
++  navi2ch-be2ch.el navi2ch-multibbs.el \
 +  navi2ch-jbbs-net.el navi2ch-jbbs-shitaraba.el navi2ch-machibbs.el \
-+  navi2ch-futaba.el \
++  navi2ch-futaba.el navi2ch-megabbs.el \
 +  navi2ch-http-date.el navi2ch-localfile.el navi2ch-oyster.el \
 +  navi2ch-auto-modify.el
 +
@@ -62,6 +50,7 @@
 +rm ${ELCDIR}/{*.el,elisp-comp}
 +
 +(cd ${ELCDIR}  ln -s contrib/*.el .)
++ln -s ${ELDIR}/navi2ch-config.el ${ELCDIR}
 +
 +echo  done.
 +fi
@@ -112,15 +101,3 @@
 +;(add-hook 'navi2ch-popup-article-mode-hook 'izonmoji-mode-on)
 +
 +(autoload 'navi2ch navi2ch Navigator for 2ch for Emacs t)
-diff -Naur navi2ch-1.7.5.orig/navi2ch-list.el navi2ch-1.7.5/navi2ch-list.el
 navi2ch-1.7.5.orig/navi2ch-list.el 2004-08-08 00:03:09.0 +0900
-+++ navi2ch-1.7.5/navi2ch-list.el  2006-12-25 08:23:08.0 +0900
-@@ -85,7 +85,7 @@
- (nil   navi2ch-list-board-name-face)))
- 
- (defconst navi2ch-list-bbstable-default-url
--  http://www.ff.iij4u.or.jp/~ch2/bbsmenu.html;)
-+  http://menu.2ch.net/bbsmenu.html;)
- 
- ;; add hook
- (add-hook 'navi2ch-save-status-hook 'navi2ch-list-save-info)



[cvs] dists/10.3/unstable/main/finkinfo/editors navi2ch.info, 1.4, 1.5 navi2ch.patch, 1.3, 1.4

2008-02-19 Thread Tomoaki Okayama
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23060/10.3/unstable/main/finkinfo/editors

Modified Files:
navi2ch.info navi2ch.patch 
Log Message:
Update to the stable cvs snapshot, 20070510.

Index: navi2ch.info
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/navi2ch.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- navi2ch.info25 Dec 2006 00:01:08 -  1.4
+++ navi2ch.info19 Feb 2008 13:06:07 -  1.5
@@ -1,17 +1,23 @@
 Package: navi2ch
-Version: 1.7.5
-Revision: 6
-GCC: 3.3
+Version: 1.7.5+cvs.0.0.20070510-1
+Revision: 1
 Description: 2ch navigator for Emacsen
 License: GPL
 Maintainer: Todai Fink Team [EMAIL PROTECTED]
+BuildDepends: fink (= 0.24.12)
 Depends: emacsen
 Recommends: monafont
-Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 3187132fbb3e79ffb40eef2d70c743c5
-PatchScript: sed 's|@PREFIX@|%p|g'  %a/%n.patch | patch -p1
-ConfigureParams: --infodir='${prefix}/share/info' 
--with-lispdir='${prefix}/share/emacs/site-lisp/%n' 
--with-icondir='${prefix}/share/pixmaps/%n'
-CompileScript: ./configure %c
+Source: http://navi2ch.sourceforge.net/snapshot/%n-cvs_0.0.20070510-1.tar.gz
+Source-MD5: ce070394eea1f067b226c6350ea00c3a
+SourceDirectory: navi2ch-cvs-20070510
+PatchFile: %n.patch
+PatchFile-MD5: ffee871f261a86d2b7d7109061a7377b
+PatchScript: 
+sed 's|@PREFIX@|%p|g'  %{PatchFile} | patch -p1
+perl -pi -e s|( -batch)|\1 -no-site-file| configure elisp-comp 
doc/Makefile.in
+
+ConfigureParams: --infodir='${prefix}/share/info' 
--with-lispdir='${prefix}/share/emacs/site-lisp/%n' 
--with-icondir='%p/share/pixmaps/%n'
+CompileScript: ./configure %c  make info
 InstallScript: 
  (cd icons  make install DESTDIR=%d)
  (cd docmake install DESTDIR=%d)
@@ -27,7 +33,7 @@
  install -m 755 fink/%n-install %i/lib/emacsen-common/packages/install/%n
  install -m 755 fink/%n-remove  %i/lib/emacsen-common/packages/remove/%n
 
-DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
 PostInstScript: 
 if [ $1 = configure ]  [ -x %p/lib/emacsen-common/emacs-package-install ]
 then

Index: navi2ch.patch
===
RCS file: 
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/navi2ch.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- navi2ch.patch   25 Dec 2006 00:01:11 -  1.3
+++ navi2ch.patch   19 Feb 2008 13:06:07 -  1.4
@@ -1,19 +1,7 @@
-diff -Naur navi2ch-1.7.5.orig/elisp-comp navi2ch-1.7.5/elisp-comp
 navi2ch-1.7.5.orig/elisp-comp  Wed Jul 31 19:57:54 2002
-+++ navi2ch-1.7.5/elisp-comp   Sun Apr  3 18:28:06 2005
-@@ -54,7 +54,7 @@
-   (setq load-path (nconc extra-load-path load-path
- (setq load-path (cons nil load-path))
- EOF
--   $EMACS -q -batch -l $compile -f batch-byte-compile $*
-+   $EMACS -q -batch -no-site-file -l $compile -f batch-byte-compile $*
-exit_status=$?
-rm -f $compile
-exit $exit_status
 diff -Naur navi2ch-1.7.5.orig/fink/navi2ch-install 
navi2ch-1.7.5/fink/navi2ch-install
 --- navi2ch-1.7.5.orig/fink/navi2ch-installThu Jan  1 09:00:00 1970
 +++ navi2ch-1.7.5/fink/navi2ch-install Sun Apr  3 18:53:51 2005
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
 +#!/bin/bash -e
 +# @PREFIX@/lib/emacsen-common/packages/install/navi2ch
 +
@@ -41,9 +29,9 @@
 +  navi2ch.el \
 +  navi2ch-head.el navi2ch-mona.el navi2ch-e21.el navi2ch-xmas.el \
 +  navi2ch-splash.el navi2ch-directory.el \
-+  navi2ch-multibbs.el \
++  navi2ch-be2ch.el navi2ch-multibbs.el \
 +  navi2ch-jbbs-net.el navi2ch-jbbs-shitaraba.el navi2ch-machibbs.el \
-+  navi2ch-futaba.el \
++  navi2ch-futaba.el navi2ch-megabbs.el \
 +  navi2ch-http-date.el navi2ch-localfile.el navi2ch-oyster.el \
 +  navi2ch-auto-modify.el
 +
@@ -62,6 +50,7 @@
 +rm ${ELCDIR}/{*.el,elisp-comp}
 +
 +(cd ${ELCDIR}  ln -s contrib/*.el .)
++ln -s ${ELDIR}/navi2ch-config.el ${ELCDIR}
 +
 +echo  done.
 +fi
@@ -112,15 +101,3 @@
 +;(add-hook 'navi2ch-popup-article-mode-hook 'izonmoji-mode-on)
 +
 +(autoload 'navi2ch navi2ch Navigator for 2ch for Emacs t)
-diff -Naur navi2ch-1.7.5.orig/navi2ch-list.el navi2ch-1.7.5/navi2ch-list.el
 navi2ch-1.7.5.orig/navi2ch-list.el 2004-08-08 00:03:09.0 +0900
-+++ navi2ch-1.7.5/navi2ch-list.el  2006-12-25 08:23:08.0 +0900
-@@ -85,7 +85,7 @@
- (nil   navi2ch-list-board-name-face)))
- 
- (defconst navi2ch-list-bbstable-default-url
--  http://www.ff.iij4u.or.jp/~ch2/bbsmenu.html;)
-+  http://menu.2ch.net/bbsmenu.html;)
- 
- ;; add hook
- (add-hook 'navi2ch-save-status-hook 'navi2ch-list-save-info)


-
This SF.net email is sponsored by: Microsoft
Defy 

[cvs] dists/10.4/unstable/main/finkinfo/gnome libgnomeprintui2.2.info, 1.2.2.37, 1.2.2.38

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26150/main/finkinfo/gnome

Modified Files:
  Tag: pangocairo-branch
libgnomeprintui2.2.info 
Log Message:
buildfink fixes

Index: libgnomeprintui2.2.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnomeprintui2.2.info,v
retrieving revision 1.2.2.37
retrieving revision 1.2.2.38
diff -u -d -r1.2.2.37 -r1.2.2.38
--- libgnomeprintui2.2.info 26 Jan 2008 07:35:20 -  1.2.2.37
+++ libgnomeprintui2.2.info 19 Feb 2008 14:31:49 -  1.2.2.38
@@ -27,6 +27,7 @@
libgnomecanvas2-dev (= 2.20.0-1),
libgnomeprint2.2-dev (= 2.18.2-1),
libiconv-dev,
+   pango1-xft2-ft219-dev (= 1.18.3-1),
pkgconfig (= 0.21-1),
x11-dev,
xft2-dev


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/libs cocoa-sharp.info, 1.5.2.5, 1.5.2.6 dbus-sharp.info, 1.4.2.8, 1.4.2.9

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26150/main/finkinfo/libs

Modified Files:
  Tag: pangocairo-branch
cocoa-sharp.info dbus-sharp.info 
Log Message:
buildfink fixes

Index: dbus-sharp.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/dbus-sharp.info,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -d -r1.4.2.8 -r1.4.2.9
--- dbus-sharp.info 13 Dec 2007 17:21:58 -  1.4.2.8
+++ dbus-sharp.info 19 Feb 2008 14:31:50 -  1.4.2.9
@@ -14,8 +14,7 @@
glitz (= 0.4.4-1),
libgettext3-dev,
libiconv-dev,
-   libicu31-dev,
-   libicu32-dev,
+   libicu36-dev | libicu32-dev,
libpixman1 (= 0.1.5-1),
libpng3,
mono-dev (= 1.2.6-1),

Index: cocoa-sharp.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/cocoa-sharp.info,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -d -r1.5.2.5 -r1.5.2.6
--- cocoa-sharp.info13 Dec 2007 17:21:58 -  1.5.2.5
+++ cocoa-sharp.info19 Feb 2008 14:31:50 -  1.5.2.6
@@ -12,8 +12,7 @@
 Source-MD5: 16d21726434ff3d35582fd3859991cdd
 BuildDepends: 
glib2-dev (= 2.14.0-1),
-   libicu31-dev,
-   libicu32-dev,
+   libicu36-dev | libicu32-dev,
mono-dev (= 1.2.6-1),
monodoc (= 1.2.6-1),
pkgconfig


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/net ettercap.patch, 1.2, 1.2.2.1

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26150/main/finkinfo/net

Modified Files:
  Tag: pangocairo-branch
ettercap.patch 
Log Message:
buildfink fixes

Index: ettercap.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/ettercap.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ettercap.patch  8 Mar 2006 23:56:45 -   1.2
+++ ettercap.patch  19 Feb 2008 14:31:51 -  1.2.2.1
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/Makefile.in 
ettercap-NG-0.7.3/Makefile.in
 ettercap-NG-0.7.3.orig/Makefile.in 2005-05-27 11:11:46.0 -0400
-+++ ettercap-NG-0.7.3/Makefile.in  2006-03-08 18:13:44.0 -0500
+diff -uNbwr ettercap-NG-0.7.3/Makefile.in ettercap-NG-0.7.3-new/Makefile.in
+--- ettercap-NG-0.7.3/Makefile.in  2005-05-27 11:11:46.0 -0400
 ettercap-NG-0.7.3-new/Makefile.in  2008-02-19 08:41:22.0 -0500
 @@ -19,7 +19,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -10,9 +10,9 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/configure ettercap-NG-0.7.3/configure
 ettercap-NG-0.7.3.orig/configure   2005-05-27 11:11:45.0 -0400
-+++ ettercap-NG-0.7.3/configure2006-03-08 18:11:02.0 -0500
+diff -uNbwr ettercap-NG-0.7.3/configure ettercap-NG-0.7.3-new/configure
+--- ettercap-NG-0.7.3/configure2005-05-27 11:11:45.0 -0400
 ettercap-NG-0.7.3-new/configure2008-02-19 08:41:22.0 -0500
 @@ -28243,7 +28243,7 @@
  
  fi
@@ -52,3 +52,14 @@
;
return 0;
  }
+diff -uNbwr ettercap-NG-0.7.3/src/interfaces/curses/widgets/wdg.h 
ettercap-NG-0.7.3-new/src/interfaces/curses/widgets/wdg.h
+--- ettercap-NG-0.7.3/src/interfaces/curses/widgets/wdg.h  2004-09-28 
09:50:37.0 -0400
 ettercap-NG-0.7.3-new/src/interfaces/curses/widgets/wdg.h  2008-02-19 
08:42:09.0 -0500
+@@ -12,6 +12,7 @@
+ #include unistd.h
+ #include stdlib.h
+ #include string.h
++#include sys/types.h
+ 
+ #ifdef OS_WINDOWS
+#include windows.h


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/net gnet2.info, 1.3.2.5, 1.3.2.6

2008-02-19 Thread Jean-Fran�ois Mertens
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5439

Modified Files:
  Tag: pangocairo-branch
gnet2.info 
Log Message:
don't patch twice

Index: gnet2.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/gnet2.info,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -d -r1.3.2.5 -r1.3.2.6
--- gnet2.info  15 Feb 2008 15:49:59 -  1.3.2.5
+++ gnet2.info  19 Feb 2008 16:19:24 -  1.3.2.6
@@ -11,7 +11,6 @@
 PatchFile: %n.patch
 PatchFile-MD5: 453f5ac3f838d46f14259b66485fc05b
 PatchScript: 
-   %{default_script}
perl -pi.bak -e 's/-pthread//' configure
 
 InstallScript: make DESTDIR=%d install


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/crypto/finkinfo ettercap-ssl.patch, 1.2, 1.2.2.1

2008-02-19 Thread Jean-Fran�ois Mertens
Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21223

Modified Files:
  Tag: pangocairo-branch
ettercap-ssl.patch 
Log Message:
same patch as in main

Index: ettercap-ssl.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/ettercap-ssl.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- ettercap-ssl.patch  8 Mar 2006 23:56:44 -   1.2
+++ ettercap-ssl.patch  19 Feb 2008 16:58:37 -  1.2.2.1
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/Makefile.in 
ettercap-NG-0.7.3/Makefile.in
 ettercap-NG-0.7.3.orig/Makefile.in 2005-05-27 11:11:46.0 -0400
-+++ ettercap-NG-0.7.3/Makefile.in  2006-03-08 18:13:44.0 -0500
+diff -uNbwr ettercap-NG-0.7.3/Makefile.in ettercap-NG-0.7.3-new/Makefile.in
+--- ettercap-NG-0.7.3/Makefile.in  2005-05-27 11:11:46.0 -0400
 ettercap-NG-0.7.3-new/Makefile.in  2008-02-19 08:41:22.0 -0500
 @@ -19,7 +19,7 @@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
@@ -10,9 +10,9 @@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  am__cd = CDPATH=$${ZSH_VERSION+.}$(PATH_SEPARATOR)  cd
-diff -Nurd -x'*~' ettercap-NG-0.7.3.orig/configure ettercap-NG-0.7.3/configure
 ettercap-NG-0.7.3.orig/configure   2005-05-27 11:11:45.0 -0400
-+++ ettercap-NG-0.7.3/configure2006-03-08 18:11:02.0 -0500
+diff -uNbwr ettercap-NG-0.7.3/configure ettercap-NG-0.7.3-new/configure
+--- ettercap-NG-0.7.3/configure2005-05-27 11:11:45.0 -0400
 ettercap-NG-0.7.3-new/configure2008-02-19 08:41:22.0 -0500
 @@ -28243,7 +28243,7 @@
  
  fi
@@ -52,3 +52,14 @@
;
return 0;
  }
+diff -uNbwr ettercap-NG-0.7.3/src/interfaces/curses/widgets/wdg.h 
ettercap-NG-0.7.3-new/src/interfaces/curses/widgets/wdg.h
+--- ettercap-NG-0.7.3/src/interfaces/curses/widgets/wdg.h  2004-09-28 
09:50:37.0 -0400
 ettercap-NG-0.7.3-new/src/interfaces/curses/widgets/wdg.h  2008-02-19 
08:42:09.0 -0500
+@@ -12,6 +12,7 @@
+ #include unistd.h
+ #include stdlib.h
+ #include string.h
++#include sys/types.h
+ 
+ #ifdef OS_WINDOWS
+#include windows.h


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[svn] commit: r1143 - in /trunk/experimental: 10.4/main/finkinfo/kde/kdebase3-unified.info common/main/finkinfo/kde/kdebase3-unified.info

2008-02-19 Thread ranger
Author: ranger
Date: Tue Feb 19 19:06:29 2008
New Revision: 1143

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1rev=1143repname=user%3a+ranger
Log:
use alternatives for kdesu so jack can package his whacky kdesu replacement

Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info

Modified: trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.inforev=1143repname=user%3a+ranger
==
--- trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdebase3-unified.info Tue Feb 19 
19:06:29 2008
@@ -137,6 +137,7 @@
 
install -d -m 755 %d`%p/bin/xfontpath basedir`
mv %i/share/apps/konsole/fonts %d`%p/bin/xfontpath basedir`/konsole
+   mv %i/bin/kdesu %i/bin/kdesu-kdebase
 
 DocFiles: AUTHORS COPYING INSTALL README README.pam
 SplitOff: 
@@ -740,24 +741,30 @@
 
 
 PostInstScript: 
-update-alternatives --install /etc/pam.d/kde  pam.d-kde  
%p/etc/pam.d/kde  50
-update-alternatives --install /etc/pam.d/kdm  pam.d-kdm  
%p/etc/pam.d/kdm  50
-update-alternatives --install /etc/pam.d/kcheckpass   pam.d-kcheckpass   
%p/etc/pam.d/kcheckpass   50
-update-alternatives --install /etc/pam.d/kscreensaver pam.d-kscreensaver 
%p/etc/pam.d/kscreensaver 50
-if test -x %p/bin/xfontpath; then
-   %p/bin/xfontpath --silent install konsole
+if [ configure = $1 ]; then
+   update-alternatives --install %p/bin/kdesukdesu 
 %p/bin/kdesu-kdebase   1
+   update-alternatives --install /etc/pam.d/kde  pam.d-kde 
 %p/etc/pam.d/kde  50
+   update-alternatives --install /etc/pam.d/kdm  pam.d-kdm 
 %p/etc/pam.d/kdm  50
+   update-alternatives --install /etc/pam.d/kcheckpass   pam.d-kcheckpass  
 %p/etc/pam.d/kcheckpass   50
+   update-alternatives --install /etc/pam.d/kscreensaver 
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
+   if test -x %p/bin/xfontpath; then
+   %p/bin/xfontpath --silent install konsole
+   fi
+   if [ -x %p/bin/kde-update-caches.sh ]; then
+   %p/bin/kde-update-caches.sh /dev/null 21 || :
+   fi
 fi
-if [ -x %p/bin/kde-update-caches.sh ]; then
-   %p/bin/kde-update-caches.sh /dev/null 21 || :
-fi
 
 PreRmScript: 
-update-alternatives --remove pam.d-kde  %p/etc/pam.d/kde
-update-alternatives --remove pam.d-kdm  %p/etc/pam.d/kdm
-update-alternatives --remove pam.d-kcheckpass   %p/etc/pam.d/kcheckpass
-update-alternatives --remove pam.d-kscreensaver %p/etc/pam.d/kscreensaver
-if test -x %p/bin/xfontpath; then
-   %p/bin/xfontpath --silent remove konsole
+if [ upgrade != $1 ]; then
+   update-alternatives --remove kdesu  %p/bin/kdesu-kdebase
+   update-alternatives --remove pam.d-kde  %p/etc/pam.d/kde
+   update-alternatives --remove pam.d-kdm  %p/etc/pam.d/kdm
+   update-alternatives --remove pam.d-kcheckpass   %p/etc/pam.d/kcheckpass
+   update-alternatives --remove pam.d-kscreensaver 
%p/etc/pam.d/kscreensaver
+   if test -x %p/bin/xfontpath; then
+   %p/bin/xfontpath --silent remove konsole
+   fi
 fi
 
 

Modified: trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.inforev=1143repname=user%3a+ranger
==
--- trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdebase3-unified.info Tue Feb 
19 19:06:29 2008
@@ -134,27 +134,34 @@
 
install -d -m 755 %d`%p/bin/xfontpath basedir`
mv %i/share/apps/konsole/fonts %d`%p/bin/xfontpath basedir`/konsole
+   mv %i/bin/kdesu %i/bin/kdesu-kdebase
 
 
 PostInstScript: 
-   update-alternatives --install /etc/pam.d/kde  pam.d-kde 
 %p/etc/pam.d/kde  50
-   update-alternatives --install /etc/pam.d/kdm  pam.d-kdm 
 %p/etc/pam.d/kdm  50
-   update-alternatives --install /etc/pam.d/kcheckpass   pam.d-kcheckpass  
 %p/etc/pam.d/kcheckpass   50
-   update-alternatives --install /etc/pam.d/kscreensaver 
pam.d-kscreensaver %p/etc/pam.d/kscreensaver 50
-   if test -x %p/bin/xfontpath; then
-   %p/bin/xfontpath --silent install konsole
+   if [ configure = $1 ]; then
+   update-alternatives --install %p/bin/kdesukdesu 
 %p/bin/kdesu-kdebase   1
+   update-alternatives --install /etc/pam.d/kde  pam.d-kde 

[svn] commit: r287 - in /trunk/finkinfo/sound: flac-xmms.info flac.info

2008-02-19 Thread chris
Author: chris
Date: Tue Feb 19 19:26:26 2008
New Revision: 287

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1rev=287repname=user%3a+chris
Log:
...and i'm spent.

Added:
trunk/finkinfo/sound/flac-xmms.info
Modified:
trunk/finkinfo/sound/flac.info

Added: trunk/finkinfo/sound/flac-xmms.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/finkinfo/sound/flac-xmms.inforev=287repname=user%3a+chris
==
--- trunk/finkinfo/sound/flac-xmms.info (added)
+++ trunk/finkinfo/sound/flac-xmms.info Tue Feb 19 19:26:26 2008
@@ -1,0 +1,66 @@
+Package: flac-xmms
+Version: 1.2.1
+Revision: 1000
+BuildDepends: xmms, popt, libtool14 (= 1.5-1), libogg, xmms, readline5, 
id3lib4-dev (= 3.8.3-1014), glib, gtk+, libiconv-dev, libgettext3-dev, 
gettext-bin, gettext-tools, fink (= 0.24.12), libflac8-dev
+Depends: libflac8 (= %v-%r), id3lib4-shlibs (= 3.8.3-1014), popt-shlibs, 
xmms-bin
+Conflicts: flac-nox, flac-bin, flac ( 1.2.1)
+Replaces: flac-nox, flac-bin
+Source: mirror:sourceforge:flac/flac-%v.tar.gz
+Source-MD5: 153c8b15a54da428d1f0fadc756c22c7
+PatchFile: flac.patch
+PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0
+PatchScript: 
+  #!/bin/sh -ex
+  patch -p1  %{PatchFile}
+  patch -p0  patches/ltmain.sh.patch
+  patch -p0  patches/nasm.h.patch
+
+
+NoSetCPPFLAGS: true
+SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-I%p/include
+NoSetLDFLAGS: true
+ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386) 
--disable-asm-optimizations
+BuildDependsOnly: True
+GCC: 4.0
+
+CompileScript: 
+  #!/bin/sh -ex
+  ./configure %c
+  #/bin/sh patches/fixrpath.sh
+  make OBJ_FORMAT=macho
+
+
+InstallScript: 
+  #!/bin/sh -ex
+  bd=$(cd %b  pwd -P)
+  perl -pi -e s#\Q$bd\E/src/libFLAC#%p/lib#g src/plugin_xmms/libxmms-flac.la
+  cd src/plugin_xmms
+  make install DESTDIR=%d 
+
+
+DocFiles: AUTHORS COPYING* README
+
+Description: Free lossless audio codec - xmms plugin
+DescDetail: 
+FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
+is similar to MP3, but lossless. The FLAC project consists of:
+*  The stream format
+In the libflacX packages:
+*  libFLAC, a library encoders and decoders, and a metadata interface
+*  libFLAC++, an object wrapper around libFLAC
+In the flac package:
+*  flac, a CLI wrapper around libFLAC to encode/decode .flac files
+*  metaflac, a command-line metadata editor for .flac files
+In the flac-xmms package:
+*  Input plugin for XMMS
+
+DescPackaging: 
+Does not use pbxbuild method since we want dylibs, and
+the xmms plugin. Also the make/config method puts everything in
+the right place.
+libtool relink and bash versioning patches applied.
+patch to enable dynamic_lookup (for prebinding on 10.3) applied.
+
+License: GPL
+Maintainer: Ben Hines [EMAIL PROTECTED]
+Homepage: http://flac.sourceforge.net/

Modified: trunk/finkinfo/sound/flac.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/finkinfo/sound/flac.inforev=287repname=user%3a+chris
==
--- trunk/finkinfo/sound/flac.info (original)
+++ trunk/finkinfo/sound/flac.info Tue Feb 19 19:26:26 2008
@@ -1,8 +1,8 @@
 Package: flac
 Version: 1.2.1
 Revision: 1000
-BuildDepends: xmms, popt, libtool14 (= 1.5-1), libogg, xmms, readline5, 
id3lib4-dev (= 3.8.3-1014), glib, gtk+, libiconv-dev, libgettext3-dev, 
gettext-bin, gettext-tools, fink (= 0.24.12)
-Depends: libflac6 (= %v-%r)
+BuildDepends: libtool14 (= 1.5-1), libogg, readline5, id3lib4-dev (= 
3.8.3-1014), libiconv-dev, libgettext3-dev, gettext-bin, gettext-tools, fink 
(= 0.24.12)
+Depends: libflac8 (= %v-%r)
 Conflicts: flac-nox, flac-bin, flac ( 1.2.1)
 Replaces: flac-nox, flac-bin
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
@@ -19,26 +19,25 @@
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-I%p/include
 NoSetLDFLAGS: true
-ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386) 
--disable-asm-optimizations
+ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386) 
--disable-asm-optimizations --disable-xmms-plugin
 BuildDependsOnly: True
 GCC: 4.0
 
 CompileScript: 
   #!/bin/sh -ex
   ./configure %c
-  #/bin/sh patches/fixrpath.sh
   make OBJ_FORMAT=macho
 
 InstallScript: 
   #!/bin/sh -ex
-  bd=$(cd .  pwd -P)
-  perl -pi -e s#\Q$bd\E/src/libFLAC#%p/lib#g src/plugin_xmms/libxmms-flac.la
+  #bd=$(cd .  pwd -P)
+  #perl -pi -e s#\Q$bd\E/src/libFLAC#%p/lib#g src/plugin_xmms/libxmms-flac.la
   make install DESTDIR=%d 
   mv %i/share/doc/%n-%v %i/share/doc/%n 
 
 
 SplitOff: 
-  Package: libflac6
+  Package: libflac8
   Conflicts: flac-nox-shlibs
   Replaces: flac-nox-shlibs, flac
   Depends: libogg-shlibs
@@ -51,20 +50,12 @@
   DocFiles: README COPYING.LGPL
   Description: Free lossless audio codec - shared libs
 
-SplitOff2: 
-  Package: %N-xmms
-  

[cvs] dists/10.4/unstable/main/finkinfo/gnome gst-player.info, 1.9, 1.10 rhythmbox.info, 1.6, 1.7

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398/gnome

Modified Files:
gst-player.info rhythmbox.info 
Log Message:
new flac yay\!

Index: rhythmbox.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/rhythmbox.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rhythmbox.info  14 Jan 2007 15:22:44 -  1.6
+++ rhythmbox.info  19 Feb 2008 19:51:37 -  1.7
@@ -1,8 +1,8 @@
 Package: rhythmbox
 Version: 0.8.5
-Revision: 1012
-Depends: atk1-shlibs (= 1.6.0-1), audiofile-shlibs (= 0.2.5-1), 
esound-shlibs (= 0.2.34-1), flac-shlibs (= 1.1.1-1011) | flac-nox-shlibs (= 
1.1.1-1011), gconf2 (= 2.6.0-1), libgettext3-shlibs, glib2-shlibs (= 
2.12.0-1), gnome-vfs2 (= 2.6.0-1) | gnome-vfs2-ssl (= 2.6.0-1), gstreamer (= 
0.8.0-1), gst-plugins (= 0.8.0-1), gtk+2 (= 2.4.0-1), libart2-shlibs (= 
2.3.16-1), libbonobo2 (= 2.6.0-1), libbonoboui2 (= 2.6.0-1), libglade2-shlibs 
(= 2.3.6-1), libgnome2 (= 2.6.0-1), libgnomecanvas2 (= 2.6.0-1), libgnomeui2 
(= 2.6.0-1), libiconv, libid3tag-shlibs, libogg-shlibs, libvorbis0-shlibs, 
libxml2-shlibs (= 2.6.7-1), orbit2 (= 2.10.0-1), pango1-xft2 (= 1.4.0-1), 
popt-shlibs, x11, scrollkeeper (= 0.3.12-2)
-BuildDepends: glib2-dev (= 2.12.0-1), atk1 (= 1.6.0-1), audiofile (= 
0.2.5-1), pango1-xft2-dev (= 1.4.0-1), flac (= 1.1.1-1011) | flac-nox (= 
1.1.1-1011), gstreamer-dev (= 0.8.0-1), gst-plugins-dev (= 0.8.0-1), 
gtk+2-dev (= 2.4.0-1), libgnomecanvas2-dev (= 2.6.0-1), linc1 (= 1.0.3-1), 
orbit2-dev (= 2.10.0-1), gconf2-dev (= 2.6.0-1), dbus-dev (= 0.60-1), 
libhowl-dev, gnome-vfs2-dev (= 2.6.0-1) | gnome-vfs2-ssl-dev (= 2.6.0-1), 
libglade2 (= 2.3.6-1), libxml2 (= 2.6.7-1), libbonobo2-dev (= 2.6.0-1), 
libid3tag, libgnome2-dev (= 2.6.0-1), libbonoboui2-dev (= 2.6.0-1), 
libgnomeui2-dev (= 2.6.0-1), libjpeg, libogg, libvorbis0, pkgconfig, intltool, 
popt, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev, libart2 (= 
2.3.16-1), esound (= 0.2.34-1), gnome-keyring-dev, x11-dev
+Revision: 1013
+Depends: atk1-shlibs (= 1.6.0-1), audiofile-shlibs (= 0.2.5-1), 
esound-shlibs (= 0.2.34-1), libflac8, gconf2 (= 2.6.0-1), libgettext3-shlibs, 
glib2-shlibs (= 2.12.0-1), gnome-vfs2 (= 2.6.0-1) | gnome-vfs2-ssl (= 
2.6.0-1), gstreamer (= 0.8.0-1), gst-plugins (= 0.8.0-1), gtk+2 (= 2.4.0-1), 
libart2-shlibs (= 2.3.16-1), libbonobo2 (= 2.6.0-1), libbonoboui2 (= 
2.6.0-1), libglade2-shlibs (= 2.3.6-1), libgnome2 (= 2.6.0-1), 
libgnomecanvas2 (= 2.6.0-1), libgnomeui2 (= 2.6.0-1), libiconv, 
libid3tag-shlibs, libogg-shlibs, libvorbis0-shlibs, libxml2-shlibs (= 
2.6.7-1), orbit2 (= 2.10.0-1), pango1-xft2 (= 1.4.0-1), popt-shlibs, x11, 
scrollkeeper (= 0.3.12-2)
+BuildDepends: glib2-dev (= 2.12.0-1), atk1 (= 1.6.0-1), audiofile (= 
0.2.5-1), pango1-xft2-dev (= 1.4.0-1), libflac8-dev, gstreamer-dev (= 
0.8.0-1), gst-plugins-dev (= 0.8.0-1), gtk+2-dev (= 2.4.0-1), 
libgnomecanvas2-dev (= 2.6.0-1), linc1 (= 1.0.3-1), orbit2-dev (= 2.10.0-1), 
gconf2-dev (= 2.6.0-1), dbus-dev (= 0.60-1), libhowl-dev, gnome-vfs2-dev (= 
2.6.0-1) | gnome-vfs2-ssl-dev (= 2.6.0-1), libglade2 (= 2.3.6-1), libxml2 (= 
2.6.7-1), libbonobo2-dev (= 2.6.0-1), libid3tag, libgnome2-dev (= 2.6.0-1), 
libbonoboui2-dev (= 2.6.0-1), libgnomeui2-dev (= 2.6.0-1), libjpeg, libogg, 
libvorbis0, pkgconfig, intltool, popt, libgettext3-dev, gettext-bin, 
gettext-tools, libiconv-dev, libart2 (= 2.3.16-1), esound (= 0.2.34-1), 
gnome-keyring-dev, x11-dev
 Source: mirror:gnome:sources/%n/0.8/%n-%v.tar.bz2
 Source-MD5: 50d2ebb835f89e01c6fb0531d65c1341
 PatchScript: perl -pi -e 's/-scrollkeeper-update/#$/' help/C/Makefile.in

Index: gst-player.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gst-player.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gst-player.info 13 Jan 2007 23:11:19 -  1.9
+++ gst-player.info 19 Feb 2008 19:51:37 -  1.10
@@ -1,8 +1,8 @@
 Package: gst-player
 Version: 0.8.0
-Revision: 1004
-Depends: atk1-shlibs (= 1.6.0-1), audiofile-shlibs (= 0.2.5-1), 
esound-shlibs (= 0.2.34-1), flac-shlibs (= 1.1.1-1011) | flac-nox-shlibs (= 
1.1.1-1011), gconf2 (= 2.6.0-1), gettext, glib2 (= 2.6.6-), gnome-vfs2 
(= 2.6.0-1) | gnome-vfs2-ssl (= 2.6.0-1), gstreamer (= 0.8.0-1), gst-plugins 
(= 0.8.0-1), gtk+2 (= 2.4.0-1), libart2-shlibs (= 2.3.16-1), libbonobo2 (= 
2.6.0-1), libbonoboui2 (= 2.6.0-1), libglade2-shlibs (= 2.3.6-1), libgnome2 
(= 2.6.0-1), libgnomecanvas2 (= 2.6.0-1), libgnomeui2 (= 2.6.0-1), libiconv, 
libid3tag-shlibs, libogg-shlibs, libvorbis0-shlibs, libxml2-shlibs (= 
2.6.7-1), orbit2 (= 2.10.0-1), pango1-xft2 (= 1.4.0-1), popt, 
gnome-desktop4-shlibs, nautilus-shlibs
-BuildDepends: glib2-dev (= 2.6.6-), atk1 (= 1.6.0-1), audiofile (= 
0.2.5-1), 

[cvs] dists/10.4/unstable/main/finkinfo/kde kid3.info,1.5,1.6

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398/kde

Modified Files:
kid3.info 
Log Message:
new flac yay\!

Index: kid3.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kid3.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kid3.info   4 Dec 2007 16:10:00 -   1.5
+++ kid3.info   19 Feb 2008 19:51:38 -  1.6
@@ -1,9 +1,9 @@
 Package: kid3
 Version: 0.10
-Revision: 1002
+Revision: 1003
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Depends: kdelibs3-unified (= 3.5-1), x11-shlibs, x11, expat1-shlibs, 
flac-shlibs, id3lib4-shlibs, libmusicbrainz4-shlibs, libogg-shlibs, 
libtunepimp3-shlibs, libvorbis0-shlibs, taglib-shlibs, libgettext3-shlibs, 
libmp4v21-shlibs, freetype219-shlibs
-BuildDepends: libart2, freetype219, kdelibs3-unified-dev (= 3.5-1), libidn, 
libpng3, qt3, x11-dev, libiconv-dev, arts-dev, gettext-tools, libxml2-bin, 
libjpeg, expat1, flac, id3lib4-dev, libgettext3-dev, libtunepimp3, libvorbis0, 
taglib, libmusicbrainz4, libogg
+Depends: kdelibs3-unified (= 3.5-1), x11-shlibs, x11, expat1-shlibs, 
libflac8, id3lib4-shlibs, libmusicbrainz4-shlibs, libogg-shlibs, 
libtunepimp3-shlibs, libvorbis0-shlibs, taglib-shlibs, libgettext3-shlibs, 
libmp4v21-shlibs, freetype219-shlibs
+BuildDepends: libart2, freetype219, kdelibs3-unified-dev (= 3.5-1), libidn, 
libpng3, qt3, x11-dev, libiconv-dev, arts-dev, gettext-tools, libxml2-bin, 
libjpeg, expat1, libflac8-dev, id3lib4-dev, libgettext3-dev, libtunepimp3, 
libvorbis0, taglib, libmusicbrainz4, libogg
 Recommends: kdebase3-unified (= 3.5-1), xmms
 GCC: 4.0
 Maintainer: Jack Fink [EMAIL PROTECTED]


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/net aircrack-ng.info, 1.1, 1.2 lopster.info, 1.4, 1.5

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398/net

Modified Files:
aircrack-ng.info lopster.info 
Log Message:
new flac yay\!

Index: aircrack-ng.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/aircrack-ng.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- aircrack-ng.info12 Feb 2008 13:00:15 -  1.1
+++ aircrack-ng.info19 Feb 2008 19:51:38 -  1.2
@@ -9,7 +9,7 @@
 
 CompileScript: make all LDFLAGS=-L%p/lib/system-openssl/lib -L%p/lib 
OPTFLAGS='-I%p/lib/system-openssl/include -I%p/include -D_FILE_OFFSET_BITS=64' 
sqlite=true
 InstallScript: 
-make install prefix=%p DESTDIR=%d
+make install prefix='%p' DESTDIR='%d' mandir='%p/share/man/man1'
 mkdir -p %i/share/doc/%n
 cp -r test %i/share/doc/%n/
 

Index: lopster.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/lopster.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lopster.info24 Feb 2006 13:29:58 -  1.4
+++ lopster.info19 Feb 2008 19:51:38 -  1.5
@@ -1,11 +1,11 @@
 Package: lopster
 Version: 1.2.2
-Revision: 1001
+Revision: 1002
 Description: Modern OpenNap client based on GTK+
 License: GPL
 Maintainer: Dave Vasilevsky [EMAIL PROTECTED]
-Depends: gtk+-shlibs, libogg-shlibs, flac-shlibs (= 1.1.1-1011) | 
flac-nox-shlibs (= 1.1.1-1011), launch
-BuildDepends: gtk+, glib, libogg, gettext-dev, gettext-bin, gettext-tools, 
flac (= 1.1.1-1011) | flac-nox (= 1.1.1-1011)
+Depends: gtk+-shlibs, libogg-shlibs, libflac8, launch
+BuildDepends: gtk+, glib, libogg, gettext-dev, gettext-bin, gettext-tools, 
libflac8
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: ae857116eddd01f1f7d2769908a142c0
 Patch: %n.patch


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sound flac.info, 1.5, 1.6 flac.patch, 1.2, 1.3 jack.info, 1.6, 1.7 libsndfile1.info, 1.8, 1.9 libtunepimp2.info, 1.4, 1.5 libtunepimp3.info, 1.3, 1.4 sdl-sound.

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398/sound

Modified Files:
flac.info flac.patch jack.info libsndfile1.info 
libtunepimp2.info libtunepimp3.info sdl-sound.info 
twolame.info 
Removed Files:
flac-nox.info flac-nox.patch 
Log Message:
new flac yay\!

Index: libtunepimp2.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libtunepimp2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libtunepimp2.info   18 May 2006 18:43:53 -  1.4
+++ libtunepimp2.info   19 Feb 2008 19:51:39 -  1.5
@@ -1,12 +1,12 @@
 Package: libtunepimp2
 Version: 0.3.0
-Revision: 1024
+Revision: 1025
 Description: Library for musicbrainz tagging
 License: LGPL
 Maintainer: Benjamin Reed [EMAIL PROTECTED]
 
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: expat, flac (= 1.1.1-1011), libmad, libmusicbrainz4 (= 
2.1.1-1001), libogg, libvorbis0
+BuildDepends: expat, libflac8-dev , libmad, libmusicbrainz4 (= 2.1.1-1001), 
libogg, libvorbis0
 Conflicts: libtunepimp3
 Replaces: libtunepimp3
 BuildDependsOnly: true
@@ -27,7 +27,7 @@
 SplitOff: 
Package: %N-shlibs
Description: Shared libraries for tunepimp
-   Depends: expat-shlibs, flac-shlibs (= 1.1.1-1011), libmad-shlibs, 
libmusicbrainz4-shlibs (= 2.1.1-1001), libogg-shlibs, libvorbis0-shlibs
+   Depends: expat-shlibs, libflac8-shlibs, libmad-shlibs, 
libmusicbrainz4-shlibs (= 2.1.1-1001), libogg-shlibs, libvorbis0-shlibs
Files: lib/libtunepimp.*.dylib
Shlibs: %p/lib/libtunepimp.2.dylib 3.0.0 %n (= 0.3.0-1)
 

--- flac-nox.patch DELETED ---

Index: flac.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/flac.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- flac.info   9 Nov 2007 12:17:49 -   1.5
+++ flac.info   19 Feb 2008 19:51:39 -  1.6
@@ -1,85 +1,79 @@
 Package: flac
-Version: 1.1.1
-Revision: 1013
-BuildDepends: xmms,popt, libtool14 (= 1.5-1), libogg, xmms, readline (= 
4.3-1028), id3lib4-dev (= 3.8.3-1014), glib, gtk+, libiconv-dev, gettext-dev, 
gettext-bin, gettext-tools
-#automake1.6,
-Depends: %n-shlibs (= %v-%r)
-Conflicts: flac-nox
-Replaces: flac-nox
+Version: 1.2.1
+Revision: 1000
+BuildDepends: libtool14 (= 1.5-1), libogg, readline5, id3lib4-dev (= 
3.8.3-1014), libiconv-dev, libgettext3-dev, gettext-bin, gettext-tools, fink 
(= 0.24.12)
+Depends: libflac8 (= %v-%r)
+Conflicts: flac-nox, flac-bin, flac ( 1.2.1)
+Replaces: flac-nox, flac-bin
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: c6ccddccf8ad344065698047c2fc7280
+Source-MD5: 153c8b15a54da428d1f0fadc756c22c7
+PatchFile: %n.patch
+PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0
 PatchScript: 
-sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
-perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
-perl -pi.bak -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
+  #!/bin/sh -ex
+  patch -p1  %{PatchFile}
+  patch -p0  patches/ltmain.sh.patch
+  patch -p0  patches/nasm.h.patch
 
+
 NoSetCPPFLAGS: true
 SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-I%p/include
 NoSetLDFLAGS: true
-#hardcode_direct avoids this:
-#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libOggFLAC++/.libs 
-L%b/src/libFLAC/.libs -L%b/src/libFLAC++/.libs
-ConfigureParams: --mandir=%p/share/man
+ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386) 
--disable-asm-optimizations --disable-xmms-plugin
 BuildDependsOnly: True
 GCC: 4.0
+
 CompileScript: 
   #!/bin/sh -ex
-#  mkdir -p %b/src/libOggFLAC/.libs 
-#  mkdir -p %b/src/libFLAC/.libs 
-#  mkdir -p %b/src/libFLAC++/.libs 
-#  %p/bin/glibtoolize --force
-#  ./autogen.sh
-  rm -rf plugin_xmms
   ./configure %c
   make OBJ_FORMAT=macho
 
 InstallScript: 
   #!/bin/sh -ex
+  #bd=$(cd .  pwd -P)
+  #perl -pi -e s#\Q$bd\E/src/libFLAC#%p/lib#g src/plugin_xmms/libxmms-flac.la
   make install DESTDIR=%d 
   mv %i/share/doc/%n-%v %i/share/doc/%n 
 
+
 SplitOff: 
-  Package: %N-shlibs
+  Package: libflac8
   Conflicts: flac-nox-shlibs
   Replaces: flac-nox-shlibs, flac
   Depends: libogg-shlibs
-  Suggests: %N-bin
-  Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib lib/libOggFLAC.*.dylib 
lib/libOggFLAC++.*.dylib 
+  Suggests: %N
+  Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib
   Shlibs: 
-%p/lib/libFLAC.6.dylib 7.0.0 %n (= 1.1.1-10)
-%p/lib/libFLAC++.4.dylib 5.0.0 %n (= 1.1.1-10)
-%p/lib/libOggFLAC.1.dylib 3.0.0 %n (= 1.1.1-10)
-%p/lib/libOggFLAC++.0.dylib 2.0.0 %n (= 1.1.1-10)
+%p/lib/libFLAC.8.dylib 11.0.0 %n (= 1.2.1-1)
+%p/lib/libFLAC++.6.dylib 9.0.0 %n (= 1.2.1-1)
   
   DocFiles: README COPYING.LGPL
   Description: Free lossless audio codec - shared libs
 
-SplitOff2: 
-  

[cvs] dists/10.4/unstable/main/finkinfo/libs libxine1.info, 1.19, 1.20 simage27.info, 1.5, 1.6

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29398/libs

Modified Files:
libxine1.info simage27.info 
Log Message:
new flac yay\!

Index: simage27.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/simage27.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- simage27.info   31 May 2006 21:14:26 -  1.5
+++ simage27.info   19 Feb 2008 19:51:38 -  1.6
@@ -3,7 +3,7 @@
 Revision: 1003
 GCC: 4.0
 BuildDependsOnly: true
-BuildDepends: libogg, libsndfile1-dev, libvorbis0, mjpegtools2-dev (= 
1.6.2-1003), flac (= 1.1.1-1001)
+BuildDepends: libogg, libsndfile1-dev, libvorbis0, mjpegtools2-dev (= 
1.6.2-1003), libflac8-dev
 Depends: %N-shlibs (= %v-%r)
 Source: ftp://ftp.sim.no/pub/coin/src/simage-%v.tar.gz
 Source-MD5: d4c836ab282388392a65cd0650f224c5
@@ -15,7 +15,7 @@
 
 SplitOff: 
   Package: %N-shlibs
-  Depends: libogg-shlibs, libsndfile1-shlibs, libvorbis0-shlibs, 
mjpegtools2-shlibs (= 1.6.2-1003), flac-shlibs (= 1.1.1-1001)
+  Depends: libogg-shlibs, libsndfile1-shlibs, libvorbis0-shlibs, 
mjpegtools2-shlibs (= 1.6.2-1003), libflac8
   Files: lib/libsimage.20.6.1.dylib lib/libsimage.20.dylib
   DocFiles: AUTHORS COPYING NEWS README
   Description: Shared libraries for simage package for Coin

Index: libxine1.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libxine1.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- libxine1.info   29 Nov 2007 05:38:33 -  1.19
+++ libxine1.info   19 Feb 2008 19:51:38 -  1.20
@@ -1,12 +1,12 @@
 Package: libxine1
 Version: 1.1.2
-Revision: 1022
+Revision: 1023
 Description: Xine video/media player library
 License: GPL
 Maintainer: Justin F. Hallett [EMAIL PROTECTED]
 
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (= 0.24-1), aalib, arts-dev (= 1.4.0-2041), audiofile, 
bzip2-shlibs, esound, flac (= 1.1.1-1011), freetype219, gconf2-dev, 
gettext-bin, gettext-tools, glib2-dev (= 2.8.6-123), gnome-vfs2-ssl-dev | 
gnome-vfs2-dev, imagemagick-dev (= 6.1.8-1002) | imagemagick10-dev (= 
6.1.8-1002), lcms, libbonobo2-dev, libcaca-dev, libcdio-dev, libgettext3-dev, 
libiconv-dev, libiso9660-dev, libjpeg, libmng2, libncurses5 (= 
5.4-20041023-1006), libogg, libpng3, libtheora0, libtiff, libtool14, libvcd-dev 
(= 0.7.21-10), libvorbis0, libxml2, orbit2-dev, pkgconfig, popt, pth, qt3 (= 
3.3.6-1027), sdl (= 1.2.9-1001), slang, speex3, x11-dev, libhowl-dev
+BuildDepends: fink (= 0.24-1), aalib, arts-dev (= 1.4.0-2041), audiofile, 
bzip2-shlibs, esound, libflac8-dev , freetype219, gconf2-dev, gettext-bin, 
gettext-tools, glib2-dev (= 2.8.6-123), gnome-vfs2-ssl-dev | gnome-vfs2-dev, 
imagemagick-dev (= 6.1.8-1002) | imagemagick10-dev (= 6.1.8-1002), lcms, 
libbonobo2-dev, libcaca-dev, libcdio-dev, libgettext3-dev, libiconv-dev, 
libiso9660-dev, libjpeg, libmng2, libncurses5 (= 5.4-20041023-1006), libogg, 
libpng3, libtheora0, libtiff, libtool14, libvcd-dev (= 0.7.21-10), libvorbis0, 
libxml2, orbit2-dev, pkgconfig, popt, pth, qt3 (= 3.3.6-1027), sdl (= 
1.2.9-1001), slang, speex3, x11-dev, libhowl-dev
 Provides: libxine
 Conflicts: libxine, libxine-docs
 Replaces: libxine, libxine-shlibs, libxine-docs
@@ -55,7 +55,7 @@
 DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
 SplitOff: 
Package: %N-shlibs
-   Depends: aalib-shlibs, arts-shlibs (= 1.4.0-2041), audiofile-shlibs, 
bzip2-shlibs, esound-shlibs, flac-shlibs (= 1.1.1-1011), freetype219-shlibs, 
gconf2-shlibs, glib2-shlibs (= 2.8.6-123), gnome-vfs2-ssl-shlibs | 
gnome-vfs2-shlibs, imagemagick-shlibs (= 6.1.8-1002), lcms-shlibs, 
libbonobo2-shlibs, libcdio7-shlibs (= 0.77-12), libgettext3-shlibs, libiconv, 
libiso96605-shlibs, libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs (= 
5.4-20041023-1006), libogg-shlibs, libpng3-shlibs, libtheora0-shlibs, 
libtiff-shlibs, libtool14-shlibs, libvcd0-shlibs (= 0.7.21-10), 
libvorbis0-shlibs, libxml2-shlibs, orbit2-shlibs, popt-shlibs, qt3-shlibs (= 
3.3.6-1027), sdl-shlibs (= 1.2.9-1001), slang-shlibs, speex3-shlibs, x11-shlibs
+   Depends: aalib-shlibs, arts-shlibs (= 1.4.0-2041), audiofile-shlibs, 
bzip2-shlibs, esound-shlibs, libflac8, freetype219-shlibs, gconf2-shlibs, 
glib2-shlibs (= 2.8.6-123), gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, 
imagemagick-shlibs (= 6.1.8-1002), lcms-shlibs, libbonobo2-shlibs, 
libcdio7-shlibs (= 0.77-12), libgettext3-shlibs, libiconv, libiso96605-shlibs, 
libjpeg-shlibs, libmng2-shlibs, libncurses5-shlibs (= 5.4-20041023-1006), 
libogg-shlibs, libpng3-shlibs, libtheora0-shlibs, libtiff-shlibs, 
libtool14-shlibs, libvcd0-shlibs (= 0.7.21-10), libvorbis0-shlibs, 
libxml2-shlibs, orbit2-shlibs, popt-shlibs, qt3-shlibs (= 3.3.6-1027), 
sdl-shlibs (= 1.2.9-1001), 

[cvs] dists/10.4/unstable/main/finkinfo/sound flac-xmms.info, NONE, 1.1

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29881

Added Files:
flac-xmms.info 
Log Message:
new flac yay\!

--- NEW FILE: flac-xmms.info ---
Package: flac-xmms
Version: 1.2.1
Revision: 1000
BuildDepends: xmms, popt, libtool14 (= 1.5-1), libogg, xmms, readline5, 
id3lib4-dev (= 3.8.3-1014), glib, gtk+, libiconv-dev, libgettext3-dev, 
gettext-bin, gettext-tools, fink (= 0.24.12), libflac8-dev
Depends: libflac8 (= %v-%r), id3lib4-shlibs (= 3.8.3-1014), popt-shlibs, 
xmms-bin
Conflicts: flac-nox, flac-bin, flac ( 1.2.1)
Replaces: flac-nox, flac-bin
Source: mirror:sourceforge:flac/flac-%v.tar.gz
Source-MD5: 153c8b15a54da428d1f0fadc756c22c7
PatchFile: flac.patch
PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0
PatchScript: 
  #!/bin/sh -ex
  patch -p1  %{PatchFile}
  patch -p0  patches/ltmain.sh.patch
  patch -p0  patches/nasm.h.patch


NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include 
-I%p/include
NoSetLDFLAGS: true
ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386) 
--disable-asm-optimizations
BuildDependsOnly: True
GCC: 4.0

CompileScript: 
  #!/bin/sh -ex
  ./configure %c
  #/bin/sh patches/fixrpath.sh
  make OBJ_FORMAT=macho


InstallScript: 
  #!/bin/sh -ex
  bd=$(cd %b  pwd -P)
  perl -pi -e s#\Q$bd\E/src/libFLAC#%p/lib#g src/plugin_xmms/libxmms-flac.la
  cd src/plugin_xmms
  make install DESTDIR=%d 


DocFiles: AUTHORS COPYING* README

Description: Free lossless audio codec - xmms plugin
DescDetail: 
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
*  The stream format
In the libflacX packages:
*  libFLAC, a library encoders and decoders, and a metadata interface
*  libFLAC++, an object wrapper around libFLAC
In the flac package:
*  flac, a CLI wrapper around libFLAC to encode/decode .flac files
*  metaflac, a command-line metadata editor for .flac files
In the flac-xmms package:
*  Input plugin for XMMS

DescPackaging: 
Does not use pbxbuild method since we want dylibs, and
the xmms plugin. Also the make/config method puts everything in
the right place.
libtool relink and bash versioning patches applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.

License: GPL
Maintainer: Ben Hines [EMAIL PROTECTED]
Homepage: http://flac.sourceforge.net/


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sound flac.info,1.6,1.7

2008-02-19 Thread Chris Zubrzycki
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31025

Modified Files:
flac.info 
Log Message:
forgot


Index: flac.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/flac.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flac.info   19 Feb 2008 19:51:39 -  1.6
+++ flac.info   19 Feb 2008 19:55:30 -  1.7
@@ -52,8 +52,8 @@
 
 SplitOff3: 
   Package: libflac8-dev
-  Conflicts: flac-nox-bin
-  Replaces: flac-nox-bin
+  Conflicts: flac-nox-bin, flac ( 1.2.1-1), flaci-nox ( 1.2.1-1)
+  Replaces: flac-nox-bin, flac ( 1.2.1-1), flaci-nox ( 1.2.1-1)
   Files: include lib share/aclocal
   Depends: libflac8, libiconv
   DocFiles: README COPYING.LGPL


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/libs libgpod3.info, NONE, 1.1 libgpod0.info, 1.7, 1.8 libgpod1.info, 1.4, 1.5

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3184/main/finkinfo/libs

Modified Files:
libgpod0.info libgpod1.info 
Added Files:
libgpod3.info 
Log Message:
new libgpod, also remove obsolete tunepimp2

Index: libgpod1.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgpod1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgpod1.info   17 Mar 2007 01:04:04 -  1.4
+++ libgpod1.info   19 Feb 2008 20:06:12 -  1.5
@@ -1,34 +1,38 @@
 Package: libgpod1
 Version: 0.4.2
-Revision: 4
+Revision: 6
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: atk1 (= 1.6.0-1), glib2-dev (= 2.6.6-1), gtk+2-dev, intltool 
(= 0.33-1), libgettext3-dev, libiconv, pango1-xft2-dev (= 1.8.0-1), pkgconfig
+BuildDepends: 
+   atk1,
+   glib2-dev,
+   gtk+2-dev,
+   intltool,
+   libgettext3-dev,
+   libiconv-dev,
+   pango1-xft2-dev,
+   pkgconfig
+
 BuildDependsOnly: true
 
-Conflicts: libgpod0
-Replaces: libgpod0
+Conflicts: libgpod0, libgpod3
+Replaces: libgpod0, libgpod3
 Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
 Source-MD5: c3c031dc6f1f6eff422598c84f2621bd
-Patch: %n.patch
+#Patch: %n.patch
+SetCPPFLAGS: -fnested-functions
 PatchScript: perl -pi -e 
's,GETTEXT_PACKAGE=libgpod,GETTEXT_PACKAGE=libgpod-1.0,' configure
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
-CompileScript: 
-#!/bin/sh -ev
-
-   case `uname -r` in
-   7*)
-   export CPPFLAGS=$CPPFLAGS -DNO_STATVFS
-   ;;
-   esac
-   ./configure %c
-   make
-
 InstallScript: make -j1 install DESTDIR=%d
 SplitOff: 
Package: %N-shlibs
Description: Shared libraries for libgpod
-   Depends: glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv
-   Files: lib/libgpod.*.dylib share/locale
+   Depends: 
+   glib2-shlibs,
+   gtk+2-shlibs,
+   libgettext3-shlibs,
+   libiconv
+   
+   Files: lib/libgpod.1*.dylib share/locale
Shlibs: %p/lib/libgpod.1.dylib 2.0.0 libgpod1-shlibs (= 0.4.2-1)
 
 

Index: libgpod0.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgpod0.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- libgpod0.info   7 Nov 2007 21:22:31 -   1.7
+++ libgpod0.info   19 Feb 2008 20:06:12 -  1.8
@@ -1,23 +1,38 @@
 Package: libgpod0
 Version: 0.3.2
-Revision: 4
+Revision: 6
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: atk1 (= 1.6.0-1), glib2-dev (= 2.6.6-1), gtk+2-dev, intltool 
(= 0.33-1), libgettext3-dev, libiconv-dev, pango1-xft2-dev (= 1.8.0-1), 
pkgconfig
+BuildDepends: 
+   atk1,
+   glib2-dev,
+   gtk+2-dev,
+   intltool,
+   libgettext3-dev,
+   libiconv-dev,
+   pango1-xft2-dev,
+   pkgconfig
+
 BuildDependsOnly: true
 
-Conflicts: libgpod1
-Replaces: libgpod1
+Conflicts: libgpod1, libgpod3
+Replaces: libgpod1, libgpod3
 Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
 Source-MD5: c9c41625347a33efd9441c4e71fdd04e
-Patch: %n.patch
+#Patch: %n.patch
+SetCPPFLAGS: -fnested-functions
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install DESTDIR=%d
 SplitOff: 
Package: %N-shlibs
Description: Shared libraries for libgpod
-   Depends: glib2-shlibs, gtk+2-shlibs, libgettext3-shlibs, libiconv
+   Depends: 
+   glib2-shlibs,
+   gtk+2-shlibs,
+   libgettext3-shlibs,
+   libiconv
+   
Replaces: libgpod0 ( 0.3.2-3)
-   Files: lib/libgpod.*.dylib share/locale
+   Files: lib/libgpod.0*.dylib share/locale
Shlibs: %p/lib/libgpod.0.dylib 303.0.0 libgpod0-shlibs (= 0.3.2-1)
 
 

--- NEW FILE: libgpod3.info ---
Package: libgpod3
Version: 0.6.0
Revision: 1
Depends: %N-shlibs (= %v-%r)
BuildDepends: 
atk1,
glib2-dev,
gtk+2-dev,
intltool,
libgettext3-dev,
libiconv-dev,
pango1-xft2-dev,
pkgconfig

BuildDependsOnly: true

Conflicts: libgpod0, libgpod1
Replaces: libgpod0, libgpod1
Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
Source-MD5: b44d8aee3f6610370b6faf61770c5f3c
SetCPPFLAGS: -fnested-functions
PatchScript: perl -pi -e 
's,GETTEXT_PACKAGE=libgpod,GETTEXT_PACKAGE=libgpod-3.0,' configure
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
InstallScript: make -j1 install DESTDIR=%d
SplitOff: 
Package: %N-shlibs
Description: Shared libraries for libgpod
Depends: 
glib2-shlibs,
gtk+2-shlibs,
libgettext3-shlibs,
   

[cvs] dists/10.4/unstable/main/finkinfo/sound libtunepimp2.info, 1.5, NONE

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3184/main/finkinfo/sound

Removed Files:
libtunepimp2.info 
Log Message:
new libgpod, also remove obsolete tunepimp2

--- libtunepimp2.info DELETED ---


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[svn] commit: r1144 - in /trunk/experimental: 10.4/main/finkinfo/sound/ common/main/finkinfo/sound/

2008-02-19 Thread ranger
Author: ranger
Date: Tue Feb 19 21:17:00 2008
New Revision: 1144

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1rev=1144repname=user%3a+ranger
Log:
use new flac, also get rid of old tunepimp

Added:
trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.patch
trunk/experimental/common/main/finkinfo/sound/libtunepimp3.patch
Removed:
trunk/experimental/10.4/main/finkinfo/sound/libtunepimp2.info
trunk/experimental/common/main/finkinfo/sound/libtunepimp2.info
Modified:
trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.info
trunk/experimental/common/main/finkinfo/sound/libtunepimp3.info

Modified: trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.inforev=1144repname=user%3a+ranger
==
--- trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.info (original)
+++ trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.info Tue Feb 19 
21:17:00 2008
@@ -1,6 +1,6 @@
 Package: libtunepimp3
-Version: 0.4.2
-Revision: 3
+Version: 0.4.4
+Revision: 1
 Description: Library for musicbrainz tagging
 License: LGPL
 Maintainer: Benjamin Reed [EMAIL PROTECTED]
@@ -8,7 +8,7 @@
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: 
expat1,
-   flac (= 1.1.1-1011) | flac-nox (= 1.1.1-1011),
+   libflac8-dev,
libgettext3-dev,
libiconv-dev,
libmad,
@@ -30,12 +30,15 @@
aus-AU: ftp://ftp.au.musicbrainz.org/pub/musicbrainz
 
 Source: mirror:custom:libtunepimp-%v.tar.gz
-Source-MD5: 10b9e4a2f1930aed78ef7ddaebbe0fde
+Source-MD5: 9e66431e28fc9a8b741a4a0fa84935d0
 SourceDirectory: libtunepimp-%v
 PatchScript: 
+   %{default_script}
perl -pi -e 's,lib/tunepimp,lib/tunepimp3,g' lib/tunepimp.cpp
perl -pi -e 's,tunepimp/plugins,tunepimp3/plugins,g' Makefile.in
 
+PatchFile: %n.patch
+PatchFile-MD5: 7d8306f17193c14f8d99f9b1ceaf3a76
 
 SetCPPFLAGS: -DHAVE_SOCKLEN_T=1
 ConfigureParams: --mandir='${prefix}/share/man'
@@ -45,7 +48,7 @@
Description: Shared libraries for tunepimp
Depends: 
expat1-shlibs,
-   flac-shlibs (= 1.1.1-1011) | flac-nox (= 1.1.1-1011),
+   libflac8,
libgettext3-shlibs,
libiconv,
libmad-shlibs,

Added: trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.patch
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.patchrev=1144repname=user%3a+ranger
==
--- trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.patch (added)
+++ trunk/experimental/10.4/main/finkinfo/sound/libtunepimp3.patch Tue Feb 19 
21:17:00 2008
@@ -1,0 +1,131 @@
+diff -Nurd libtunepimp-0.4.4/plugins/flac/flac_meta.cpp 
libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp
+--- libtunepimp-0.4.4/plugins/flac/flac_meta.cpp   2006-10-13 
16:06:46.0 -0400
 libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp   2008-02-19 
15:10:43.0 -0500
+@@ -21,7 +21,7 @@
+ along with libtunepimp; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-$Id: flac_meta.cpp 1472 2006-01-22 14:26:17Z luks $
++$Id: flac_meta.cpp 7325 2006-04-25 07:57:00Z luks $
+ 
+ */
+   // 
---
+@@ -243,8 +243,6 @@
+   if (get_comment(tagmap, MUSICBRAINZ_ALBUMARTISTSORTNAME, val))
+   metadata.albumArtistSortName = string(val.c_str());
+}
+-   if (get_comment(tagmap, MUSICBRAINZ_TRMID, val))
+-  metadata.fileTrm = string(val.c_str());
+if (get_comment(tagmap, RELEASECOUNTRY, val))
+   metadata.releaseCountry = string(val.c_str());
+ if (get_comment(tagmap, MUSICBRAINZ_NONALBUM, val))
+@@ -322,7 +320,6 @@
+add_comment(tagmap, MUSICBRAINZ_ALBUMSTATUS, temp.c_str());
+}
+add_comment(tagmap, MUSICBRAINZ_ARTISTID, metadata.artistId.c_str());
+-   add_comment(tagmap, MUSICBRAINZ_TRMID, metadata.fileTrm.c_str());
+if (!metadata.albumArtistId.empty())
+{
+ add_comment(tagmap, MUSICBRAINZ_ALBUMARTISTID, 
metadata.albumArtistId.c_str());
+diff -Nurd libtunepimp-0.4.4/plugins/flac/flacdecode.cpp 
libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp
+--- libtunepimp-0.4.4/plugins/flac/flacdecode.cpp  2006-10-13 
16:06:46.0 -0400
 libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp  2008-02-19 
15:10:43.0 -0500
+@@ -21,13 +21,21 @@
+along with libtunepimp; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-   $Id: flacdecode.cpp 1394 2005-06-16 06:44:37Z robert $
++   $Id: flacdecode.cpp 

[svn] commit: r1145 - in /trunk/experimental/common/main/finkinfo/libs: libgpod0.info libgpod1.info libgpod3.info

2008-02-19 Thread ranger
Author: ranger
Date: Tue Feb 19 21:17:36 2008
New Revision: 1145

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1rev=1145repname=user%3a+ranger
Log:
updated libgpod(s)

Added:
trunk/experimental/common/main/finkinfo/libs/libgpod3.info
Modified:
trunk/experimental/common/main/finkinfo/libs/libgpod0.info
trunk/experimental/common/main/finkinfo/libs/libgpod1.info

Modified: trunk/experimental/common/main/finkinfo/libs/libgpod0.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libgpod0.inforev=1145repname=user%3a+ranger
==
--- trunk/experimental/common/main/finkinfo/libs/libgpod0.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libgpod0.info Tue Feb 19 
21:17:36 2008
@@ -1,23 +1,38 @@
 Package: libgpod0
 Version: 0.3.2
-Revision: 5
+Revision: 6
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: atk1 (= 1.20.0-1), glib2-dev (= 2.12.0-1), gtk+2-dev (= 
2.10.2-1), intltool (= 0.33-1), libgettext3-dev, libiconv-dev, pango1-xft2-dev 
(= 1.8.0-1), pkgconfig (= 0.21-1)
+BuildDepends: 
+   atk1,
+   glib2-dev,
+   gtk+2-dev,
+   intltool,
+   libgettext3-dev,
+   libiconv-dev,
+   pango1-xft2-dev,
+   pkgconfig
+
 BuildDependsOnly: true
 
-Conflicts: libgpod1
-Replaces: libgpod1
+Conflicts: libgpod1, libgpod3
+Replaces: libgpod1, libgpod3
 Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
 Source-MD5: c9c41625347a33efd9441c4e71fdd04e
-Patch: %n.patch
+#Patch: %n.patch
+SetCPPFLAGS: -fnested-functions
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
-InstallScript: make install DESTDIR=%d
+InstallScript: make -j1 install DESTDIR=%d
 SplitOff: 
Package: %N-shlibs
Description: Shared libraries for libgpod
-   Depends: glib2-shlibs (= 2.12.0-1), gtk+2-shlibs (= 2.10.2-1), 
libgettext3-shlibs, libiconv
+   Depends: 
+   glib2-shlibs,
+   gtk+2-shlibs,
+   libgettext3-shlibs,
+   libiconv
+   
Replaces: libgpod0 ( 0.3.2-3)
-   Files: lib/libgpod.*.dylib share/locale
+   Files: lib/libgpod.0*.dylib share/locale
Shlibs: %p/lib/libgpod.0.dylib 303.0.0 libgpod0-shlibs (= 0.3.2-1)
 
 

Modified: trunk/experimental/common/main/finkinfo/libs/libgpod1.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/libgpod1.inforev=1145repname=user%3a+ranger
==
--- trunk/experimental/common/main/finkinfo/libs/libgpod1.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/libgpod1.info Tue Feb 19 
21:17:36 2008
@@ -1,34 +1,38 @@
 Package: libgpod1
 Version: 0.4.2
-Revision: 5
+Revision: 6
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: atk1 (= 1.20.0-1), glib2-dev (= 2.12.0-1), gtk+2-dev (= 
2.10.2-1), intltool (= 0.33-1), libgettext3-dev, libiconv-dev, pango1-xft2-dev 
(= 1.8.0-1), pkgconfig (= 0.21-1)
+BuildDepends: 
+   atk1,
+   glib2-dev,
+   gtk+2-dev,
+   intltool,
+   libgettext3-dev,
+   libiconv-dev,
+   pango1-xft2-dev,
+   pkgconfig
+
 BuildDependsOnly: true
 
-Conflicts: libgpod0
-Replaces: libgpod0
+Conflicts: libgpod0, libgpod3
+Replaces: libgpod0, libgpod3
 Source: mirror:sourceforge:gtkpod/libgpod-%v.tar.gz
 Source-MD5: c3c031dc6f1f6eff422598c84f2621bd
-Patch: %n.patch
+#Patch: %n.patch
+SetCPPFLAGS: -fnested-functions
 PatchScript: perl -pi -e 
's,GETTEXT_PACKAGE=libgpod,GETTEXT_PACKAGE=libgpod-1.0,' configure
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
-CompileScript: 
-#!/bin/sh -ev
-
-   case `uname -r` in
-   7*)
-   export CPPFLAGS=$CPPFLAGS -DNO_STATVFS
-   ;;
-   esac
-   ./configure %c
-   make
-
 InstallScript: make -j1 install DESTDIR=%d
 SplitOff: 
Package: %N-shlibs
Description: Shared libraries for libgpod
-   Depends: glib2-shlibs (= 2.12.0-1), gtk+2-shlibs (= 2.10.2-1), 
libgettext3-shlibs, libiconv
-   Files: lib/libgpod.*.dylib share/locale
+   Depends: 
+   glib2-shlibs,
+   gtk+2-shlibs,
+   libgettext3-shlibs,
+   libiconv
+   
+   Files: lib/libgpod.1*.dylib share/locale
Shlibs: %p/lib/libgpod.1.dylib 2.0.0 libgpod1-shlibs (= 0.4.2-1)
 
 

Added: trunk/experimental/common/main/finkinfo/libs/libgpod3.info
URL: 
http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/libs/libgpod3.inforev=1145repname=user%3a+ranger
==
--- trunk/experimental/common/main/finkinfo/libs/libgpod3.info (added)
+++ trunk/experimental/common/main/finkinfo/libs/libgpod3.info Tue Feb 19 
21:17:36 2008
@@ -1,0 +1,51 @@
+Package: libgpod3
+Version: 0.6.0

[cvs] dists/10.4/stable/main/finkinfo/sound libtunepimp2.info, 1.2, NONE

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sound
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6765/stable/main/finkinfo/sound

Removed Files:
libtunepimp2.info 
Log Message:
remove this one too

--- libtunepimp2.info DELETED ---


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/graphics freetype219.info, 1.12.2.11, 1.12.2.12

2008-02-19 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19292

Modified Files:
  Tag: pangocairo-branch
freetype219.info 
Log Message:
link upstream bug


Index: freetype219.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/freetype219.info,v
retrieving revision 1.12.2.11
retrieving revision 1.12.2.12
diff -u -d -r1.12.2.11 -r1.12.2.12
--- freetype219.info5 Feb 2008 16:49:26 -   1.12.2.11
+++ freetype219.info20 Feb 2008 03:33:28 -  1.12.2.12
@@ -70,7 +70,8 @@
   - integrated endianness fix from freetype CVS
 * 2008-02-05 Daniel Macks [EMAIL PROTECTED]
   - split separate -frameworks into separate words so pkg-config
-can de-dup them individually
+can de-dup them individually. See:
+https://savannah.nongnu.org/bugs/index.php?22366
 
 License: OSI-Approved
 Homepage: http://www.freetype.org/


-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sound libtunepimp3.patch, NONE, 1.1 libtunepimp3.info, 1.4, 1.5

2008-02-19 Thread Benjamin Reed
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21675/main/finkinfo/sound

Modified Files:
libtunepimp3.info 
Added Files:
libtunepimp3.patch 
Log Message:
0.4.4, also fix build against new flac

--- NEW FILE: libtunepimp3.patch ---
diff -Nurd libtunepimp-0.4.4/plugins/flac/flac_meta.cpp 
libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp
--- libtunepimp-0.4.4/plugins/flac/flac_meta.cpp2006-10-13 
16:06:46.0 -0400
+++ libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp2008-02-19 
15:10:43.0 -0500
@@ -21,7 +21,7 @@
 along with libtunepimp; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-$Id: flac_meta.cpp 1472 2006-01-22 14:26:17Z luks $
+$Id: flac_meta.cpp 7325 2006-04-25 07:57:00Z luks $
 
 */
   // 
---
@@ -243,8 +243,6 @@
   if (get_comment(tagmap, MUSICBRAINZ_ALBUMARTISTSORTNAME, val))
   metadata.albumArtistSortName = string(val.c_str());
}
-   if (get_comment(tagmap, MUSICBRAINZ_TRMID, val))
-  metadata.fileTrm = string(val.c_str());
if (get_comment(tagmap, RELEASECOUNTRY, val))
   metadata.releaseCountry = string(val.c_str());
 if (get_comment(tagmap, MUSICBRAINZ_NONALBUM, val))
@@ -322,7 +320,6 @@
add_comment(tagmap, MUSICBRAINZ_ALBUMSTATUS, temp.c_str());
}
add_comment(tagmap, MUSICBRAINZ_ARTISTID, metadata.artistId.c_str());
-   add_comment(tagmap, MUSICBRAINZ_TRMID, metadata.fileTrm.c_str());
if (!metadata.albumArtistId.empty())
{
 add_comment(tagmap, MUSICBRAINZ_ALBUMARTISTID, 
metadata.albumArtistId.c_str());
diff -Nurd libtunepimp-0.4.4/plugins/flac/flacdecode.cpp 
libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp
--- libtunepimp-0.4.4/plugins/flac/flacdecode.cpp   2006-10-13 
16:06:46.0 -0400
+++ libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp   2008-02-19 
15:10:43.0 -0500
@@ -21,13 +21,21 @@
along with libtunepimp; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-   $Id: flacdecode.cpp 1394 2005-06-16 06:44:37Z robert $
+   $Id: flacdecode.cpp 8625 2006-11-05 22:13:17Z luks $
 
 */
 #include stdlib.h
 #include string.h
 #include flacdecode.h
 
+#include FLAC/export.h
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT  8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 void FLAC_errorcb(const FLAC__StreamDecoder * decoder,
   FLAC__StreamDecoderErrorStatus status, void *client_data)
 {
@@ -54,12 +62,12 @@
 const FLAC__int32 * const 
buffer[], void *client_data)
 {

-   // No idea how TRM signatures are generated for more than two 
+   // No idea how PUID signatures are generated for more than two 
// channels, so not going to try
if (frame-header.channels  2)
   return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-   // TRM code doesn't support anything other than 8 and 16 bit samples
+   // PUID code doesn't support anything other than 8 and 16 bit samples
if (frame-header.bits_per_sample != 8 
frame-header.bits_per_sample != 16 
frame-header.bits_per_sample != 24)
@@ -99,7 +107,11 @@
 
 FLAC__StreamDecoderReadStatus FLAC_readcb(const FLAC__StreamDecoder *decoder, 
   FLAC__byte buffer[], 
+#ifdef LEGACY_FLAC
   unsigned *bytes, 
+#else
+  size_t *bytes, 
+#endif
   void *client_data)
 {
clientdata_t *cd = reinterpret_cast  clientdata_t * (client_data);
@@ -131,6 +143,7 @@
if (!cd.in)
   return;
 
+#ifdef LEGACY_FLAC
if (!FLAC__stream_decoder_set_read_callback(decoder, FLAC_readcb))
   return;
 
@@ -149,6 +162,10 @@
state = FLAC__stream_decoder_init(decoder);
if (state != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
   return;
+#else
+   if (FLAC__stream_decoder_init_stream(decoder, FLAC_readcb, NULL, NULL, 
NULL, NULL, FLAC_writecb, FLAC_metadatacb, FLAC_errorcb, cd) != 
FLAC__STREAM_DECODER_INIT_STATUS_OK)
+  return;
+#endif
 
FLAC__stream_decoder_process_until_end_of_metadata(decoder);
state = FLAC__stream_decoder_get_state(decoder);
@@ -221,6 +238,8 @@
   break;

state = FLAC__stream_decoder_get_state(decoder);
+   if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
+   break;
if (state != FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ||
state != FLAC__STREAM_DECODER_READ_FRAME)
{
diff -Nurd