Index: head/net/gupnp-igd/files/patch-configure =================================================================== --- head/net/gupnp-igd/files/patch-configure (revision 549783) +++ head/net/gupnp-igd/files/patch-configure (nonexistent) @@ -1,61 +0,0 @@ ---- configure.orig 2017-11-20 16:27:28 UTC -+++ configure -@@ -13055,12 +13055,12 @@ if test -n "$LIBGUPNP_CFLAGS"; then - pkg_cv_LIBGUPNP_CFLAGS="$LIBGUPNP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBGUPNP_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0" 2>/dev/null` -+ pkg_cv_LIBGUPNP_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -13072,12 +13072,12 @@ if test -n "$LIBGUPNP_LIBS"; then - pkg_cv_LIBGUPNP_LIBS="$LIBGUPNP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LIBGUPNP_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0" 2>/dev/null` -+ pkg_cv_LIBGUPNP_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -13098,14 +13098,14 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0" 2>&1` -+ LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0" 2>&1` - else -- LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0" 2>&1` -+ LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGUPNP_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) were not met: -+ as_fn_error $? "Package requirements (glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) were not met: - - $LIBGUPNP_PKG_ERRORS - -@@ -13655,8 +13655,6 @@ fi - - - if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_TYPELIBDIR=`$PKG_CONFIG --variable=typelibdir --define-variable="libdir=${libdir}" gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir --define-variable="datadir=${datadir}" gobject-introspection-1.0` - - - fi Property changes on: head/net/gupnp-igd/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in =================================================================== --- head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in (revision 549783) +++ head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in (nonexistent) @@ -1,11 +0,0 @@ ---- gupnp-igd-1.0.pc.in.orig 2009-05-04 22:40:53 UTC -+++ gupnp-igd-1.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-igd-1.0 - Cflags: -I${includedir}/gupnp-igd-1.0 Property changes on: head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir =================================================================== --- head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir (revision 549783) +++ head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir (nonexistent) @@ -1,11 +0,0 @@ ---- libgupnp-igd/GUPnPIgd-1.0.gir.orig 2017-11-20 16:27:47 UTC -+++ libgupnp-igd/GUPnPIgd-1.0.gir -@@ -7,7 +7,7 @@ and/or use gtk-doc annotations. --> - xmlns:c="http://www.gtk.org/introspection/c/1.0" - xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - -- -+ - # $FreeBSD$ PORTNAME= gupnp-igd -PORTVERSION= 0.2.5 -PORTREVISION= 3 +PORTVERSION= 1.2.0 CATEGORIES= net MASTER_SITES= GNOME MAINTAINER= sunpoet@FreeBSD.org COMMENT= Library to handle UPnP IGD port mapping LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gobject-introspection>=0.10:devel/gobject-introspection \ - gupnp>=0.18:net/gupnp + gupnp>=1.2.0:net/gupnp \ + gssdp>=1.2.0:net/gssdp LIB_DEPENDS= libgssdp-1.2.so:net/gssdp \ libgupnp-1.2.so:net/gupnp -RUN_DEPENDS= gupnp>=0.18:net/gupnp +RUN_DEPENDS= gupnp>=1.2.0:net/gupnp \ + gssdp>=1.2.0:net/gssdp -USES= compiler:c11 gmake gnome libtool pathfix pkgconfig tar:xz +USES= compiler:c11 gnome meson pathfix pkgconfig tar:xz USE_GNOME= glib20 introspection:build -CONFIGURE_ARGS= --disable-python --enable-introspection=yes -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +MESON_ARGS= -Dgtk_doc=false -Dintrospection=true +USE_CSTD= c11 USE_LDCONFIG= yes .include Index: head/net/gupnp-igd/distinfo =================================================================== --- head/net/gupnp-igd/distinfo (revision 549783) +++ head/net/gupnp-igd/distinfo (revision 549784) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511371381 -SHA256 (gupnp-igd-0.2.5.tar.xz) = 8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20 -SIZE (gupnp-igd-0.2.5.tar.xz) = 287964 +TIMESTAMP = 1600863356 +SHA256 (gupnp-igd-1.2.0.tar.xz) = 4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1 +SIZE (gupnp-igd-1.2.0.tar.xz) = 26100 Index: head/net/gupnp-igd/pkg-plist =================================================================== --- head/net/gupnp-igd/pkg-plist (revision 549783) +++ head/net/gupnp-igd/pkg-plist (revision 549784) @@ -1,23 +1,8 @@ include/gupnp-igd-1.0/libgupnp-igd/gupnp-simple-igd-thread.h include/gupnp-igd-1.0/libgupnp-igd/gupnp-simple-igd.h -lib/libgupnp-igd-1.0.a +lib/girepository-1.0/GUPnPIgd-1.0.typelib lib/libgupnp-igd-1.0.so lib/libgupnp-igd-1.0.so.4 -lib/libgupnp-igd-1.0.so.4.2.0 -lib/girepository-1.0/GUPnPIgd-1.0.typelib +lib/libgupnp-igd-1.0.so.4.2.1 libdata/pkgconfig/gupnp-igd-1.0.pc share/gir-1.0/GUPnPIgd-1.0.gir -share/gtk-doc/html/gupnp-igd/GUPnPSimpleIgd.html -share/gtk-doc/html/gupnp-igd/GUPnPSimpleIgdThread.html -share/gtk-doc/html/gupnp-igd/ch01.html -share/gtk-doc/html/gupnp-igd/ch02.html -share/gtk-doc/html/gupnp-igd/gupnp-igd.devhelp2 -share/gtk-doc/html/gupnp-igd/home.png -share/gtk-doc/html/gupnp-igd/index.html -share/gtk-doc/html/gupnp-igd/left-insensitive.png -share/gtk-doc/html/gupnp-igd/left.png -share/gtk-doc/html/gupnp-igd/right-insensitive.png -share/gtk-doc/html/gupnp-igd/right.png -share/gtk-doc/html/gupnp-igd/style.css -share/gtk-doc/html/gupnp-igd/up-insensitive.png -share/gtk-doc/html/gupnp-igd/up.png