Attachment #218359 for bug #249942

View | Details | Raw Unified | Return to bug 249942
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libsoup
PORTVERSION=	2.72.0
CATEGORIES=	devel gnome
MASTER_SITES=	GNOME
DIST_SUBDIR=	gnome

LICENSE=	LGPL20
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	glib-networking>=2.29.18:net/glib-networking \
		valac:lang/vala
LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
		libpsl.so:dns/libpsl \
		libbrotlidec.so:archivers/brotli
RUN_DEPENDS=	glib-networking>=2.29.18:net/glib-networking

PORTSCOUT=	limitw:1,even

USES=		gettext gnome meson localbase pkgconfig \
		python:3.6+,build sqlite tar:xz
USE_GNOME=	glib20 introspection:build libxml2
		libxml2 referencehack
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-more-warnings \
		--disable-vala
INSTALL_TARGET=	install-strip

MESON_ARGS=	-Dsysprof=disabled

LIBVERSION=	1.11.0
PLIST_SUB=	VERSION="2.4" LIBVERSION=${LIBVERSION}

.if defined(SOUP_SLAVE)
EXTRA_PATCHES=	${FILESDIR}/extra-patch-libsoup_meson.build \
		${FILESDIR}/extra-patch-meson.build

LIB_DEPENDS+=	libsoup-2.4.so:devel/libsoup
CONFIGURE_ARGS+=--with-gnome
.else
MESON_ARGS+=	-Dgnome=false
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|env python3|env ${PYTHON_VERSION}|g' \
		${WRKSRC}/libsoup/tld-parser.py
	@${REINPLACE_CMD} -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
		${WRKSRC}/configure

.if defined(SOUP_SLAVE)
do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gir-1.0/
	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.typelib ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/
	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
.endif

post-install:
.if defined(SOUP_SLAVE)
	@${RM} -R ${STAGEDIR}${PREFIX}/include/libsoup-2.4/
	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libsoup-2.4.pc
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
.else
	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
		${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)libsoup/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539116814	1	TIMESTAMP = 1600253366
2	SHA256 (gnome/libsoup-2.62.3.tar.xz) = d312ade547495c2093ff8bda61f9b9727a98cfdae339f3263277dd39c0451172	2	SHA256 (gnome/libsoup-2.72.0.tar.xz) = 170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387
3	SIZE (gnome/libsoup-2.62.3.tar.xz) = 1851780	3	SIZE (gnome/libsoup-2.72.0.tar.xz) = 1477940




--- libsoup/meson.build.orig	2020-03-07 02:43:34 UTC
+++ libsoup/meson.build
@@ -203,7 +203,7 @@ endif
 
 
 includedir = join_paths(libsoup_api_name, meson.project_name())
-install_headers(soup_installed_headers, subdir : includedir)
+#install_headers(soup_installed_headers, subdir : includedir)
 
 version_cdata = configuration_data()
 version_cdata.set('SOUP_MAJOR_VERSION', soup_version_major)
@@ -223,7 +223,7 @@ soup_enums = gnome.mkenums('soup-enum-types',
   ],
   h_template : enum_types + '.h.template',
   c_template : enum_types + '.c.template',
-  install_header : true,
+  install_header : false,
   install_dir : join_paths(get_option('includedir'), includedir))
 
 soup_enum_h = soup_enums[1]
@@ -253,7 +253,7 @@ libsoup = library('soup-@0@'.format(apiversion),
   darwin_versions: darwin_versions,
   c_args : libsoup_c_args + hidden_visibility_flag,
   include_directories : configinc,
-  install : true,
+  install : false,
   dependencies : deps)
 
 pkg.generate(libsoup,
@@ -319,7 +319,7 @@ if enable_introspection or enable_vapi
     export_packages : libsoup_api_name,
     extra_args : soup_gir_args,
     includes : 'Gio-2.0',
-    install : true,
+    install : false,
     header: join_paths(meson.project_name(), 'soup.h'),
   )
 
@@ -336,7 +336,7 @@ if enable_introspection or enable_vapi
         soup_ns_version + '-custom.vala'
       ],
       packages : 'gio-2.0',
-      install : true,
+      install : false,
     )
   endif
 




