From owner-svn-ports-all@freebsd.org Fri Feb 21 18:55:43 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A22AD23F17E; Fri, 21 Feb 2020 18:55:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48PLJH2q5Pz402V; Fri, 21 Feb 2020 18:55:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CD74F3EB; Fri, 21 Feb 2020 18:55:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01LIthAH085909; Fri, 21 Feb 2020 18:55:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01LItgkm085905; Fri, 21 Feb 2020 18:55:42 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202002211855.01LItgkm085905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 21 Feb 2020 18:55:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526644 - in head/net/gupnp-igd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/net/gupnp-igd: . files X-SVN-Commit-Revision: 526644 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Feb 2020 18:55:43 -0000 Author: sunpoet Date: Fri Feb 21 18:55:42 2020 New Revision: 526644 URL: https://svnweb.freebsd.org/changeset/ports/526644 Log: Convert REINPLACE_CMD to patch files Added: head/net/gupnp-igd/files/ head/net/gupnp-igd/files/patch-configure (contents, props changed) head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in (contents, props changed) head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir (contents, props changed) head/net/gupnp-igd/files/patch-libgupnp-igd-Makefile.in (contents, props changed) Modified: head/net/gupnp-igd/Makefile Modified: head/net/gupnp-igd/Makefile ============================================================================== --- head/net/gupnp-igd/Makefile Fri Feb 21 18:55:36 2020 (r526643) +++ head/net/gupnp-igd/Makefile Fri Feb 21 18:55:42 2020 (r526644) @@ -22,13 +22,9 @@ RUN_DEPENDS= gupnp>=0.18:net/gupnp USES= compiler:c11 gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 introspection:build -CONFIGURE_ARGS= --enable-introspection=yes --disable-python +CONFIGURE_ARGS= --disable-python --enable-introspection=yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USE_LDCONFIG= yes - -post-patch: - @${REINPLACE_CMD} -e 's|gssdp-1.0|gssdp-1.2|; s|gupnp-1.0|gupnp-1.2|' ${WRKSRC}/configure ${WRKSRC}/gupnp-igd-1.0.pc.in ${WRKSRC}/libgupnp-igd/Makefile.in ${WRKSRC}/libgupnp-igd/GUPnPIgd-1.0.gir - @${REINPLACE_CMD} -e '/ --define-variable=/d' ${WRKSRC}/configure .include Added: head/net/gupnp-igd/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp-igd/files/patch-configure Fri Feb 21 18:55:42 2020 (r526644) @@ -0,0 +1,61 @@ +--- 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 Added: head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp-igd/files/patch-gupnp-igd-1.0.pc.in Fri Feb 21 18:55:42 2020 (r526644) @@ -0,0 +1,11 @@ +--- 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 Added: head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/gupnp-igd/files/patch-libgupnp-igd-GUPnPIgd-1.0.gir Fri Feb 21 18:55:42 2020 (r526644) @@ -0,0 +1,11 @@ +--- 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"> + +- ++ +