cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to libproxy-0.4.7.

Browse Source 
Moves from gconf to gsettings.
Comment the mozilla FLAVOR for now as it requires a newer xulrunner.
This commit is contained in:
ajacoutot 2012-03-29 14:58:24 +00:00
parent e91683cbb6
commit cc08e8fa9c
9 changed files with 51 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/libproxy/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2011/12/05 10:38:42 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2012/03/29 14:58:24 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,20 +6,15 @@ COMMENT-main= library handling all the details of proxy configuration
COMMENT-mozilla= pacrunner libproxy plugin for mozilla-based (gecko) browsers
COMMENT-webkit= pacrunner libproxy plugin for webkit-based browsers
VERSION= 0.4.6
VERSION= 0.4.7
DISTNAME= libproxy-${VERSION}
PKGNAME-main= libproxy-${VERSION}
PKGNAME-mozilla= libproxy-mozilla-${VERSION}
PKGNAME-webkit= libproxy-webkit-${VERSION}
REVISION-main= 7
REVISION-mozilla= 4
REVISION-webkit= 6
CATEGORIES= net
SHARED_LIBS += modman 0.0 # 1.0
SHARED_LIBS += proxy 1.0 # 0.0
HOMEPAGE= http://libproxy.googlecode.com/
@ -40,7 +35,9 @@ MODULES= devel/cmake \
# do not enable webkit support by default because of cyclic dependency:
# libproxy,-webkit -> webkit -> libsoup -> libproxy
# do not enable mozilla support by default, xulrunner doesn't build on all arches
PSEUDO_FLAVORS= mozilla webkit
PSEUDO_FLAVORS= webkit
# XXX needs mozilla-js>=2.0b12; re-enable in net/Makefile when FLAVOR is back
#PSEUDO_FLAVORS += mozilla
FLAVOR?=
MULTI_PACKAGES= -main
@ -50,7 +47,7 @@ BUILD_DEPENDS= lang/vala
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS} \
${MODPY_RUN_DEPENDS}
LIB_DEPENDS-main= ${LIB_DEPENDS} \
devel/gconf2
devel/glib2
RUN_DEPENDS-mozilla= # empty
LIB_DEPENDS-mozilla= ${BUILD_PKGPATH}>=${VERSION} \
@ -59,34 +56,33 @@ LIB_DEPENDS-mozilla= ${BUILD_PKGPATH}>=${VERSION} \
RUN_DEPENDS-webkit= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-webkit= STEM->=${VERSION}:${BUILD_PKGPATH}, \
www/webkit>=1.4.0v0
www/webkit,gtk3
cWANTLIB += m stdc++
WANTLIB-main += ${cWANTLIB} ${MODGETTEXT_WANTLIB}
WANTLIB-main += c gconf-2 glib-2.0 gobject-2.0 gthread-2.0 perl pthread
WANTLIB-main += c gio-2.0 glib-2.0 gobject-2.0 perl pthread
WANTLIB-mozilla += ${cWANTLIB} c modman nspr4 plc4 plds4 proxy
WANTLIB-mozilla += xulrunner1.9/mozjs
WANTLIB-webkit += ${cWANTLIB} ${MODGETTEXT_WANTLIB}
WANTLIB-webkit += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-webkit += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
WANTLIB-webkit += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB-webkit += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB-webkit += gtk-x11-2.0 modman pango-1.0 pangocairo-1.0
WANTLIB-webkit += GL X11 Xrender atk-1.0 cairo cairo-gobject expat fontconfig
WANTLIB-webkit += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB-webkit += gtk-3 javascriptcoregtk-3.0 pango-1.0 pangocairo-1.0
WANTLIB-webkit += pangoft2-1.0 pixman-1 png proxy pthread-stubs soup-2.4
WANTLIB-webkit += webkitgtk-1.0 xcb xcb-render xcb-shm xml2 z
WANTLIB-webkit += webkitgtk-3.0 xcb xcb-render xcb-shm z
CONFIGURE_ARGS= -DCMAKE_C_FLAGS="${CFLAGS} -pthread" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" \
-DWITH_PYTHON:BOOL=ON \
-DWITH_PERL:BOOL=ON \
-DWITH_GNOME:BOOL=ON \
-DWITH_GNOME3:BOOL=ON \
-DWITH_VALA:BOOL=ON \
-DWITH_KDE4:BOOL=OFF \
-DWITH_DOTNET:BOOL=OFF \
-DWITH_NM:BOOL=OFF
-DWITH_NM:BOOL=OFF \
-DWITH_WEBKIT:BOOL=OFF
.if ${FLAVOR:L:Mmozilla}
BUILD_DEPENDS += devel/xulrunner/1.9,-devel>=1.9.1
@ -98,13 +94,12 @@ CONFIGURE_ARGS += -DWITH_MOZJS:BOOL=OFF
.if ${FLAVOR:L:Mwebkit}
MULTI_PACKAGES += -webkit
CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=ON
CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=ON
.else
CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF
CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=OFF
.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/libproxy/cmake/libproxy.cmk \
${WRKSRC}/libmodman/CMakeLists.txt
${SUBST_CMD} ${WRKSRC}/libproxy/cmake/libproxy.cmk
.include <bsd.port.mk>

