Subject: some fixes to libwww to get their libraries in the right order
To: NetBSD Packages Technical Discussion List <tech-pkg@NetBSD.ORG>
From: Greg A. Woods <woods@weird.com>
List: tech-pkg
Date: 01/16/2005 16:44:22
The following changes get the libraries in the right order for libwww.
I would submit them directly to w3c.org, but they've got a bogus
requirement for a written paper copy of a copyright
disclaimer/assignment, and I simply don't want to bother with such
time-consuming nonsense for such a trivial self-obvious fix.
(Shouldn't MIT, of all places, be happy with PGP-signed disclaimers?)
If anyone else already has a copyright assignment on file with them,
then please be my guest and submit these changes as your own.
(note these changes apply to the pkgsrc module, not directly to libwww)
cvs diff: Diffing www/libwww
Index: www/libwww/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/www/libwww/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- www/libwww/Makefile 3 Oct 2004 00:18:26 -0000 1.58
+++ www/libwww/Makefile 16 Jan 2005 21:08:43 -0000
@@ -70,4 +70,6 @@
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/automake.mk"
+
.include "../../mk/bsd.pkg.mk"
Index: www/libwww/distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/www/libwww/distinfo,v
retrieving revision 1.18
diff -u -r1.18 distinfo
--- www/libwww/distinfo 29 Feb 2004 11:49:55 -0000 1.18
+++ www/libwww/distinfo 16 Jan 2005 21:20:53 -0000
@@ -10,10 +10,11 @@
SHA1 (patch-ad) = a585498bace904928d18e7449a6defad82f59596
SHA1 (patch-ae) = 4130a9a20d806553a79e04c79d652b76ec1dce34
SHA1 (patch-af) = 6cb4967a94626154fd940bf4e2406aad45d59e93
-SHA1 (patch-ai) = 95912fb5b836e4dce01b630f9e6e9c9f41d7bb72
+SHA1 (patch-ai) = ecf67c56be6c7ab6fd30ac82e0009e07d72b3e08
SHA1 (patch-aj) = 6148ae393aefcce54477b289835038b01a26a0ed
SHA1 (patch-ak) = fb13a43105ee252a461d20b67d5841db6d247dde
SHA1 (patch-al) = dae1e731f7a9ff36ef1f60f2a4a6cc97e359ae63
-SHA1 (patch-am) = 8252ce567efc056daa10af39eeca314f9a915f90
+SHA1 (patch-am) = 3c1ed8a0fc3729fb0df33db42ece081ba58dc874
SHA1 (patch-an) = e7195c25ce08e13e0c8b64b05b737e9a5f5157a8
SHA1 (patch-ao) = fa5c98f6c4e873f816e5a5bc48481d1462c946dc
+SHA1 (patch-za) = 5943970b6e8a392a739d34b917255e13d3069593
cvs diff: Diffing www/libwww/patches
Index: www/libwww/patches/patch-ai
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/www/libwww/patches/patch-ai,v
retrieving revision 1.1
diff -u -r1.1 patch-ai
--- www/libwww/patches/patch-ai 20 Apr 2001 12:33:54 -0000 1.1
+++ www/libwww/patches/patch-ai 16 Jan 2005 19:40:44 -0000
@@ -2,12 +2,12 @@
--- libwww-config.in.orig Wed Jun 23 13:05:01 1999
+++ libwww-config.in
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ while test $# -gt 0; do
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 -L@libdir@ -Wl,-R@libdir@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWXML@ @LWWWZIP@ @LWWWMD5@ @LIBS@
;;
*)
echo "${usage}" 1>&2
Index: www/libwww/patches/patch-am
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/www/libwww/patches/patch-am,v
retrieving revision 1.3
diff -u -r1.3 patch-am
--- www/libwww/patches/patch-am 29 Feb 2004 11:49:55 -0000 1.3
+++ www/libwww/patches/patch-am 16 Jan 2005 21:16:35 -0000
@@ -2,7 +2,29 @@
--- configure.in.orig 2002-06-12 04:26:46.000000000 -0500
+++ configure.in
-@@ -237,6 +237,8 @@ AC_CHECK_FUNC(unlink)
+@@ -35,9 +35,9 @@
+ AC_ISC_POSIX
+ dnl AC_PROG_CXX Caused problems and is not needed...
+ dnl You should probably use all three of these for maximum portability
+-AC_CYGWIN
+-AC_MINGW32
+-AC_EXEEXT
++dnl AC_CYGWIN
++dnl AC_MINGW32
++dnl AC_EXEEXT
+ if test "$MINGW32" = "yes"; then
+ # With MinGW, need to explicitly link against winsock2
+ LIBS="$LIBS -lws2_32"
+@@ -47,7 +47,7 @@
+ AC_DISABLE_SHARED
+ fi
+
+-AC_LIBTOOL_WIN32_DLL
++dnl AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+@@ -237,6 +237,8 @@
fi
fi
@@ -11,7 +33,7 @@
dnl Checks for configuration arguments
AC_MSG_CHECKING(whether to support direct WAIS access.)
AC_ARG_WITH(wais,
-@@ -330,6 +332,11 @@ AC_ARG_WITH(regex,
+@@ -330,6 +332,11 @@
AC_DEFINE(HT_POSIX_REGEX)
if test "x$withval" = "xyes"; then
AC_CHECK_LIB(rx, regexec, [ LIBS="-lrx $LIBS" ] )
@@ -23,7 +45,25 @@
else
AC_ADDLIB($withval)
AC_TRY_LINK([],
-@@ -532,27 +539,39 @@ AC_ARG_WITH(md5,
+@@ -501,7 +508,7 @@
+ XMLTOK="libxmltok.la"
+ XMLPARSE="libxmlparse.la"
+ WWWXML="libwwwxml.la"
+- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
++ LWWWXML="-lwwwxml -lxmlparse -lxmltok"
+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+ SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
+ ;;
+@@ -513,7 +520,7 @@
+ XMLTOK="libxmltok.la"
+ XMLPARSE="libxmlparse.la"
+ WWWXML="libwwwxml.la"
+- LWWWXML="-lwwwxml -lxmltok -lxmlparse"
++ LWWWXML="-lwwwxml -lxmlparse -lxmltok"
+ LIBWWWXML='${top_builddir}/Library/src/libwwwxml.la ${top_builddir}/modules/expat/xmlparse/libxmlparse.la ${top_builddir}/modules/expat/xmltok/libxmltok.la'
+ SHOWXML='showxml$(EXEEXT) ptri$(EXEEXT) stri$(EXEEXT) rdf_parse_file$(EXEEXT) rdf_parse_buffer$(EXEEXT)'
+ )
+@@ -532,27 +539,39 @@
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -63,7 +103,7 @@
AC_MSG_CHECKING(whether we include WebDAV support.)
AC_ARG_WITH(dav,
-@@ -609,31 +628,9 @@ AC_SUBST(MYEXT)
+@@ -609,31 +628,9 @@
@@ -97,7 +137,7 @@
LWWWSSL=""
LIBWWWSSL=""
WWWSSLEX=""
-@@ -645,10 +642,35 @@ AC_ARG_WITH(ssl,
+@@ -645,10 +642,35 @@
;;
*)
if test "x$withval" = "xyes"; then
@@ -136,7 +176,7 @@
AC_TRY_LINK([],
[ SSL_library_init(); ],
[],
-@@ -663,6 +685,7 @@ AC_ARG_WITH(ssl,
+@@ -663,6 +685,7 @@
[ AC_MSG_RESULT(no) ])
AC_SUBST(WWWSSL)
AC_SUBST(SSLINC)
@@ -144,3 +184,22 @@
AC_SUBST(LWWWSSL)
AC_SUBST(LIBWWWSSL)
AC_SUBST(WWWSSLEX)
+@@ -1066,7 +1089,8 @@
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+- AC_DEFINE(_POSIX_SOURCE) [CFLAGS="$CFLAGS -D_POSIX_SOURCE"]
++ AC_DEFINE([_POSIX_SOURCE], [], [Defined to enable POSIX-only system APIs])
++ [CFLAGS="$CFLAGS -D_POSIX_SOURCE"]
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+@@ -1081,7 +1105,7 @@
+ AC_OUTPUT([Makefile libwww-config w3c-libwww.spec
+ config/Makefile
+ modules/Makefile
+-modules/expat/Makefile modules/expat/xmltok/Makefile modules/expat/xmlparse/Makefile
++modules/expat/Makefile modules/expat/xmlparse/Makefile modules/expat/xmltok/Makefile
+ modules/md5/Makefile
+ Library/Makefile Library/User/Makefile Library/User/Patch/Makefile
+ Library/User/Architecture/Makefile Library/User/Using/Makefile Library/User/Guide/Makefile
Index: www/libwww/patches/patch-za
===================================================================
RCS file: www/libwww/patches/patch-za
diff -N www/libwww/patches/patch-za
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/libwww/patches/patch-za 16 Jan 2005 21:20:47 -0000
@@ -0,0 +1,10 @@
+--- Makefile.am.orig Wed Jun 12 05:32:59 2002
++++ Makefile.am Sun Jan 16 16:19:59 2005
+@@ -42,7 +42,6 @@
+ chmod -R a+r $(distdir)
+ zip -rq $(distdir).zip $(distdir)
+ $(TAR) chofz $(distdir).tgz $(distdir)
+- # gzip -f $(distdir).tar
+
+ # Tag before making distribution. Also, don't make a distribution if
+ # checks fail.
--
Greg A. Woods
H:+1 416 218-0098 W:+1 416 489-5852 x122 VE3TCP RoboHack <woods@robohack.ca>
Planix, Inc. <woods@planix.com> Secrets of the Weird <woods@weird.com>