From fc188fc5fc5b97a1b6206cf755047bd8477db121 Mon Sep 17 00:00:00 2001 From: fredb Date: Fri, 20 Apr 2001 12:33:52 +0000 Subject: Rely on the fact that shared libraries can encode run-time dependencies on other libraries, on both ELF and (NetBSD/)a.out, to make libwwwssl.so.?.? depend on the correct openssl shared libraries, as determined by the setting of ${SSLBASE} in bsd.pkg.mk. This closes PR pkg/12570, and has the additional advantage that programs that _do_ _not_ need to link in "-lwwwssl" won't get "-lssl" or "-lcrypto" at all. Also, make"w3c" and "www" build again with USE_SOCKS=4. --- www/libwww/Makefile | 22 +++-- www/libwww/distinfo | 16 ++-- www/libwww/patches/patch-aa | 20 ++--- www/libwww/patches/patch-ab | 208 +++----------------------------------------- www/libwww/patches/patch-ac | 13 +++ www/libwww/patches/patch-ad | 12 +++ www/libwww/patches/patch-ae | 28 +++--- www/libwww/patches/patch-af | 44 ++++++++++ www/libwww/patches/patch-ag | 44 ++++++++++ www/libwww/patches/patch-ah | 101 +++++++++++++++++++++ www/libwww/patches/patch-ai | 13 +++ 11 files changed, 289 insertions(+), 232 deletions(-) create mode 100644 www/libwww/patches/patch-ac create mode 100644 www/libwww/patches/patch-ad create mode 100644 www/libwww/patches/patch-af create mode 100644 www/libwww/patches/patch-ag create mode 100644 www/libwww/patches/patch-ah create mode 100644 www/libwww/patches/patch-ai (limited to 'www/libwww') diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 916f1f24902..787b012b307 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2001/03/27 03:20:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.22 2001/04/20 12:33:52 fredb Exp $ # FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp # @@ -12,6 +12,8 @@ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.w3.org/Library/ COMMENT= The W3C Reference Library +BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf +BUILD_DEPENDS+= automake-1.4:../../devel/automake BUILD_DEPENDS+= perl-5.*:../../lang/perl5 USE_GMAKE= yes @@ -20,29 +22,33 @@ USE_SSL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-zlib --with-regex --without-x -CONFIGURE_ARGS+= --with-ssl +CONFIGURE_ARGS+= --with-ssl="${SSLBASE}" DOCDIR= ${PREFIX}/share/doc/libwww LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig pre-configure: cd ${WRKSRC}; \ - for foo in configure.in aclocal.m4 `find . -name Makefile.in` \ - configure stamp-h.in; do \ - ${TOUCH} $$foo; \ - done + ${LOCALBASE}/bin/aclocal && \ + ${LOCALBASE}/bin/automake && \ + ${LOCALBASE}/bin/autoconf .include "../../mk/bsd.prefs.mk" # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) .if ${USE_SOCKS} == 4 -CONFIGURE_ARGS+= --with-socks --with-socks4 --without-socks5 +CONFIGURE_ARGS+= --with-socks4=${LOCALBASE}/lib/libsocks4.a --with-socks5=no DEPENDS+= socks4-2.2:../../net/socks4 .else -CONFIGURE_ARGS+= --with-socks --without-socks4 --with-socks5 +CONFIGURE_ARGS+= --with-socks5=${LOCALBASE}/lib/libsocks5.a --with-socks4=no DEPENDS+= socks5-1.0.2:../../net/socks5 .endif .endif .include "../../mk/bsd.pkg.mk" + +# This has to come after bsd.pkg.mk's construction of "${CONFIGURE_ENV}" +# in order to have the desired effect. It's purpose is to allow "${SSLBASE}" +# to take control of which "openssl" is used, if several are installed. +CONFIGURE_ENV+= LDFLAGS="" diff --git a/www/libwww/distinfo b/www/libwww/distinfo index 616b89276a1..8e6e6f1ae02 100644 --- a/www/libwww/distinfo +++ b/www/libwww/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:37 skrll Exp $ - -SHA1 (w3c-libwww-5.3.2.tar.gz) = c50f3624889b3a0ebc720264a1b9b64990457516 -Size (w3c-libwww-5.3.2.tar.gz) = 1956340 bytes -SHA1 (patch-aa) = 7256cb9eb469c23219ee5cc8a039ed620325b2ec -SHA1 (patch-ab) = 92878c3f9e04892066f55f5eabd38093fde1a050 -SHA1 (patch-ae) = 37aa1c9c90a556b71d7c76e4dc3331cbdf05cda6 +SHA1 (patch-aa) = fc0124c8995992536782e60ce67332c2dc505b10 +SHA1 (patch-ab) = 24db9ca337bd6768fa5b208186f7b55e555beb8f +SHA1 (patch-ac) = d3b153c4360d5eb0439a9d328d259896937902df +SHA1 (patch-ad) = 3dbc185d083b655f4157055b13563b5b123931f5 +SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34 +SHA1 (patch-af) = 9b982568c52f4685862be2192612ce3d795ac813 +SHA1 (patch-ag) = b3b0ca974d4dfccf4aaebc2ee65f0938525eb51b +SHA1 (patch-ah) = 3c41a679b4f679f65df3f5723f8f8ada8609c78a +SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72 diff --git a/www/libwww/patches/patch-aa b/www/libwww/patches/patch-aa index 2820527db82..e170e72f251 100644 --- a/www/libwww/patches/patch-aa +++ b/www/libwww/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.3 1999/10/08 04:43:07 deberg Exp $ +$NetBSD: patch-aa,v 1.4 2001/04/20 12:33:53 fredb Exp $ ---- Library/src/HTMIMImp.c.orig Thu May 27 16:26:50 1999 -+++ Library/src/HTMIMImp.c Thu May 27 16:26:58 1999 -@@ -227,5 +227,5 @@ - if (start != NULL) { - start += strlen(needle); -- while isspace(*start) start++; -+ while (isspace(*start)) start++; - if (isdigit(*start)) { - char * end = start + 1; +--- Library/Makefile.am.orig Wed Aug 5 20:54:52 1998 ++++ Library/Makefile.am +@@ -5,5 +5,5 @@ + EXTRA_DIST = \ + $(DOCS) + +-SUBDIRS = src User Examples External cvs2sql # Test ++SUBDIRS = src User # Examples External cvs2sql Test + diff --git a/www/libwww/patches/patch-ab b/www/libwww/patches/patch-ab index fa8b397dd9e..c8d76796686 100644 --- a/www/libwww/patches/patch-ab +++ b/www/libwww/patches/patch-ab @@ -1,197 +1,13 @@ -$NetBSD: patch-ab,v 1.8 2000/12/27 02:34:12 fredb Exp $ +$NetBSD: patch-ab,v 1.9 2001/04/20 12:33:53 fredb Exp $ ---- 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) - if test "x$withval" = "xyes"; then -- AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) -+ AC_TRY_LINK([], -+ [ regexec(); ], -+ [], -+ [ AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) ] ) - else - AC_ADDLIB($withval) - AC_TRY_LINK([], -@@ -535,13 +538,17 @@ - dnl Checks for libwww and OpenSSL: - AC_MSG_CHECKING(whether we can find OpenSSL) - dnl find the ssl library dir (empirical) --if test -d '/usr/local/ssl/lib'; then -+if test -f "${prefix}/lib/libssl.a" -a -f "${prefix}/lib/libcrypto.a"; then -+ ssllib="-L${prefix}/lib -lssl -lcrypto" -+elif test -d '/usr/local/ssl/lib'; then - ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" - else - ssllib="-L/usr/lib -lssl -lcrypto" - fi - dnl find the ssl include dir (empirical) --if test -d '/usr/local/ssl/include'; then -+if test -d "${prefix}/include/openssl"; then -+ sslinc="-I${prefix}/include -I${prefix}/include/openssl" -+elif test -d '/usr/local/ssl/include'; then - sslinc="-I/usr/local/ssl/include" - elif test -d '/usr/local/openssl/include'; then - sslinc="-I/usr/local/openssl/include" ---- 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 - - if test "x$withval" = "xyes"; then -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* - echo $ac_n "checking for regexec in -lrx""... $ac_c" 1>&6 --echo "configure:6795: checking for regexec in -lrx" >&5 -+echo "configure:6809: checking for regexec in -lrx" >&5 - ac_lib_var=`echo rx'_'regexec | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -6830,6 +6844,8 @@ - echo "$ac_t""no" 1>&6 - fi - -+fi -+rm -f conftest* - else - echo $ac_n "checking for $withval""... $ac_c" 1>&6 - echo "configure:6836: checking for $withval" >&5 -@@ -7270,13 +7286,17 @@ - - - echo $ac_n "checking whether we can find OpenSSL""... $ac_c" 1>&6 --echo "configure:7274: checking whether we can find OpenSSL" >&5 --if test -d '/usr/local/ssl/lib'; then -+echo "configure:7290: checking whether we can find OpenSSL" >&5 -+if test -f "${prefix}/lib/libssl.a" -a -f "${prefix}/lib/libcrypto.a"; then -+ ssllib="-L${prefix}/lib -lssl -lcrypto" -+elif test -d '/usr/local/ssl/lib'; then - ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" - else - ssllib="-L/usr/lib -lssl -lcrypto" - fi --if test -d '/usr/local/ssl/include'; then -+if test -d "${prefix}/include/openssl"; then -+ sslinc="-I${prefix}/include -I${prefix}/include/openssl" -+elif test -d '/usr/local/ssl/include'; then - 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 +--- Library/src/HTMIMImp.c.orig Mon Feb 22 16:10:11 1999 ++++ Library/src/HTMIMImp.c +@@ -226,7 +226,7 @@ + int value = deflt; + if (start != NULL) { + start += strlen(needle); +- while isspace(*start) start++; ++ while (isspace(*start)) start++; + if (isdigit(*start)) { + char * end = start + 1; + char save; diff --git a/www/libwww/patches/patch-ac b/www/libwww/patches/patch-ac new file mode 100644 index 00000000000..1c179e7304f --- /dev/null +++ b/www/libwww/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.7 2001/04/20 12:33:53 fredb Exp $ + +--- Library/src/HTStyle.c.orig Mon Feb 22 16:10:12 1999 ++++ Library/src/HTStyle.c +@@ -18,6 +18,8 @@ + #include "WWWUtil.h" + #include "HTStyle.h" + ++PUBLIC HTStyleSheet * styleSheet; /* application-wide style sheet */ ++ + struct _HTStyle { + char * name; /* Style name */ + int element; /* Element (if any) that this style applies to */ diff --git a/www/libwww/patches/patch-ad b/www/libwww/patches/patch-ad new file mode 100644 index 00000000000..73f8499ce80 --- /dev/null +++ b/www/libwww/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.3 2001/04/20 12:33:53 fredb Exp $ + +--- Library/src/Makefile.am.orig Tue Jun 20 06:01:34 2000 ++++ Library/src/Makefile.am +@@ -379,7 +379,6 @@ + libwwwsql_la_LDFLAGS = -rpath $(libdir) + + INCLUDES = \ +- -I/usr/local/include \ + -I${top_srcdir}/modules/md5 \ + -I${top_srcdir}/modules/expat/xmlparse + diff --git a/www/libwww/patches/patch-ae b/www/libwww/patches/patch-ae index 6211aa817e4..5ff25e64f05 100644 --- a/www/libwww/patches/patch-ae +++ b/www/libwww/patches/patch-ae @@ -1,13 +1,19 @@ -$NetBSD: patch-ae,v 1.3 1999/10/08 04:43:07 deberg Exp $ +$NetBSD: patch-ae,v 1.4 2001/04/20 12:33:53 fredb Exp $ ---- Library/src/HTStyle.c.orig Wed Oct 6 23:16:43 1999 -+++ Library/src/HTStyle.c Wed Oct 6 23:16:35 1999 -@@ -18,6 +18,8 @@ - #include "WWWUtil.h" - #include "HTStyle.h" +--- Library/src/SSL/Makefile.am.orig Tue Jun 20 06:01:34 2000 ++++ Library/src/SSL/Makefile.am +@@ -39,13 +39,12 @@ + HTSSLhttps.h \ + HTSSLhttps.c -+PUBLIC HTStyleSheet * styleSheet; /* application-wide style sheet */ -+ - struct _HTStyle { - char * name; /* Style name */ - int element; /* Element (if any) that this style applies to */ +-libwwwssl_la_LDFLAGS = -rpath $(libdir) ++libwwwssl_la_LDFLAGS = @SSLLIBS@ -rpath $(libdir) + + LDADD = \ + libwwwssl.la + + INCLUDES = \ +- -I/usr/local/include \ + -I${top_srcdir}/modules/md5 \ + -I${top_srcdir}/modules/expat/xmlparse \ + -I$(top_srcdir)/Library/src \ diff --git a/www/libwww/patches/patch-af b/www/libwww/patches/patch-af new file mode 100644 index 00000000000..2e3250cb750 --- /dev/null +++ b/www/libwww/patches/patch-af @@ -0,0 +1,44 @@ +$NetBSD: patch-af,v 1.1 2001/04/20 12:33:53 fredb Exp $ + +--- Library/src/wwwsys.h.orig Wed Dec 20 05:00:07 2000 ++++ Library/src/wwwsys.h +@@ -1138,25 +1138,24 @@ + #ifdef SOCKS4 + #define connect Rconnect + #define getsockname Rgetsockname +-#define getpeername Rgetpeername ++/* #define getpeername Rgetpeername */ + #define bind Rbind + #define accept Raccept + #define listen Rlisten + #define select Rselect +-#define recvfrom Rrecvfrom +-#define sendto Rsendto +-#define recv Rrecv +-#define send Rsend +-#define read Rread +-#define write Rwrite +-#define rresvport Rrresvport +-#define shutdown Rshutdown +-#define listen Rlisten +-#define close Rclose +-#define dup Rdup +-#define dup2 Rdup2 +-#define fclose Rfclose +-#define gethostbyname Rgethostbyname ++/* #define recvfrom Rrecvfrom */ ++/* #define sendto Rsendto */ ++/* #define recv Rrecv */ ++/* #define send Rsend */ ++/* #define read Rread */ ++/* #define write Rwrite */ ++/* #define rresvport Rrresvport */ ++/* #define shutdown Rshutdown */ ++/* #define close Rclose */ ++/* #define dup Rdup */ ++/* #define dup2 Rdup2 */ ++/* #define fclose Rfclose */ ++/* #define gethostbyname Rgethostbyname */ + #else + #ifdef SOCKS5 + #define connect SOCKSconnect diff --git a/www/libwww/patches/patch-ag b/www/libwww/patches/patch-ag new file mode 100644 index 00000000000..ba57d9ed432 --- /dev/null +++ b/www/libwww/patches/patch-ag @@ -0,0 +1,44 @@ +$NetBSD: patch-ag,v 1.1 2001/04/20 12:33:53 fredb Exp $ + +--- Library/src/wwwsys.html.orig Tue Jul 11 04:18:38 2000 ++++ Library/src/wwwsys.html +@@ -1093,25 +1093,24 @@ + #ifdef SOCKS4 + #define connect Rconnect + #define getsockname Rgetsockname +-#define getpeername Rgetpeername ++/* #define getpeername Rgetpeername */ + #define bind Rbind + #define accept Raccept + #define listen Rlisten + #define select Rselect +-#define recvfrom Rrecvfrom +-#define sendto Rsendto +-#define recv Rrecv +-#define send Rsend +-#define read Rread +-#define write Rwrite +-#define rresvport Rrresvport +-#define shutdown Rshutdown +-#define listen Rlisten +-#define close Rclose +-#define dup Rdup +-#define dup2 Rdup2 +-#define fclose Rfclose +-#define gethostbyname Rgethostbyname ++/* #define recvfrom Rrecvfrom */ ++/* #define sendto Rsendto */ ++/* #define recv Rrecv */ ++/* #define send Rsend */ ++/* #define read Rread */ ++/* #define write Rwrite */ ++/* #define rresvport Rrresvport */ ++/* #define shutdown Rshutdown */ ++/* #define close Rclose */ ++/* #define dup Rdup */ ++/* #define dup2 Rdup2 */ ++/* #define fclose Rfclose */ ++/* #define gethostbyname Rgethostbyname */ + #else + #ifdef SOCKS5 + #define connect SOCKSconnect diff --git a/www/libwww/patches/patch-ah b/www/libwww/patches/patch-ah new file mode 100644 index 00000000000..2e4779dab60 --- /dev/null +++ b/www/libwww/patches/patch-ah @@ -0,0 +1,101 @@ +$NetBSD: patch-ah,v 1.1 2001/04/20 12:33:53 fredb Exp $ + +--- configure.in.orig Thu Dec 14 05:49:06 2000 ++++ configure.in +@@ -307,7 +307,10 @@ + AC_MSG_RESULT(yes) + AC_DEFINE(HT_POSIX_REGEX) + if test "x$withval" = "xyes"; then +- AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) ++ AC_TRY_LINK([], ++ [ regexec(); ], ++ [], ++ [ AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] ) ] ) + else + AC_ADDLIB($withval) + AC_TRY_LINK([], +@@ -532,31 +535,9 @@ + AC_SUBST(LWWWMD5) + AC_SUBST(LIBWWWMD5) + +-dnl Checks for libwww and OpenSSL: +-AC_MSG_CHECKING(whether we can find OpenSSL) +-dnl find the ssl library dir (empirical) +-if test -d '/usr/local/ssl/lib'; then +- ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" +-else +- ssllib="-L/usr/lib -lssl -lcrypto" +-fi +-dnl find the ssl include dir (empirical) +-if test -d '/usr/local/ssl/include'; then +- sslinc="-I/usr/local/ssl/include" +-elif test -d '/usr/local/openssl/include'; then +- sslinc="-I/usr/local/openssl/include" +-elif test -d '/usr/local/include/openssl'; then +- sslinc="-I/usr/local/include/openssl" +-elif test -d '/usr/include/ssl'; then +- sslinc="-I/usr/include/ssl" +-elif test -d '/usr/include/openssl'; then +- sslinc="-I/usr/include/openssl" +-else +- sslinc="" +-fi ++dnl Checks for OpenSSL: ++AC_MSG_CHECKING(whether to support OpenSSL.) + WWWSSL="" +-SSLINC="" +-LIBSSL="" + LWWWSSL="" + LIBWWWSSL="" + WWWSSLEX="" +@@ -568,14 +549,39 @@ + ;; + *) + if test "x$withval" = "xyes"; then +- withval=$ssllib +- SSLINC=$sslinc ++ dnl find the ssl library dir (empirical) ++ if test -d '/usr/local/ssl/lib'; then ++ ssllib="-L/usr/local/ssl/lib -lssl -lcrypto" ++ else ++ ssllib="-L/usr/lib -lssl -lcrypto" ++ fi ++ dnl find the ssl include dir (empirical) ++ if test -d '/usr/local/ssl/include'; then ++ sslinc="-I/usr/local/ssl/include" ++ elif test -d '/usr/local/openssl/include'; then ++ sslinc="-I/usr/local/openssl/include" ++ elif test -d '/usr/local/include/openssl'; then ++ sslinc="-I/usr/local/include/openssl" ++ elif test -d '/usr/include/ssl'; then ++ sslinc="-I/usr/include/ssl" ++ elif test -d '/usr/include/openssl'; then ++ sslinc="-I/usr/include/openssl" ++ else ++ sslinc="" ++ fi ++ SSLINC="$sslinc" ++ SSLLIBS="$ssllib" ++ else ++ SSLINC="-I${withval}/include -I${withval}/include/openssl" ++ SSLLIBS="-L${withval}/lib -Wl,-R${withval}/lib -lssl -lcrypto" + fi +- LIBS="$LIBS $withval" ++ SAVED_LIBS="${LIBS}" ++ LIBS="${SSLLIBS}" + AC_TRY_LINK([], + [ SSL_library_init(); ], + [], + [ AC_MSG_ERROR(Could not find the $withval libraries. You must first install openSSL.) ]) ++ LIBS="${SAVED_LIBS}" + AC_MSG_RESULT(yes) + WWWSSL="libwwwssl.la" + LWWWSSL="-lwwwssl" +@@ -586,6 +592,7 @@ + [ AC_MSG_RESULT(no) ]) + AC_SUBST(WWWSSL) + AC_SUBST(SSLINC) ++AC_SUBST(SSLLIBS) + AC_SUBST(LWWWSSL) + AC_SUBST(LIBWWWSSL) + AC_SUBST(WWWSSLEX) diff --git a/www/libwww/patches/patch-ai b/www/libwww/patches/patch-ai new file mode 100644 index 00000000000..6811cc03264 --- /dev/null +++ b/www/libwww/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2001/04/20 12:33:54 fredb Exp $ + +--- libwww-config.in.orig Wed Jun 23 13:05:01 1999 ++++ libwww-config.in +@@ -48,7 +48,7 @@ + echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@ + ;; + --libs) +- echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@ ++ echo -L@libdir@ -Wl,-R@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@ + ;; + *) + echo "${usage}" 1>&2 -- cgit v1.2.3