[Midnightbsd-cvs] mports [18392] trunk/www/libwww: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Mar 27 19:41:56 EDT 2015


Revision: 18392
          http://svnweb.midnightbsd.org/mports/?rev=18392
Author:   laffer1
Date:     2015-03-27 19:41:55 -0400 (Fri, 27 Mar 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/www/libwww/Makefile
    trunk/www/libwww/pkg-plist

Added Paths:
-----------
    trunk/www/libwww/files/patch-Library__src__HTMIMImp.c
    trunk/www/libwww/files/patch-Library_src_SSL_HTSSL.c
    trunk/www/libwww/files/patch-configure

Removed Paths:
-------------
    trunk/www/libwww/files/patch-aa

Modified: trunk/www/libwww/Makefile
===================================================================
--- trunk/www/libwww/Makefile	2015-03-27 23:39:47 UTC (rev 18391)
+++ trunk/www/libwww/Makefile	2015-03-27 23:41:55 UTC (rev 18392)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libwww
 PORTVERSION=	5.4.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.w3.org/Library/Distribution/
 DISTNAME=	w3c-${PORTNAME}-${PORTVERSION}
@@ -10,21 +10,13 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The W3C Reference Library
 
-LICENSE=	other
-
-USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib 
-#--with-ssl=${OPENSSLBASE}/lib
-USE_PERL5_BUILD=yes
+CONFIGURE_ARGS=	--with-zlib --with-ssl=${OPENSSLBASE}
+USES=		perl5 gmake libtool tar:tgz
+USE_PERL5=	build
 USE_LDCONFIG=	yes
-USES=		gmake tar:tgz
-#USE_OPENSSL=	yes
+USE_OPENSSL=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
-		${WRKSRC}/configure
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/modules/expat/xmlparse/xmlparse.h \
 		${PREFIX}/include/w3c-libwww/

Added: trunk/www/libwww/files/patch-Library__src__HTMIMImp.c
===================================================================
--- trunk/www/libwww/files/patch-Library__src__HTMIMImp.c	                        (rev 0)
+++ trunk/www/libwww/files/patch-Library__src__HTMIMImp.c	2015-03-27 23:41:55 UTC (rev 18392)
@@ -0,0 +1,11 @@
+--- Library/src/HTMIMImp.c.orig	Sun Jun 30 22:51:48 2002
++++ Library/src/HTMIMImp.c	Sun Jun 30 22:52:01 2002
+@@ -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;


Property changes on: trunk/www/libwww/files/patch-Library__src__HTMIMImp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/www/libwww/files/patch-Library_src_SSL_HTSSL.c
===================================================================
--- trunk/www/libwww/files/patch-Library_src_SSL_HTSSL.c	                        (rev 0)
+++ trunk/www/libwww/files/patch-Library_src_SSL_HTSSL.c	2015-03-27 23:41:55 UTC (rev 18392)
@@ -0,0 +1,19 @@
+--- Library/src/SSL/HTSSL.c.orig	2000-08-03 16:17:20 UTC
++++ Library/src/SSL/HTSSL.c
+@@ -187,12 +187,16 @@ PUBLIC BOOL HTSSL_init (void)
+ 
+ 	/* select the protocol method */
+ 	switch (ssl_prot_method) {
++#ifndef OPENSSL_NO_SSL2
+ 	case HTSSL_V2:
+ 	  meth = SSLv2_client_method();
+ 	  break;
++#endif
++#ifndef OPENSSL_NO_SSL3_METHOD
+ 	case HTSSL_V3:
+ 	  meth = SSLv3_client_method();
+ 	  break;
++#endif
+ 	case HTSSL_V23:
+ 	  meth = SSLv23_client_method();
+ 	  break;


Property changes on: trunk/www/libwww/files/patch-Library_src_SSL_HTSSL.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/www/libwww/files/patch-aa
===================================================================
--- trunk/www/libwww/files/patch-aa	2015-03-27 23:39:47 UTC (rev 18391)
+++ trunk/www/libwww/files/patch-aa	2015-03-27 23:41:55 UTC (rev 18392)
@@ -1,11 +0,0 @@
---- Library/src/HTMIMImp.c.orig	Sun Jun 30 22:51:48 2002
-+++ Library/src/HTMIMImp.c	Sun Jun 30 22:52:01 2002
-@@ -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;

Added: trunk/www/libwww/files/patch-configure
===================================================================
--- trunk/www/libwww/files/patch-configure	                        (rev 0)
+++ trunk/www/libwww/files/patch-configure	2015-03-27 23:41:55 UTC (rev 18392)
@@ -0,0 +1,15 @@
+--- configure.orig	Wed Jun 12 11:31:31 2002
++++ configure	Sat Mar 10 21:51:00 2007
+@@ -7612,8 +7612,11 @@
+     if test "x$withval" = "xyes"; then
+       withval=$ssllib
+       SSLINC=$sslinc
++      LIBS="$LIBS $withval"
++    else
++      SSLINC="-I$withval/include/openssl"
++      LIBS="$LIBS -L$withval/lib -lssl -lcrypto"
+     fi
+-    LIBS="$LIBS $withval"
+     cat > conftest.$ac_ext <<EOF
+ #line 7619 "configure"
+ #include "confdefs.h"


Property changes on: trunk/www/libwww/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/www/libwww/pkg-plist
===================================================================
--- trunk/www/libwww/pkg-plist	2015-03-27 23:39:47 UTC (rev 18391)
+++ trunk/www/libwww/pkg-plist	2015-03-27 23:41:55 UTC (rev 18392)
@@ -163,97 +163,101 @@
 include/w3c-libwww/xmlparse.h
 include/wwwconf.h
 lib/libmd5.a
-lib/libmd5.la
 lib/libmd5.so
-lib/libmd5.so.1
+lib/libmd5.so.0
+lib/libmd5.so.0.1.0
 lib/libpics.a
-lib/libpics.la
 lib/libpics.so
 lib/libpics.so.0
+lib/libpics.so.0.0.0
 lib/libwwwapp.a
-lib/libwwwapp.la
 lib/libwwwapp.so
-lib/libwwwapp.so.1
+lib/libwwwapp.so.0
+lib/libwwwapp.so.0.1.0
 lib/libwwwcache.a
-lib/libwwwcache.la
 lib/libwwwcache.so
-lib/libwwwcache.so.1
+lib/libwwwcache.so.0
+lib/libwwwcache.so.0.1.0
 lib/libwwwcore.a
-lib/libwwwcore.la
 lib/libwwwcore.so
-lib/libwwwcore.so.1
+lib/libwwwcore.so.0
+lib/libwwwcore.so.0.1.0
 lib/libwwwdir.a
-lib/libwwwdir.la
 lib/libwwwdir.so
-lib/libwwwdir.so.1
+lib/libwwwdir.so.0
+lib/libwwwdir.so.0.1.0
 lib/libwwwfile.a
-lib/libwwwfile.la
 lib/libwwwfile.so
-lib/libwwwfile.so.1
+lib/libwwwfile.so.0
+lib/libwwwfile.so.0.1.0
 lib/libwwwftp.a
-lib/libwwwftp.la
 lib/libwwwftp.so
-lib/libwwwftp.so.1
+lib/libwwwftp.so.0
+lib/libwwwftp.so.0.1.0
 lib/libwwwgopher.a
-lib/libwwwgopher.la
 lib/libwwwgopher.so
-lib/libwwwgopher.so.1
+lib/libwwwgopher.so.0
+lib/libwwwgopher.so.0.1.0
 lib/libwwwhtml.a
-lib/libwwwhtml.la
 lib/libwwwhtml.so
-lib/libwwwhtml.so.1
+lib/libwwwhtml.so.0
+lib/libwwwhtml.so.0.1.0
 lib/libwwwhttp.a
-lib/libwwwhttp.la
 lib/libwwwhttp.so
-lib/libwwwhttp.so.1
+lib/libwwwhttp.so.0
+lib/libwwwhttp.so.0.1.0
 lib/libwwwinit.a
-lib/libwwwinit.la
 lib/libwwwinit.so
-lib/libwwwinit.so.1
+lib/libwwwinit.so.0
+lib/libwwwinit.so.0.1.0
 lib/libwwwmime.a
-lib/libwwwmime.la
 lib/libwwwmime.so
-lib/libwwwmime.so.1
+lib/libwwwmime.so.0
+lib/libwwwmime.so.0.1.0
 lib/libwwwmux.a
-lib/libwwwmux.la
 lib/libwwwmux.so
-lib/libwwwmux.so.1
+lib/libwwwmux.so.0
+lib/libwwwmux.so.0.1.0
 lib/libwwwnews.a
-lib/libwwwnews.la
 lib/libwwwnews.so
-lib/libwwwnews.so.1
+lib/libwwwnews.so.0
+lib/libwwwnews.so.0.1.0
+lib/libwwwssl.a
+lib/libwwwssl.so
+lib/libwwwssl.so.0
+lib/libwwwssl.so.0.1.0
 lib/libwwwstream.a
-lib/libwwwstream.la
 lib/libwwwstream.so
-lib/libwwwstream.so.1
+lib/libwwwstream.so.0
+lib/libwwwstream.so.0.1.0
 lib/libwwwtelnet.a
-lib/libwwwtelnet.la
 lib/libwwwtelnet.so
-lib/libwwwtelnet.so.1
+lib/libwwwtelnet.so.0
+lib/libwwwtelnet.so.0.1.0
 lib/libwwwtrans.a
-lib/libwwwtrans.la
 lib/libwwwtrans.so
-lib/libwwwtrans.so.1
+lib/libwwwtrans.so.0
+lib/libwwwtrans.so.0.1.0
 lib/libwwwutils.a
-lib/libwwwutils.la
 lib/libwwwutils.so
-lib/libwwwutils.so.1
+lib/libwwwutils.so.0
+lib/libwwwutils.so.0.1.0
 lib/libwwwxml.a
-lib/libwwwxml.la
 lib/libwwwxml.so
-lib/libwwwxml.so.1
+lib/libwwwxml.so.0
+lib/libwwwxml.so.0.1.0
 lib/libwwwzip.a
-lib/libwwwzip.la
 lib/libwwwzip.so
-lib/libwwwzip.so.1
+lib/libwwwzip.so.0
+lib/libwwwzip.so.0.1.0
 lib/libxmlparse.a
-lib/libxmlparse.la
 lib/libxmlparse.so
-lib/libxmlparse.so.1
+lib/libxmlparse.so.0
+lib/libxmlparse.so.0.1.0
 lib/libxmltok.a
-lib/libxmltok.la
 lib/libxmltok.so
-lib/libxmltok.so.1
+lib/libxmltok.so.0
+lib/libxmltok.so.0.1.0
 share/w3c-libwww/back.xbm
 share/w3c-libwww/binary.xbm
 share/w3c-libwww/binhex.xbm



More information about the Midnightbsd-cvs mailing list