From f305e3a2f85a84beed810c1162ac9429e858547e Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sun, 10 Feb 2019 12:56:47 +0000
Subject: [PATCH] fix build with gupnp-1.1.2

---
 x11/mate/caja-extensions/Makefile | 32 +++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/x11/mate/caja-extensions/Makefile b/x11/mate/caja-extensions/Makefile
index dd0a314fd66..a36c4e5246e 100644
--- a/x11/mate/caja-extensions/Makefile
+++ b/x11/mate/caja-extensions/Makefile
@@ -1,34 +1,38 @@
-# $OpenBSD: Makefile,v 1.8 2018/09/20 11:15:22 robert Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/10 12:56:47 jasper Exp $
 
 COMMENT=		extensions for Caja, the MATE file manager
 MATE_VERSION=		1.20.1
+REVISION=		0
 
 MATE_PROJECT=		caja-extensions
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += X11 X11-xcb Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender c dconf epoxy expat
-WANTLIB += ffi fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 iconv intl m pcre pixman-1
-WANTLIB += pthread sqlite3 xcb xcb-render xcb-shm
-WANTLIB += xcb-util z
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi cairo-gobject cairo
-WANTLIB += caja-extension dbus-1 dbus-glib-1 gdk-3 gdk_pixbuf-2.0
-WANTLIB += graphite2 gssdp-1.0 gtk-3 gupnp-1.0 harfbuzz lzma
-WANTLIB += mate-desktop-2 pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += png soup-2.4 startup-notification-1 xml2
-WANTLIB += fribidi
+WANTLIB += X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 c
+WANTLIB += cairo cairo-gobject caja-extension dbus-1 dbus-glib-1
+WANTLIB += dconf epoxy expat ffi fontconfig freetype fribidi gdk-3
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gssdp-1.2 gthread-2.0 gtk-3 gupnp-1.2 harfbuzz
+WANTLIB += iconv idn2 intl lzma m mate-desktop-2 pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png16 psl pthread soup-2.4
+WANTLIB += sqlite3 startup-notification-1 unistring xcb xcb-render
+WANTLIB += xcb-shm xcb-util xml2 z
 
 MODULES=		devel/dconf \
 			x11/gnome
 
-LIB_DEPENDS=		net/gupnp/core \
+LIB_DEPENDS=		net/gupnp/core>=1.1.2 \
 			x11/dbus-glib \
 			x11/mate/desktop \
 			x11/mate/caja
 
 CONFIGURE_STYLE=	gnu
 
+# Adjust to new gssdp/gupnp
+pre-configure:
+	sed -i -e 's,gssdp-1.0,gssdp-1.2,g' -e 's,gupnp-1.0,gupnp-1.2,g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>