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

Update to libproxy-0.4.16.

Browse Source 
Add debug packages.
This commit is contained in:
ajacoutot 2020-12-05 11:11:30 +00:00
parent 90bc81adcb
commit 1414d3b7ba
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/libproxy/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.65 2020/07/03 21:12:59 sthen Exp $ # $OpenBSD: Makefile,v 1.66 2020/12/05 11:11:30 ajacoutot Exp $
COMMENT-main= library handling all the details of proxy configuration COMMENT-main= library handling all the details of proxy configuration
COMMENT-webkit= pacrunner libproxy plugin for webkit-based browsers COMMENT-webkit= pacrunner libproxy plugin for webkit-based browsers
GH_ACCOUNT= libproxy GH_ACCOUNT= libproxy
GH_PROJECT= libproxy GH_PROJECT= libproxy
GH_TAGNAME= 0.4.15 GH_TAGNAME= 0.4.16
SUBST_VARS= GH_TAGNAME SUBST_VARS= GH_TAGNAME
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}
PKGNAME-webkit= ${GH_PROJECT}-webkit-${GH_TAGNAME} PKGNAME-webkit= ${GH_PROJECT}-webkit-${GH_TAGNAME}
REVISION-main= 5
REVISION-webkit= 3
CATEGORIES= net CATEGORIES= net
@ -41,7 +39,8 @@ MULTI_PACKAGES= -main -webkit
BUILD_DEPENDS= lang/vala BUILD_DEPENDS= lang/vala
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS}
LIB_DEPENDS-main= devel/glib2 LIB_DEPENDS-main= devel/glib2 \
x11/dbus
RUN_DEPENDS-webkit= # empty RUN_DEPENDS-webkit= # empty
LIB_DEPENDS-webkit= STEM->=${GH_TAGNAME}:${BUILD_PKGPATH}, \ LIB_DEPENDS-webkit= STEM->=${GH_TAGNAME}:${BUILD_PKGPATH}, \
@ -50,11 +49,11 @@ LIB_DEPENDS-webkit= STEM->=${GH_TAGNAME}:${BUILD_PKGPATH}, \
WANTLIB += intl m ${COMPILER_LIBCXX} WANTLIB += intl m ${COMPILER_LIBCXX}
WANTLIB-main += ${WANTLIB} WANTLIB-main += ${WANTLIB}
WANTLIB-main += c gio-2.0 glib-2.0 gobject-2.0 perl pthread WANTLIB-main += c dbus-1 gio-2.0 glib-2.0 gobject-2.0 perl pthread
WANTLIB-main += perl # uses perl ABI WANTLIB-main += perl # uses perl ABI
WANTLIB-webkit += ${WANTLIB} WANTLIB-webkit += ${WANTLIB}
WANTLIB-webkit += glib-2.0 javascriptcoregtk-4.0 proxy pthread WANTLIB-webkit += glib-2.0 gobject-2.0 javascriptcoregtk-4.0 proxy pthread
CONFIGURE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION} CONFIGURE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION}
MAKE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION} MAKE_ENV= LIBlibproxy_VERSION=${LIBproxy_VERSION}
@ -78,4 +77,6 @@ CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=ON
CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF
.endif .endif
DEBUG_PACKAGES= ${BUILD_PACKAGES}
.include <bsd.port.mk> .include <bsd.port.mk>

4
net/libproxy/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (libproxy-0.4.15.tar.gz) = GPWLCgBDtogXdBh0J+rRWNMQEn/EahxmitbSB/sotOA= SHA256 (libproxy-0.4.16.tar.gz) = nnlZ1q4dbIF/CsHiUxBc6NmfVdeCHBturvMr9oecbwo=
SIZE (libproxy-0.4.15.tar.gz) = 93084 SIZE (libproxy-0.4.16.tar.gz) = 95534

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

