o have plugger be a mozilla plugin instead of a netscape plugin

o install several plugins per default; hence, adding audio and
  graphics as secondary categories
o update COMMENT, DESCR and PKGMESSAGE accordingly
o style fix: un"echo" Makefile commands
o given all this work -> switch over maintainership to submitter

PR:             29585
Submitted by:   John Merryweather Cooper <jmcoopr@webmail.bmi.net>

7 files changed, 99 insertions, 29 deletions

diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 2195897c1121..39d59718f5a8 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -7,33 +7,44 @@
 
 PORTNAME=	plugger
 PORTVERSION=	3.3
-CATEGORIES=	www
+PORTREVISION=	1
+CATEGORIES=	www audio graphics
 MASTER_SITES=	http://fredrik.hubbe.net/plugger/ \
 		ftp://ftp.netscape.com/pub/sdk/plugin/unix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} unix-sdk-3.0b5.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jmcoopr@webmail.bmi.net
 
-RUN_DEPENDS=	${LOCALBASE}/lib/netscape/plugins:${PORTSDIR}/www/netscape47-navigator
+RUN_DEPENDS=	${X11BASE}/bin/mozilla:${PORTSDIR}/www/mozilla \
+		${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \
+		${LOCALBASE}/bin/nspmod:${PORTSDIR}/audio/nspmod \
+		${LOCALBASE}/bin/sidplay:${PORTSDIR}/audio/sidplay \
+		${LOCALBASE}/bin/splay:${PORTSDIR}/audio/splay \
+		${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \
+		${LOCALBASE}/bin/wavplay:${PORTSDIR}/audio/wavplay \
+		${LOCALBASE}/bin/mtvp:${PORTSDIR}/graphics/mtv \
+		${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \
+		${LOCALBASE}/bin/xloadimage:${PORTSDIR}/x11/xloadimage
 
-#BROKEN_ELF=	"Needs a.out c++rt0.o file"
+USE_X_PREFIX=	yes
 
 MAN7=		plugger.7
 MANCOMPRESSED=	no
 ALL_TARGET=	freebsd-elf
 
 post-patch:
-	${MV} ${WRKSRC}/plugger.c ${WRKSRC}/plugger.c.orig
-	${SED} \
+	@${MV} ${WRKSRC}/plugger.c ${WRKSRC}/plugger.c.orig
+	@${SED} \
 	  -e 's#/usr/local/#${PREFIX}/#' \
 	  ${WRKSRC}/plugger.c.orig > ${WRKSRC}/plugger.c
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/plugger.so ${PREFIX}/lib/netscape/plugins
-	${INSTALL_MAN}  ${WRKSRC}/plugger.7  ${MANPREFIX}/man/man7
-	${INSTALL_DATA} ${WRKSRC}/pluggerrc  ${PREFIX}/etc/pluggerrc.sample
+	@${INSTALL_DATA} ${WRKSRC}/plugger.so ${PREFIX}/lib/mozilla/plugins
+	@${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7
+	@${INSTALL_DATA} ${WRKSRC}/pluggerrc ${PREFIX}/etc/pluggerrc.sample
+	@${INSTALL_DATA} -b ${WRKSRC}/pluggerrc ${PREFIX}/etc
 
 post-install:
-	@${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
+	@${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/X11R6:${PREFIX}:'
 
 .include <bsd.port.mk>
diff --git a/www/plugger/files/patch-aa b/www/plugger/files/patch-aa
index a465e528db6c..be2d2eec6619 100644
--- a/www/plugger/files/patch-aa
+++ b/www/plugger/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Tue Mar  6 16:37:41 2001
-+++ Makefile	Thu Apr  5 23:03:02 2001
+--- Makefile	Tue Mar  6 16:37:41 2001
++++ Makefile.new	Thu Aug  9 16:46:37 2001
 @@ -1,8 +1,8 @@
  # Where is your Plugin Source Development Kit from Netscape?
 -SDK=/home/hubbe/src/PluginSDK30b5
@@ -30,3 +30,12 @@
  BINFORMAT=bin
  
  any:
+@@ -91,7 +91,7 @@
+ BIN_FILES=plugger.so
+ 
+ DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\"  # -DDEBUG # -DPLUGIN_TRACE
+-CFLAGS=-O -I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) $(XCFLAGS)
++CFLAGS+=-I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) $(XCFLAGS)
+ LDFLAGS=$(XLDFLAGS)
+ 
+ plugger.so: plugger.o common.o
diff --git a/www/plugger/files/patch-pluggerrc b/www/plugger/files/patch-pluggerrc
new file mode 100644
index 000000000000..e480b4c5c4f4
--- /dev/null
+++ b/www/plugger/files/patch-pluggerrc
@@ -0,0 +1,26 @@
+--- pluggerrc	Tue Mar  6 17:02:41 2001
++++ pluggerrc.new	Thu Aug  9 16:39:02 2001
+@@ -1,4 +1,4 @@
+-# Configure file for plugger version 3.0
++# Configure file for plugger version 3.3
+ # Commands which are not installed on your system will not
+ # be used.
+ #
+@@ -29,7 +29,7 @@
+ audio/x-mid: midi,mid: MIDI audio file
+ audio/midi: midi,mid: MIDI audio file
+ audio/x-midi: midi,mid: MIDI audio file
+-	many: timidity -s 65000 -a -idqqqqqqq $file
++	many: timidity -s 44100 -a -idqqqqqqq $file
+ 	: playmidi "$file"
+ 
+ audio/mod: mod: Soundracker audio Module
+@@ -38,7 +38,7 @@
+ 	: xmp --nocmd "$file" 2>/dev/null
+ 	loop: nspmod -r "$file" 2>/dev/null 1>/dev/null
+ 	repeat: nspmod -l $repeat "$file" 2>/dev/null 1>/dev/null
+-	: tracker -q -frequency 65000 "$file"
++	: tracker -q -frequency 44100 "$file"
+ 	loop: mikmod -i -r "$file" 2>/dev/null 1>/dev/null
+ 	: mikmod -i "$file" 2>/dev/null 1>/dev/null
+ 
diff --git a/www/plugger/pkg-comment b/www/plugger/pkg-comment
index ff5be02996f9..3d1fa0bf198e 100644
--- a/www/plugger/pkg-comment
+++ b/www/plugger/pkg-comment
@@ -1 +1 @@
-A multimedia front-end plugin for Netscape
+A multimedia front-end plugin for Mozilla
diff --git a/www/plugger/pkg-descr b/www/plugger/pkg-descr
index 3d533f913857..67a4d8022747 100644
--- a/www/plugger/pkg-descr
+++ b/www/plugger/pkg-descr
@@ -1,12 +1,12 @@
 Plugger is a multimedia plugin for Unix Netscape 3.0 or later that
 handles Quicktime, MPEG, MP2, AVI, SGI-movie, Tiff, DL, IFF-anim,
-MIDI, Soundtracker, AU, WAV and Commodore 64 audio files. And now,
-with Plugger 3.0, MPEG audio and video can be played streaming.
+MIDI, Soundtracker, AU, WAV and Commodore 64 audio files. Since
+Plugger 3.0, MPEG audio and video can be streamed played.
 
 Plugger is a very small plugin, because plugger uses external programs
 to show/play the different formats.
 
 WWW: http://www.hubbe.net/~hubbe/plugger.html
 
--Jay
- sachs@cs.williams.edu
+--jmc
+jmcoopr@webmail.bmi.net
diff --git a/www/plugger/pkg-message b/www/plugger/pkg-message
index 7bdbc63dcdf5..3520d23aa77c 100644
--- a/www/plugger/pkg-message
+++ b/www/plugger/pkg-message
@@ -1,15 +1,37 @@
-
-**************************************************
-**************************************************
+*****************************************************************
+*****************************************************************
 NOTE:
 
-Be sure to create a /usr/local/etc/pluggerrc file; use
-/usr/local/etc/pluggerrc.sample as a starting point. 
-It should work fine as is.
+Edit the /usr/X11R6/etc/pluggerrc file as needed. It should work
+fine as is. If you had a previous /usr/X11R6/etc/pluggerrc file,
+it will be renamed /usr/X11R6/etc/pluggerrc.old.
+
+This Plugger port will install a default set of multimedia utilities
+that I have found to work well. Other combinations may work also.
+Look at the pluggerrc file for details.
+
+Plugger searches for pluggerrc files in the following order:
+
+~/.netscape/pluggerrc
+~/.mozilla/pluggerrc
+$MOZILLA_HOME/pluggerrc  (MOZILLA_HOME is usually equal to HOME)
+/usr/local/netscape/pluggerrc
+/etc/pluggerrc
+/usr/etc/pluggerrc
+/usr/local/etc/pluggerrc
+./pluggerrc
+
+Whichever pluggerrc is found first in the above order will be
+used, no merging of other pluggerrc's occurs. You have been warned.
 
-Also note that you will need the various external viewers
-(splay, xanim, etc) in order to view embedded web content.
+NOTES on Sound:
 
-**************************************************
-**************************************************
+Remember, you have to have the Timidity patch files installed for
+it to work.
 
+Also, some of the frequency settings are extremely sound-card
+dependent. If you get no sound, adjust the frequency settings in
+your pluggerrc to be compatible with your sound card. See the
+documentation for the various sound utilities for details.
+*****************************************************************
+*****************************************************************
diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist
index ab96b13a8922..0f565b84f48d 100644
--- a/www/plugger/pkg-plist
+++ b/www/plugger/pkg-plist
@@ -1,3 +1,5 @@
-lib/netscape/plugins/plugger.so
+lib/mozilla/plugins/plugger.so
+@unexec if [ -f %D/etc/pluggerrc ]; then cmp -s %D/etc/pluggerrc.sample %D/etc/pluggerrc && rm -f %D/etc/pluggerrc || echo "If you are permanently removing this port, you should do a ``rm -f ${PKG_PREFIX}/etc/pluggerrc`` to remove configuration files left." | fmt ; fi
+@unexec if [ -f %D/etc/pluggerrc.old ]; then echo "If you are permanently removing this port, you should do a ``rm -f ${PKG_PREFIX}/etc/pluggerrc.old`` to remove backup configuration files left." | fmt ; fi
 etc/pluggerrc.sample
-
+@exec if [ ! -f %D/etc/pluggerrc ]; then cp %D/etc/pluggerrc.sample %D/etc/pluggerrc ; fi