--- meson.build.orig	2020-03-07 02:43:35 UTC
+++ meson.build
@@ -369,9 +369,9 @@ configure_file(output : 'config.h', configuration : cd
 subdir('libsoup')
 # xgettext is optional (on Windows for instance)
 if find_program('xgettext', required : false).found()
-  subdir('po')
+  #subdir('po')
 endif
-subdir('examples')
+#subdir('examples')
 
 if get_option('tests')
   subdir('tests')




--- libsoup/Makefile.in.orig	2016-04-26 12:36:13 UTC
+++ libsoup/Makefile.in
@@ -290,7 +290,7 @@ libsoup_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(libsoup_2_4_la_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES =  \
-@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la $(am__DEPENDENCIES_1)
+@BUILD_LIBSOUP_GNOME_TRUE@	$(am__DEPENDENCIES_1)
 am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \
 	soup-gnome-features.c soup-proxy-resolver-gnome.h \
 	soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \
@@ -788,7 +788,7 @@ TLD_DATA_FILE = $(top_srcdir)/data/effective_tld_names
 @BUILD_LIBSOUP_GNOME_TRUE@	-export-dynamic
 
 @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
-@BUILD_LIBSOUP_GNOME_TRUE@	libsoup-2.4.la			\
+@BUILD_LIBSOUP_GNOME_TRUE@	-lsoup-2.4			\
 @BUILD_LIBSOUP_GNOME_TRUE@	$(GLIB_LIBS)
 
 @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \
@@ -848,7 +848,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
 @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@	--include-uninstalled=$(builddir)/Soup-2.4.gir
 
 @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
-@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
+@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la soup-2.4
 @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
 @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0

Lines 6-12 Link Here

(-)libsoup/pkg-plist (-64 / +10 lines)
6	include/libsoup-%%VERSION%%/libsoup/soup-auth.h	6	include/libsoup-%%VERSION%%/libsoup/soup-auth.h
7	include/libsoup-%%VERSION%%/libsoup/soup-autocleanups.h	7	include/libsoup-%%VERSION%%/libsoup/soup-autocleanups.h
8	include/libsoup-%%VERSION%%/libsoup/soup-cache.h	8	include/libsoup-%%VERSION%%/libsoup/soup-cache.h
9	include/libsoup-%%VERSION%%/libsoup/soup-connection.h
10	include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h	9	include/libsoup-%%VERSION%%/libsoup/soup-content-decoder.h
11	include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h	10	include/libsoup-%%VERSION%%/libsoup/soup-content-sniffer.h
12	include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-db.h	11	include/libsoup-%%VERSION%%/libsoup/soup-cookie-jar-db.h
Lines 17-22 Link Here
17	include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h	16	include/libsoup-%%VERSION%%/libsoup/soup-enum-types.h
18	include/libsoup-%%VERSION%%/libsoup/soup-form.h	17	include/libsoup-%%VERSION%%/libsoup/soup-form.h
19	include/libsoup-%%VERSION%%/libsoup/soup-headers.h	18	include/libsoup-%%VERSION%%/libsoup/soup-headers.h
		19	include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer-db.h
		20	include/libsoup-%%VERSION%%/libsoup/soup-hsts-enforcer.h
		21	include/libsoup-%%VERSION%%/libsoup/soup-hsts-policy.h
20	include/libsoup-%%VERSION%%/libsoup/soup-logger.h	22	include/libsoup-%%VERSION%%/libsoup/soup-logger.h
21	include/libsoup-%%VERSION%%/libsoup/soup-message-body.h	23	include/libsoup-%%VERSION%%/libsoup/soup-message-body.h
22	include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h	24	include/libsoup-%%VERSION%%/libsoup/soup-message-headers.h
Lines 48-126 Link Here
48	include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h	50	include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
49	include/libsoup-%%VERSION%%/libsoup/soup-version.h	51	include/libsoup-%%VERSION%%/libsoup/soup-version.h
50	include/libsoup-%%VERSION%%/libsoup/soup-websocket-connection.h	52	include/libsoup-%%VERSION%%/libsoup/soup-websocket-connection.h
		53	include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-deflate.h
		54	include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension-manager.h
		55	include/libsoup-%%VERSION%%/libsoup/soup-websocket-extension.h
51	include/libsoup-%%VERSION%%/libsoup/soup-websocket.h	56	include/libsoup-%%VERSION%%/libsoup/soup-websocket.h
52	include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-old.h	57	include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc-old.h
53	include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h	58	include/libsoup-%%VERSION%%/libsoup/soup-xmlrpc.h
54	include/libsoup-%%VERSION%%/libsoup/soup.h	59	include/libsoup-%%VERSION%%/libsoup/soup.h
55	lib/girepository-1.0/Soup-%%VERSION%%.typelib	60	lib/girepository-1.0/Soup-%%VERSION%%.typelib
56	lib/libsoup-%%VERSION%%.a
57	lib/libsoup-%%VERSION%%.so	61	lib/libsoup-%%VERSION%%.so
58	lib/libsoup-%%VERSION%%.so.1	62	lib/libsoup-%%VERSION%%.so.1
59	lib/libsoup-%%VERSION%%.so.%%LIBVERSION%%	63	lib/libsoup-%%VERSION%%.so.%%LIBVERSION%%
60	libdata/pkgconfig/libsoup-%%VERSION%%.pc	64	libdata/pkgconfig/libsoup-%%VERSION%%.pc
61	share/gir-1.0/Soup-%%VERSION%%.gir	65	share/gir-1.0/Soup-%%VERSION%%.gir
62	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html
63	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html
64	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html
65	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html
66	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html
67	share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthManager.html
68	share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html
69	share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html
70	share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html
71	share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html
72	share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html
73	share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarDB.html
74	share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html
75	share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html
76	share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html
77	share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html
78	share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html
79	share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html
80	share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html
81	share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html
82	share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html
83	share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html
84	share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html
85	share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html
86	share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html
87	share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html
88	share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html
89	share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html
90	share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html
91	share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html
92	share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html
93	share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html
94	share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html
95	share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html
96	share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html
97	share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html
98	share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html
99	share/gtk-doc/html/libsoup-%%VERSION%%/home.png
100	share/gtk-doc/html/libsoup-%%VERSION%%/index.html
101	share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html
102	share/gtk-doc/html/libsoup-%%VERSION%%/left-insensitive.png
103	share/gtk-doc/html/libsoup-%%VERSION%%/left.png
104	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html
105	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html
106	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupServer-deprecated-API.html
107	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html
108	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Version-Information.html
109	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-WebSockets.html
110	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html
111	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html
112	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html
113	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2
114	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html
115	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html
116	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-request-howto.html
117	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html
118	share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-session-porting.html
119	share/gtk-doc/html/libsoup-%%VERSION%%/right-insensitive.png
120	share/gtk-doc/html/libsoup-%%VERSION%%/right.png
121	share/gtk-doc/html/libsoup-%%VERSION%%/style.css
122	share/gtk-doc/html/libsoup-%%VERSION%%/up-insensitive.png
123	share/gtk-doc/html/libsoup-%%VERSION%%/up.png
124	share/locale/an/LC_MESSAGES/libsoup.mo	66	share/locale/an/LC_MESSAGES/libsoup.mo
125	share/locale/as/LC_MESSAGES/libsoup.mo	67	share/locale/as/LC_MESSAGES/libsoup.mo
126	share/locale/be/LC_MESSAGES/libsoup.mo	68	share/locale/be/LC_MESSAGES/libsoup.mo
Lines 139-144 Link Here
139	share/locale/et/LC_MESSAGES/libsoup.mo	81	share/locale/et/LC_MESSAGES/libsoup.mo
140	share/locale/eu/LC_MESSAGES/libsoup.mo	82	share/locale/eu/LC_MESSAGES/libsoup.mo
141	share/locale/fa/LC_MESSAGES/libsoup.mo	83	share/locale/fa/LC_MESSAGES/libsoup.mo
		84	share/locale/fi/LC_MESSAGES/libsoup.mo
142	share/locale/fr/LC_MESSAGES/libsoup.mo	85	share/locale/fr/LC_MESSAGES/libsoup.mo
143	share/locale/fur/LC_MESSAGES/libsoup.mo	86	share/locale/fur/LC_MESSAGES/libsoup.mo
144	share/locale/gd/LC_MESSAGES/libsoup.mo	87	share/locale/gd/LC_MESSAGES/libsoup.mo
Lines 157-162 Link Here
157	share/locale/lv/LC_MESSAGES/libsoup.mo	100	share/locale/lv/LC_MESSAGES/libsoup.mo
158	share/locale/ml/LC_MESSAGES/libsoup.mo	101	share/locale/ml/LC_MESSAGES/libsoup.mo
159	share/locale/mr/LC_MESSAGES/libsoup.mo	102	share/locale/mr/LC_MESSAGES/libsoup.mo
		103	share/locale/ms/LC_MESSAGES/libsoup.mo
160	share/locale/nb/LC_MESSAGES/libsoup.mo	104	share/locale/nb/LC_MESSAGES/libsoup.mo
161	share/locale/ne/LC_MESSAGES/libsoup.mo	105	share/locale/ne/LC_MESSAGES/libsoup.mo
162	share/locale/nl/LC_MESSAGES/libsoup.mo	106	share/locale/nl/LC_MESSAGES/libsoup.mo
Lines 185-187 Link Here
185	share/locale/zh_CN/LC_MESSAGES/libsoup.mo	129	share/locale/zh_CN/LC_MESSAGES/libsoup.mo
186	share/locale/zh_HK/LC_MESSAGES/libsoup.mo	130	share/locale/zh_HK/LC_MESSAGES/libsoup.mo
187	share/locale/zh_TW/LC_MESSAGES/libsoup.mo	131	share/locale/zh_TW/LC_MESSAGES/libsoup.mo
		132	share/vala/vapi/libsoup-%%VERSION%%.deps
		133	share/vala/vapi/libsoup-%%VERSION%%.vapi

Return to bug 249942

Lines 2-8 Link Here

(-)libsoup/Makefile (-40 / +18 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libsoup	4	PORTNAME= libsoup
5	PORTVERSION= 2.62.3	5	PORTVERSION= 2.72.0
6	CATEGORIES= devel gnome	6	CATEGORIES= devel gnome
7	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
8	DIST_SUBDIR= gnome	8	DIST_SUBDIR= gnome
Lines 13-73 Link Here
13	LICENSE= LGPL20	13	LICENSE= LGPL20
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	BUILD_DEPENDS= glib-networking>=2.29.18:net/glib-networking	16	BUILD_DEPENDS= glib-networking>=2.29.18:net/glib-networking \
17	LIB_DEPENDS= libgcrypt.so:security/libgcrypt	17	valac:lang/vala
		18	LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
		19	libpsl.so:dns/libpsl \
		20	libbrotlidec.so:archivers/brotli
18	RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking	21	RUN_DEPENDS= glib-networking>=2.29.18:net/glib-networking
19		22
20	PORTSCOUT= limitw:1,even	23	PORTSCOUT= limitw:1,even
21		24
22	USES= gettext gmake gnome libtool localbase pathfix \	25	USES= gettext gnome meson localbase pkgconfig \
23	pkgconfig python:3.6+,build sqlite ssl tar:xz	26	python:3.6+,build sqlite tar:xz
24	USE_GNOME= glib20 intlhack introspection:build \	27	USE_GNOME= glib20 introspection:build libxml2
25	libxml2 referencehack
26	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
27	GNU_CONFIGURE= yes
28	CONFIGURE_ARGS= --disable-more-warnings \
29	--disable-vala
30	INSTALL_TARGET= install-strip
31		29
32	LIBVERSION= 1.8.0	30	MESON_ARGS= -Dsysprof=disabled
		31
		32	LIBVERSION= 1.11.0
33	PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}	33	PLIST_SUB= VERSION="2.4" LIBVERSION=${LIBVERSION}
34		34
35	.if defined(SOUP_SLAVE)	35	.if defined(SOUP_SLAVE)
36	USES+= sqlite	36	EXTRA_PATCHES= ${FILESDIR}/extra-patch-libsoup_meson.build \
		37	${FILESDIR}/extra-patch-meson.build
		38
37	LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup	39	LIB_DEPENDS+= libsoup-2.4.so:devel/libsoup
38	CONFIGURE_ARGS+=--with-gnome
39	.else	40	.else
40	CONFIGURE_ARGS+=--without-gnome	41	MESON_ARGS+= -Dgnome=false
41	.endif	42	.endif
42		43
43	post-patch:
44	@${REINPLACE_CMD} -e 's\|-Wmissing-include-dirs\|\|g' \
45	${WRKSRC}/configure
46	@${REINPLACE_CMD} -e 's\|env python3\|env ${PYTHON_VERSION}\|g' \
47	${WRKSRC}/libsoup/tld-parser.py
48	@${REINPLACE_CMD} -e 's\|DATADIRNAME=lib\|DATADIRNAME=share\|g' \
49	${WRKSRC}/configure
50		44
51	.if defined(SOUP_SLAVE)
52	do-install:
53	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gir-1.0/
54	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.gir ${STAGEDIR}${PREFIX}/share/gir-1.0/
55	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
56	${INSTALL_DATA} ${WRKSRC}/libsoup/SoupGNOME-2.4.typelib ${STAGEDIR}${PREFIX}/lib/girepository-1.0/
57	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so ${STAGEDIR}${PREFIX}/lib/
58	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.1 ${STAGEDIR}${PREFIX}/lib/
59	${INSTALL_PROGRAM} ${WRKSRC}/libsoup/.libs/libsoup-gnome-2.4.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/
60	cd ${WRKSRC}/libsoup && DESTDIR=${STAGEDIR} ${GMAKE} install-libsoupgnomeincludeHEADERS
61	.endif
62
63	post-install:	45	post-install:
64	.if defined(SOUP_SLAVE)	46	.if defined(SOUP_SLAVE)
65	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig	47	@${RM} -R ${STAGEDIR}${PREFIX}/include/libsoup-2.4/
66	${INSTALL_DATA} ${WRKSRC}/libsoup-gnome-2.4.pc \	48	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libsoup-2.4.pc
67	${STAGEDIR}${PREFIX}/libdata/pkgconfig/
68	.else
69	${INSTALL_DATA} ${WRKSRC}/libsoup/soup-connection.h \
70	${STAGEDIR}${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
71	.endif	49	.endif
72		50
73	.include <bsd.port.mk>	51	.include <bsd.port.mk>

Line 0 Link Here

(-)libsoup/files/extra-patch-libsoup_meson.build (+47 lines)
	1	--- libsoup/meson.build.orig 2020-03-07 02:43:34 UTC
	2	+++ libsoup/meson.build
	3	@@ -203,7 +203,7 @@ endif
	4
	5
	6	includedir = join_paths(libsoup_api_name, meson.project_name())
	7	-install_headers(soup_installed_headers, subdir : includedir)
	8	+#install_headers(soup_installed_headers, subdir : includedir)
	9
	10	version_cdata = configuration_data()
	11	version_cdata.set('SOUP_MAJOR_VERSION', soup_version_major)
	12	@@ -223,7 +223,7 @@ soup_enums = gnome.mkenums('soup-enum-types',
	13	],
	14	h_template : enum_types + '.h.template',
	15	c_template : enum_types + '.c.template',
	16	- install_header : true,
	17	+ install_header : false,
	18	install_dir : join_paths(get_option('includedir'), includedir))
	19
	20	soup_enum_h = soup_enums[1]
	21	@@ -253,7 +253,7 @@ libsoup = library('soup-@0@'.format(apiversion),
	22	darwin_versions: darwin_versions,
	23	c_args : libsoup_c_args + hidden_visibility_flag,
	24	include_directories : configinc,
	25	- install : true,
	26	+ install : false,
	27	dependencies : deps)
	28
	29	pkg.generate(libsoup,
	30	@@ -319,7 +319,7 @@ if enable_introspection or enable_vapi
	31	export_packages : libsoup_api_name,
	32	extra_args : soup_gir_args,
	33	includes : 'Gio-2.0',
	34	- install : true,
	35	+ install : false,
	36	header: join_paths(meson.project_name(), 'soup.h'),
	37	)
	38
	39	@@ -336,7 +336,7 @@ if enable_introspection or enable_vapi
	40	soup_ns_version + '-custom.vala'
	41	],
	42	packages : 'gio-2.0',
	43	- install : true,
	44	+ install : false,
	45	)
	46	endif
	47

