[arch-commits] Commit in curl/trunk (PKGBUILD m4-typo.patch)

[Jan de Groot]

    Date: Tuesday, October 5, 2010 @ 04:26:50
  Author: jgc
Revision: 94207

Remove || return 1, remove old patch

Modified:
  curl/trunk/PKGBUILD
Deleted:
  curl/trunk/m4-typo.patch

---------------+
 PKGBUILD      |   10 +++++-----
 m4-typo.patch |   13 -------------
 2 files changed, 5 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-05 08:24:49 UTC (rev 94206)
+++ PKGBUILD	2010-10-05 08:26:50 UTC (rev 94207)
@@ -29,16 +29,16 @@
 	    --enable-manual \
 	    --enable-versioned-symbols \
 	    --with-ca-path=/etc/ssl/certs \
-	    --without-libidn || return 1
-	make || return 1
+	    --without-libidn
+	make
 }
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 	install -Dm644 COPYING \
-		${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
+		${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 	install -Dm644 docs/libcurl/libcurl.m4 \
-		${pkgdir}/usr/share/aclocal/libcurl.m4 || return 1
+		${pkgdir}/usr/share/aclocal/libcurl.m4
 }

Deleted: m4-typo.patch
===================================================================
--- m4-typo.patch	2010-10-05 08:24:49 UTC (rev 94206)
+++ m4-typo.patch	2010-10-05 08:26:50 UTC (rev 94207)
@@ -1,13 +0,0 @@
-diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4
-index ce8e476..50dc20d 100644
---- a/docs/libcurl/libcurl.m4
-+++ b/docs/libcurl/libcurl.m4
-@@ -198,7 +198,7 @@ x=CURLOPT_VERBOSE;
- 
- 	      # We don't have --protocols, so just assume that all
- 	      # protocols are available
--	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP
-+	      _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
- 
- 	      if test x$libcurl_feature_SSL = xyes ; then
- 	         _libcurl_protocols="$_libcurl_protocols HTTPS"