Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6373/main/finkinfo/libs

Modified Files:
      Tag: pangocairo-branch
        libexif.info libexif12.info libwww.info libwww.patch 
        progressbar-rb.info suikyo.info suikyo.patch 
Log Message:
merged from HEAD (tagged as pangocairo-root-2)

Index: suikyo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/suikyo.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- suikyo.patch        20 Jan 2006 20:21:18 -0000      1.1
+++ suikyo.patch        20 Dec 2006 18:01:07 -0000      1.1.2.1
@@ -57,8 +57,8 @@
 +
 +LOG=CompilationLog
 +
-+echo -n "install/${PACKAGE}: Handling install for emacsen flavor
-+${FLAVOR}..."
++/bin/echo "install/${PACKAGE}: Handling install for emacsen flavor
++${FLAVOR}...\c"
 +if [ -e "${STAMP}" ]; then
 +    if [ "X${VERSION}" = X"$(cat ${STAMP})" ]; then
 +        echo " skipped. (already compiled)" 

Index: libexif12.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libexif12.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- libexif12.info      21 Mar 2006 20:37:22 -0000      1.3
+++ libexif12.info      20 Dec 2006 18:01:05 -0000      1.3.2.1
@@ -1,16 +1,21 @@
 Package: libexif12
 Version: 0.6.13
-Revision: 2
+Revision: 5
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 Conflicts: libexif-dev
 Replaces: libexif-dev
 BuildDependsOnly: true
 BuildDepends: doxygen, libiconv-dev, libgettext3-dev, gettext-tools
+Depends: %N-shlibs (= %v-%r)
 Source: mirror:sourceforge:libexif/libexif-%v.tar.bz2
 Source-MD5: 1b1e2b495c5aa20c08725f30545a110b
-NoSetLDFLAGS: true
-SetLibs: -L%p/lib
-SetCPPFLAGS: -no-cpp-precomp
+PatchScript: <<
+       # um no, CPPFLAGS and AM_CPPFLAGS have quite different meanings
+       perl -ni -e 'print unless /AM_CPPFLAGS="\$CPPFLAGS"/' configure
+<<
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+SetCFLAGS: -Os
 ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
 InstallScript: <<
@@ -28,8 +33,9 @@
 SplitOff: <<
        Package: %N-shlibs
        Depends: libgettext3-shlibs, libiconv
-       Files: lib/libexif.*.dylib
-       Shlibs: %p/lib/libexif.*.dylib 13.0.0 libexif12 (>= 0.6.13-1)
+       Files: lib/libexif.*.dylib share/locale
+       Replaces: %N (<< 0.6.13-5)
+       Shlibs: %p/lib/libexif.12.dylib 13.0.0 libexif12 (>= 0.6.13-1)
        DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README
 <<
 Description: EXIF Tag Parsing Library

Index: libexif.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libexif.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- libexif.info        12 Mar 2006 04:48:46 -0000      1.3
+++ libexif.info        20 Dec 2006 18:01:05 -0000      1.3.2.1
@@ -1,9 +1,9 @@
 Package: libexif
 Version: 0.5.12
-Revision: 5
+Revision: 6
 Maintainer: Keith Conger <[EMAIL PROTECTED]>
-#Depends: 
-BuildDepends: libiconv-dev, gettext-dev, gettext-tools
+Depends: %N-shlibs (=%v-%r), fink-obsolete-packages
+BuildDepends: libiconv-dev, libgettext3-dev, gettext-tools
 Source: mirror:sourceforge:libexif/%N-%v.tar.gz
 Source-MD5: 97e17fa05cb638eed5e8e59db431ed3a
 PatchScript: <<
@@ -12,16 +12,16 @@
   perl -pi -e 's,(libexif_la_LIBADD =),\1 -lintl ,' libexif/Makefile.in
 
   perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/' configure
+  perl -pi -e 's/[EMAIL PROTECTED]@/[EMAIL PROTECTED]@/' po/Makefile.in.in
 <<
-#NoSetLDFLAGS: True
-#SetLibs: -L%p/lib
 SetCPPFLAGS: -no-cpp-precomp
 ConfigureParams: --mandir=%i/share/man --disable-dependency-tracking
 DocFiles: ChangeLog COPYING NEWS README
 SplitOff: <<
  Package: %N-shlibs
- Depends: gettext
- Files: lib/libexif.9*.dylib
+ Depends: libgettext3-shlibs
+ Replaces: %N (<< 0.5.12-6)
+ Files: lib/libexif.9*.dylib share/locale
  Shlibs: %p/lib/libexif.9.dylib 11.0.0 %n (>= 0.5.12-4)
  DocFiles: COPYING README ChangeLog NEWS
 <<
@@ -45,6 +45,11 @@
 DescPackaging: <<
   Use fink's gettext only, not included one that wasn't being used
   consistently anyway. Therefore only need libiconv for tests.
+
+  Move gettext catalogs %N->%N-shlibs in 0.5.12-6
+
+  Source called gettext catalogs with libversion, so patch
+  po/Makefile.in.in to install them with that name
 <<
 License: BSD
 Homepage: http://home.bawue.de/~lutz/

