summaryrefslogtreecommitdiff
path: root/x11/xlockmore/patches
diff options
context:
space:
mode:
authorhubertf <hubertf>2000-05-11 16:37:52 +0000
committerhubertf <hubertf>2000-05-11 16:37:52 +0000
commit742b14052a9a1371ec8cd66cc9899e9519d53930 (patch)
treec2c9647807289094dbd57b7869385468c92c3c83 /x11/xlockmore/patches
parentbd6bb4f72f8a2b36c5e8cc609afb24b170eb2117 (diff)
downloadpkgsrc-742b14052a9a1371ec8cd66cc9899e9519d53930.tar.gz
Add "lsall" and "lsbest" commands to pkg_admin, to find all/best
package matching a certain pattern. Examples: yui# cd /usr/pkgsrc/packages/i386ELF/All/ yui# ls unzip* unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip*' unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip>=5.40' unzip-5.40.tgz unzip-5.41.tgz yui# pkg_admin lsall 'unzip>=5.41' unzip-5.41.tgz yui# pkg_admin lsbest 'unzip>=5.40' unzip-5.41.tgz yui# pkg_admin lsall /usr/pkgsrc/packages/i386ELF/All/'{mit,unproven}-pthread*' /usr/pkgsrc/packages/i386ELF/All/mit-pthreads-1.60b6.tgz This adds a shell/user-interface to pkg-patterns, which are a superset of sh/csh patterns and can't be expanded by any shell.
Diffstat (limited to 'x11/xlockmore/patches')
-rw-r--r--x11/xlockmore/patches/patch-ab26
-rw-r--r--x11/xlockmore/patches/patch-ac8
-rw-r--r--x11/xlockmore/patches/patch-ad13
-rw-r--r--x11/xlockmore/patches/patch-ae22
4 files changed, 53 insertions, 16 deletions
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-ab
index e12d30002dc..84cdb3b5fbd 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.5 2000/02/05 16:13:41 wiz Exp $
---- xlock/xlock.h Tue Mar 9 01:51:30 1999
-+++ xlock/xlock.h.BAK Tue Mar 9 01:49:16 1999
-@@ -131,7 +131,7 @@
- #define XSCREENSAVER_PREF 1 /* Disagreements handled with this :) */
-
- #else /* STANDALONE */
--#include <sys/signal.h>
-+#include <signal.h>
- # include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/Xos.h>
+$NetBSD: patch-ab,v 1.6 2000/05/11 16:37:53 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 */
+ #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;
diff --git a/x11/xlockmore/patches/patch-ac b/x11/xlockmore/patches/patch-ac
index 3afacf082b8..6b106cd1caa 100644
--- a/x11/xlockmore/patches/patch-ac
+++ b/x11/xlockmore/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2000/04/05 20:38:25 tron Exp $
+$NetBSD: patch-ac,v 1.4 2000/05/11 16:37:53 hubertf Exp $
---- configure.orig Wed Jun 16 21:23:29 1999
-+++ configure Wed Apr 5 22:32:36 2000
-@@ -4614,7 +4614,7 @@
+--- configure.orig Fri Mar 24 00:12:23 2000
++++ configure Tue May 9 13:38:23 2000
+@@ -4844,7 +4844,7 @@
#define USE_GL 1
EOF
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
new file mode 100644
index 00000000000..41113c3ba76
--- /dev/null
+++ b/x11/xlockmore/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2000/05/11 16:37:53 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 @@
+ #ifdef USE_ESOUND
+
+ #ifndef DEFAULT_SOUND_DIR
+-#define DEFAULT_SOUND_DIR "/usr/lib/sounds/xlockmore/"
++#define DEFAULT_SOUND_DIR "@PREFIX@/lib/X11/xlockmore/"
+ #endif
+
+ #ifdef HAVE_LIBESD
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae
new file mode 100644
index 00000000000..749f4d4bccb
--- /dev/null
+++ b/x11/xlockmore/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2000/05/11 16:37:54 hubertf Exp $
+
+--- xlock/resource.c.orig Fri Apr 14 13:23:03 2000
++++ xlock/resource.c Fri Apr 14 13:24:27 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
+ #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"