summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs/libwww/files/libwww-5.4.0-asneeded.patch')
-rw-r--r--net-libs/libwww/files/libwww-5.4.0-asneeded.patch84
1 files changed, 59 insertions, 25 deletions
diff --git a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
index df557bf9b110..d7fddbc443ac 100644
--- a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
+++ b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
@@ -1,8 +1,7 @@
-Index: w3c-libwww-5.4.0/Library/src/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/Library/src/Makefile.am
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am
-@@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \
+diff -urN w3c-libwww-5.4.0.orig/Library/src/Makefile.am w3c-libwww-5.4.0/Library/src/Makefile.am
+--- w3c-libwww-5.4.0.orig/Library/src/Makefile.am 2002-05-29 18:09:13.000000000 +0200
++++ w3c-libwww-5.4.0/Library/src/Makefile.am 2006-04-30 22:54:18.000000000 +0200
+@@ -33,7 +33,7 @@
libwwwdav.la \
libwwwsql.la
@@ -11,7 +10,17 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
# .h files are distributed but originally are made from the
# self-documenting hypertext files.
-@@ -181,6 +181,7 @@ libwwwstream_la_SOURCES = \
+@@ -144,6 +144,9 @@
+ HTWWWStr.h \
+ HTWWWStr.c
+
++libwwwcore_la_LIBADD = \
++ libwwwutils.la
++
+ libwwwtrans_la_SOURCES = \
+ WWWTrans.h \
+ HTANSI.h \
+@@ -181,6 +184,7 @@
HTTee.c \
HTXParse.h \
HTXParse.c
@@ -19,7 +28,7 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
libwwwcache_la_SOURCES = \
WWWCache.h \
-@@ -197,6 +198,9 @@ libwwwfile_la_SOURCES = \
+@@ -197,6 +201,9 @@
HTFile.c \
HTMulti.h \
HTMulti.c
@@ -29,7 +38,7 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
libwwwftp_la_SOURCES = \
WWWFTP.h \
-@@ -225,6 +229,9 @@ libwwwmime_la_SOURCES = \
+@@ -225,6 +232,9 @@
HTMIMImp.h \
HTMIMImp.c \
HTMulpar.h
@@ -39,22 +48,19 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
libwwwhttp_la_SOURCES = \
WWWHTTP.h \
-@@ -252,8 +259,13 @@ libwwwhttp_la_SOURCES = \
+@@ -252,8 +262,9 @@
HTPEP.h \
HTPEP.c
-+libwwwhttp_la_LIBADD = \
-+ ../../modules/md5/libmd5.la \
-+ libwwwmime.la
-+
- libwwwhttp_la_DEPENDENCIES = \
+-libwwwhttp_la_DEPENDENCIES = \
- ../../modules/md5/libmd5.la
++libwwwhttp_la_LIBADD = \
+ ../../modules/md5/libmd5.la \
+ libwwwmime.la
libwwwnews_la_SOURCES = \
WWWNews.h \
-@@ -310,6 +322,8 @@ libwwwdir_la_SOURCES = \
+@@ -310,6 +321,8 @@
HTDescpt.c \
HTDir.h \
HTDir.c
@@ -63,11 +69,40 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
libwwwapp_la_SOURCES = \
WWWApp.h \
-Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am
-+++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
-@@ -39,6 +39,14 @@ libwwwssl_la_SOURCES = \
+@@ -334,6 +347,16 @@
+ HTRules.h \
+ HTRules.c
+
++libwwwapp_la_LIBADD = \
++ libwwwmime.la \
++ libwwwhttp.la \
++ libwwwnews.la \
++ libwwwftp.la \
++ libwwwxml.la \
++ libwwwtelnet.la \
++ libwwwgopher.la \
++ libwwwzip.la
++
+ libwwwinit_la_SOURCES = \
+ WWWInit.h \
+ HTProfil.h \
+@@ -362,9 +385,10 @@
+ HTXML.h \
+ HTXML.c
+
+-libwwwxml_la_DEPENDENCIES = \
++libwwwxml_la_LIBADD = \
+ ../../modules/expat/xmltok/libxmltok.la \
+- ../../modules/expat/xmlparse/libxmlparse.la
++ ../../modules/expat/xmlparse/libxmlparse.la \
++ libwwwcore.la
+
+ libwwwxml_la_LDFLAGS = -rpath $(libdir)
+
+diff -urN w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
+--- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am 2000-06-20 13:01:34.000000000 +0200
++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am 2006-04-30 22:53:39.000000000 +0200
+@@ -39,6 +39,14 @@
HTSSLhttps.h \
HTSSLhttps.c
@@ -82,11 +117,10 @@ Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
libwwwssl_la_LDFLAGS = -rpath $(libdir)
LDADD = \
-Index: w3c-libwww-5.4.0/PICS-client/src/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am
-+++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am
-@@ -29,6 +29,8 @@ libpics_la_SOURCES = \
+diff -urN w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am w3c-libwww-5.4.0/PICS-client/src/Makefile.am
+--- w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am 2000-08-04 11:48:37.000000000 +0200
++++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am 2006-04-30 22:53:39.000000000 +0200
+@@ -29,6 +29,8 @@
CSLabel.c CSLLOut.c CSLLURLs.c \
CSMacRed.c CSMem.c CSApp.c \
CSParse.c CSUsrLst.c CSUser.c