summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-01-12 21:10:54 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-01-12 21:10:54 +0800
commit9f43eeb934c87900ce625fbfb16062ce062a7898 (patch)
tree0edecec609ebefbf1d65551a49c1be4e96eafeef /net
parenta10e232a3159543727fefab24dd80958dec9400c (diff)
downloadmarcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar.gz
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar.bz2
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar.lz
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar.xz
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.tar.zst
marcuscom-ports-9f43eeb934c87900ce625fbfb16062ce062a7898.zip
Update to 0.4.6.
This took a while since it now uses cmake. And I had to figure out how that works. New -python and -perl slave ports. Also I haven't figured out how to build only optional code with cmake. Currently it builds libproxy for the slave ports too, since libproxy is quite small this isn't really a problem. Patches for this problem are welcome. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14990 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net')
-rw-r--r--net/libproxy-gnome/Makefile31
-rw-r--r--net/libproxy-gnome/pkg-descr7
-rw-r--r--net/libproxy-gnome/pkg-plist2
-rw-r--r--net/libproxy-kde/Makefile31
-rw-r--r--net/libproxy-kde/pkg-descr7
-rw-r--r--net/libproxy-kde/pkg-plist1
-rw-r--r--net/libproxy-mozjs/Makefile28
-rw-r--r--net/libproxy-mozjs/pkg-descr7
-rw-r--r--net/libproxy-mozjs/pkg-plist1
-rw-r--r--net/libproxy-perl/Makefile31
-rw-r--r--net/libproxy-perl/pkg-descr7
-rw-r--r--net/libproxy-perl/pkg-plist5
-rw-r--r--net/libproxy-python/Makefile39
-rw-r--r--net/libproxy-python/pkg-descr7
-rw-r--r--net/libproxy-python/pkg-plist3
-rw-r--r--net/libproxy-webkit/Makefile29
-rw-r--r--net/libproxy-webkit/pkg-descr7
-rw-r--r--net/libproxy-webkit/pkg-plist1
-rw-r--r--net/libproxy/Makefile73
-rw-r--r--net/libproxy/distinfo2
-rw-r--r--net/libproxy/files/patch-libmodman_CMakeLists.txt14
-rw-r--r--net/libproxy/files/patch-libproxy_CMakeLists.txt11
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_devfiles.cmk11
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_libproxy.cmk19
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_modules.cmk16
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_modules_config-gnome.cmk8
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_modules_network-networkmanager.cmk9
-rw-r--r--net/libproxy/files/patch-libproxy_cmake_modules_pacrunner-webkit.cmk11
-rw-r--r--net/libproxy/files/patch-libproxy_proxy.cpp11
-rw-r--r--net/libproxy/files/patch-libproxy_url.hpp11
-rw-r--r--net/libproxy/pkg-descr9
-rw-r--r--net/libproxy/pkg-plist15
32 files changed, 464 insertions, 0 deletions
diff --git a/net/libproxy-gnome/Makefile b/net/libproxy-gnome/Makefile
new file mode 100644
index 000000000..33b181785
--- /dev/null
+++ b/net/libproxy-gnome/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: libproxy-gnome
+# Date created: 26 February 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom$
+
+PORTREVISION= 0
+CATEGORIES= net devel
+PKGNAMESUFFIX= -gnome
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME plug-in for libproxy
+
+LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy
+
+MASTERDIR= ${.CURDIR}/../libproxy
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+USE_GNOME= gconf2
+
+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-descr b/net/libproxy-gnome/pkg-descr
new file mode 100644
index 000000000..60ce67f8f
--- /dev/null
+++ b/net/libproxy-gnome/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 the GNOME Desktop to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-gnome/pkg-plist b/net/libproxy-gnome/pkg-plist
new file mode 100644
index 000000000..4b735c7b3
--- /dev/null
+++ b/net/libproxy-gnome/pkg-plist
@@ -0,0 +1,2 @@
+lib/libproxy/%%VERSION%%/modules/config_gnome.so
+libexec/pxgconf
diff --git a/net/libproxy-kde/Makefile b/net/libproxy-kde/Makefile
new file mode 100644
index 000000000..f0de35259
--- /dev/null
+++ b/net/libproxy-kde/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for: libproxy-kde
+# Date created: 26 February 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom$
+
+PORTREVISION= 0
+CATEGORIES= net devel
+PKGNAMESUFFIX= -kde
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= KDE plug-in for libproxy
+
+LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy
+
+MASTERDIR= ${.CURDIR}/../libproxy
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+USE_QT_VER= 4
+QT_COMPONENTS= corelib moc_build qmake_build uic_build rcc_build
+USE_KDE4= automoc4 kdelibs
+
+LIBPROXY_SLAVE= kde
+
+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-descr b/net/libproxy-kde/pkg-descr
new file mode 100644
index 000000000..af1779a74
--- /dev/null
+++ b/net/libproxy-kde/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 the KDE Desktop to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-kde/pkg-plist b/net/libproxy-kde/pkg-plist
new file mode 100644
index 000000000..e343d5a43
--- /dev/null
+++ b/net/libproxy-kde/pkg-plist
@@ -0,0 +1 @@
+lib/libproxy/%%VERSION%%/modules/config_kde4.so
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
new file mode 100644
index 000000000..b95648ce8
--- /dev/null
+++ b/net/libproxy-mozjs/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: libproxy-mozjs
+# Date created: 26 February 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom$
+
+PORTREVISION= 0
+CATEGORIES= net www
+PKGNAMESUFFIX= -mozjs
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Mozilla Javascript plug-in for libproxy
+
+LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy
+
+MASTERDIR= ${.CURDIR}/../libproxy
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+USE_GECKO= libxul
+
+LIBPROXY_SLAVE= mozjs
+
+do-install:
+ ${INSTALL_LIB} ${WRKSRC}/libproxy/pacrunner_mozjs.so \
+ ${PREFIX}/lib/libproxy/${PORTVERSION}/modules/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-mozjs/pkg-descr b/net/libproxy-mozjs/pkg-descr
new file mode 100644
index 000000000..1bcd6c2a3
--- /dev/null
+++ b/net/libproxy-mozjs/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 Mozilla-based browsers to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-mozjs/pkg-plist b/net/libproxy-mozjs/pkg-plist
new file mode 100644
index 000000000..49a504212
--- /dev/null
+++ b/net/libproxy-mozjs/pkg-plist
@@ -0,0 +1 @@
+lib/libproxy/%%VERSION%%/modules/pacrunner_mozjs.so
diff --git a/net/libproxy-perl/Makefile b/net/libproxy-perl/Makefile
new file mode 100644
index 000000000..6e111db99
--- /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$
+
+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 000000000..49068649c
--- /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 000000000..51235dcfa
--- /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 000000000..b79cb59f2
--- /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$
+
+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 000000000..fe6c53af7
--- /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 000000000..3c6098ab1
--- /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
new file mode 100644
index 000000000..08dcf2134
--- /dev/null
+++ b/net/libproxy-webkit/Makefile
@@ -0,0 +1,29 @@
+# New ports collection makefile for: libproxy-webkit
+# Date created: 26 February 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom$
+
+PORTREVISION= 0
+CATEGORIES= net www
+PKGNAMESUFFIX= -webkit
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= WebKit Javascript plug-in for libproxy
+
+LIB_DEPENDS= proxy.1:${PORTSDIR}/net/libproxy \
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
+
+MASTERDIR= ${.CURDIR}/../libproxy
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+
+LIBPROXY_SLAVE= webkit
+
+do-install:
+# ${MKDIR}
+ ${INSTALL_LIB} ${WRKSRC}/libproxy/pacrunner_webkit.so \
+ ${PREFIX}/lib/libproxy/0.4.6/modules/
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-webkit/pkg-descr b/net/libproxy-webkit/pkg-descr
new file mode 100644
index 000000000..e9b912c76
--- /dev/null
+++ b/net/libproxy-webkit/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 the WebKit web browser to make use of libproxy.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy-webkit/pkg-plist b/net/libproxy-webkit/pkg-plist
new file mode 100644
index 000000000..0ec505707
--- /dev/null
+++ b/net/libproxy-webkit/pkg-plist
@@ -0,0 +1 @@
+lib/libproxy/%%VERSION%%/modules/pacrunner_webkit.so
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
new file mode 100644
index 000000000..bac4313a3
--- /dev/null
+++ b/net/libproxy/Makefile
@@ -0,0 +1,73 @@
+# New ports collection makefile for: libproxy
+# Date created: 26 February 2009
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom$
+
+PORTNAME= libproxy
+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_CMAKE= yes
+
+PLIST_SUB+= VERSION=${PORTVERSION}
+
+.if !defined(LIBPROXY_SLAVE)
+USE_LDCONFIG= yes
+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
+
+# 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.
+
+. 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
new file mode 100644
index 000000000..3d981bd75
--- /dev/null
+++ b/net/libproxy/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libproxy-0.4.6.tar.gz) = 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
+SIZE (libproxy-0.4.6.tar.gz) = 82483
diff --git a/net/libproxy/files/patch-libmodman_CMakeLists.txt b/net/libproxy/files/patch-libmodman_CMakeLists.txt
new file mode 100644
index 000000000..76f2848dd
--- /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 000000000..69a25ed01
--- /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 000000000..ea1a0b88b
--- /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 000000000..d1d22b193
--- /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 000000000..08768da01
--- /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 000000000..cc4bc6854
--- /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 000000000..e8f52ba06
--- /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 000000000..de1d1f649
--- /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 000000000..90d6de2c8
--- /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 000000000..4fbef585a
--- /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/pkg-descr b/net/libproxy/pkg-descr
new file mode 100644
index 000000000..a542311cc
--- /dev/null
+++ b/net/libproxy/pkg-descr
@@ -0,0 +1,9 @@
+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.
+
+GNOME? KDE? Command line? WPAD? PAC? Network changed? It doesn't matter!
+Just ask libproxy what proxy to use: you get simple code and your users
+get correct, consistant behavior and broad infrastructure compatibility.
+
+WWW: http://code.google.com/p/libproxy/
diff --git a/net/libproxy/pkg-plist b/net/libproxy/pkg-plist
new file mode 100644
index 000000000..14cd64a7e
--- /dev/null
+++ b/net/libproxy/pkg-plist
@@ -0,0 +1,15 @@
+bin/proxy
+include/proxy.h
+lib/libmodman.so
+lib/libmodman.so.1
+lib/libproxy.so
+lib/libproxy.so.1
+libdata/pkgconfig/libproxy-1.0.pc
+share/cmake/Modules/Findlibproxy.cmake
+share/vala/vapi/libproxy-1.0.vapi
+@dirrmtry share/vala/vapi
+@dirrmtry share/vala
+@exec mkdir -p %D/lib/libproxy/%%VERSION%%/modules
+@dirrm lib/libproxy/%%VERSION%%/modules
+@dirrm lib/libproxy/%%VERSION%%
+@dirrm lib/libproxy