[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pkgsrc-changes
Subject:    CVS commit: pkgsrc/multimedia/mate-media
From:       "David H. Gutteridge" <gutteridge () netbsd ! org>
Date:       2019-05-31 4:45:20
Message-ID: 20190531044520.4E00EFB15 () cvs ! NetBSD ! org
[Download RAW message or body]

This is a multi-part message in MIME format.

--_----------=_1559277920110250
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gutteridge
Date:		Fri May 31 04:45:20 UTC 2019

Modified Files:
	pkgsrc/multimedia/mate-media: distinfo
	pkgsrc/multimedia/mate-media/patches: patch-configure

Log Message:
mate-media: amend patch-configure (NFC)

While preparing to send patch-configure upstream, I noticed there were
more issues present. None would affect how the package builds as we've
defined it, but I'm aligning this patch with what I've sent upstream,
for consistency. (pkgsrc's check-portability.awk doesn't catch
incorrect expressions of test[1] if they're [unnecessarily] enclosed
in parentheses, so some of this didn't get automatically flagged when I
originally updated the package.)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/mate-media/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/mate-media/patches/patch-configure

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


--_----------=_1559277920110250
Content-Disposition: inline
Content-Length: 3023
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/multimedia/mate-media/distinfo
diff -u pkgsrc/multimedia/mate-media/distinfo:1.6 \
                pkgsrc/multimedia/mate-media/distinfo:1.7
--- pkgsrc/multimedia/mate-media/distinfo:1.6	Sun Apr  7 01:02:35 2019
+++ pkgsrc/multimedia/mate-media/distinfo	Fri May 31 04:45:20 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2019/04/07 01:02:35 gutteridge Exp $
+$NetBSD: distinfo,v 1.7 2019/05/31 04:45:20 gutteridge Exp $
 
 SHA1 (mate-media-1.22.1.tar.xz) = 53516e2615c40097dcbde4ced00a6dcb8900d60f
 RMD160 (mate-media-1.22.1.tar.xz) = 9a1aef67db76b707c0c7a95690bbb9ae40583f83
 SHA512 (mate-media-1.22.1.tar.xz) = \
e7bce9128bc6e551cd918af669d52a7ca238a280a4ca09d15822f4d5b52fd9925b647278a39067a1f2a5dd0facfad4988385233939abbdf4aefecc21d2e089d9
  Size (mate-media-1.22.1.tar.xz) = 486664 bytes
-SHA1 (patch-configure) = 6deed33abaea7fa2f356ae20d9766f701326a912
+SHA1 (patch-configure) = 932b9744e936df213d75dfe0d5b3cf2f9d821d3e

Index: pkgsrc/multimedia/mate-media/patches/patch-configure
diff -u pkgsrc/multimedia/mate-media/patches/patch-configure:1.1 \
                pkgsrc/multimedia/mate-media/patches/patch-configure:1.2
--- pkgsrc/multimedia/mate-media/patches/patch-configure:1.1	Sun Apr  7 01:02:35 2019
+++ pkgsrc/multimedia/mate-media/patches/patch-configure	Fri May 31 04:45:20 2019
@@ -1,8 +1,54 @@
-$NetBSD: patch-configure,v 1.1 2019/04/07 01:02:35 gutteridge Exp $
+$NetBSD: patch-configure,v 1.2 2019/05/31 04:45:20 gutteridge Exp $
+
+Fix non-portable uses of test, typos in variable names, etc.
 
 --- configure.orig	2019-04-01 10:25:27.200097504 +0000
 +++ configure
-@@ -14708,7 +14708,7 @@ fi
+@@ -14654,9 +14654,11 @@ fi
+ # Check whether --enable-statusicon was given.
+ if test "${enable_statusicon+set}" = set; then :
+   enableval=$enable_statusicon;
++else
++  enable_statusicon=yes
+ fi
+ 
+-if (test "${enable-statusicon}" == "no"); then
++if test "x$enable_statusicon" = "xno"; then
+ 
+ $as_echo "#define ENABLE_STATUSICON 0" >>confdefs.h
+ 
+@@ -14666,7 +14668,7 @@ else
+ $as_echo "#define ENABLE_STATUSICON 1" >>confdefs.h
+ 
+ fi
+- if test "${enable_statusicon}" != "no"; then
++ if test "x$enable_statusicon" != "xno"; then
+   ENABLE_STATUSICON_TRUE=
+   ENABLE_STATUSICON_FALSE='#'
+ else
+@@ -14684,9 +14686,11 @@ fi
+ # Check whether --enable-panelapplet was given.
+ if test "${enable_panelapplet+set}" = set; then :
+   enableval=$enable_panelapplet;
++else
++  enable_panelapplet=yes
+ fi
+ 
+-if (test "${enable-panelapplet}" == "no"); then
++if test "x$enable_panelapplet" = "xno"; then
+ 
+ $as_echo "#define ENABLE_PANELAPPLET 0" >>confdefs.h
+ 
+@@ -14695,7 +14699,7 @@ else
+ $as_echo "#define ENABLE_PANELAPPLET 1" >>confdefs.h
+ 
+ fi
+- if test "${enable_panelapplet}" != "no"; then
++ if test "x$enable_panelapplet" != "xno"; then
+   ENABLE_PANELAPPLET_TRUE=
+   ENABLE_PANELAPPLET_FALSE='#'
+ else
+@@ -14708,7 +14712,7 @@ fi
  # Sanity check: must build either status icon or panel applet
  #============================================================================
  


--_----------=_1559277920110250--


[prev in list] [next in list] [prev in thread] [next in thread]