From 1cd53b41e2852683613ea31efbc7c0f0df816fdf Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 8 Apr 2002 15:46:48 +0000 Subject: Update to 4.0. PR: 36277 Submitted by: maintainer Approved by: sobomax --- www/plugger/Makefile | 53 +++++++++++++++++----- www/plugger/distinfo | 2 +- www/plugger/files/patch-aa | 42 +++++++++++++----- www/plugger/files/patch-pluggerrc | 92 +++++++++++++++++++++++++++++---------- www/plugger/pkg-message | 9 ++-- www/plugger/pkg-plist | 1 + 6 files changed, 147 insertions(+), 52 deletions(-) diff --git a/www/plugger/Makefile b/www/plugger/Makefile index 804b3f20920d..a3bd9884a480 100644 --- a/www/plugger/Makefile +++ b/www/plugger/Makefile @@ -6,8 +6,7 @@ # PORTNAME= plugger -PORTVERSION= 3.3 -PORTREVISION= 2 +PORTVERSION= 4.0 CATEGORIES= www audio graphics MASTER_SITES= http://fredrik.hubbe.net/plugger/ \ ftp://ftp.netscape.com/pub/sdk/plugin/unix/ @@ -16,15 +15,18 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} unix-sdk-3.0b5.tar.Z MAINTAINER= jmcoopr@webmail.bmi.net 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 \ + ${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \ ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \ + ${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \ ${LOCALBASE}/bin/wavplay:${PORTSDIR}/audio/wavplay \ - ${LOCALBASE}/bin/mtvp:${PORTSDIR}/graphics/mtv \ - ${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \ - ${LOCALBASE}/bin/xloadimage:${PORTSDIR}/x11/xloadimage + ${LOCALBASE}/bin/xmp:${PORTSDIR}/audio/xmp \ + ${LOCALBASE}/bin/sidplay:${PORTSDIR}/audio/sidplay \ + ${LOCALBASE}/bin/display:${PORTSDIR}/graphics/ImageMagick \ + ${X11BASE}/bin/gqview:${PORTSDIR}/graphics/gqview \ + ${X11BASE}/bin/gv:${PORTSDIR}/print/gv \ + ${X11BASE}/bin/abiword:${PORTSDIR}/editors/AbiWord \ + ${X11BASE}/bin/gnumeric:${PORTSDIR}/math/gnumeric \ + ${LOCALBASE}/bin/acroread4:${PORTSDIR}/print/acroread4 USE_X_PREFIX= yes @@ -32,6 +34,33 @@ MAN7= plugger.7 MANCOMPRESSED= no ALL_TARGET= freebsd-elf +.include + +.if exists(${LOCALBASE}/bin/mplayer) +WITH_MPLAYER = yes +.endif + +.if exists(${LOCALBASE}/bin/mtvp) +WITH_MTV = yes +.endif + +.if defined(WITH_MPLAYER) +RUN_DEPENDS+= ${LOCALBASE}/bin/mplayer:${PORTSDIR}/graphics/mplayer +.endif + +.if defined(WITH_MTV) +RUN_DEPENDS+= ${LOCALBASE}/bin/mtvp:${PORTSDIR}/graphics/mtv +.endif + +pre-extract: +.if !defined(WITH_MPLAYER) + @${ECHO_MSG} "Enable mplayer for AVI video by defining WITH_MPLAYER." +.endif + +.if !defined(WITH_MTV) + @${ECHO_MSG} "Enable mtvp for MPEG video by defining WITH_MTV." +.endif + post-patch: @${MV} ${WRKSRC}/plugger.c ${WRKSRC}/plugger.c.orig @${SED} \ @@ -39,6 +68,8 @@ post-patch: ${WRKSRC}/plugger.c.orig > ${WRKSRC}/plugger.c do-install: + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ + ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ ${PREFIX}/lib/mozilla/plugins/npplugger.so @${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7 @@ -46,6 +77,6 @@ do-install: @${INSTALL_DATA} -b ${WRKSRC}/pluggerrc ${PREFIX}/etc post-install: - @${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/X11R6:${PREFIX}:' + @${CAT} ${PKGMESSAGE} | sed -e 's|%%PREFIX%%|${PREFIX}|g' -.include +.include diff --git a/www/plugger/distinfo b/www/plugger/distinfo index d98282127a5e..181f3e28a1ea 100644 --- a/www/plugger/distinfo +++ b/www/plugger/distinfo @@ -1,2 +1,2 @@ -MD5 (plugger-3.3.tar.gz) = 98dbd59720792ecc71c92220178fd1e0 +MD5 (plugger-4.0.tar.gz) = bf39c1405760183a01b8ec8fbfa6d430 MD5 (unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e diff --git a/www/plugger/files/patch-aa b/www/plugger/files/patch-aa index be2d2eec6619..f4981fec1ab0 100644 --- a/www/plugger/files/patch-aa +++ b/www/plugger/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile Tue Mar 6 16:37:41 2001 -+++ Makefile.new Thu Aug 9 16:46:37 2001 +--- Makefile.orig Sun Mar 24 18:40:09 2002 ++++ Makefile Sun Mar 24 18:45:17 2002 @@ -1,8 +1,8 @@ # Where is your Plugin Source Development Kit from Netscape? -SDK=/home/hubbe/src/PluginSDK30b5 @@ -20,7 +20,7 @@ # # - RPMDIR=/usr/src/redhat + RPMDIR=/usr/src/RPM # Choose compiler -CC=gcc @@ -30,12 +30,32 @@ BINFORMAT=bin any: +@@ -32,7 +32,7 @@ + @echo ' make hp-cc - for HP-UX with cc' + @echo ' make irix - for Irix' + @echo ' make aix - for AIX >= 4.2' +- @echo ' make freebsd - for FreeBSD 4.x' ++ @echo ' make freebsd-elf - for FreeBSD 4.x' + + irix: + make all CC=gcc XCFLAGS=-fpic LD=ld XLDFLAGS='-shared -n32' @@ -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 + BIN_FILES=plugger.so plugger-$(VERSION) + + DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" # -DDEBUG # -DPLUGIN_TRACE +-COMMON_CFLAGS=-O -I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) ++COMMON_CFLAGS=-I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) + COMMON_LDFLAGS= + NORM_CFLAGS= + NORM_LDFLAGS= +@@ -100,8 +100,8 @@ + XLIBS=-lX11 -L$(X11)/lib + + LDSHARED=$(LD) $(XLDFLAGS) +-CFLAGS=$(COMMON_CFLAGS) $(NORM_CFLAGS) +-LDFLAGS=$(COMMON_LDFLAGS) $(NORM_LDFLAGS) ++CFLAGS+=$(COMMON_CFLAGS) $(NORM_CFLAGS) ++LDFLAGS+=$(COMMON_LDFLAGS) $(NORM_LDFLAGS) + SHARED_CFLAGS=$(COMMON_CFLAGS) $(XCFLAGS) + + all: plugger.so plugger-$(VERSION) diff --git a/www/plugger/files/patch-pluggerrc b/www/plugger/files/patch-pluggerrc index e480b4c5c4f4..e2b0bb77c054 100644 --- a/www/plugger/files/patch-pluggerrc +++ b/www/plugger/files/patch-pluggerrc @@ -1,26 +1,70 @@ ---- 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" +--- pluggerrc.orig Wed Dec 5 11:14:01 2001 ++++ pluggerrc Wed Apr 3 08:05:35 2002 +@@ -58,12 +58,12 @@ + audio/x-mpeg3: mp3: MPEG audio + audio/mpeg: mpa,abs,mpega: MPEG audio + audio/x-mpeg: mpa,abs,mpega: MPEG audio +- stream, preload: splay -t 200 -M +- stream, preload: mpg123 -q -b 128 - ++ stream, preload: mpg123 -q -b 1024 - ++ stream, preload: splay -M -t 200 + repeat swallow(alsaplayer): alsaplayer -q "$file" >/dev/null +- : mpg123 -q -b 128 "$file" +- nokill exits:xmms "$file" +- : splay -t 200 "$file" ++ : mpg123 -q -b 1024 "$file" ++# nokill exits:xmms "$file" # immortal on FreeBSD ++ : splay "$file" -t 200 + : amp -b 200 -q "$file" + : maplay "$file" + : mpeg3play "$file" +@@ -89,12 +89,21 @@ + stream preload: bplay 1>/dev/null 2>/dev/null + : bplay 1>/dev/null 2>/dev/null "$file" + : splay "$file" +- nokill exits:xmms "$file" ++# nokill exits:xmms "$file" # immortal on FreeBSD + loop: xanim +Av100 -Zr +W$window +q +f "$file" + : xanim +Av100 -Zr +W$window +q +f +Ze "$file" + + image/tiff: tiff,tif: TIFF image + image/x-tiff: tiff,tif: TIFF image ++ repeat swallow(display) fill: display "$file" ++ repeat swallow(Sdtimage) fill: sdtimage "$file" ++ repeat swallow(gqview) fill: gqview -t "$file" >/dev/null 2>/dev/null ++ repeat swallow(xli) fill: xli -quiet "$file" >/dev/null 2>/dev/null ++ repeat swallow(xloadimage) fill: xloadimage -quiet "$file" >/dev/null 2>/dev/null ++ exits: xli -quiet -windowid $window "$file" ++ exits: xloadimage -quiet -windowid $window "$file" ++ exits: display -window $window -backdrop $file ++ + image/png: png: PNG image + image/x-png: png: PNG image + repeat swallow(gqview) fill: gqview -t "$file" >/dev/null 2>/dev/null +@@ -132,7 +141,7 @@ + audio/x-mpeg-url: m3u: MPEG music resource locator + audio/mpegurl: m3u: MPEG music resource locator + audio/x-mpegurl: m3u: MPEG music resource locator +- nokill exits:xmms "$file" ++# nokill exits:xmms "$file" # immortal on FreeBSD + :internal:url - 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 + audio/x-pn-realaudio-plugin:rpm:Realaudio-plugin resource locator +@@ -142,7 +151,7 @@ + application/x-pdf: pdf: PDF file + text/pdf: pdf: PDF file + text/x-pdf: pdf: PDF file +- repeat swallow(documentShell) fill: acroread -geometry +9000+9000 -xrm '*userFrontEndProgram: FALSE' "$file" ++ repeat swallow(documentShell) fill: acroread4 -geometry +9000+9000 -xrm '*userFrontEndProgram: FALSE' "$file" + repeat swallow(gv) fill: gv -safer -quiet -antialias -geometry +9000+9000 "$file" 2>/dev/null + repeat swallow(xpdf) fill: xpdf -g +9000+9000 -err "$file" + +@@ -159,7 +168,7 @@ + application/rtf: rtf: Rich Text Format + application/x-msword: doc, dot: Microsoft Word Document + application/msword: doc, dot: Microsoft Word Document +- repeat swallow(AbiWord) fill: abiword -nosplash -geometry +9000+9000 "$file" >/dev/null 2>/dev/null ++ repeat swallow(AbiWord) fill: abiword --nosplash --geometry=+9000+9000 "$file" >/dev/null 2>/dev/null + repeat swallow(PCFileViewer) fill: sdtpcv "$file" + repeat swallow(PCFileViewer) fill: /opt/SUNWdtpcv/bin/sdtpcv "$file" diff --git a/www/plugger/pkg-message b/www/plugger/pkg-message index 3520d23aa77c..659835b80fe1 100644 --- a/www/plugger/pkg-message +++ b/www/plugger/pkg-message @@ -2,9 +2,9 @@ ***************************************************************** NOTE: -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. +Edit the %%PREFIX%%/etc/pluggerrc file as needed. It should work +fine as is. If you had a previous %%PREFIX%%/etc/pluggerrc file, +it will be renamed %%PREFIX%%/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. @@ -15,10 +15,9 @@ 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 +%%PREFIX%%/etc/pluggerrc ./pluggerrc Whichever pluggerrc is found first in the above order will be diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist index 3316d26e7dcf..761af879e791 100644 --- a/www/plugger/pkg-plist +++ b/www/plugger/pkg-plist @@ -1,3 +1,4 @@ +bin/plugger-4.0 lib/mozilla/plugins/npplugger.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 -- cgit v1.2.3