summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/xlockmore-lite/Makefile4
-rw-r--r--x11/xlockmore/Makefile4
-rw-r--r--x11/xlockmore/Makefile.common8
-rw-r--r--x11/xlockmore/distinfo19
-rw-r--r--x11/xlockmore/patches/patch-aa56
-rw-r--r--x11/xlockmore/patches/patch-ab18
-rw-r--r--x11/xlockmore/patches/patch-ac6
-rw-r--r--x11/xlockmore/patches/patch-ad6
-rw-r--r--x11/xlockmore/patches/patch-ae20
-rw-r--r--x11/xlockmore/patches/patch-config.cygport19
10 files changed, 108 insertions, 52 deletions
diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile
index d6866170b71..1c987d37d83 100644
--- a/x11/xlockmore-lite/Makefile
+++ b/x11/xlockmore-lite/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2012/12/14 15:54:30 is Exp $
+# $NetBSD: Makefile,v 1.20.20.1 2015/04/29 20:49:54 tron Exp $
.include "../../x11/xlockmore/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-lite-/}
COMMENT= "lite" version of xlockmore
-PKGREVISION= 2
-
CONFIGURE_ARGS+= --without-xpm
CONFIGURE_ARGS+= --without-gltt
CONFIGURE_ARGS+= --without-ttf
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 3aad6c46868..aadb70a60e5 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2014/10/07 16:47:38 adam Exp $
+# $NetBSD: Makefile,v 1.118.4.1 2015/04/29 20:49:54 tron Exp $
.include "Makefile.common"
-PKGREVISION= 16
-
COMMENT= Like the XLock session-locker/screensaver, but with more
CONFIGURE_ARGS+= --with-opengl
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index b1a7bb1ad77..591d6611bb8 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.common,v 1.72 2014/10/09 14:07:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.72.4.1 2015/04/29 20:49:54 tron Exp $
#
# used by x11/xlockmore/Makefile
# used by x11/xlockmore-lite/Makefile
-DISTNAME= xlockmore-5.41
+DISTNAME= xlockmore-5.46
CATEGORIES= x11
-MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${DISTNAME}/ \
+MASTER_SITES= http://www.tux.org/~bagleyd/xlock/ \
ftp://ibiblio.org/pub/Linux/X11/screensavers/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tux.org/~bagleyd/xlockmore.html
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index 68e76f4358e..590c60377b8 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.52 2012/12/14 15:54:30 is Exp $
+$NetBSD: distinfo,v 1.52.20.1 2015/04/29 20:49:54 tron Exp $
-SHA1 (xlockmore-5.41.tar.bz2) = 68115d9f7b92fea3fa55ce07f03a3fe4a42952ec
-RMD160 (xlockmore-5.41.tar.bz2) = 98eda44768f5d757ad12dc1c0eed1692e6ee725f
-Size (xlockmore-5.41.tar.bz2) = 1962608 bytes
-SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
-SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
-SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
-SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
-SHA1 (patch-ae) = e0cac92c22eb1b83f634f4d1ef2ce0950984ad21
+SHA1 (xlockmore-5.46.tar.xz) = 849ba21a6a82493b0b352d5fbd9212e6d4581752
+RMD160 (xlockmore-5.46.tar.xz) = 978f8119c89c1c954ec5bc5f8cc8d8edea7c8c8e
+Size (xlockmore-5.46.tar.xz) = 1610356 bytes
+SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
+SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
+SHA1 (patch-ac) = 465a9e5e9f6310b7207a0a71dca8cbdca0f33922
+SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
+SHA1 (patch-ae) = 2dd755a188cf6701fd822472be169d8583ef04be
+SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
diff --git a/x11/xlockmore/patches/patch-aa b/x11/xlockmore/patches/patch-aa
index 1b4ec29834a..4787bec0e51 100644
--- a/x11/xlockmore/patches/patch-aa
+++ b/x11/xlockmore/patches/patch-aa
@@ -1,17 +1,55 @@
-$NetBSD: patch-aa,v 1.6 2008/10/06 22:40:12 hubertf Exp $
+$NetBSD: patch-aa,v 1.6.52.1 2015/04/29 20:49:54 tron Exp $
---- xlock/XLock.ad.orig 2008-10-05 02:51:17.000000000 +0200
+--- xlock/XLock.ad.orig 2015-03-12 13:34:33.000000000 +0000
+++ xlock/XLock.ad
-@@ -62,9 +62,9 @@ XLock.left3d: Red
+@@ -46,10 +46,10 @@ XLock.icongeometry: 64x64
+ !XLock.icongeometry: 256x256
+
+ ! For sound
+-XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
+-XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
+-XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
+-XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
++XLock.locksound: /usr/pkg/lib/X11/xlock/sounds/complete.au
++XLock.infosound: /usr/pkg/lib/X11/xlock/sounds/identify-please.au
++XLock.validsound: /usr/pkg/lib/X11/xlock/sounds/thank-you.au
++XLock.invalidsound: /usr/pkg/lib/X11/xlock/sounds/not-programmed.au
+ !XLock.locksound: complete.au
+ !XLock.infosound: identify-please.au
+ !XLock.validsound: thank-you.au
+@@ -63,12 +63,12 @@ XLock.left3d: Red
XLock.both3d: Magenta
! For marquee & nose modes
--!XLock.program: fortune -o
-XLock.program: fortune -s
--!XLock.program: fortune
-+!XLock.program: /usr/games/fortune -o
-+XLock.program: /usr/games/fortune -s
-+!XLock.program: /usr/games/fortune
++!XLock.program: fortune -s
+ !XLock.program: fortune -o
+ !XLock.program: fortune -s
+ !XLock.program: fortune
!XLock.program: /usr/games/fortune -o
- !XLock.program: /usr/games/fortune -s
+-!XLock.program: /usr/games/fortune -s
++XLock.program: /usr/games/fortune -s
!XLock.program: /usr/games/fortune
+ !XLock.program: finger
+ !XLock.messagesfile: fortune.dat
+@@ -81,7 +81,7 @@ XLock.messagefont: *8x16*
+ ! For modes with images
+ !XLock.*.bitmap: bitmaps/m-xlock.xbm
+ !XLock.*.bitmap: pixmaps/m-xlock.xpm
+-!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps
++!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps
+
+ ! For mailbox check application
+ !XLock.mailCmd: /usr/ucb/mail -e
+@@ -847,9 +847,9 @@ XLock.text3d.delay: 100000
+ !XLock.text3d.cycles: 1
+ !XLock.text3d.size: 1
+ XLock.text3d.saturation: 1.0
+-!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf
++!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf
+ ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded
+-!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/
++!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/
+ XLock.text3d.extrusion: 25.0
+ XLock.text3d.rot_amplitude: 1.0
+ XLock.text3d.rot_frequency: 0.001
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 798ac8ed519..e46091e760e 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2012/02/13 11:46:13 drochner Exp $
+$NetBSD: patch-ab,v 1.24.26.1 2015/04/29 20:49:54 tron Exp $
---- configure.orig 2011-11-10 16:08:45.000000000 +0000
+--- configure.orig 2015-03-03 01:05:29.000000000 +0000
+++ configure
-@@ -9434,10 +9434,10 @@ case "${canonical}" in
+@@ -9508,10 +9508,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
dirname=`which gcc`
dirname=`dirname $dirname`
dirname=`dirname $dirname`/lib
@@ -17,16 +17,16 @@ $NetBSD: patch-ab,v 1.24 2012/02/13 11:46:13 drochner Exp $
fi
XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
-@@ -9486,6 +9486,8 @@ _ACEOF
- ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default"
+@@ -9566,6 +9566,8 @@ _ACEOF
if test "x$ac_cv_header_elf_h" = xyes; then :
- $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
-+ XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
-+ XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
+
+ $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
++XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
++XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
fi
-@@ -9581,10 +9583,10 @@ $as_echo "no" >&6; }
+@@ -9673,10 +9675,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
dirname=`which gcc`
dirname=`dirname $dirname`
dirname=`dirname $dirname`/lib
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac
index d96cafb6c56..154b22a764a 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2007/10/28 16:06:04 joerg Exp $
+$NetBSD: patch-ac,v 1.12.64.1 2015/04/29 20:49:54 tron Exp $
---- xglock/Makefile.in.orig 2006-10-25 03:01:51.000000000 +0200
+--- xglock/Makefile.in.orig 2010-04-19 13:34:35.000000000 +0000
+++ xglock/Makefile.in
-@@ -116,14 +116,14 @@ install_xglock : install-program install
+@@ -117,14 +117,14 @@ install_xglock : install-program install
@ $(ECHO) ""
install-program : xglock
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
index 12ceb46f36b..f0b80be95b4 100644
--- a/x11/xlockmore/patches/patch-ad
+++ b/x11/xlockmore/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2007/10/28 16:15:21 joerg Exp $
+$NetBSD: patch-ad,v 1.8.64.1 2015/04/29 20:49:54 tron Exp $
---- xmlock/Makefile.in.orig 2007-09-16 20:16:51.000000000 +0200
+--- xmlock/Makefile.in.orig 2010-04-19 13:33:29.000000000 +0000
+++ xmlock/Makefile.in
-@@ -118,14 +118,14 @@ install_xmlock : install-program install
+@@ -119,14 +119,14 @@ install_xmlock : install-program install
@ $(ECHO) ""
install-program : xmlock
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae
index 60fc9a9a22f..d5611af9abf 100644
--- a/x11/xlockmore/patches/patch-ae
+++ b/x11/xlockmore/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 2012/12/14 15:54:30 is Exp $
+$NetBSD: patch-ae,v 1.7.20.1 2015/04/29 20:49:54 tron Exp $
---- modes/Makefile.in.orig 2008-10-05 02:50:23.000000000 +0200
+--- modes/Makefile.in.orig 2015-02-13 04:24:37.000000000 +0000
+++ modes/Makefile.in
-@@ -588,19 +588,20 @@ install : install-program install-man in
+@@ -600,21 +600,22 @@ install : install-program install-man in
@ $(ECHO) ""
install-program : xlock
@@ -24,11 +24,13 @@ $NetBSD: patch-ae,v 1.7 2012/12/14 15:54:30 is Exp $
+ $(INSTALL_DATA) $(UTILDIR)xlock.man ${DESTDIR}$(mandir)/xlock.1
install-ad :
-- $(top_srcdir)/mkinstalldirs $(xapploaddir)
-- $(INSTALL_DATA) $(UTILDIR)XLock.ad $(xapploaddir)/XLock
-+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
-+ $(top_srcdir)/mkinstalldirs ${DESTDIR}${datarootdir}/examples/xlock/app-defaults
-+ $(INSTALL_DATA) $(UTILDIR)XLock.ad ${DESTDIR}${datarootdir}/examples/xlock/app-defaults/XLock
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
+- $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)${datarootdir}/examples/xlock/app-defaults
++ $(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ @FORTUNE@sed 's;^XLock.program: fortune;XLock.program: $(FORTUNE);' $(UTILDIR)XLock.ad > $(UTILOBJDIR)XLock.ad.tmp
+- @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)$(xapploaddir)/XLock
++ @FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ @FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
uninstall : uninstall-program uninstall-man uninstall-ad
-
diff --git a/x11/xlockmore/patches/patch-config.cygport b/x11/xlockmore/patches/patch-config.cygport
new file mode 100644
index 00000000000..4eb4d3cac95
--- /dev/null
+++ b/x11/xlockmore/patches/patch-config.cygport
@@ -0,0 +1,19 @@
+$NetBSD: patch-config.cygport,v 1.1.2.2 2015/04/29 20:49:54 tron Exp $
+
+--- config.cygport.orig 2015-02-18 04:10:55.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=`sed 's/^.*"\(.*\)"/\1/' ./version.h`
+ RELEASE=1
+ else
+ VERSION=$1
+- if test "$2" == ""; then
++ if test "$2" = ""; then
+ RELEASE=1
+ else
+ RELEASE=$2
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 14:46:43 +0000