Update to 0.4.6.

34 files changed, 323 insertions, 313 deletions

diff --git a/net/libproxy-gnome/Makefile b/net/libproxy-gnome/Makefile
index dc392ef071bc..baaf76b46ced 100644
--- a/net/libproxy-gnome/Makefile
+++ b/net/libproxy-gnome/Makefile
@@ -3,28 +3,29 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/libproxy-gnome/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	net devel
 PKGNAMESUFFIX=	-gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME plug-in for libproxy
 
-LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
-BUILD_WRKSRC=	${WRKSRC}/src/plugins
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_XORG=	xmu x11
 USE_GNOME=	gconf2
-CONFIGURE_ARGS=--with-gnome --without-kde --without-webkit \
-		--without-mozjs --without-networkmanager --without-python \
-		--without-envvar --without-file
 
-LIBPROXY_SLAVE=	yes
+LIBPROXY_SLAVE=	gnome
+
+do-install:
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
+	${INSTALL_LIB} ${WRKSRC}/libproxy/config_gnome.so \
+		${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
+	${INSTALL_PROGRAM} ${WRKSRC}/libproxy/pxgconf \
+		${PREFIX}/libexec/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-gnome/pkg-plist b/net/libproxy-gnome/pkg-plist
index 0ee9c67e3789..4b735c7b3567 100644
--- a/net/libproxy-gnome/pkg-plist
+++ b/net/libproxy-gnome/pkg-plist
@@ -1 +1,2 @@
-lib/libproxy/%%VERSION%%/plugins/gnome.so
+lib/libproxy/%%VERSION%%/modules/config_gnome.so
+libexec/pxgconf
diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
index d1a4d51851df..40ea072c6fae 100644
--- a/net/libproxy-kde/Makefile
+++ b/net/libproxy-kde/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/libproxy-kde/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
 
 PORTREVISION=	0
 CATEGORIES=	net devel
@@ -12,18 +12,20 @@ PKGNAMESUFFIX=	-kde
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	KDE plug-in for libproxy
 
-LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
-BUILD_WRKSRC=	${WRKSRC}/src/plugins
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_XORG=	xmu x11
-CONFIGURE_ARGS=--without-gnome --with-kde --without-webkit \
-		--without-mozjs --without-networkmanager --without-python \
-		--without-envvar --without-file
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib moc_build qmake_build uic_build rcc_build
+USE_KDE4=	automoc4 kdelibs
+
+LIBPROXY_SLAVE=	kde
 
-LIBPROXY_SLAVE=	yes
+do-install:
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
+	${INSTALL_LIB} ${WRKSRC}/lib/config_kde4.so \
+		${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/modules/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-kde/pkg-plist b/net/libproxy-kde/pkg-plist
index 606024d13181..e343d5a436b3 100644
--- a/net/libproxy-kde/pkg-plist
+++ b/net/libproxy-kde/pkg-plist
@@ -1 +1 @@
-lib/libproxy/%%VERSION%%/plugins/kde.so
+lib/libproxy/%%VERSION%%/modules/config_kde4.so
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
index 461c13ca24e1..15366949c4a4 100644
--- a/net/libproxy-mozjs/Makefile
+++ b/net/libproxy-mozjs/Makefile
@@ -3,31 +3,26 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/libproxy-mozjs/Makefile,v 1.5 2011/01/12 13:10:53 kwm Exp $
 
-PORTREVISION=	6
-CATEGORIES=	net devel
+PORTREVISION=	0
+CATEGORIES=	net www
 PKGNAMESUFFIX=	-mozjs
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mozilla Javascript plug-in for libproxy
 
-LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
 
 MASTERDIR=	${.CURDIR}/../libproxy
-BUILD_WRKSRC=	${WRKSRC}/src/plugins
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 USE_GECKO=	libxul
-CONFIGURE_ARGS=--without-gnome --without-kde --without-webkit \
-		--with-mozjs --without-networkmanager --without-python \
-		--without-envvar --without-file
 
-LIBPROXY_SLAVE=	yes
+LIBPROXY_SLAVE=	mozjs
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul|g' \
-		${WRKSRC}/configure
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/libproxy/pacrunner_mozjs.so \
+		${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-mozjs/pkg-plist b/net/libproxy-mozjs/pkg-plist
index 9bd61ce5a8de..49a5042127d8 100644
--- a/net/libproxy-mozjs/pkg-plist
+++ b/net/libproxy-mozjs/pkg-plist
@@ -1 +1 @@
-lib/libproxy/%%VERSION%%/plugins/mozjs.so
+lib/libproxy/%%VERSION%%/modules/pacrunner_mozjs.so
diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile
new file mode 100644
index 000000000000..c6b0db8d044d
--- /dev/null
+++ b/net/libproxy-perl/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	libproxy-perl
+# Date created:		11 Januari 2011
+# Whom:			Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/libproxy-perl/Makefile,v 1.1 2011/01/12 13:10:53 kwm Exp $
+
+PORTREVISION=	0
+CATEGORIES=	net lang
+PKGNAMESUFFIX=	-perl
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Perl binding for libproxy
+
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
+
+MASTERDIR=	${.CURDIR}/../libproxy
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+USE_PERL5=	yes
+
+LIBPROXY_SLAVE=	perl
+
+do-install:
+	${MKDIR} ${SITE_PERL}/mach/auto/Net/Libproxy ${SITE_PERL}/mach/Net
+	${INSTALL_LIB} ${WRKSRC}/perl/blib/arch/auto/Net/Libproxy.so \
+		${SITE_PERL}/mach/auto/Net/Libproxy/
+	${INSTALL_DATA} ${WRKSRC}/perl/blib/lib/Libproxy.pm \
+		${SITE_PERL}/mach/Net/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-perl/pkg-descr b/net/libproxy-perl/pkg-descr
new file mode 100644
index 000000000000..49068649c73d
--- /dev/null
+++ b/net/libproxy-perl/pkg-descr
@@ -0,0 +1,7 @@
+Libproxy exists to answer the question: Given a network resource, how do I
+reach it?  It handles all the details, enabling you to get back to
+programming.
+
+This plug-in allows perl applications to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-perl/pkg-plist b/net/libproxy-perl/pkg-plist
new file mode 100644
index 000000000000..51235dcfaf93
--- /dev/null
+++ b/net/libproxy-perl/pkg-plist
@@ -0,0 +1,5 @@
+%%SITE_PERL%%/mach/Net/Libproxy.pm
+%%SITE_PERL%%/mach/auto/Net/Libproxy/Libproxy.so
+@dirrm %%SITE_PERL%%/mach/auto/Net/Libproxy
+@dirrmtry %%SITE_PERL%%/mach/auto/Net
+@dirrmtry %%SITE_PERL%%/mach/Net
diff --git a/net/libproxy-python/Makefile b/net/libproxy-python/Makefile
new file mode 100644
index 000000000000..99156a0c4541
--- /dev/null
+++ b/net/libproxy-python/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	libproxy-python
+# Date created:		11 Januari 2011
+# Whom:			Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/net/libproxy-python/Makefile,v 1.1 2011/01/12 13:10:54 kwm Exp $
+
+PORTREVISION=	0
+CATEGORIES=	net lang
+PKGNAMESUFFIX=	-python
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	python binding for libproxy
+
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy
+
+MASTERDIR=	${.CURDIR}/../libproxy
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+USE_PYTHON=	2.5+
+
+LIBPROXY_SLAVE=	python
+
+do-build:
+# empty	
+
+post-build:
+	${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py \
+		${WRKSRC}/bindings/python
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		${WRKSRC}/bindings/python
+
+do-install:
+.for file in libproxy.py libproxy.pyc libproxy.pyo
+	${INSTALL_DATA} ${WRKSRC}/bindings/python/${file} \
+		${PYTHON_SITELIBDIR}
+.endfor
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-python/pkg-descr b/net/libproxy-python/pkg-descr
new file mode 100644
index 000000000000..fe6c53af7737
--- /dev/null
+++ b/net/libproxy-python/pkg-descr
@@ -0,0 +1,7 @@
+Libproxy exists to answer the question: Given a network resource, how do I
+reach it?  It handles all the details, enabling you to get back to
+programming.
+
+This plug-in allows python applications to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-python/pkg-plist b/net/libproxy-python/pkg-plist
new file mode 100644
index 000000000000..3c6098ab109f
--- /dev/null
+++ b/net/libproxy-python/pkg-plist
@@ -0,0 +1,3 @@
+%%PYTHON_SITELIBDIR%%/libproxy.py
+%%PYTHON_SITELIBDIR%%/libproxy.pyc
+%%PYTHON_SITELIBDIR%%/libproxy.pyo
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index 972887970eb2..dd9eea7f0b7d 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -3,27 +3,26 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/libproxy-webkit/Makefile,v 1.13 2011/03/06 23:12:41 kwm Exp $
 
-PORTREVISION=	9
-CATEGORIES=	net devel
+PORTREVISION=	1
+CATEGORIES=	net www
 PKGNAMESUFFIX=	-webkit
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	WebKit Javascript plug-in for libproxy
 
-LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy \
-    		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/libproxy \
+		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
 
 MASTERDIR=	${.CURDIR}/../libproxy
-BUILD_WRKSRC=	${WRKSRC}/src/plugins
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-CONFIGURE_ARGS=--without-gnome --without-kde --with-webkit \
-		--without-mozjs --without-networkmanager --without-python \
-		--without-envvar --without-file
 
-LIBPROXY_SLAVE=	yes
+LIBPROXY_SLAVE=	webkit
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/libproxy/pacrunner_webkit.so \
+		${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-webkit/pkg-plist b/net/libproxy-webkit/pkg-plist
index 1032ea9e211c..0ec505707ee6 100644
--- a/net/libproxy-webkit/pkg-plist
+++ b/net/libproxy-webkit/pkg-plist
@@ -1 +1 @@
-lib/libproxy/%%VERSION%%/plugins/webkit.so
+lib/libproxy/%%VERSION%%/modules/pacrunner_webkit.so
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index 5f31eef73a1a..d9e867cc9174 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -3,44 +3,71 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/net/libproxy/Makefile,v 1.1 2011/01/12 13:10:52 kwm Exp $
 
 PORTNAME=	libproxy
-PORTVERSION=	0.2.3
-PORTREVISION?=	1
+PORTVERSION=	0.4.6
+PORTREVISION?=	0
 CATEGORIES?=	net devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT?=	Library that provides automatic proxy configuration management
 
-USE_GMAKE=	yes
-USE_GNOME+=	gnomehack
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		ac_cv_func_malloc_0_nonnull=yes
-CONFIGURE_ARGS?=--without-gnome --without-kde --without-webkit \
-		--without-mozjs --without-networkmanager --with-python \
-		--with-envvar --with-file
+USE_CMAKE=	yes
 
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .if !defined(LIBPROXY_SLAVE)
 USE_LDCONFIG=	yes
-USE_PYTHON=	2.5+
+CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF  -DWITH_PERL:BOOL=OFF \
+		-DWITH_GNOME:BOOL=OFF -DWITH_KDE4:BOOL=OFF \
+		-DWITH_WEBKIT:BOOL=OFF -DWITH_MOZJS:BOOL=OFF \
+		-DWITH_NETWORKMANAGER:BOOL=OFF -DWITH_VALA:BOOL=ON
+.else
 
-post-build:
-	${PYTHON_CMD} -Qold ${PYTHON_LIBDIR}/compileall.py \
-	    	${WRKSRC}/src/bindings/python
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-	    	${WRKSRC}/src/bindings/python
+# Libproxy is build for the slave ports, since I haven't been able to find
+# out how to only build optional code with cmake.
+# Patches for this problem are welcome.
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/src/bindings/python/libproxy.pyc \
-		${PYTHON_SITELIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/bindings/python/libproxy.pyo \
-		${PYTHON_SITELIBDIR}
+. if ${LIBPROXY_SLAVE}=="python"
+CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_PYTHON:BOOL=OFF
+. endif
+
+. if ${LIBPROXY_SLAVE}=="perl"
+CMAKE_ARGS+=	-DWITH_PERL:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_PERL:BOOL=OFF
+. endif
+
+. if ${LIBPROXY_SLAVE}=="gnome"
+CMAKE_ARGS+=	-DWITH_GNOME:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_GNOME:BOOL=OFF
+. endif
+
+. if ${LIBPROXY_SLAVE}=="kde"
+CMAKE_ARGS+=	-DWITH_KDE4:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_KDE4:BOOL=OFF
+. endif
+
+. if ${LIBPROXY_SLAVE}=="webkit"
+CMAKE_ARGS+=	-DWITH_WEBKIT:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_WEBKIT:BOOL=OFF
+. endif
+
+. if ${LIBPROXY_SLAVE}=="mozjs"
+CMAKE_ARGS+=	-DWITH_MOZJS:BOOL=ON
+. else
+CMAKE_ARGS+=	-DWITH_MOZJS:BOOL=OFF
+. endif
 .endif
 
+post-install:
+	@${MKDIR} ${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
+
 .include <bsd.port.mk>
diff --git a/net/libproxy/distinfo b/net/libproxy/distinfo
index 99b29d11e643..3d981bd75eb0 100644
--- a/net/libproxy/distinfo
+++ b/net/libproxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libproxy-0.2.3.tar.gz) = 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
-SIZE (libproxy-0.2.3.tar.gz) = 378773
+SHA256 (libproxy-0.4.6.tar.gz) = 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
+SIZE (libproxy-0.4.6.tar.gz) = 82483
diff --git a/net/libproxy/files/patch-configure b/net/libproxy/files/patch-configure
deleted file mode 100644
index 86ec7097bf13..000000000000
--- a/net/libproxy/files/patch-configure
+++ /dev/null
@@ -1,95 +0,0 @@
---- configure.orig	2009-02-27 00:08:46.000000000 -0500
-+++ configure	2009-02-27 00:09:25.000000000 -0500
-@@ -20509,16 +20509,16 @@ fi
- if test "${with_gnome+set}" = set; then
-   withval=$with_gnome;
- else
--  test x$have_gconf == xyes &&
--             test x$have_x11   == xyes &&
--             test x$have_xmu   == xyes &&
-+  test x$have_gconf = xyes &&
-+             test x$have_x11   = xyes &&
-+             test x$have_xmu   = xyes &&
-              with_gnome=yes
- fi
- 
- if test x$with_gnome = xyes; then
--	if test x$have_gconf == xyes && \
--	   test x$have_x11 == xyes && \
--	   test x$have_xmu == xyes; then
-+	if test x$have_gconf = xyes && \
-+	   test x$have_x11 = xyes && \
-+	   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 &&
--             test x$have_xmu   == xyes &&
-+  test x$have_x11   = xyes &&
-+             test x$have_xmu   = xyes &&
-              with_kde=yes
- fi
- 
- if test x$with_kde = xyes; then
--	if test x$have_x11 == xyes && \
--	   test x$have_xmu == xyes; then
-+	if test x$have_x11 = xyes && \
-+	   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
- 
- 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
- 
- 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
- 
- 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"
- 
-@@ -21610,7 +21610,7 @@ fi
- 
- PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins
- 
--CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1"
-+CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\""
- 
- ### Checks for library functions.
- 
diff --git a/net/libproxy/files/patch-libmodman_CMakeLists.txt b/net/libproxy/files/patch-libmodman_CMakeLists.txt
new file mode 100644
index 000000000000..76f2848dd4c0
--- /dev/null
+++ b/net/libproxy/files/patch-libmodman_CMakeLists.txt
@@ -0,0 +1,14 @@
+--- libmodman/CMakeLists.txt.orig	2010-09-01 22:23:34.000000000 +0200
++++ libmodman/CMakeLists.txt	2011-01-08 01:39:09.000000000 +0100
+@@ -12,9 +12,9 @@
+             module_manager.hpp
+             module_manager.cpp)
+ if(NOT WIN32)
+-  target_link_libraries(modman dl)
++  target_link_libraries(modman)
+ endif()
+-set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1)
++set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1 SOVERSION 1)
+ install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR})
+ 
+ ### Tests
diff --git a/net/libproxy/files/patch-libproxy_CMakeLists.txt b/net/libproxy/files/patch-libproxy_CMakeLists.txt
new file mode 100644
index 000000000000..69a25ed01bb5
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- libproxy/CMakeLists.txt.orig	2010-09-01 22:23:34.000000000 +0200
++++ libproxy/CMakeLists.txt	2010-12-27 10:59:14.000000000 +0100
+@@ -6,7 +6,7 @@
+ if (WIN32)
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+ else(WIN32)
+-  add_definitions(-D_POSIX_C_SOURCE=1)
++#  add_definitions(-D_POSIX_C_SOURCE=1)
+   set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}")
+ endif(WIN32)
+ 
diff --git a/net/libproxy/files/patch-libproxy_cmake_devfiles.cmk b/net/libproxy/files/patch-libproxy_cmake_devfiles.cmk
new file mode 100644
index 000000000000..ea1a0b88b6cf
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_devfiles.cmk
@@ -0,0 +1,11 @@
+--- libproxy/cmake/devfiles.cmk.orig	2010-09-01 22:23:34.000000000 +0200
++++ libproxy/cmake/devfiles.cmk	2010-12-27 11:23:34.000000000 +0100
+@@ -15,7 +15,7 @@
+   endif(IS_ABSOLUTE ${INCLUDE_INSTALL_DIR})
+ 
+   configure_file(${CMAKE_SOURCE_DIR}/libproxy/libproxy-1.0.pc.in ${CMAKE_BINARY_DIR}/libproxy-1.0.pc @ONLY)
+-  install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++  install(FILES ${CMAKE_BINARY_DIR}/libproxy-1.0.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata//pkgconfig)
+   
+   # CMake Find helper
+   configure_file(${CMAKE_SOURCE_DIR}/libproxy/Findlibproxy.cmake.in ${CMAKE_BINARY_DIR}/Findlibproxy.cmake @ONLY)
diff --git a/net/libproxy/files/patch-libproxy_cmake_libproxy.cmk b/net/libproxy/files/patch-libproxy_cmake_libproxy.cmk
new file mode 100644
index 000000000000..d1d22b1937b0
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_libproxy.cmk
@@ -0,0 +1,19 @@
+--- libproxy/cmake/libproxy.cmk.orig	2010-09-01 22:23:34.000000000 +0200
++++ libproxy/cmake/libproxy.cmk	2011-01-08 01:32:46.000000000 +0100
+@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_co
+ if(WIN32)
+   target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
+ else()
+-  target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
++  target_link_libraries(libproxy modman;m;pthread;${LIBPROXY_LIBRARIES})
+ endif()
+ file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
+ if(WIN32)
+@@ -17,6 +17,6 @@ endif()
+ 
+ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
+              PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
+-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
++set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1 SOVERSION 1)
+ install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+ install(FILES   proxy.h  DESTINATION ${INCLUDE_INSTALL_DIR})
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules.cmk b/net/libproxy/files/patch-libproxy_cmake_modules.cmk
new file mode 100644
index 000000000000..08768da011b7
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_modules.cmk
@@ -0,0 +1,16 @@
+--- libproxy/cmake/modules.cmk.orig	2011-01-08 01:06:52.000000000 +0100
++++ libproxy/cmake/modules.cmk	2011-01-08 01:07:02.000000000 +0100
+@@ -17,10 +17,10 @@ include(cmake/modules/pacrunner_mozjs.cm
+ include(cmake/modules/pacrunner_webkit.cmk)
+ 
+ # Build the pacrunner into libproxy unless we are building for multiple engines
+-set(BIPR 1)
+-if(MOZJS_FOUND AND WEBKIT_FOUND)
++#set(BIPR 1)
++#if(MOZJS_FOUND AND WEBKIT_FOUND)
+   set(BIPR 0)
+-endif()
++#endif()
+ 
+ #
+ ## Module definition
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_config-gnome.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_config-gnome.cmk
new file mode 100644
index 000000000000..cc4bc6854c8c
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_modules_config-gnome.cmk
@@ -0,0 +1,8 @@
+--- libproxy/cmake/modules/config_gnome.cmk.orig	2011-01-08 01:14:36.000000000 +0100
++++ libproxy/cmake/modules/config_gnome.cmk	2011-01-08 01:16:19.000000000 +0100
+@@ -1,4 +1,5 @@
+ if (NOT WIN32 AND NOT APPLE)
++  option(WITH_GNOME "Search for GConf2 package" ON)
+   px_check_modules(GNOME gconf-2.0 gobject-2.0)
+   
+   # GNOME (gconf) helper
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_network-networkmanager.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_network-networkmanager.cmk
new file mode 100644
index 000000000000..e8f52ba0600e
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_modules_network-networkmanager.cmk
@@ -0,0 +1,9 @@
+--- libproxy/cmake/modules/network_networkmanager.cmk.orig	2011-01-08 01:21:37.000000000 +0100
++++ libproxy/cmake/modules/network_networkmanager.cmk	2011-01-08 01:22:18.000000000 +0100
+@@ -1,3 +1,4 @@
+ if (NOT WIN32 AND NOT APPLE)
++  option(WITH_NETWORKMANAGER "Search for NetworkManager package" ON)
+   px_check_modules(NM NetworkManager dbus-1)
+-endif()
+\ No newline at end of file
++endif()
diff --git a/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner-webkit.cmk b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner-webkit.cmk
new file mode 100644
index 000000000000..de1d1f649532
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_cmake_modules_pacrunner-webkit.cmk
@@ -0,0 +1,11 @@
+--- libproxy/cmake/modules/pacrunner_webkit.cmk.orig	2011-01-08 01:14:30.000000000 +0100
++++ libproxy/cmake/modules/pacrunner_webkit.cmk	2011-01-08 01:16:05.000000000 +0100
+@@ -12,5 +12,6 @@ elseif(APPLE)
+     set(WEBKIT_FOUND 1)
+   endif()
+ else()
++  option(WITH_WEBKIT "Search for WebKit package" ON)
+   px_check_modules(WEBKIT webkit-1.0)
+-endif()
+\ No newline at end of file
++endif()
diff --git a/net/libproxy/files/patch-libproxy_proxy.cpp b/net/libproxy/files/patch-libproxy_proxy.cpp
new file mode 100644
index 000000000000..90d6de2c8b57
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_proxy.cpp
@@ -0,0 +1,11 @@
+--- libproxy/proxy.cpp.orig	2010-09-01 14:31:50.000000000 +0200
++++ libproxy/proxy.cpp	2010-09-01 14:32:09.000000000 +0200
+@@ -17,6 +17,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  ******************************************************************************/
+ 
++#include <sys/types.h>
++
+ #include <vector>
+ #include <cstring>   // For strdup()
+ #include <iostream>  // For cerr
diff --git a/net/libproxy/files/patch-libproxy_url.hpp b/net/libproxy/files/patch-libproxy_url.hpp
new file mode 100644
index 000000000000..4fbef585a008
--- /dev/null
+++ b/net/libproxy/files/patch-libproxy_url.hpp
@@ -0,0 +1,11 @@
+--- libproxy/url.hpp.orig	2010-09-01 14:30:33.000000000 +0200
++++ libproxy/url.hpp	2010-09-01 14:31:13.000000000 +0200
+@@ -20,6 +20,8 @@
+ #ifndef URL_HPP_
+ #define URL_HPP_
+ 
++#include <sys/types.h>
++
+ #include <map>
+ #include <stdexcept>
+ #include <string>
diff --git a/net/libproxy/files/patch-src_bin_Makefile.in b/net/libproxy/files/patch-src_bin_Makefile.in
deleted file mode 100644
index 3cf5ea2e84ff..000000000000
--- a/net/libproxy/files/patch-src_bin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/Makefile.in.orig	2009-02-26 23:50:56.000000000 -0500
-+++ src/bin/Makefile.in	2009-02-26 23:51:00.000000000 -0500
-@@ -210,7 +210,7 @@ xmu_LIBS = @xmu_LIBS@
- # Command line interface to libproxy
- proxy_SOURCES = proxy.c
- proxy_CFLAGS = -I$(top_srcdir)/src/lib
--proxy_LDFLAGS = -ldl
-+proxy_LDFLAGS = 
- proxy_LDADD = ../lib/libproxy.la
- all: all-am
- 
diff --git a/net/libproxy/files/patch-src_lib_proxy_factory.c b/net/libproxy/files/patch-src_lib_proxy_factory.c
deleted file mode 100644
index bdc815461ee8..000000000000
--- a/net/libproxy/files/patch-src_lib_proxy_factory.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/proxy_factory.c.orig	2009-02-26 23:49:38.000000000 -0500
-+++ src/lib/proxy_factory.c	2009-02-26 23:49:58.000000000 -0500
-@@ -26,6 +26,7 @@
- #include <dlfcn.h>
- #include <math.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include <pthread.h>
- 
diff --git a/net/libproxy/files/patch-src_lib_url.c b/net/libproxy/files/patch-src_lib_url.c
deleted file mode 100644
index 0ca5714efef5..000000000000
--- a/net/libproxy/files/patch-src_lib_url.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/url.c.orig	2009-02-26 23:45:38.000000000 -0500
-+++ src/lib/url.c	2009-02-26 23:47:25.000000000 -0500
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- 
- #include "misc.h"
diff --git a/net/libproxy/files/patch-src_plugins_Makefile.in b/net/libproxy/files/patch-src_plugins_Makefile.in
deleted file mode 100644
index 62aada090868..000000000000
--- a/net/libproxy/files/patch-src_plugins_Makefile.in
+++ /dev/null
@@ -1,84 +0,0 @@
---- src/plugins/Makefile.in.orig	2009-02-27 00:10:06.000000000 -0500
-+++ src/plugins/Makefile.in	2009-02-27 00:10:56.000000000 -0500
-@@ -70,21 +70,21 @@ file_la_LINK = $(LIBTOOL) --tag=CC $(AM_
- 	--mode=link $(CCLD) $(file_la_CFLAGS) $(CFLAGS) \
- 	$(file_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_FILE_TRUE@am_file_la_rpath = -rpath $(plugindir)
--gnome_la_DEPENDENCIES = ../lib/libproxy.la
-+gnome_la_DEPENDENCIES =
- am_gnome_la_OBJECTS = gnome_la-gnome.lo gnome_la-xhasclient.lo
- gnome_la_OBJECTS = $(am_gnome_la_OBJECTS)
- gnome_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(gnome_la_CFLAGS) $(CFLAGS) \
- 	$(gnome_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_GNOME_TRUE@am_gnome_la_rpath = -rpath $(plugindir)
--kde_la_DEPENDENCIES = ../lib/libproxy.la
-+kde_la_DEPENDENCIES =
- am_kde_la_OBJECTS = kde_la-kde.lo kde_la-xhasclient.lo
- kde_la_OBJECTS = $(am_kde_la_OBJECTS)
- kde_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(kde_la_CFLAGS) $(CFLAGS) \
- 	$(kde_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_KDE_TRUE@am_kde_la_rpath = -rpath $(plugindir)
--mozjs_la_DEPENDENCIES = ../lib/libproxy.la
-+mozjs_la_DEPENDENCIES =
- am_mozjs_la_OBJECTS = mozjs_la-mozjs.lo
- nodist_mozjs_la_OBJECTS =
- mozjs_la_OBJECTS = $(am_mozjs_la_OBJECTS) $(nodist_mozjs_la_OBJECTS)
-@@ -92,7 +92,7 @@ mozjs_la_LINK = $(LIBTOOL) --tag=CC $(AM
- 	--mode=link $(CCLD) $(mozjs_la_CFLAGS) $(CFLAGS) \
- 	$(mozjs_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_MOZJS_TRUE@am_mozjs_la_rpath = -rpath $(plugindir)
--networkmanager_la_DEPENDENCIES = ../lib/libproxy.la
-+networkmanager_la_DEPENDENCIES =
- am_networkmanager_la_OBJECTS = networkmanager_la-networkmanager.lo
- networkmanager_la_OBJECTS = $(am_networkmanager_la_OBJECTS)
- networkmanager_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -101,7 +101,7 @@ networkmanager_la_LINK = $(LIBTOOL) --ta
- 	$(networkmanager_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_NETWORKMANAGER_TRUE@am_networkmanager_la_rpath = -rpath \
- @WITH_NETWORKMANAGER_TRUE@	$(plugindir)
--webkit_la_DEPENDENCIES = ../lib/libproxy.la
-+webkit_la_DEPENDENCIES =
- am_webkit_la_OBJECTS = webkit_la-webkit.lo
- nodist_webkit_la_OBJECTS =
- webkit_la_OBJECTS = $(am_webkit_la_OBJECTS) \
-@@ -293,33 +293,33 @@ file_la_LDFLAGS = -module -avoid-version
- # GConf/GNOME Config Plugin
- gnome_la_SOURCES = gnome.c xhasclient.c
- gnome_la_CFLAGS = -I$(top_srcdir)/src/lib @GNOME_CFLAGS@
--gnome_la_LIBADD = ../lib/libproxy.la
-+gnome_la_LIBADD = -lproxy
- gnome_la_LDFLAGS = -module -avoid-version @GNOME_LIBS@
- 
- # KDE Config Plugin
- kde_la_SOURCES = kde.c xhasclient.c
- kde_la_CFLAGS = -I$(top_srcdir)/src/lib @KDE_CFLAGS@
--kde_la_LIBADD = ../lib/libproxy.la
-+kde_la_LIBADD = -lproxy
- kde_la_LDFLAGS = -module -avoid-version @KDE_LIBS@
- 
- # WebKit (JavaScriptCore) based PAC runner
- webkit_la_SOURCES = webkit.c
- webkit_la_CFLAGS = -I$(top_srcdir)/src/lib @WEBKIT_CFLAGS@
--webkit_la_LIBADD = ../lib/libproxy.la
-+webkit_la_LIBADD = -lproxy
- webkit_la_LDFLAGS = -module -avoid-version @WEBKIT_LIBS@
- nodist_webkit_la_SOURCES = pacutils.h
- 
- # Mozilla (Spidermonkey) based PAC runner
- mozjs_la_SOURCES = mozjs.c
- mozjs_la_CFLAGS = -I$(top_srcdir)/src/lib @MOZJS_CFLAGS@
--mozjs_la_LIBADD = ../lib/libproxy.la
-+mozjs_la_LIBADD = -lproxy
- mozjs_la_LDFLAGS = -module -avoid-version @MOZJS_LIBS@
- nodist_mozjs_la_SOURCES = pacutils.h
- 
- # NetworkManager Plugin
- networkmanager_la_SOURCES = networkmanager.c
- networkmanager_la_CFLAGS = -I$(top_srcdir)/src/lib @NETWORKMANAGER_CFLAGS@
--networkmanager_la_LIBADD = ../lib/libproxy.la
-+networkmanager_la_LIBADD = -lproxy
- networkmanager_la_LDFLAGS = -module -avoid-version @NETWORKMANAGER_LIBS@
- BUILT_SOURCES = pacutils.h
- CLEANFILES = pacutils.h
diff --git a/net/libproxy/files/patch-src_plugins_mozjs.c b/net/libproxy/files/patch-src_plugins_mozjs.c
deleted file mode 100644
index b2c5aa67088d..000000000000
--- a/net/libproxy/files/patch-src_plugins_mozjs.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugins/mozjs.c.orig	2009-02-27 00:18:46.000000000 -0500
-+++ src/plugins/mozjs.c	2009-02-27 00:18:56.000000000 -0500
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #define __USE_BSD
- #include <unistd.h>
- 
diff --git a/net/libproxy/files/patch-src_plugins_webkit.c b/net/libproxy/files/patch-src_plugins_webkit.c
deleted file mode 100644
index 9fb65909a18c..000000000000
--- a/net/libproxy/files/patch-src_plugins_webkit.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/plugins/webkit.c.orig	2009-02-27 00:22:39.000000000 -0500
-+++ src/plugins/webkit.c	2009-02-27 00:22:50.000000000 -0500
-@@ -21,6 +21,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <arpa/inet.h>
- #define __USE_BSD
diff --git a/net/libproxy/pkg-plist b/net/libproxy/pkg-plist
index 6f71b5cf89a3..ca4f6738eb16 100644
--- a/net/libproxy/pkg-plist
+++ b/net/libproxy/pkg-plist
@@ -1,15 +1,17 @@
 bin/proxy
 include/proxy.h
-lib/libproxy.a
-lib/libproxy.la
+lib/libmodman.so
+lib/libmodman.so.1
 lib/libproxy.so
-lib/libproxy.so.0
-lib/libproxy/%%VERSION%%/plugins/envvar.so
-lib/libproxy/%%VERSION%%/plugins/file.so
+lib/libproxy.so.1
 libdata/pkgconfig/libproxy-1.0.pc
-%%PYTHON_SITELIBDIR%%/libproxy.py
-%%PYTHON_SITELIBDIR%%/libproxy.pyc
-%%PYTHON_SITELIBDIR%%/libproxy.pyo
-@dirrmtry lib/libproxy/%%VERSION%%/plugins
-@dirrmtry lib/libproxy/%%VERSION%%
-@dirrmtry lib/libproxy
+share/cmake/Modules/Findlibproxy.cmake
+share/vala/vapi/libproxy-1.0.vapi
+@dirrmtry share/vala/vapi
+@dirrmtry share/vala
+@dirrm share/cmake/Modules
+@dirrm share/cmake
+@exec mkdir -p %D/lib/libproxy/%%VERSION%%/modules
+@dirrm lib/libproxy/%%VERSION%%/modules
+@dirrm lib/libproxy/%%VERSION%%
+@dirrm lib/libproxy