CVS commit: pkgsrc/sysutils/caja-extensions

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Aug 29 20:24:15 UTC 2023

Modified Files:
        pkgsrc/sysutils/caja-extensions: Makefile distinfo
Added Files:
        pkgsrc/sysutils/caja-extensions/patches: patch-configure

Log Message:
caja-extensions: allow building with gupnp-1.6; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/sysutils/caja-extensions/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/caja-extensions/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/caja-extensions/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/caja-extensions/Makefile
diff -u pkgsrc/sysutils/caja-extensions/Makefile:1.43 pkgsrc/sysutils/caja-extensions/Makefile:1.44
--- pkgsrc/sysutils/caja-extensions/Makefile:1.43       Wed Apr 19 08:11:27 2023
+++ pkgsrc/sysutils/caja-extensions/Makefile    Tue Aug 29 20:24:14 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2023/04/19 08:11:27 adam Exp $
+# $NetBSD: Makefile,v 1.44 2023/08/29 20:24:14 adam Exp $
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      caja-extensions-${VERSION:R}.1

Index: pkgsrc/sysutils/caja-extensions/distinfo
diff -u pkgsrc/sysutils/caja-extensions/distinfo:1.11 pkgsrc/sysutils/caja-extensions/distinfo:1.12
--- pkgsrc/sysutils/caja-extensions/distinfo:1.11       Sun Nov 27 04:46:31 2022
+++ pkgsrc/sysutils/caja-extensions/distinfo    Tue Aug 29 20:24:14 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2022/11/27 04:46:31 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2023/08/29 20:24:14 adam Exp $
 
 BLAKE2s (caja-extensions-1.26.1.tar.xz) = 75fde86a51f539ab468d59efc7641efe7acdf226915881a3f1b3a8359bb00b39
 SHA512 (caja-extensions-1.26.1.tar.xz) = 0b4df2b141f1a5b2e06b9c426f9605b900e9ed61c8725930165465265938740725f3e49f27788cb41728ab6d559245fc1ce6e44ef97b229d1456b191892c1ef0
 Size (caja-extensions-1.26.1.tar.xz) = 573240 bytes
+SHA1 (patch-configure) = 5c6dc506d50def3a7d3afec3f2eb977254b7b7a9

Added files:

Index: pkgsrc/sysutils/caja-extensions/patches/patch-configure
diff -u /dev/null pkgsrc/sysutils/caja-extensions/patches/patch-configure:1.1
--- /dev/null   Tue Aug 29 20:24:15 2023
+++ pkgsrc/sysutils/caja-extensions/patches/patch-configure     Tue Aug 29 20:24:15 2023
@@ -0,0 +1,50 @@
+$NetBSD: patch-configure,v 1.1 2023/08/29 20:24:15 adam Exp $
+
+Build with gupnp-1.6.
+
+--- configure.orig     2023-08-29 10:31:18.878560816 +0000
++++ configure
+@@ -15072,12 +15072,12 @@ if test -n "$UPNP_CFLAGS"; then
+     pkg_cv_UPNP_CFLAGS="$UPNP_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gupnp-1.2 >= \$GUPNP_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gupnp-1.2 >= $GUPNP_REQUIRED") 2>&5
++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gupnp-1.6 >= \$GUPNP_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gupnp-1.6 >= $GUPNP_REQUIRED") 2>&5
+   ac_status=$?
+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_UPNP_CFLAGS=`$PKG_CONFIG --cflags "gupnp-1.2 >= $GUPNP_REQUIRED" 2>/dev/null`
++  pkg_cv_UPNP_CFLAGS=`$PKG_CONFIG --cflags "gupnp-1.6 >= $GUPNP_REQUIRED" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15089,12 +15089,12 @@ if test -n "$UPNP_LIBS"; then
+     pkg_cv_UPNP_LIBS="$UPNP_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gupnp-1.2 >= \$GUPNP_REQUIRED\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gupnp-1.2 >= $GUPNP_REQUIRED") 2>&5
++    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gupnp-1.6 >= \$GUPNP_REQUIRED\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gupnp-1.6 >= $GUPNP_REQUIRED") 2>&5
+   ac_status=$?
+   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_UPNP_LIBS=`$PKG_CONFIG --libs "gupnp-1.2 >= $GUPNP_REQUIRED" 2>/dev/null`
++  pkg_cv_UPNP_LIBS=`$PKG_CONFIG --libs "gupnp-1.6 >= $GUPNP_REQUIRED" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15115,9 +15115,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-              UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gupnp-1.2 >= $GUPNP_REQUIRED" 2>&1`
++              UPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gupnp-1.6 >= $GUPNP_REQUIRED" 2>&1`
+         else
+-              UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gupnp-1.2 >= $GUPNP_REQUIRED" 2>&1`
++              UPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gupnp-1.6 >= $GUPNP_REQUIRED" 2>&1`
+         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$UPNP_PKG_ERRORS" >&5