@ -1,4 +1,4 @@
$OpenBSD: patch-libproxy_CMakeLists_txt,v 1.7 2017/05/12 07:12:10 ajacoutot Exp $ $OpenBSD: patch-libproxy_CMakeLists_txt,v 1.8 2020/12/05 11:11:30 ajacoutot Exp $
Adding -pthread: Adding -pthread:
https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244 https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244
@ -10,7 +10,7 @@ https://svnweb.freebsd.org/ports/head/net/libproxy/files/patch-libproxy_CMakeLis
Index: libproxy/CMakeLists.txt Index: libproxy/CMakeLists.txt
--- libproxy/CMakeLists.txt.orig --- libproxy/CMakeLists.txt.orig
+++ libproxy/CMakeLists.txt +++ libproxy/CMakeLists.txt
@@ -6,8 +6,7 @@ set_project_version(0 4 15) @@ -6,8 +6,7 @@ set_project_version(0 4 16)
if (WIN32) if (WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
else(WIN32) else(WIN32)

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

@ -1,10 +1,11 @@
$OpenBSD: patch-libproxy_url_cpp,v 1.5 2017/01/11 08:41:32 ajacoutot Exp $ $OpenBSD: patch-libproxy_url_cpp,v 1.6 2020/12/05 11:11:30 ajacoutot Exp $
https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244 https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244
--- libproxy/url.cpp.orig Mon Jan 9 15:22:22 2017 Index: libproxy/url.cpp
+++ libproxy/url.cpp Wed Jan 11 09:31:58 2017 --- libproxy/url.cpp.orig
@@ -46,6 +46,10 @@ +++ libproxy/url.cpp
@@ -45,6 +45,10 @@
using namespace libproxy; using namespace libproxy;
using namespace std; using namespace std;
@ -15,7 +16,7 @@ https://code.google.com/p/libproxy/issues/detail?id=196&thanks=196&ts=1370457244
// This mime type should be reported by the web server // This mime type should be reported by the web server
#define PAC_MIME_TYPE "application/x-ns-proxy-autoconfig" #define PAC_MIME_TYPE "application/x-ns-proxy-autoconfig"
// Fall back to checking for this mime type, which servers often report wrong // Fall back to checking for this mime type, which servers often report wrong
@@ -59,14 +63,22 @@ using namespace std; @@ -58,14 +62,22 @@ using namespace std;
static inline int get_default_port(string scheme) { static inline int get_default_port(string scheme) {
struct servent *serv; struct servent *serv;
size_t plus = scheme.find('+'); size_t plus = scheme.find('+');

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.8 2016/01/19 16:16:38 ajacoutot Exp $ @comment $OpenBSD: PLIST-main,v 1.9 2020/12/05 11:11:30 ajacoutot Exp $
@conflict libproxy-gnome-* @conflict libproxy-gnome-*
@pkgpath net/libproxy,-gnome @pkgpath net/libproxy,-gnome
@bin bin/proxy @bin bin/proxy
@ -7,8 +7,9 @@ lib/libproxy/
@lib lib/libproxy.so.${LIBproxy_VERSION} @lib lib/libproxy.so.${LIBproxy_VERSION}
lib/libproxy/${GH_TAGNAME}/ lib/libproxy/${GH_TAGNAME}/
lib/libproxy/${GH_TAGNAME}/modules/ lib/libproxy/${GH_TAGNAME}/modules/
lib/libproxy/${GH_TAGNAME}/modules/config_gnome3.so @so lib/libproxy/${GH_TAGNAME}/modules/config_gnome3.so
lib/libproxy/${GH_TAGNAME}/modules/config_kde.so @so lib/libproxy/${GH_TAGNAME}/modules/config_kde.so
@so lib/libproxy/${GH_TAGNAME}/modules/config_pacrunner.so
lib/pkgconfig/libproxy-1.0.pc lib/pkgconfig/libproxy-1.0.pc
lib/python${MODPY_VERSION}/site-packages/libproxy.py lib/python${MODPY_VERSION}/site-packages/libproxy.py
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
@ -17,7 +18,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Net/Libproxy.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ 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/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/Libproxy.so @so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Net/Libproxy/Libproxy.so
@bin libexec/pxgsettings @bin libexec/pxgsettings
share/cmake/ share/cmake/
share/cmake/Modules/ share/cmake/Modules/

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

@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-webkit,v 1.4 2016/01/19 16:16:38 ajacoutot Exp $ @comment $OpenBSD: PLIST-webkit,v 1.5 2020/12/05 11:11:30 ajacoutot Exp $
lib/libproxy/${GH_TAGNAME}/modules/pacrunner_webkit.so @so lib/libproxy/${GH_TAGNAME}/modules/pacrunner_webkit.so