summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/xlockmore/Makefile8
-rw-r--r--x11/xlockmore/files/md54
-rw-r--r--x11/xlockmore/files/patch-sum10
-rw-r--r--x11/xlockmore/patches/patch-ab14
-rw-r--r--x11/xlockmore/patches/patch-ac8
-rw-r--r--x11/xlockmore/patches/patch-ad10
-rw-r--r--x11/xlockmore/patches/patch-ae32
-rw-r--r--x11/xlockmore/pkg/PLIST9
8 files changed, 48 insertions, 47 deletions
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 2cee12ed91c..e27fe6c17c2 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2000/05/11 16:37:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.30 2000/08/15 03:54:16 hubertf Exp $
# FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
#
-DISTNAME= xlockmore-4.16.1
+DISTNAME= xlockmore-4.17
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/
@@ -21,8 +21,8 @@ CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \
post-patch:
for i in xlock/sound.c xlock/resource.c ; do \
f=${WRKSRC}/$$i ; \
- [ -f $$f.BAK ] || mv $$f $$f.BAK ; \
- sed \
+ [ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
+ ${SED} \
-e 's|@PREFIX@|${PREFIX}|g' \
<$$f.BAK >$$f ; \
done
diff --git a/x11/xlockmore/files/md5 b/x11/xlockmore/files/md5
index ee49775091b..b74c4541456 100644
--- a/x11/xlockmore/files/md5
+++ b/x11/xlockmore/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.15 2000/05/11 16:37:53 hubertf Exp $
+$NetBSD: md5,v 1.16 2000/08/15 03:54:17 hubertf Exp $
-MD5 (xlockmore-4.16.1.tar.gz) = ba7af9df46b75e603b4774f76fcb2f3f
+MD5 (xlockmore-4.17.tar.gz) = 6e221dd493bb3fb49c1793c51e7d6e2a
diff --git a/x11/xlockmore/files/patch-sum b/x11/xlockmore/files/patch-sum
index e7c34d8d811..c81cf143b3e 100644
--- a/x11/xlockmore/files/patch-sum
+++ b/x11/xlockmore/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2000/05/16 13:32:07 hubertf Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/15 03:54:17 hubertf Exp $
MD5 (patch-aa) = ef89b7291b0d3c6351330887741cd7ae
-MD5 (patch-ab) = 46768c69cc39e88e811017eb52774f2a
-MD5 (patch-ac) = 91eab8d9ca9e7a9341381c7425108463
-MD5 (patch-ad) = 7ba55716f652bf455e010e3214e63074
-MD5 (patch-ae) = d3a0846410c423a54a022ffc36d88860
+MD5 (patch-ab) = 7992237902b0eed93f476390e81122e7
+MD5 (patch-ac) = 982191521403c38e1804c7b078e4f45d
+MD5 (patch-ad) = c8f16f930ebc3a759cc6dbb85da43ffd
+MD5 (patch-ae) = 9dab989b9c932f21d88f08f080221a38
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index 84cdb3b5fbd..c3a9fa459f7 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.6 2000/05/11 16:37:53 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2000/08/15 03:54:17 hubertf Exp $
---- xlock/xlock.c.orig Wed Mar 22 17:55:32 2000
-+++ xlock/xlock.c Tue May 9 13:35:51 2000
-@@ -592,7 +592,9 @@
- #ifdef USE_DPMS
- #define MIN_DPMS 30 /* 30 second minimum */
+--- xlock/xlock.c.orig Mon Jul 10 17:46:19 2000
++++ xlock/xlock.c Tue Aug 15 05:38:20 2000
+@@ -597,7 +597,9 @@
+ #include <X11/extensions/dpms.h>
+ #else /* XFree86 < 4.x */
#include <X11/extensions/dpms.h>
+#ifndef __NetBSD__
extern unsigned char DPMSQueryExtension(Display *, int *, int *);
+#endif
extern int DPMSGetTimeouts(Display *, unsigned short *, unsigned short *, unsigned short *);
extern int DPMSSetTimeouts(Display *, unsigned short, unsigned short, unsigned short);
- extern int dpmsstandby;
+ #endif
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac
index 6b106cd1caa..283c9f541a7 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2000/05/11 16:37:53 hubertf Exp $
+$NetBSD: patch-ac,v 1.5 2000/08/15 03:54:17 hubertf Exp $
---- configure.orig Fri Mar 24 00:12:23 2000
-+++ configure Tue May 9 13:38:23 2000
-@@ -4844,7 +4844,7 @@
+--- configure.orig Sat Jul 29 00:48:47 2000
++++ configure Tue Aug 15 05:38:38 2000
+@@ -4542,7 +4542,7 @@
#define USE_GL 1
EOF
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
index 41113c3ba76..a3a79ac3f1c 100644
--- a/x11/xlockmore/patches/patch-ad
+++ b/x11/xlockmore/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2000/05/11 16:37:53 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2000/08/15 03:54:17 hubertf Exp $
---- xlock/sound.c.orig Fri Apr 14 13:21:37 2000
-+++ xlock/sound.c Fri Apr 14 13:22:28 2000
-@@ -127,7 +127,7 @@
+--- xlock/sound.c.orig Mon Jun 26 21:05:45 2000
++++ xlock/sound.c Tue Aug 15 05:41:29 2000
+@@ -154,7 +154,7 @@
#ifdef USE_ESOUND
#ifndef DEFAULT_SOUND_DIR
--#define DEFAULT_SOUND_DIR "/usr/lib/sounds/xlockmore/"
+-#define DEFAULT_SOUND_DIR "/usr/share/sounds/xlockmore/"
+#define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore/"
#endif
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae
index 749f4d4bccb..39695767977 100644
--- a/x11/xlockmore/patches/patch-ae
+++ b/x11/xlockmore/patches/patch-ae
@@ -1,22 +1,22 @@
-$NetBSD: patch-ae,v 1.1 2000/05/11 16:37:54 hubertf Exp $
+$NetBSD: patch-ae,v 1.2 2000/08/15 03:54:17 hubertf Exp $
---- xlock/resource.c.orig Fri Apr 14 13:23:03 2000
-+++ xlock/resource.c Fri Apr 14 13:24:27 2000
+--- xlock/resource.c.orig Mon Jul 10 17:54:13 2000
++++ xlock/resource.c Tue Aug 15 05:43:10 2000
@@ -86,7 +86,7 @@
#ifdef USE_MODULES
- #ifndef DEF_MODULEPATH
--#define DEF_MODULEPATH "/usr/lib/X11/xlock_modules"
-+#define DEF_MODULEPATH "@PREFIX@/lib/X11/xlocklock/modules"
- #endif
+ # ifndef DEF_MODULEPATH
+-# define DEF_MODULEPATH "/usr/lib/X11/xlock_modules"
++# define DEF_MODULEPATH "@PREFIX@/lib/X11/xlocklock/modules"
+ # endif
#endif
-@@ -247,7 +247,7 @@
- #define DEF_INVALIDSOUND "[]not-programmed.au"
- #endif /* !USE_VMSPLAY */
- #ifdef USE_ESOUND
--#define DEFAULT_SOUND_DIR "/usr/lib/sounds/xlockmore"
-+#define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore"
- #define DEF_LOCKSOUND "thank-you.au"
- #define DEF_INFOSOUND "identify-please.au"
- #define DEF_VALIDSOUND "complete.au"
+@@ -252,7 +252,7 @@
+ # endif /* !USE_VMSPLAY */
+ # ifdef USE_ESOUND
+ # ifndef DEFAULT_SOUND_DIR
+-# define DEFAULT_SOUND_DIR "/usr/share/sounds/xlockmore"
++# define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore"
+ # endif
+ # define DEF_LOCKSOUND "thank-you.au"
+ # define DEF_INFOSOUND "identify-please.au"
diff --git a/x11/xlockmore/pkg/PLIST b/x11/xlockmore/pkg/PLIST
index f9684e58075..c49efb6f4ca 100644
--- a/x11/xlockmore/pkg/PLIST
+++ b/x11/xlockmore/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2000/05/11 16:37:54 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/08/15 03:54:18 hubertf Exp $
bin/xlock
-man/man1/xlock.1.gz
lib/X11/app-defaults/XLock
-lib/X11/xlockmore/thank-you.au
+lib/X11/xlockmore/complete.au
lib/X11/xlockmore/identify-please.au
lib/X11/xlockmore/not-programmed.au
-lib/X11/xlockmore/complete.au
+lib/X11/xlockmore/thank-you.au
+man/man1/xlock.1
+@dirrm lib/X11/xlockmore
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 13:23:44 +0000