Index: progressbar-rb.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/progressbar-rb.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- progressbar-rb.info 20 Jan 2006 20:21:18 -0000      1.1
+++ progressbar-rb.info 20 Dec 2006 18:01:06 -0000      1.1.2.1
@@ -1,6 +1,6 @@
 Package: progressbar-rb
 Version: 0.8
-Revision: 2
+Revision: 3
 Description: Text Progress Bar Library for Ruby
 License: OSI-Approved
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
@@ -13,7 +13,7 @@
 Source3-MD5: 6d696d2989653707aaab0dfc73c01aa6
 Source3Rename: RUBY_LICENSE.ja
 Source4: http://www.gnu.org/licenses/gpl.txt
-Source4-MD5: 393a5ca445f6965873eca0259a17f833
+Source4-MD5: 751419260aa954499f7abaabaa882bbe
 
 PatchScript: tail -n 12 progressbar.en.rd > LICENSE
 CompileScript: echo "Nothing is compiled in this section."

Index: suikyo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/suikyo.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- suikyo.info 20 Jan 2006 20:21:18 -0000      1.1
+++ suikyo.info 20 Dec 2006 18:01:06 -0000      1.1.2.1
@@ -1,14 +1,17 @@
 Package: suikyo
 Version: 2.1.0
-Revision: 1
+Revision: 2
+BuildDepends: fink (>= 0.24.12)
 Description: Romaji Hiragana conversion library
 License: GPL
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Source: http://prime.sourceforge.jp/src/%n-%v.tar.gz
 Source-MD5: d33d713c57522f5c28323e19b3f635b2
+PatchFile: %n.patch
+PatchFile-MD5: 0d943c040db3dc7a96e1411588c055c9
 PatchScript: <<
 perl -i.bak -pe "s|[EMAIL PROTECTED]@|[EMAIL PROTECTED]@-el|g" 
elisp/etc/_init-%n.el.in
-sed 's|@PREFIX@|%p|g' < %a/%n.patch | sed 's|@VERSION@|%v-%r|g' | patch -p1
+sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@VERSION@|%v-%r|g' | patch -p1
 <<
 ConfigureParams: --infodir='${prefix}/share/info' 
--mandir='${prefix}/share/man' --with-rubydir='$(libdir)/ruby/site_ruby' 
--with-emacs-initdir='$(emacs_sitelisp_dir)/%n-el'
 InstallScript: <<

Index: libwww.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libwww.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- libwww.patch        6 Dec 2006 06:35:12 -0000       1.2
+++ libwww.patch        20 Dec 2006 18:01:06 -0000      1.2.2.1
@@ -1,6 +1,15 @@
-diff -Nurd -x'*~' w3c-libwww-5.4.0.orig/configure w3c-libwww-5.4.0/configure
---- w3c-libwww-5.4.0.orig/configure    2002-06-12 05:31:31.000000000 -0400
-+++ w3c-libwww-5.4.0/configure 2006-12-06 00:46:07.000000000 -0500
+diff -ru w3c-libwww-5.4.0-orig/configure w3c-libwww-5.4.0/configure
+--- w3c-libwww-5.4.0-orig/configure    2006-12-07 22:18:04.000000000 -0800
++++ w3c-libwww-5.4.0/configure 2006-12-07 22:19:45.000000000 -0800
+@@ -1418,7 +1418,7 @@
+   if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; 
}; then
+     for file in conftest.*; do
+       case $file in
+-      *.c | *.o | *.obj) ;;
++      *.c | *.o | *.obj | *.dSYM) ;;
+       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
 @@ -3284,16 +3284,16 @@
  fi
  rm -f conftest*

Index: libwww.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libwww.info,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- libwww.info 6 Dec 2006 06:35:12 -0000       1.5
+++ libwww.info 20 Dec 2006 18:01:06 -0000      1.5.2.1
@@ -1,7 +1,7 @@
 Package: libwww
 Version: 5.4.0
-Revision: 6
-BuildDepends: 
+Revision: 7
+BuildDepends: fink (>= 0.24.12)
 Depends: %N-shlibs (= %v-%r), %N-bin
 BuildDependsOnly: True
 Source: mirror:custom:w3c-%n-%v.tgz
@@ -12,8 +12,12 @@
 <<
 UpdateConfigGuessInDirs: config
 UpdateLibtoolInDirs: config
-Patch: %n.patch
-PatchScript: perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/' 
config/ltconfig
+PatchFile: %n.patch
+PatchFile-MD5: a4d7d12a15e43bc7ee45c350e3a4d7be
+PatchScript: <<
+ patch -p1 < %{PatchFile}
+ perl -pi -e 's/hardcode_direct=yes/hardcode_direct=no/' config/ltconfig
+<<
 ConfigureParams:  --enable-shared --with-gnu-ld --with-regex --with-zlib
 SplitOff: <<
   Package: %N-shlibs


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to