10
net/libproxy/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libproxy-0.4.6.tar.gz) = GZxrEguvH3JYpV841ex09Q==
RMD160 (libproxy-0.4.6.tar.gz) = 9fA8hK0th/5yiGn63GaWKHN8Y54=
SHA1 (libproxy-0.4.6.tar.gz) = bpdFyHt3TzS/U/B6VChMDXICDpQ=
SHA256 (libproxy-0.4.6.tar.gz) = mtkS5jse/KmPtEIkCivHMC5gIcHQsbk2MydynylGLzA=
SIZE (libproxy-0.4.6.tar.gz) = 82483
MD5 (libproxy-0.4.7.tar.gz) = UJ4DpIimHNYr+686tqKnpQ==
RMD160 (libproxy-0.4.7.tar.gz) = oJyDIMur7SPITO3fPJtXLPicnA4=
SHA1 (libproxy-0.4.7.tar.gz) = sB6734N7q/Y/OO404mHXbyPa0xk=
SHA256 (libproxy-0.4.7.tar.gz) = j+CliBATm6PC4YbezPPmitzRJ6oOlysIYrMLPd5JN5c=
SIZE (libproxy-0.4.7.tar.gz) = 91092

11
net/libproxy/patches/patch-libmodman_CMakeLists_txt
View File

@ -1,15 +1,12 @@
$OpenBSD: patch-libmodman_CMakeLists_txt,v 1.1 2011/03/24 06:50:09 ajacoutot Exp $
--- libmodman/CMakeLists.txt.orig Wed Sep 1 22:23:34 2010
+++ libmodman/CMakeLists.txt Tue Mar 22 09:36:04 2011
@@ -12,9 +12,9 @@ add_library(modman SHARED
$OpenBSD: patch-libmodman_CMakeLists_txt,v 1.2 2012/03/29 14:58:24 ajacoutot Exp $
--- libmodman/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
+++ libmodman/CMakeLists.txt Thu Mar 29 11:30:02 2012
@@ -12,7 +12,7 @@ add_library(modman STATIC
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 ${LIBmodman_VERSION})
install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR})
### Tests

