packages: w3c-libwww/w3c-libwww-link.patch, w3c-libwww/w3c-libwww-system-li...

[shadzik]

Author: shadzik                      Date: Tue Nov  9 16:11:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated

---- Files affected:
packages/w3c-libwww:
   w3c-libwww-link.patch (1.3 -> 1.4) , w3c-libwww-system-libmd5.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/w3c-libwww/w3c-libwww-link.patch
diff -u packages/w3c-libwww/w3c-libwww-link.patch:1.3 packages/w3c-libwww/w3c-libwww-link.patch:1.4
--- packages/w3c-libwww/w3c-libwww-link.patch:1.3	Mon Mar 31 23:33:37 2008
+++ packages/w3c-libwww/w3c-libwww-link.patch	Tue Nov  9 17:11:31 2010
@@ -1,5 +1,5 @@
---- w3c-libwww-5.4.0/Library/src/Makefile.am.orig	2007-04-10 19:22:56.706644924 +0200
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am	2007-04-10 19:23:14.659668008 +0200
+--- w3c-libwww-5.4.0/Library/src/Makefile.am.orig	2010-11-09 16:19:08.655724837 +0100
++++ w3c-libwww-5.4.0/Library/src/Makefile.am	2010-11-09 16:35:05.816043461 +0100
 @@ -6,23 +6,23 @@
  	libwwwutils.la \
  	libwwwcore.la \
@@ -107,19 +107,6 @@
  libwwwhttp_la_SOURCES = \
  	WWWHTTP.h \
  	HTTPUtil.h \
-@@ -254,8 +271,11 @@
- 	HTPEP.c
- 
- libwwwhttp_la_DEPENDENCIES = \
--	../../modules/md5/libmd5.la
-+	../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la
- 
-+libwwwhttp_la_LIBADD = \
-+	../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la
-+
- libwwwnews_la_SOURCES = \
- 	WWWNews.h \
- 	HTNDir.h \
 @@ -265,11 +285,15 @@
  	HTNewsRq.h \
  	HTNewsRq.c
@@ -150,7 +137,7 @@
  	HTDir.c
  
 +libwwwdir_la_LIBADD = \
-+	libwwwhtml.la libwwwutils.la libwwwcore.la
++	libwwwhtml.la libwwwutils.la libwwwcore.la HTBind.lo
 +
  libwwwapp_la_SOURCES = \
  	WWWApp.h \
@@ -209,3 +196,27 @@
  libwwwzip_la_LDFLAGS = -rpath $(libdir)
  
  libwwwsql_la_SOURCES = \
+--- w3c-libwww-5.4.0/Library/src/SSL/Makefile.am.orig	2010-11-09 16:38:48.992046302 +0100
++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am	2010-11-09 16:44:35.662364395 +0100
+@@ -39,7 +39,8 @@
+ 	HTSSLhttps.h \
+ 	HTSSLhttps.c
+ 
+-libwwwssl_la_LDFLAGS = -rpath $(libdir)
++libwwwssl_la_LDFLAGS = -rpath $(libdir) \
++		       ../libwwwcore.la ../libwwwapp.la ../libwwwhttp.la
+ 
+ LDADD = \
+ 	libwwwssl.la
+--- w3c-libwww-5.4.0/PICS-client/src/Makefile.am.orig	2010-11-09 16:45:44.105885672 +0100
++++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am	2010-11-09 16:47:56.818021370 +0100
+@@ -30,6 +30,9 @@
+ 	CSMacRed.c	CSMem.c		CSApp.c \
+ 	CSParse.c	CSUsrLst.c	CSUser.c
+ 
++libpics_la_LIBADD = \
++	../../Library/src/libwwwcore.la ../../Library/src/libwwwapp.la
++
+ BUILT_SOURCES = \
+ 	CSLApp.h	CSLUtils.h \
+ 	CSLL.h		CSLLSt.h \

================================================================
Index: packages/w3c-libwww/w3c-libwww-system-libmd5.patch
diff -u packages/w3c-libwww/w3c-libwww-system-libmd5.patch:1.2 packages/w3c-libwww/w3c-libwww-system-libmd5.patch:1.3
--- packages/w3c-libwww/w3c-libwww-system-libmd5.patch:1.2	Wed Sep 17 23:09:44 2008
+++ packages/w3c-libwww/w3c-libwww-system-libmd5.patch	Tue Nov  9 17:11:31 2010
@@ -55,32 +55,6 @@
  	$(LIBS)
  
  
---- w3c-libwww-5.4.0/Library/src/Makefile.am.orig	2008-09-17 13:29:33.000000000 +0200
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am	2008-09-17 14:08:06.000000000 +0200
-@@ -269,10 +269,10 @@
- 	HTPEP.c
- 
- libwwwhttp_la_DEPENDENCIES = \
--	../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la
-+	libwwwmime.la libwwwutils.la libwwwcore.la
- 
- libwwwhttp_la_LIBADD = \
--	../../modules/md5/libmd5.la libwwwmime.la libwwwutils.la libwwwcore.la
-+	@LIBWWWMD5@ libwwwmime.la libwwwutils.la libwwwcore.la
- 
- libwwwnews_la_SOURCES = \
- 	WWWNews.h \
-@@ -425,10 +425,6 @@
- 
- libwwwsql_la_LDFLAGS = -rpath $(libdir)
- 
--INCLUDES = \
--	-I/usr/local/include \
--	-I${top_srcdir}/modules/md5
--
- BUILT_SOURCES = \
- 	wwwsys.h \
- 	HTAABrow.h \
 --- w3c-libwww-5.4.0/Library/src/HTDigest.h.orig	2002-06-12 11:31:20.000000000 +0200
 +++ w3c-libwww-5.4.0/Library/src/HTDigest.h	2008-09-17 13:42:22.000000000 +0200
 @@ -60,7 +60,7 @@
@@ -129,3 +103,29 @@
  
 -SUBDIRS = md5
  
+--- w3c-libwww-5.4.0/Library/src/Makefile.am.orig	2010-11-09 17:07:12.876029313 +0100
++++ w3c-libwww-5.4.0/Library/src/Makefile.am	2010-11-09 17:09:21.308695152 +0100
+@@ -269,8 +269,11 @@
+ 	HTPEP.c
+ 
+ libwwwhttp_la_DEPENDENCIES = \
+-	../../modules/md5/libmd5.la
++	libwwwmime.la libwwwutils.la libwwwcore.la
+ 
++libwwwhttp_la_LIBADD = \
++	@LIBWWWMD5@ libwwwmime.la libwwwutils.la libwwwcore.la
++ 
+ libwwwnews_la_SOURCES = \
+ 	WWWNews.h \
+ 	HTNDir.h \
+@@ -422,10 +425,6 @@
+ 
+ libwwwsql_la_LDFLAGS = -rpath $(libdir)
+ 
+-INCLUDES = \
+-	-I/usr/local/include \
+-	-I${top_srcdir}/modules/md5
+-
+ BUILT_SOURCES = \
+ 	wwwsys.h \
+ 	HTAABrow.h \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w3c-libwww/w3c-libwww-link.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/w3c-libwww/w3c-libwww-system-libmd5.patch?r1=1.2&r2=1.3&f=u