Line 0 Link Here

(-)libsoup/files/extra-patch-meson.build (+14 lines)
	1	--- meson.build.orig 2020-03-07 02:43:35 UTC
	2	+++ meson.build
	3	@@ -369,9 +369,9 @@ configure_file(output : 'config.h', configuration : cd
	4	subdir('libsoup')
	5	# xgettext is optional (on Windows for instance)
	6	if find_program('xgettext', required : false).found()
	7	- subdir('po')
	8	+ #subdir('po')
	9	endif
	10	-subdir('examples')
	11	+#subdir('examples')
	12
	13	if get_option('tests')
	14	subdir('tests')

Lines 1-29 Link Here

(-)libsoup/files/patch-libsoup_Makefile.in (-29 lines)
1	--- libsoup/Makefile.in.orig 2016-04-26 12:36:13 UTC
2	+++ libsoup/Makefile.in
3	@@ -290,7 +290,7 @@ libsoup_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
4	$(libsoup_2_4_la_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) \
5	$(LDFLAGS) -o $@
6	@BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \
7	-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1)
8	+@BUILD_LIBSOUP_GNOME_TRUE@ $(am__DEPENDENCIES_1)
9	am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \
10	soup-gnome-features.c soup-proxy-resolver-gnome.h \
11	soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \
12	@@ -788,7 +788,7 @@ TLD_DATA_FILE = $(top_srcdir)/data/effective_tld_names
13	@BUILD_LIBSOUP_GNOME_TRUE@ -export-dynamic
14
15	@BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
16	-@BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \
17	+@BUILD_LIBSOUP_GNOME_TRUE@ -lsoup-2.4 \
18	@BUILD_LIBSOUP_GNOME_TRUE@ $(GLIB_LIBS)
19
20	@BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \
21	@@ -848,7 +848,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
22	@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(builddir)/Soup-2.4.gir
23
24	@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
25	-@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
26	+@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la soup-2.4
27	@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
28	@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
29	@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0