[pkgsrc/pkgsrc-2006Q3]: pkgsrc/www/libwww Pullup ticket 1857 - requested by d...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e29637a3202e
branches:  pkgsrc-2006Q3
changeset: 519141:e29637a3202e
user:      salo <salo%pkgsrc.org@localhost>
date:      Tue Oct 17 16:18:08 2006 +0000

description:
Pullup ticket 1857 - requested by dmcmahill
portability fixes for libwww

Revisions pulled up:
- pkgsrc/www/libwww/Makefile                    1.69, 1.70, 1.71
- pkgsrc/www/libwww/distinfo                    1.22
- pkgsrc/www/libwww/options.mk                  1.2
- pkgsrc/www/libwww/patches/patch-aq            1.1

   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Wed Oct  4 19:45:21 UTC 2006

   Modified Files:
        pkgsrc/www/libwww: distinfo
   Added Files:
        pkgsrc/www/libwww/patches: patch-aq

   Log Message:
   Added a patch for the broken "test ==".
---
   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Wed Oct  4 19:45:58 UTC 2006

   Modified Files:
        pkgsrc/www/libwww: Makefile options.mk

   Log Message:
   Fixed some pkglint warnings.
---
   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Thu Oct  5 10:05:41 UTC 2006

   Modified Files:
        pkgsrc/www/libwww: Makefile

   Log Message:
   Overwrite the configure script in the post-extract phase, so that it can
   be patched. Noted by Andreas Gustafsson in private mail.
---
   Module Name:         pkgsrc
   Committed By:        dmcmahill
   Date:                Tue Oct 10 00:24:54 UTC 2006

   Modified Files:
        pkgsrc/www/libwww: Makefile

   Log Message:
   USE_TOOLS+áutomake14

   This package contained several Makefile.am patches but then proceeded to
   ignore all of them by touching all of the Makefile.in's.  Unfortunately
   those patches were there for a reason!

   Correctly packages on solaris now.

diffstat:

 www/libwww/Makefile         |  16 ++++++++--------
 www/libwww/distinfo         |   3 ++-
 www/libwww/options.mk       |   6 +++---
 www/libwww/patches/patch-aq |  13 +++++++++++++
 4 files changed, 26 insertions(+), 12 deletions(-)

diffs (100 lines):

diff -r 70fe105f87e0 -r e29637a3202e www/libwww/Makefile
--- a/www/libwww/Makefile       Tue Oct 17 16:02:59 2006 +0000
+++ b/www/libwww/Makefile       Tue Oct 17 16:18:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/07/27 18:48:04 jlam Exp $
+# $NetBSD: Makefile,v 1.68.2.1 2006/10/17 16:18:08 salo Exp $
 
 DISTNAME=              w3c-libwww-5.4.0
 PKGNAME=               libwww-5.4.0
@@ -18,7 +18,7 @@
 EXTRACT_ONLY=          ${DISTNAME}${EXTRACT_SUFX}
 SITES.libwww-configure-5.4.0nb1.gz=    ${MASTER_SITE_LOCAL}
 
-USE_TOOLS+=            gmake perl
+USE_TOOLS+=            automake14 gmake gzcat perl
 USE_LIBTOOL=           YES
 
 GNU_CONFIGURE=         YES
@@ -30,21 +30,21 @@
 
 .include "options.mk"
 
-DOCDIR=                        ${PREFIX}/share/doc/libwww
+post-extract:
+       gzcat ${DISTDIR}/libwww-configure-5.4.0nb1.gz > ${WRKSRC}/configure
 
 pre-configure:
-       ${GZCAT} ${DISTDIR}/libwww-configure-5.4.0nb1.gz > ${WRKSRC}/configure
-       ${CHMOD} a+x ${WRKSRC}/configure
+       chmod a+x ${WRKSRC}/configure
 .for f in aclocal.m4 configure stamp-h.in
-       ${TOUCH} ${WRKSRC}/${f}
+       touch ${WRKSRC}/${f}
 .endfor
-       ${TOUCH} `${FIND} ${WRKSRC} -name Makefile.in -print`
+       cd ${WRKSRC} && automake
 
 .include "../../mk/bsd.prefs.mk"
 
 .if empty(LOWER_OPSYS:Mirix5*)
 # IRIX 5 does not have libregex
-CONFIGURE_ARGS+=        --with-regex
+CONFIGURE_ARGS+=       --with-regex
 .endif
 
 .if ${OPSYS} == "SunOS"
diff -r 70fe105f87e0 -r e29637a3202e www/libwww/distinfo
--- a/www/libwww/distinfo       Tue Oct 17 16:02:59 2006 +0000
+++ b/www/libwww/distinfo       Tue Oct 17 16:18:08 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2005/11/03 15:51:59 salo Exp $
+$NetBSD: distinfo,v 1.21.8.1 2006/10/17 16:18:08 salo Exp $
 
 SHA1 (w3c-libwww-5.4.0.tgz) = 2394cb4e0dc4e2313a9a0ddbf508e4b726e9af63
 RMD160 (w3c-libwww-5.4.0.tgz) = 12e55ecb2435f9048d627e56f8ae60d4c246648b
@@ -20,3 +20,4 @@
 SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
 SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
 SHA1 (patch-ap) = 506ee8ddd2e627aa6ba84b933ca39a6934b95689
+SHA1 (patch-aq) = f44086c50dfe3d5af714b6defcb40ac7a1ed36f1
diff -r 70fe105f87e0 -r e29637a3202e www/libwww/options.mk
--- a/www/libwww/options.mk     Tue Oct 17 16:02:59 2006 +0000
+++ b/www/libwww/options.mk     Tue Oct 17 16:18:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/02 17:05:04 wiz Exp $
+# $NetBSD: options.mk,v 1.1.8.1 2006/10/17 16:18:08 salo Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libwww
 PKG_OPTIONS_OPTIONAL_GROUPS+=  socks
@@ -7,11 +7,11 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Msocks4)
-CONFIGURE_ARGS+=       --with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
+CONFIGURE_ARGS+=       --with-socks4=${BUILDLINK_PREFIX.socks4}/lib/libsocks4.a
 CONFIGURE_ARGS+=       --with-socks5=no
 .include "../../net/socks4/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Msocks5)
 CONFIGURE_ARGS+=       --with-socks4=no
-CONFIGURE_ARGS+=       --with-socks5=${BUILDLINK_prefix.socks5}/lib/libsocks5.a
+CONFIGURE_ARGS+=       --with-socks5=${BUILDLINK_PREFIX.socks5}/lib/libsocks5.a
 .include "../../net/socks5/buildlink3.mk"
 .endif
diff -r 70fe105f87e0 -r e29637a3202e www/libwww/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/libwww/patches/patch-aq       Tue Oct 17 16:18:08 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.2.2 2006/10/17 16:18:08 salo Exp $
+
+--- configure.orig     2006-10-04 21:39:50.000000000 +0200
++++ configure  2006-10-04 21:40:36.000000000 +0200
+@@ -31593,7 +31593,7 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+-     if test "$ac_cv_func_remove" == yes ; then
++     if test "$ac_cv_func_remove" = yes ; then
+         cat >>confdefs.h <<\_ACEOF
+ #define unlink remove
+ _ACEOF