Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15722/stable/main/finkinfo/devel

Modified Files:
        automake1.12.info 
Added Files:
        automake1.12.patch 
Log Message:
new version; includes and passes more (but not all) selftests


Index: automake1.12.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/automake1.12.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- automake1.12.info   7 Jan 2013 22:47:33 -0000       1.8
+++ automake1.12.info   18 Feb 2013 06:08:10 -0000      1.9
@@ -1,8 +1,8 @@
 Package: automake1.12
-Version: 1.12.5
-Revision: 3
+Version: 1.12.6
+Revision: 1
 Source: mirror:gnu:automake/automake-%v.tar.xz
-Source-MD5: 2bc1aef898712c7e56320f264040972d
+Source-MD5: 140e084223bf463a24c1a28427c6aec7
 # versions of dpkg < 1.10.21-1233 have a buggy install-info command
 BuildDepends: fink (>= 0.32), dpkg (>= 1.10.21-1234)
 Depends: %N-core (>= %v-%r)
@@ -10,11 +10,20 @@
 Replaces: automake, automake1.4, automake15, automake1.5, automake1.6, 
automake1.7, automake1.8, automake1.9, automake1.10, automake1.11, 
automake1.12, automake1.13
 Provides: automaken
 
+PatchFile: %n.patch
+PatchFile-MD5: 70042de9a8f9170238fff95645e6f7aa
 PatchScript: <<
   #!/bin/sh -ev
   # Disable one of the lex tests which is incompatible with our flex
   # package (but not with flex-devel, nor with the flex Apple ships).
   /usr/bin/sed -i.orig -E -e 's|t/lex-header.sh||g' Makefile.in
+
+  # import bug-fixes for t/pkg-config-macros.sh from automake-1.13.1
+  %{default_script}
+
+  # fink's libtool2 has %p/bin/glibtool not %p/bin/libtool and Apple's
+  # /usr/bin/libtool is different beast
+  ln -s %p/bin/glibtool t/wrap/libtool
 <<
 
 # HACK: Set ac_cv_prog_TEX to disable any TeX or texinfo related tests,
@@ -52,7 +61,7 @@
 # TODO: Perhaps rename automake.info* to automake-X.Y.info* ?
 InfoTest: <<
   TestScript: make check || exit 2
-  TestDepends: libtool2
+  TestDepends: dejagnu, libtool2, pkgconfig
 <<
 DocFiles: COPYING README AUTHORS NEWS THANKS
 InfoDocs: automake.info

--- NEW FILE: automake1.12.patch ---
diff -Nurd -x'*~' automake-1.12.6.orig/t/pkg-config-macros.sh 
automake-1.12.6/t/pkg-config-macros.sh
--- automake-1.12.6.orig/t/pkg-config-macros.sh 2012-12-14 12:21:46.000000000 
-0500
+++ automake-1.12.6/t/pkg-config-macros.sh      2013-02-17 17:18:14.000000000 
-0500
@@ -48,9 +48,10 @@
 
 # Find the location of the pkg-config executable.
 oIFS=$IFS dir=
+IFS=:
 for d in $PATH; do
   IFS=$oIFS
-  if test -f $dir/pkg-config || test -f $dir/pkg-config.exe; then
+  if test -f $d/pkg-config || test -f $d/pkg-config.exe; then
     dir=$d
     break
   fi
@@ -61,7 +62,7 @@
 # where the corresponding pkg.m4 might be installed.
 if test -n "$dir"; then
   # Only support standard installation layouts.
-  XT_ACLOCAL_PATH=${dir%/bin}/share/alocal:$XT_ACLOCAL_PATH
+  XT_ACLOCAL_PATH=${dir%/bin}/share/aclocal:$XT_ACLOCAL_PATH
 fi
 
 XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}


------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet, 
is your hub for all things parallel software development, from weekly thought 
leadership blogs to news, videos, case studies, tutorials, tech docs, 
whitepapers, evaluation guides, and opinion stories. Check out the most 
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to