xlockmore: Update to 5.68

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xlockmore: Update to 5.68
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Mon, 20 Dec 2021 09:55:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Dec 20 10:55:55 2021 +0100
Changeset:	24b242e8bdcdad361b09a1e50312eb9aa71c9314

Modified Files:
	xlockmore/Makefile.common
	xlockmore/distinfo
	xlockmore/patches/patch-configure
	xlockmore/patches/patch-modes_Makefile.in
Removed Files:
	xlockmore/patches/patch-config.cygport
	xlockmore/patches/patch-xglock_Makefile.in

Log Message:
xlockmore: Update to 5.68

5.68
  Updated xscreensaver port for xscreensaver-6.02.
  Various NetBsd install issues fixed including config.cygport.
  pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net.
    Card vulnerability may remain, see README.
  module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is
    still experimental.
  biof mode removed again (though was not building by default).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=24b242e8bdcdad361b09a1e50312eb9aa71c9314

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

diffstat:
 xlockmore/Makefile.common                  |  2 +-
 xlockmore/distinfo                         | 14 ++++++--------
 xlockmore/patches/patch-config.cygport     | 22 ----------------------
 xlockmore/patches/patch-configure          |  7 ++++---
 xlockmore/patches/patch-modes_Makefile.in  | 28 +++++++---------------------
 xlockmore/patches/patch-xglock_Makefile.in | 15 ---------------
 6 files changed, 18 insertions(+), 70 deletions(-)

diffs:
diff --git a/xlockmore/Makefile.common b/xlockmore/Makefile.common
index 3fd0118360..57645feb2d 100644
--- a/xlockmore/Makefile.common
+++ b/xlockmore/Makefile.common
@@ -3,7 +3,7 @@
 # used by ../../x11/xlockmore/Makefile
 # used by ../../x11/xlockmore-lite/Makefile
 
-DISTNAME=	xlockmore-5.67
+DISTNAME=	xlockmore-5.68
 CATEGORIES=	x11
 MASTER_SITES=	http://sillycycle.com/xlock/
 EXTRACT_SUFX=	.tar.xz
diff --git a/xlockmore/distinfo b/xlockmore/distinfo
index b722e899db..f5b17d343a 100644
--- a/xlockmore/distinfo
+++ b/xlockmore/distinfo
@@ -1,11 +1,9 @@
 $NetBSD: distinfo,v 1.58 2021/10/26 11:34:51 nia Exp $
 
-SHA1 (xlockmore-5.67.tar.xz) = e4d7ce5d840d1e6a3aaef701a33d2bf616de157a
-RMD160 (xlockmore-5.67.tar.xz) = 5ae56d3d26f8d8978f81c263ba75f2bf6bdb455b
-SHA512 (xlockmore-5.67.tar.xz) = d32ae6c11c9e2389a563b91f970c93d0e67028ac6406038985a416404679aaf7d6e15551d1cf4387d71f851a90d2a02a0a328c0af57265c839edfe40dfffaa65
-Size (xlockmore-5.67.tar.xz) = 2000040 bytes
-SHA1 (patch-config.cygport) = 8f515068eca680e4f00858eaba2767625d92758f
-SHA1 (patch-configure) = 48bc780cf4241c43ca6a2502cf74e700e319c238
-SHA1 (patch-modes_Makefile.in) = 0a927c8927bd5c24eabb0078651b3813eea9227a
-SHA1 (patch-xglock_Makefile.in) = e5f3bf2054d4e7ea18d13c04f6bd94457d574ad1
+SHA1 (xlockmore-5.68.tar.xz) = 0aaf11f75d2460b76cd2c55298183827203b8ddd
+RMD160 (xlockmore-5.68.tar.xz) = 65a6ee1356cd6eb050c2a883dede01b27323a435
+SHA512 (xlockmore-5.68.tar.xz) = e884ac8395bfee21eedecbe0652eaa8bcae10e8f56896d7f3f5e970d40a87f002b7fb248caa0d981ea815e0fcfda6a1e8529c618c8c073b7f0b44b58abde17d4
+Size (xlockmore-5.68.tar.xz) = 1998852 bytes
+SHA1 (patch-configure) = eb2706b4de9d6212ab183ddf4faeaac6f598ca86
+SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
 SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a
