From 742b14052a9a1371ec8cd66cc9899e9519d53930 Mon Sep 17 00:00:00 2001 From: hubertf Date: Thu, 11 May 2000 16:37:52 +0000 Subject: 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. --- x11/xlockmore/Makefile | 22 ++++++++++++++++++++-- x11/xlockmore/files/md5 | 4 ++-- x11/xlockmore/files/patch-sum | 9 +++++---- x11/xlockmore/patches/patch-ab | 26 ++++++++++++++------------ x11/xlockmore/patches/patch-ac | 8 ++++---- x11/xlockmore/patches/patch-ad | 13 +++++++++++++ x11/xlockmore/patches/patch-ae | 22 ++++++++++++++++++++++ x11/xlockmore/pkg/PLIST | 10 +++++++--- 8 files changed, 87 insertions(+), 27 deletions(-) create mode 100644 x11/xlockmore/patches/patch-ad create mode 100644 x11/xlockmore/patches/patch-ae diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index 8281e4cea09..2cee12ed91c 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.28 1999/09/29 22:58:45 tron Exp $ +# $NetBSD: Makefile,v 1.29 2000/05/11 16:37:52 hubertf Exp $ # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp # -DISTNAME= xlockmore-4.14 +DISTNAME= xlockmore-4.16.1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ @@ -18,4 +18,22 @@ CONFIGURE_ARGS+= --with-mesagl --without-motif --without-sx \ --without-editres --without-dtsaver --without-rplay \ --without-nas --without-gtk +post-patch: + for i in xlock/sound.c xlock/resource.c ; do \ + f=${WRKSRC}/$$i ; \ + [ -f $$f.BAK ] || mv $$f $$f.BAK ; \ + sed \ + -e 's|@PREFIX@|${PREFIX}|g' \ + <$$f.BAK >$$f ; \ + done + +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/xlockmore + ${INSTALL_DATA} \ + ${WRKSRC}/sounds/thank-you.au \ + ${WRKSRC}/sounds/identify-please.au \ + ${WRKSRC}/sounds/not-programmed.au \ + ${WRKSRC}/sounds/complete.au \ + ${PREFIX}/lib/X11/xlockmore + .include "../../mk/bsd.pkg.mk" diff --git a/x11/xlockmore/files/md5 b/x11/xlockmore/files/md5 index 1b7faea5ff0..ee49775091b 100644 --- a/x11/xlockmore/files/md5 +++ b/x11/xlockmore/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.14 1999/06/23 17:29:04 hubertf Exp $ +$NetBSD: md5,v 1.15 2000/05/11 16:37:53 hubertf Exp $ -MD5 (xlockmore-4.14.tar.gz) = a2d833304a090614a1d75ded1c985f77 +MD5 (xlockmore-4.16.1.tar.gz) = ba7af9df46b75e603b4774f76fcb2f3f diff --git a/x11/xlockmore/files/patch-sum b/x11/xlockmore/files/patch-sum index 536d264ea44..7af385c00f1 100644 --- a/x11/xlockmore/files/patch-sum +++ b/x11/xlockmore/files/patch-sum @@ -1,5 +1,6 @@ -$NetBSD: patch-sum,v 1.2 2000/04/05 20:38:24 tron Exp $ +$NetBSD: patch-sum,v 1.3 2000/05/11 16:37:53 hubertf Exp $ -MD5 (patch-aa) = 4eaaed116fb2e1ae1908e6144d03f095 -MD5 (patch-ab) = a73a0303ed7b4810468379b804662bc1 -MD5 (patch-ac) = 9a7d6648a6a5587213cc4a0481cd88dc +MD5 (patch-ab) = 46768c69cc39e88e811017eb52774f2a +MD5 (patch-ac) = 91eab8d9ca9e7a9341381c7425108463 +MD5 (patch-ad) = 7ba55716f652bf455e010e3214e63074 +MD5 (patch-ae) = d3a0846410c423a54a022ffc36d88860 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 -+#include - # include - #include - #include +$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 ++#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" diff --git a/x11/xlockmore/pkg/PLIST b/x11/xlockmore/pkg/PLIST index 6572c20d73b..f9684e58075 100644 --- a/x11/xlockmore/pkg/PLIST +++ b/x11/xlockmore/pkg/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:05:35 agc Exp $ -lib/X11/app-defaults/XLock -man/man1/xlock.1.gz +@comment $NetBSD: PLIST,v 1.3 2000/05/11 16:37:54 hubertf Exp $ bin/xlock +man/man1/xlock.1.gz +lib/X11/app-defaults/XLock +lib/X11/xlockmore/thank-you.au +lib/X11/xlockmore/identify-please.au +lib/X11/xlockmore/not-programmed.au +lib/X11/xlockmore/complete.au -- cgit v1.2.3