Make it compile on DragonFly (and probably on some other systems).

6 files changed, 93 insertions, 69 deletions

diff --git a/www/libproxy/Makefile b/www/libproxy/Makefile
index 16a3f38ff51..d149c47e89d 100644
--- a/www/libproxy/Makefile
+++ b/www/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2009/03/12 13:31:48 hasso Exp $
 #
 
 DISTNAME=	libproxy-0.2.3
@@ -13,15 +13,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
+USE_TOOLS+=	pkg-config gmake autoreconf autoconf automake
 PY_PATCHPLIST=	yes
 
 PKGCONFIG_OVERRIDE+=	libproxy-1.0.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "NetBSD")
-BUILDLINK_TRANSFORM+=	rm:-ldl
-.endif
+pre-configure:
+	cd ${WRKSRC} && autoreconf --force
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/www/libproxy/distinfo b/www/libproxy/distinfo
index 762e39a3c5b..2e5bd6e4c01 100644
--- a/www/libproxy/distinfo
+++ b/www/libproxy/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/03/12 13:31:48 hasso Exp $
 
 SHA1 (libproxy-0.2.3.tar.gz) = 2b2b00a179740548035a1145bbae600db9b0a2ce
 RMD160 (libproxy-0.2.3.tar.gz) = c86c4f8403cb879380e101d074af469c960b5c1c
 Size (libproxy-0.2.3.tar.gz) = 378773 bytes
-SHA1 (patch-aa) = e27fd8a773fab0a7e0813b1a8acf6311b4fd012a
+SHA1 (patch-aa) = ab5445d93d3dc0e17828ddb18c5e662ea982e262
+SHA1 (patch-ab) = 092f99af979d3a456e188386a3e62da1ac6e843d
+SHA1 (patch-ac) = 891e6217c1d7cd78a5f57afb8b1267aed8c1de75
+SHA1 (patch-ad) = f88c2818f861533a504119333e5aff44bb12ce0f
diff --git a/www/libproxy/patches/patch-aa b/www/libproxy/patches/patch-aa
index cc4519770fe..50cba895385 100644
--- a/www/libproxy/patches/patch-aa
+++ b/www/libproxy/patches/patch-aa
@@ -1,20 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/03/12 13:31:48 hasso Exp $
 
---- configure.orig	2008-06-05 16:56:33.000000000 -0400
-+++ configure
-@@ -20509,16 +20509,16 @@ fi
- if test "${with_gnome+set}" = set; then
-   withval=$with_gnome;
- else
--  test x$have_gconf == xyes &&
+--- configure.ac.orig	2009-03-12 12:13:00 +0200
++++ configure.ac	2009-03-12 12:15:44 +0200
+@@ -41,14 +41,14 @@ AC_ARG_WITH([gnome],
+             [AS_HELP_STRING([--with-gnome],
+             [build GNOME configuration plugin @<:@automatic@:>@])],
+             [],
+-            [test x$have_gconf == xyes && 
 -             test x$have_x11   == xyes &&
 -             test x$have_xmu   == xyes &&
-+  test x$have_gconf = xyes &&
++            [test x$have_gconf = xyes && 
 +             test x$have_x11   = xyes &&
 +             test x$have_xmu   = xyes &&
-              with_gnome=yes
- fi
- 
+              with_gnome=yes])
  if test x$with_gnome = xyes; then
 -	if test x$have_gconf == xyes && \
 -	   test x$have_x11 == xyes && \
@@ -24,18 +22,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
 +	   test x$have_xmu = xyes; then
  		GNOME_CFLAGS="$x11_CFLAGS $xmu_CFLAGS $gconf_CFLAGS"
  		GNOME_LIBS="$x11_LIBS $xmu_LIBS $gconf_LIBS"
- 
-@@ -20545,14 +20545,14 @@ fi
- if test "${with_kde+set}" = set; then
-   withval=$with_kde;
- else
--  test x$have_x11   == xyes &&
+ 		AC_SUBST(GNOME_CFLAGS)
+@@ -67,12 +67,12 @@ AC_ARG_WITH([kde],
+             [AS_HELP_STRING([--with-kde],
+             [build KDE configuration plugin @<:@automatic@:>@])],
+             [],
+-            [test x$have_x11   == xyes &&
 -             test x$have_xmu   == xyes &&
-+  test x$have_x11   = xyes &&
++            [test x$have_x11   = xyes &&
 +             test x$have_xmu   = xyes &&
-              with_kde=yes
- fi
- 
+              with_kde=yes])
  if test x$with_kde = xyes; then
 -	if test x$have_x11 == xyes && \
 -	   test x$have_xmu == xyes; then
@@ -43,58 +39,50 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/03/04 02:11:07 jmcneill Exp $
 +	   test x$have_xmu = xyes; then
  		KDE_CFLAGS="$x11_CFLAGS $xmu_CFLAGS"
  		KDE_LIBS="$x11_LIBS $xmu_LIBS"
- 
-@@ -20579,11 +20579,11 @@ fi
- if test "${with_webkit+set}" = set; then
-   withval=$with_webkit;
- else
--  test x$have_webkit == xyes && with_webkit=yes
-+  test x$have_webkit = xyes && with_webkit=yes
- fi
- 
+ 		AC_SUBST(KDE_CFLAGS)
+@@ -91,9 +91,9 @@ AC_ARG_WITH([webkit],
+             [AS_HELP_STRING([--with-webkit],
+             [build WebKit JavaScriptCore PAC runner plugin @<:@automatic@:>@])],
+             [],
+-            [test x$have_webkit == xyes && with_webkit=yes])
++            [test x$have_webkit = xyes && with_webkit=yes])
  if test x$with_webkit = xyes; then
 -	if test x$have_webkit == xyes; then
 +	if test x$have_webkit = xyes; then
  		WEBKIT_CFLAGS="$webkit_CFLAGS"
  		WEBKIT_LIBS="$webkit_LIBS"
- 
-@@ -20610,11 +20610,11 @@ fi
- if test "${with_mozjs+set}" = set; then
-   withval=$with_mozjs;
- else
--  test x$have_mozjs == xyes && with_mozjs=yes
-+  test x$have_mozjs = xyes && with_mozjs=yes
- fi
- 
+ 		AC_SUBST(WEBKIT_CFLAGS)
+@@ -112,9 +112,9 @@ AC_ARG_WITH([mozjs],
+             [AS_HELP_STRING([--with-mozjs],
+             [build Mozilla JavaScript PAC runner plugin @<:@automatic@:>@])],
+             [],
+-            [test x$have_mozjs == xyes && with_mozjs=yes])
++            [test x$have_mozjs = xyes && with_mozjs=yes])
  if test x$with_mozjs = xyes; then
 -	if test x$have_mozjs == xyes; then
 +	if test x$have_mozjs = xyes; then
  		MOZJS_CFLAGS="$mozjs_CFLAGS"
  		MOZJS_LIBS="$mozjs_LIBS"
