Update ns-plugger-* packages to 4.0. Notable changes include:

    * Shows more mime types, including word, excel and pdf documents.
    * Updated pluggerrc to include applications for more platforms.
    * Now has the ability to use X applications *without* $window
    * New configuration keywords: swallow, fill, maxaspect, nokill
    * Moved some plugger functionality into an external program for more
      reliable operation.
    * Made the buffering code better

4 files changed, 37 insertions, 35 deletions

diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 484045cc1d9..73bd58807b4 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2002/09/21 15:14:55 tron Exp $
+# $NetBSD: Makefile,v 1.11 2003/01/05 04:27:10 rh Exp $
 
-DISTNAME=		plugger-3.2-linux-x86-glibc
+DISTNAME=		plugger-4.0-linux-x86-glibc
 PKGNAME=		ns-${PLUGGERNAME}-${BINNAME}-${PLUGGERVERS}
-PKGREVISION=		1
 WRKSRC=			${WRKDIR}/${PLUGGERFULL}
 CATEGORIES=		www
 MASTER_SITES=		http://fredrik.hubbe.net/plugger/
@@ -44,6 +43,7 @@ do-install:
 .else
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${DOCDIR}
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR}
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger-4.0 ${PREFIX}/bin
 	cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/man/man7
 	cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR}
 .endif
diff --git a/www/ns-plugger-common/PLIST b/www/ns-plugger-common/PLIST
index ab4620a2563..46097998c3e 100644
--- a/www/ns-plugger-common/PLIST
+++ b/www/ns-plugger-common/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:50 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/05 04:27:11 rh Exp $
+bin/plugger-4.0
 ${NS_PLUGINS_DIR}/plugger.so
 man/man7/plugger.7
 share/doc/plugger/README
diff --git a/www/ns-plugger-common/distinfo b/www/ns-plugger-common/distinfo
index 532f16d6ef4..67a98576284 100644
--- a/www/ns-plugger-common/distinfo
+++ b/www/ns-plugger-common/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:38 skrll Exp $
+$NetBSD: distinfo,v 1.3 2003/01/05 04:27:11 rh Exp $
 
-SHA1 (plugger-3.2-linux-x86-glibc.tar.gz) = f300d108b8b0757d10aef5453f1974f45423ed10
-Size (plugger-3.2-linux-x86-glibc.tar.gz) = 23406 bytes
-SHA1 (patch-aa) = 74204a7279b68a930c6631b882383e71cc72fc5f
+SHA1 (plugger-4.0-linux-x86-glibc.tar.gz) = 23a8d66da585ce98757f0071ac9d245a00f1b9b3
+Size (plugger-4.0-linux-x86-glibc.tar.gz) = 36409 bytes
+SHA1 (patch-aa) = 8afd1ff0a6bc02d65c612f454751d5a840c2ea3b
diff --git a/www/ns-plugger-common/patches/patch-aa b/www/ns-plugger-common/patches/patch-aa
index d0ba4e00000..c7d87edb6d6 100644
--- a/www/ns-plugger-common/patches/patch-aa
+++ b/www/ns-plugger-common/patches/patch-aa
@@ -1,38 +1,39 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/22 11:02:12 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/05 04:27:11 rh Exp $
 
---- pluggerrc.orig	Wed Nov 10 02:42:29 1999
+--- pluggerrc.orig	Thu Dec  6 05:14:01 2001
 +++ pluggerrc
-@@ -27,6 +27,7 @@
- 
+@@ -36,6 +36,7 @@ audio/mid: midi,mid: MIDI audio file
+ audio/x-mid: midi,mid: MIDI audio file
  audio/midi: midi,mid: MIDI audio file
  audio/x-midi: midi,mid: MIDI audio file
-+	many: midiplay $file
- 	many: timidity -s 44100 -a -idqqqqqqq $file
++	: midiplay $file
+ 	: timidity -s 48000 -a -idqqqqqqq "$file" >/dev/null 2>/dev/null
  	: playmidi $file
  
-@@ -48,6 +49,7 @@
- audio/x-mpeg: mpa,abs,mpega: MPEG audio
- 	stream, preload: splay -t 200 -M
- 	stream, preload: mpg123 -q -b 128 -
-+	many: gqmpeg --playlist_add_play $file
- 	many: splay -t 200 $file
- 	many: amp -b 200 -q $file
- 	many: mpg123 -q -b 128 $file
-@@ -68,7 +70,9 @@
+@@ -67,6 +68,7 @@ audio/x-mpeg: mpa,abs,mpega: MPEG audio
+ 	: amp -b 200 -q "$file"
+ 	: maplay "$file"
+ 	: mpeg3play "$file"
++	: gqmpeg --playlist_add_play "$file"
+ 
+ audio/x-sidtune: sid,psid,dat: Commodore 64 audio
+ audio/sidtune: sid,psid,dat: Commodore 64 audio
+@@ -83,8 +85,10 @@ audio/x-basic: au,snd: Basic audio file
  
  audio/wav:wav:Microsoft wave file
  audio/x-wav:wav:Microsoft wave file
-+	stream, preload: audioplay
- 	stream, preload: splay -W
-+	many: audioplay $file
- 	many: wavplay -q $file
- 	stream, preload: bplay 1>/dev/null 2>/dev/null
- 	: bplay 1>/dev/null 2>/dev/null
-@@ -84,6 +88,7 @@
- image/x-sun-raster: rs: SUN raster image
- 	exits: xloadimage -quiet -windowid $window $file
++	stream preload: audioplay
+ 	stream preload: splay -W
+ 	repeat swallow(alsaplayer): alsaplayer -q "$file" >/dev/null
++	: audioplay "$file"
+ 	: wavplay -q "$file"
+ 	stream preload: bplay 1>/dev/null 2>/dev/null
+ 	: bplay 1>/dev/null 2>/dev/null "$file"
+@@ -124,6 +128,7 @@ image/x-portable-anymap: pnm: PBM Image
+ 	exits: xli -quiet -windowid $window "$file"
+ 	exits: xloadimage -quiet -windowid $window "$file"
  	exits: display -window $window -backdrop $file
-+	many: xv $file
++	: xv $file
  
- audio/mpeg-url: m3u: MPEG music resource locator
- audio/x-mpeg-url: m3u: MPEG music resource locator
+ # This does not work :(
+ #	swallow(XVroot) maxaspect: xv -nopos "$file"