diff --git a/xlockmore/patches/patch-config.cygport b/xlockmore/patches/patch-config.cygport
deleted file mode 100644
index 2c5ea52003..0000000000
--- a/xlockmore/patches/patch-config.cygport
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Fix unportable syntax in shell script.
-Patch was merged upstream, remove for next release.
-
---- config.cygport.orig	2019-12-05 00:56:37.000000000 +0000
-+++ config.cygport
-@@ -4,12 +4,12 @@ PWD=`pwd`
- #NAME=${DIR}
- NAME=xlockmore
- GROUP=${NAME}
--if test "$1" == ""; then
-+if test "$1" = ""; then
- 	VERSION=`grep VERSION xlock/version.h | sed 's/^.*"\(.*\)"/\1/'`
- 	RELEASE=1
- else
- 	VERSION=$1
--	if test "$2" == ""; then
-+	if test "$2" = ""; then
- 		RELEASE=1
- 	else
- 		RELEASE=$2
diff --git a/xlockmore/patches/patch-configure b/xlockmore/patches/patch-configure
index 791d62e82d..d417a4f70b 100644
--- a/xlockmore/patches/patch-configure
+++ b/xlockmore/patches/patch-configure
@@ -1,10 +1,11 @@
 $NetBSD$
 
 Modify handling of LDFLAGS.
+Rejected by upstream.
 
 --- configure.orig	2020-06-04 14:43:47.000000000 +0000
 +++ configure
-@@ -10831,10 +10831,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
+@@ -10833,10 +10833,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
@@ -19,7 +20,7 @@ Modify handling of LDFLAGS.
      fi
      case "${canonical}" in
        *-*-freebsd* )
-@@ -10894,6 +10894,8 @@ _ACEOF
+@@ -10896,6 +10896,8 @@ _ACEOF
  if test "x$ac_cv_header_elf_h" = xyes; then :
  
  $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
@@ -28,7 +29,7 @@ Modify handling of LDFLAGS.
  
  fi
  
-@@ -11004,10 +11006,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
+@@ -11006,10 +11008,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
diff --git a/xlockmore/patches/patch-modes_Makefile.in b/xlockmore/patches/patch-modes_Makefile.in
index 84881d5e1f..8bc0b84ec5 100644
--- a/xlockmore/patches/patch-modes_Makefile.in
+++ b/xlockmore/patches/patch-modes_Makefile.in
@@ -1,34 +1,20 @@
 $NetBSD$
 
-Honour LDFLAGS.
 Use INSTALL properly.
+First part was rejected by upstream.
+Second part is not suitable for upstream.
 
---- modes/Makefile.in.orig	2020-10-05 02:36:51.000000000 +0000
+--- modes/Makefile.in.orig	2021-12-17 04:47:25.000000000 +0000
 +++ modes/Makefile.in
-@@ -345,7 +345,7 @@ CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-+XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) @LDFLAGS@
- XLIBS = @XLIBS@
- XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
- 
-@@ -633,10 +633,10 @@ install : install-program install-man in
+@@ -633,7 +633,7 @@ install : install-program install-man in
  
  install-program : xlock
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 -	$(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
--	@MODULES@mkdir -p $(DEF_MODULEPATH)
--	@MODULES@cp *.xlk $(DEF_MODULEPATH)
--	@MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
 +	$(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
-+	@MODULES@mkdir -p $(DESTDIR)$(DEF_MODULEPATH)
-+	@MODULES@cp *.xlk $(DESTDIR)$(DEF_MODULEPATH)
-+	@MODULES@cp glx/*.xlk $(DESTDIR)$(DEF_MODULEPATH)
- 
- install-man :
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
+ 	@MODULES@mkdir -p $(DESTDIR)$(DEF_MODULEPATH)
+ 	@MODULES@cp *.xlk $(DESTDIR)$(DEF_MODULEPATH)
+ 	@MODULES@cp glx/*.xlk $(DESTDIR)$(DEF_MODULEPATH)
 @@ -644,9 +644,10 @@ install-man :
  
  install-ad :
diff --git a/xlockmore/patches/patch-xglock_Makefile.in b/xlockmore/patches/patch-xglock_Makefile.in
deleted file mode 100644
index ebfe52fcd2..0000000000
--- a/xlockmore/patches/patch-xglock_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Honour LDFLAGS.
-
---- xglock/Makefile.in.orig	2010-04-19 13:34:35.000000000 +0000
-+++ xglock/Makefile.in
-@@ -93,7 +93,7 @@ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_src
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-+XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ @LDFLAGS@
- XLIBS = @XLIBS@
- XGLOCKLIBS = @XGLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or
Prev by Date: Add rtaudio version 5.2.0 to pkgsrc-wip
Next by Date: xlockmore: Update TODO
Previous by Thread: Add rtaudio version 5.2.0 to pkgsrc-wip
Next by Thread: Import libva-2.13.0 as wip/libva
Indexes:
Home | Main Index | Thread Index | Old Index