summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfredb <fredb>2000-12-27 02:34:12 +0000
committerfredb <fredb>2000-12-27 02:34:12 +0000
commit4234998cfcf76cd313e205bd29ef433002d45ba0 (patch)
tree34d17d497d15e35fa9257fa81a8f2111e24c3b79
parentced83864c9eea06628a727f9ecd0cf2482094007 (diff)
downloadpkgsrc-4234998cfcf76cd313e205bd29ef433002d45ba0.tar.gz
Drop "libwww" from the list of packages which need to be
grautiutiously reinstalled whenever "perl" is reinstalled. For the NetBSD package, the dependence on autoconf and automake has already been removed, so it remained only to patch the configure script.
-rw-r--r--www/libwww/Makefile3
-rw-r--r--www/libwww/files/patch-sum4
-rw-r--r--www/libwww/patches/patch-ab115
3 files changed, 113 insertions, 9 deletions
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index c84c22ab7b3..5e01de58eeb 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/12/26 17:23:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2000/12/27 02:34:12 fredb Exp $
# FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
#
@@ -14,7 +14,6 @@ HOMEPAGE= http://www.w3.org/Library/
USE_GMAKE= yes
USE_LIBTOOL= yes
USE_SSL= yes
-USE_PERL5= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-zlib --with-regex --without-x
diff --git a/www/libwww/files/patch-sum b/www/libwww/files/patch-sum
index 96a88bc08e5..fba183fe77f 100644
--- a/www/libwww/files/patch-sum
+++ b/www/libwww/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.7 2000/10/15 12:56:25 fredb Exp $
+$NetBSD: patch-sum,v 1.8 2000/12/27 02:34:12 fredb Exp $
MD5 (patch-aa) = a519b8eb3c732d53a366d148c3be6ea4
-MD5 (patch-ab) = 0179133b1d2eebdd2ac88fada18b409b
+MD5 (patch-ab) = dc3516e5b29fa7508854c2ab333e0081
MD5 (patch-ae) = a9b8a535f0b6bfc40cf2fb6ec908d1d6
diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab
index 845671c9ffd..fa8b397dd9e 100644
--- a/www/libwww/patches/patch-ab
+++ b/www/libwww/patches/patch-ab
@@ -1,7 +1,22 @@
-$NetBSD: patch-ab,v 1.7 2000/10/15 12:56:25 fredb Exp $
+$NetBSD: patch-ab,v 1.8 2000/12/27 02:34:12 fredb Exp $
---- configure.in.orig Fri Aug 4 05:21:20 2000
-+++ configure.in Fri Aug 4 13:56:59 2000
+--- configure.in.orig Thu Dec 14 05:49:06 2000
++++ configure.in Tue Dec 26 20:02:08 2000
+@@ -90,10 +90,10 @@
+ if test -n "$have_tn3270" ; then
+ AC_DEFINE_UNQUOTED(TN3270_PROGRAM, "$have_tn3270")
+ fi
+-AC_CHECK_PROGS(have_perl, perl)
+-if test ! -n "$have_perl" ; then
+- AC_MSG_ERROR("Perl needs to be installed in order to compile libwww")
+-fi
++dnlAC_CHECK_PROGS(have_perl, perl)
++dnlif test ! -n "$have_perl" ; then
++dnl AC_MSG_ERROR("Perl needs to be installed in order to compile libwww")
++dnlfi
+
+ AC_PATH_PROG(RM, rm, rm)
+ AC_PATH_PROG(AR, ar, ar)
@@ -307,7 +307,10 @@
AC_MSG_RESULT(yes)
AC_DEFINE(HT_POSIX_REGEX)
@@ -34,8 +49,89 @@ $NetBSD: patch-ab,v 1.7 2000/10/15 12:56:25 fredb Exp $
sslinc="-I/usr/local/ssl/include"
elif test -d '/usr/local/openssl/include'; then
sslinc="-I/usr/local/openssl/include"
---- configure.orig Fri Aug 4 08:28:00 2000
-+++ configure Mon Oct 9 14:10:23 2000
+--- configure.orig Wed Dec 20 05:00:17 2000
++++ configure Tue Dec 26 20:04:54 2000
+@@ -2405,43 +2405,43 @@
+ EOF
+
+ fi
+-for ac_prog in perl
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2414: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_have_perl'+set}'`\" = set"; then
+- echo $ac_n "(cached) $ac_c" 1>&6
+-else
+- if test -n "$have_perl"; then
+- ac_cv_prog_have_perl="$have_perl" # Let the user override the test.
+-else
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+- ac_dummy="$PATH"
+- for ac_dir in $ac_dummy; do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- ac_cv_prog_have_perl="$ac_prog"
+- break
+- fi
+- done
+- IFS="$ac_save_ifs"
+-fi
+-fi
+-have_perl="$ac_cv_prog_have_perl"
+-if test -n "$have_perl"; then
+- echo "$ac_t""$have_perl" 1>&6
+-else
+- echo "$ac_t""no" 1>&6
+-fi
+-
+-test -n "$have_perl" && break
+-done
+-
+-if test ! -n "$have_perl" ; then
+- { echo "configure: error: "Perl needs to be installed in order to compile libwww"" 1>&2; exit 1; }
+-fi
++#for ac_prog in perl
++#do
++## Extract the first word of "$ac_prog", so it can be a program name with args.
++#set dummy $ac_prog; ac_word=$2
++#echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++#echo "configure:2414: checking for $ac_word" >&5
++#if eval "test \"`echo '$''{'ac_cv_prog_have_perl'+set}'`\" = set"; then
++# echo $ac_n "(cached) $ac_c" 1>&6
++#else
++# if test -n "$have_perl"; then
++# ac_cv_prog_have_perl="$have_perl" # Let the user override the test.
++#else
++# IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++# ac_dummy="$PATH"
++# for ac_dir in $ac_dummy; do
++# test -z "$ac_dir" && ac_dir=.
++# if test -f $ac_dir/$ac_word; then
++# ac_cv_prog_have_perl="$ac_prog"
++# break
++# fi
++# done
++# IFS="$ac_save_ifs"
++#fi
++#fi
++#have_perl="$ac_cv_prog_have_perl"
++#if test -n "$have_perl"; then
++# echo "$ac_t""$have_perl" 1>&6
++#else
++# echo "$ac_t""no" 1>&6
++#fi
++#
++#test -n "$have_perl" && break
++#done
++#
++#if test ! -n "$have_perl" ; then
++# { echo "configure: error: "Perl needs to be installed in order to compile libwww"" 1>&2; exit 1; }
++#fi
+
+ # Extract the first word of "rm", so it can be a program name with args.
+ set dummy rm; ac_word=$2
@@ -6790,8 +6790,22 @@
EOF
@@ -90,3 +186,12 @@ $NetBSD: patch-ab,v 1.7 2000/10/15 12:56:25 fredb Exp $
sslinc="-I/usr/local/ssl/include"
elif test -d '/usr/local/openssl/include'; then
sslinc="-I/usr/local/openssl/include"
+@@ -8195,7 +8215,7 @@
+ s%@have_telnet@%$have_telnet%g
+ s%@have_rlogin@%$have_rlogin%g
+ s%@have_tn3270@%$have_tn3270%g
+-s%@have_perl@%$have_perl%g
++s%@have_perl@%perl%g
+ s%@RM@%$RM%g
+ s%@AR@%$AR%g
+ s%@MKDIR@%$MKDIR%g