- 
-@@ -20641,11 +20641,11 @@ fi
- if test "${with_networkmanager+set}" = set; then
-   withval=$with_networkmanager;
- else
--  test x$have_networkmanager == xyes && with_networkmanager=yes
-+  test x$have_networkmanager = xyes && with_networkmanager=yes
- fi
- 
+ 		AC_SUBST(MOZJS_CFLAGS)
+@@ -133,9 +133,9 @@ AC_ARG_WITH([networkmanager],
+             [AS_HELP_STRING([--with-networkmanager],
+             [build NetworkManager plugin @<:@automatic@:>@])],
+             [],
+-            [test x$have_networkmanager == xyes && with_networkmanager=yes])
++            [test x$have_networkmanager = xyes && with_networkmanager=yes])
  if test x$with_networkmanager = xyes; then
 -	if test x$have_networkmanager == xyes; then
 +	if test x$have_networkmanager = xyes; then
  		NETWORKMANAGER_CFLAGS="$NetworkManager_CFLAGS"
  		NETWORKMANAGER_LIBS="$NetworkManager_LIBS"
+ 		AC_SUBST(NETWORKMANAGER_CFLAGS)
+@@ -182,6 +182,9 @@ CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=
+ AC_FUNC_MALLOC
+ #AC_CHECK_FUNCS([gethostbyname gethostname memset socket strdup strstr])
  
-@@ -21611,6 +21611,11 @@ fi
- PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
- 
- CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
-+case $host_os in
-+  netbsd*)
-+    CFLAGS="$CFLAGS -D_NETBSD_SOURCE"
-+    ;;
-+esac
- 
- ### Checks for library functions.
- 
++AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl")
++AC_SUBST(DL_LIBS)
++
+ AC_CONFIG_FILES([libproxy-1.0.pc Makefile src/Makefile src/lib/Makefile
+                  src/plugins/Makefile src/bin/Makefile src/bindings/Makefile
+                  src/bindings/python/Makefile src/bindings/java/Makefile
diff --git a/www/libproxy/patches/patch-ab b/www/libproxy/patches/patch-ab
new file mode 100644
index 00000000000..d634d74b02e
--- /dev/null
+++ b/www/libproxy/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2009/03/12 13:31:48 hasso Exp $
+
+--- ./src/lib/url.c.orig	2009-03-12 11:23:52 +0200
++++ ./src/lib/url.c	2009-03-12 11:24:58 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include "misc.h"
+ #include "url.h"
diff --git a/www/libproxy/patches/patch-ac b/www/libproxy/patches/patch-ac
new file mode 100644
index 00000000000..fb90a28971e
--- /dev/null
+++ b/www/libproxy/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2009/03/12 13:31:48 hasso Exp $
+
+--- ./src/lib/proxy_factory.c.orig	2009-03-12 11:25:26 +0200
++++ ./src/lib/proxy_factory.c	2009-03-12 11:25:47 +0200
+@@ -27,6 +27,7 @@
+ #include <math.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ #include <pthread.h>
+ 
+ 
diff --git a/www/libproxy/patches/patch-ad b/www/libproxy/patches/patch-ad
new file mode 100644
index 00000000000..83108cab513
--- /dev/null
+++ b/www/libproxy/patches/patch-ad
@@ -0,0 +1,11 @@
+$NetBSD: patch-ad,v 1.1 2009/03/12 13:31:48 hasso Exp $
+
+--- src/bin/Makefile.am.orig	2009-03-12 12:18:18 +0200
++++ src/bin/Makefile.am	2009-03-12 12:18:33 +0200
+@@ -3,5 +3,5 @@ bin_PROGRAMS  = proxy
+ # Command line interface to libproxy
+ proxy_SOURCES = proxy.c
+ proxy_CFLAGS  = -I$(top_srcdir)/src/lib
+-proxy_LDFLAGS = -ldl
++proxy_LDFLAGS = $(DL_LIBS)
+ proxy_LDADD   = ../lib/libproxy.la