Merge branch 'master' of github.com:sm/sm-libraries

sm · Mar 28, 2012 · c9c16be · c9c16be
2 parents 45fbf2f + a2d747d
commit c9c16be
Show file tree

Hide file tree

Showing 59 changed files with 91 additions and 193 deletions.
diff --git a/jpeg/config/md5 → expat/CHANGELOG.md b/jpeg/config/md5 → expat/CHANGELOG.md
diff --git a/expat/README.md b/expat/README.md
@@ -0,0 +1,2 @@
+# Extension Template
+
diff --git a/expat/TODO.md b/expat/TODO.md
diff --git a/imagemagick/VERSION → expat/VERSION b/imagemagick/VERSION → expat/VERSION
diff --git a/libpng/bin/help → expat/bin/help b/libpng/bin/help → expat/bin/help
diff --git a/expat/config/defaults b/expat/config/defaults
@@ -0,0 +1,3 @@
+version=2.0.1
+base_url=http://sourceforge.net/projects/expat/files/expat
+archive_format=tar.gz
diff --git a/expat/config/md5 b/expat/config/md5
@@ -0,0 +1 @@
+expat-2.0.1.tar.gz=ee8b492592568805593f81f8cdf2a04c
diff --git a/imagemagick/map → expat/map b/imagemagick/map → expat/map
diff --git a/expat/shell/functions b/expat/shell/functions
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+expat_prefetch()
+{
+  package define base_url "http://sourceforge.net/projects/expat/files/expat/${package_version}"
+}
diff --git a/imagemagick/shell/includes → expat/shell/includes b/imagemagick/shell/includes → expat/shell/includes
diff --git a/imagemagick/CHANGELOG.md b/imagemagick/CHANGELOG.md
diff --git a/imagemagick/README.md b/imagemagick/README.md
diff --git a/imagemagick/TODO.md b/imagemagick/TODO.md
diff --git a/imagemagick/bin/help b/imagemagick/bin/help
diff --git a/imagemagick/config/defaults b/imagemagick/config/defaults
diff --git a/imagemagick/config/md5 b/imagemagick/config/md5
diff --git a/imagemagick/shell/functions b/imagemagick/shell/functions
diff --git a/jpeg/CHANGELOG.md b/jpeg/CHANGELOG.md
diff --git a/jpeg/README.md b/jpeg/README.md
diff --git a/jpeg/TODO.md b/jpeg/TODO.md
diff --git a/jpeg/VERSION b/jpeg/VERSION
diff --git a/jpeg/bin/help b/jpeg/bin/help
diff --git a/jpeg/config/defaults b/jpeg/config/defaults
diff --git a/jpeg/map b/jpeg/map
diff --git a/jpeg/shell/functions b/jpeg/shell/functions
diff --git a/jpeg/shell/includes b/jpeg/shell/includes
diff --git a/libffi/patches/darwin/3.0.10/wc-test-configure.patch b/libffi/patches/darwin/3.0.10/wc-test-configure.patch
@@ -0,0 +1,58 @@
+--- a/m4/ax_enable_builddir.m4
++++ b/m4/ax_enable_builddir.m4
+@@ -204,7 +204,7 @@ a\\
+ 	; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\
+-	; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" = "0" ; then : \\\\\\
++	; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq 0 ; then : \\\\\\
+ 	; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\
+ 	; test ".\$\$BUILD" = "." && BUILD="." \\\\\\
+ 	; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\
+@@ -217,7 +217,7 @@ dnl special rule add-on: "dist" copies the tarball to $(PUB). (source tree)
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; found=$x echo \$\$BUILD | wc -w $x \\\\\\
+ 	; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\
+-	; if test "\$\$found" = "0" ; then : \\\\\\
++	; if test "\$\$found" -eq 0 ; then : \\\\\\
+ 	; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\
+ 	; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
+ 	; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\
+@@ -229,7 +229,7 @@ dnl special rule add-on: "dist-foo" copies all the archives to $(PUB). (source t
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; found=$x echo \$\$BUILD | wc -w $x \\\\\\
+ 	; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\
+-	; if test "\$\$found" = "0" ; then : \\\\\\
++	; if test "\$\$found" -eq 0 ; then : \\\\\\
+ 	; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\
+ 	; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
+ 	; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\
+--- a/configure
++++ b/configure
+@@ -16339,7 +16339,7 @@
+ 	; test ".\$\$HOST" = "." && HOST=$x sh $ax_enable_builddir_auxdir/config.guess $x \\\\\\
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; use=$x basename "\$\@" -all $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\
+-	; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" = "0" ; then : \\\\\\
++	; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -gt "0" ; then : \\\\\\
+ 	; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\
+ 	; test ".\$\$BUILD" = "." && BUILD="." \\\\\\
+ 	; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\
+@@ -16351,7 +16351,7 @@
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; found=$x echo \$\$BUILD | wc -w $x \\\\\\
+ 	; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\
+-	; if test "\$\$found" = "0" ; then : \\\\\\
++	; if test "\$\$found" -gt "0" ; then : \\\\\\
+ 	; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\
+ 	; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
+ 	; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\
+@@ -16362,7 +16362,7 @@
+ 	; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\
+ 	; found=$x echo \$\$BUILD | wc -w $x \\\\\\
+ 	; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\
+-	; if test "\$\$found" = "0" ; then : \\\\\\
++	; if test "\$\$found" -gt "0" ; then : \\\\\\
+ 	; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\
+ 	; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\
+ 	; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\
diff --git a/libffi/shell/functions b/libffi/shell/functions
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+libffi_preconfigure()
+{
+  if __sm.os.type.is darwin
+  then
+    export HOST
+    HOST="$( ./config.guess )"
+  fi
+}
diff --git a/libpng/CHANGELOG.md b/libpng/CHANGELOG.md
diff --git a/libpng/README.md b/libpng/README.md
diff --git a/libpng/TODO.md b/libpng/TODO.md
diff --git a/libpng/VERSION b/libpng/VERSION
diff --git a/libpng/config/defaults b/libpng/config/defaults
diff --git a/libpng/config/md5 b/libpng/config/md5
diff --git a/libpng/map b/libpng/map
diff --git a/libpng/shell/functions b/libpng/shell/functions
diff --git a/libpng/shell/includes b/libpng/shell/includes
diff --git a/libwmf/CHANGELOG.md b/libwmf/CHANGELOG.md
diff --git a/libwmf/README.md b/libwmf/README.md
diff --git a/libwmf/TODO.md b/libwmf/TODO.md
diff --git a/libwmf/VERSION b/libwmf/VERSION
diff --git a/libwmf/bin/help b/libwmf/bin/help
diff --git a/libwmf/config/defaults b/libwmf/config/defaults
diff --git a/libwmf/config/md5 b/libwmf/config/md5
diff --git a/libwmf/map b/libwmf/map
diff --git a/libwmf/shell/functions b/libwmf/shell/functions
diff --git a/libwmf/shell/includes b/libwmf/shell/includes
diff --git a/openssl/config/defaults b/openssl/config/defaults
@@ -2,4 +2,4 @@ version=1.0.0d
 base_url=http://www.openssl.org/source
 md5_url=http://www.openssl.org/source
 configure_flags=zlib no-asm
-make_flags=-j1
+make_flags=-j 1
diff --git a/openssl/shell/functions b/openssl/shell/functions
@@ -1,11 +1,14 @@
 #!/bin/sh
 
-openssl_configure()
+openssl_preconfigure()
 {
-  if (( ${static_flag:-0} == 1 ))
-  then
-    ./config --prefix="${install_path}" ${configure_flags[@]} > configure.log 2>&1
-  else
-    ./config --prefix="${install_path}" ${configure_flags[@]} shared > configure.log 2>&1
+  typeset -gx configure_command
+  if os is darwin && os arch type is x86_64
+  then configure_command="./Configure darwin64-x86_64-cc"
+  else configure_command="./config"
+  fi
+
+  if (( ${static_flag:-0} == 0 ))
+  then __sm.package.configure.flags shared
   fi
 }
diff --git a/tiff/CHANGELOG.md b/tiff/CHANGELOG.md
diff --git a/tiff/README.md b/tiff/README.md
diff --git a/tiff/TODO.md b/tiff/TODO.md
diff --git a/tiff/VERSION b/tiff/VERSION
diff --git a/tiff/bin/help b/tiff/bin/help
diff --git a/tiff/config/defaults b/tiff/config/defaults
diff --git a/tiff/config/md5 b/tiff/config/md5
diff --git a/tiff/map b/tiff/map
diff --git a/tiff/shell/includes b/tiff/shell/includes
diff --git a/zlib/config/defaults b/zlib/config/defaults
@@ -1,2 +1,2 @@
-version=1.2.5
+version=1.2.6
 base_url=http://zlib.net