[Gpg4win-commits] r1311 - in trunk: . packages

[scm-commit@wald.intevation.org]

Author: werner
Date: 2010-01-05 13:49:12 +0100 (Tue, 05 Jan 2010)
New Revision: 1311

Modified:
   trunk/ChangeLog
   trunk/packages/download.sh
   trunk/packages/packages.current
Log:
Updated libpng and pkgconfig


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-01-05 10:35:11 UTC (rev 1310)
+++ trunk/ChangeLog	2010-01-05 12:49:12 UTC (rev 1311)
@@ -1,9 +1,12 @@
 2010-01-05  Werner Koch  <wk at g10code.com>
 
+	* packages/download.sh: Add option --quiet.
+
 	* m4/gpg4win.m4: Quote variables in test comamnds instead of using
 	instead of comparing against xno or xyes.
 
-	* packages/packages.current: Update gpgex and gpgol.
+	* packages/packages.current: Update gpgex and gpgol.  Update
+	libpng and pkgconfig.
 
 2009-12-22  Werner Koch  <wk at g10code.com>
 

Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh	2010-01-05 10:35:11 UTC (rev 1310)
+++ trunk/packages/download.sh	2010-01-05 12:49:12 UTC (rev 1311)
@@ -41,12 +41,14 @@
 Usage: $0 [OPTIONS]
 Options:
 	[--force]
+        [--quiet]
 EOF
     exit $1
 }
 
 
 force=no
+quiet=no
 #keep_list=no
 #sig_check=yes
 while [ $# -gt 0 ]; do
@@ -71,6 +73,9 @@
             # Now a dummy
             sig_check=no
             ;;
+        --quiet)
+            quiet=yes
+            ;;
 	*)
 	    usage 1 1>&2
 	    ;;
@@ -124,7 +129,7 @@
            exit 1
        fi
        name="$value"
-       echo "using name  \`$name'"
+       [ $quiet = no ] && echo "using name  \`$name'"
        ;;
     file)
        if [ -z "$value" ]; then
@@ -140,7 +145,7 @@
            name=`basename "$value"`
        fi
        if [ -f "$name" -a "$force" = "no" ]; then
-           echo "package     \`$url' ... already exists"
+           [ $quiet = no ] && echo "package     \`$url' ... already exists"
        else
            echo -n "downloading \`$url' ..."
            if ${WGET} -c -q "$url" -O "$name" ; then
@@ -161,7 +166,7 @@
            exit 1
        fi
        if [ -f "$value" -a "$force" = "no" ]; then
-           echo "package     \`$value' ... already exists"
+           [ $quiet = no ] && echo "package     \`$value' ... already exists"
        else
            echo -n "linking \`$value' to \`$name' ..."
 	   if ln -f "$name" "$value"; then
@@ -181,11 +186,12 @@
            echo "no file name for chk statement, line $lnr" >&2
            exit 1
        fi
-       echo -n "checking    \`$name' ..."
+       [ $quiet = no ] && echo -n "checking    \`$name' ..."
        if echo "$value *$name" | sha1sum -c >/dev/null 2>&1 ; then
-           echo " okay"
+           [ $quiet = no ] && echo " okay"
        else
-           echo " FAILED (line $lnr)"
+           [ $quiet = no ] && echo " FAILED (line $lnr)"
+           [ $quiet = no ] || echo "checking    \`$name' FAILED (line $lnr)"
            echo "line $lnr: checking $name failed" >> '.#download.failed'
        fi
        name=

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2010-01-05 10:35:11 UTC (rev 1310)
+++ trunk/packages/packages.current	2010-01-05 12:49:12 UTC (rev 1311)
@@ -252,25 +252,25 @@
 file pkg-config-0.23.tar.gz
 chk  b59dddd6b5320bd74c0f74b3339618a327096b2a
 name pkgconfig-0.23.zip
-file pkg-config-0.23-2.zip
-chk  2d300159d8c5ebd4f7c139aa9e320e194106d003
+file pkg-config_0.23-3_win32.zip
+chk  d063e705812e1ee7feb8f35d51b3cad04ca13b0d
 
 
 # PNG
 
 server http://dfn.dl.sourceforge.net/sourceforge/libpng
 
-file libpng-1.2.34.tar.gz
-chk  8b1e1e544660e918af75d8af2c078f85c022db68
+file libpng-1.2.40.tar.gz
+chk  a3f2df01871da15d66f103a5b4e793601e4d1043
 
 server http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
 
-name libpng-1.2.34.zip
-file libpng_1.2.34-1_win32.zip
-chk  5de32013ebad64ec7c592103d8e7b6806851197d
-name libpng-dev-1.2.34.zip
-file libpng-dev_1.2.34-1_win32.zip
-chk  509a4cea2fd45fccd0660980a3257cb29398fbeb
+name libpng-1.2.40.zip
+file libpng_1.2.40-1_win32.zip
+chk  918523518a0eba14965035c6a06ec4357816bad2
+name libpng-dev-1.2.40.zip
+file libpng-dev_1.2.40-1_win32.zip
+chk  6834194cfb9824be53be352e3c9a4548512e355d
 
 #
 # WinPT