8
net/libproxy/patches/patch-libproxy_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-libproxy_CMakeLists_txt,v 1.1 2011/03/24 06:50:09 ajacoutot Exp $
$OpenBSD: patch-libproxy_CMakeLists_txt,v 1.2 2012/03/29 14:58:24 ajacoutot Exp $
error: '::wcstof' has not been declared
--- libproxy/CMakeLists.txt.orig Tue Mar 22 09:13:30 2011
+++ libproxy/CMakeLists.txt Tue Mar 22 09:13:36 2011
@@ -6,7 +6,7 @@ set_project_version(0 4 6)
--- libproxy/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
+++ libproxy/CMakeLists.txt Thu Mar 29 11:29:08 2012
@@ -6,7 +6,7 @@ set_project_version(0 4 7)
if (WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
else(WIN32)

9
net/libproxy/patches/patch-libproxy_cmake_libproxy_cmk
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.2 2011/04/26 08:06:41 ajacoutot Exp $
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.3 2012/03/29 14:58:24 ajacoutot Exp $
Do not link with -lpthread (we use -pthread in CMAKE_C*_FLAGS)
--- libproxy/cmake/libproxy.cmk.orig Wed Sep 1 22:23:34 2010
+++ libproxy/cmake/libproxy.cmk Tue Mar 22 09:35:32 2011
--- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 23:44:37 2011
+++ libproxy/cmake/libproxy.cmk Thu Mar 29 11:29:08 2012
@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_config.cpp exten
if(WIN32)
target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
@ -13,11 +13,12 @@ Do not link with -lpthread (we use -pthread in CMAKE_C*_FLAGS)
endif()
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
if(WIN32)
@@ -17,6 +17,6 @@ endif()
@@ -17,7 +17,7 @@ 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 ${LIBproxy_VERSION})
set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})

12
net/libproxy/patches/patch-libproxy_cmake_modules_cmk
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-libproxy_cmake_modules_cmk,v 1.1 2011/03/24 06:50:09 ajacoutot Exp $
--- libproxy/cmake/modules.cmk.orig Tue Mar 22 11:03:08 2011
+++ libproxy/cmake/modules.cmk Tue Mar 22 11:05:20 2011
@@ -17,10 +17,10 @@ include(cmake/modules/pacrunner_mozjs.cmk)
$OpenBSD: patch-libproxy_cmake_modules_cmk,v 1.2 2012/03/29 14:58:24 ajacoutot Exp $
--- libproxy/cmake/modules.cmk.orig Mon Jun 6 23:44:37 2011
+++ libproxy/cmake/modules.cmk Thu Mar 29 11:30:44 2012
@@ -19,10 +19,10 @@ include(cmake/modules/pacrunner_natus.cmk)
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)
-if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND))
+#set(BIPR 1)
+#if(MOZJS_FOUND AND WEBKIT_FOUND)
+#if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND))
set(BIPR 0)
-endif()
+#endif()

11
net/libproxy/pkg/PLIST-main
View File

@ -1,14 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/05/30 13:02:26 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2012/03/29 14:58:25 ajacoutot Exp $
@conflict libproxy-gnome-*
@pkgpath net/libproxy,-gnome
@bin bin/proxy
include/proxy.h
@lib lib/libmodman.so.${LIBmodman_VERSION}
lib/libproxy/
@lib lib/libproxy.so.${LIBproxy_VERSION}
lib/libproxy/0.4.6/
lib/libproxy/0.4.6/modules/
lib/libproxy/0.4.6/modules/config_gnome.so
lib/libproxy/0.4.7/
lib/libproxy/0.4.7/modules/
lib/libproxy/0.4.7/modules/config_gnome3.so
lib/pkgconfig/libproxy-1.0.pc
lib/python${MODPY_VERSION}/site-packages/libproxy.py
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@ -18,7 +17,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/Libproxy.so
@bin libexec/pxgconf
@bin libexec/pxgsettings
share/cmake/
share/cmake/Modules/
share/cmake/Modules/Findlibproxy.cmake

4
net/libproxy/pkg/PLIST-mozilla
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-mozilla,v 1.1 2011/03/24 06:50:10 ajacoutot Exp $
lib/libproxy/0.4.6/modules/pacrunner_mozjs.so
@comment $OpenBSD: PLIST-mozilla,v 1.2 2012/03/29 14:58:25 ajacoutot Exp $
lib/libproxy/0.4.7/modules/pacrunner_mozjs.so

4
net/libproxy/pkg/PLIST-webkit
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-webkit,v 1.1 2011/03/24 06:50:10 ajacoutot Exp $
lib/libproxy/0.4.6/modules/pacrunner_webkit.so
@comment $OpenBSD: PLIST-webkit,v 1.2 2012/03/29 14:58:25 ajacoutot Exp $
lib/libproxy/0.4.7/modules/pacrunner_webkit.so