Fri Nov 26 12:56:21 2010 UTC ()
The Darwin 8 /bin/{,k}sh take offense at empty if .. fi blocks,
so comment out the entire statement.


(hauke)
diff -r1.79 -r1.80 pkgsrc/textproc/libxml2/distinfo
diff -r1.19 -r1.20 pkgsrc/textproc/libxml2/patches/patch-ab
cvs diff -r1.79 -r1.80 pkgsrc/textproc/libxml2/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/distinfo 2010/11/25 13:18:38 1.79
+++ pkgsrc/textproc/libxml2/distinfo 2010/11/26 12:56:21 1.80
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.79 2010/11/25 13:18:38 drochner Exp $ 1$NetBSD: distinfo,v 1.80 2010/11/26 12:56:21 hauke Exp $
2 2
3SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40 3SHA1 (libxml2-2.7.8.tar.gz) = 859dd535edbb851cc15b64740ee06551a7a17d40
4RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47 4RMD160 (libxml2-2.7.8.tar.gz) = 30709622cfe3e2175e73d6701b7e19a25ab5ac47
5Size (libxml2-2.7.8.tar.gz) = 4881808 bytes 5Size (libxml2-2.7.8.tar.gz) = 4881808 bytes
6SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3 6SHA1 (patch-aa) = bf7db00ddf8a36394521baf656cf83d99bd9cbd3
7SHA1 (patch-ab) = ccc4103a8ff53267644123a17dcc777ac3f151e3 7SHA1 (patch-ab) = a0fd68bbd40031473eb05d6c4729feb47a3690a8
8SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e 8SHA1 (patch-ac) = 264c75cf9fff5319105b971c122cdf5fc103c04e
9SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177 9SHA1 (patch-ad) = cd45da492b02cce9983c46762839f68b8b1e0177
10SHA1 (patch-ae) = b8d8e0275cab3caafd98275ac22b63951fc4b5fd 10SHA1 (patch-ae) = b8d8e0275cab3caafd98275ac22b63951fc4b5fd
11SHA1 (patch-ag) = 30ec5c8daece4aba75a02bbc13db5373542dea7b 11SHA1 (patch-ag) = 30ec5c8daece4aba75a02bbc13db5373542dea7b
12SHA1 (patch-aj) = 24eb4a08ea4c40be6d75a72cd0bb5280514f73d4 12SHA1 (patch-aj) = 24eb4a08ea4c40be6d75a72cd0bb5280514f73d4
cvs diff -r1.19 -r1.20 pkgsrc/textproc/libxml2/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/libxml2/patches/Attic/patch-ab 2010/11/25 13:18:39 1.19
+++ pkgsrc/textproc/libxml2/patches/Attic/patch-ab 2010/11/26 12:56:21 1.20
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1$NetBSD: patch-ab,v 1.19 2010/11/25 13:18:39 drochner Exp $ 1$NetBSD: patch-ab,v 1.20 2010/11/26 12:56:21 hauke Exp $
2 2
3--- configure.orig 2010-11-04 17:28:14.000000000 +0000 3--- configure.orig 2010-11-04 17:28:14.000000000 +0000
4+++ configure 4+++ configure
5@@ -13364,7 +13364,7 @@ fi 5@@ -13364,7 +13364,7 @@ fi
6 fi 6 fi
7  7
8  8
9-XML_LIBDIR='-L${libdir}' 9-XML_LIBDIR='-L${libdir}'
10+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}' 10+XML_LIBDIR='-Wl,-R${libdir} -L${libdir}'
11 XML_INCLUDEDIR='-I${includedir}/libxml2' 11 XML_INCLUDEDIR='-I${includedir}/libxml2'
12  12
13 XML_CFLAGS="" 13 XML_CFLAGS=""
14@@ -14584,7 +14584,7 @@ $as_echo "#define vsnprintf _vsnprintf"  14@@ -14582,10 +14582,10 @@ $as_echo "#define snprintf _snprintf" >>
15  15
16 if test "${PYTHON}" != "" 16 $as_echo "#define vsnprintf _vsnprintf" >>confdefs.h
17 then 17
 18- if test "${PYTHON}" != ""
 19- then
18- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}" 20- WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}"
 21- fi
 22+# if test "${PYTHON}" != ""
 23+# then
19+# WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}" 24+# WIN32_EXTRA_PYTHON_LIBADD="-L${pythondir}/../../libs -lpython${PYTHON_VERSION//./}"
20 fi 25+# fi
21 ;; 26 ;;
22 *-*-cygwin*) 27 *-*-cygwin*)
 28 CYGWIN_EXTRA_LDFLAGS="-no-undefined"