From jmcoopr@webmail.bmi.net Sun Mar 24 23:08:07 2002 Return-Path: Received: from yoda.bmi.net (yoda.bmi.net [204.57.191.163]) by hub.freebsd.org (Postfix) with ESMTP id C156F37B400 for ; Sun, 24 Mar 2002 23:08:05 -0800 (PST) Received: from johncoop.MSHOME ([206.63.201.3]) by yoda.bmi.net (Pro-8.9.3/Pro-8.9.3) with ESMTP id XAB30203 for ; Sun, 24 Mar 2002 23:04:47 -0800 Received: (from root@localhost) by johncoop.MSHOME (8.11.6/8.11.6) id g2P78Ft53800; Sun, 24 Mar 2002 23:08:15 -0800 (PST) (envelope-from jmcoopr) Message-Id: <200203250708.g2P78Ft53800@johncoop.MSHOME> Date: Sun, 24 Mar 2002 23:08:15 -0800 (PST) From: John Merryweather Cooper Reply-To: John Merryweather Cooper To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [MAINTAINER UPDATE] Update www/plugger to plugger-4.0 X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 36277 >Category: ports >Synopsis: [MAINTAINER UPDATE] Update www/plugger to plugger-4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: marcus >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Mar 24 23:10:01 PST 2002 >Closed-Date: Mon Apr 08 08:47:18 PDT 2002 >Last-Modified: Mon Apr 08 08:47:18 PDT 2002 >Originator: John Merryweather Cooper >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.5-STABLE FreeBSD 4.5-STABLE #26: Sat Mar 23 23:03:43 PST 2002 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: Update www/plugger to plugger 4.0. Plugger-4.0 now has: * swallow mode to incorporate X-aware plugins into mozilla * support for more mime-types * upgraded selection of helper applications In addition, my patches aim to: * reduce the number of buffer overflows (I'm sure they're more but I'm still looking . . .) * use display instead of gqview for TIFF files (qgview doesn't seem to work right on FreeBSD for TIFF's) * outlaw the use of xmms (bad, evil, nasty things will happen to your system if you allow xmms to function as a helper app --such as: consume all available processor time, xmms goes "immortal", and so on . . .) * by user request, disable MTV and MPLAYER so that plugger can become a full-fleged-install-from-cdrom package * patch pluggerrc to use correct value for mpg123 minimum buffer * patch pluggerrc to enable Acrobat4 to display pdf's (it works almost as well as the linux plugin on linux-netscape) >How-To-Repeat: N/A >Fix: --- update-plugger-4.0 begins here --- # This is a patch for plugger to update it to plugger.40 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create # the files as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # touch 'files/patch-plugger-helper.c' chmod 0644 'files/patch-plugger-helper.c' touch 'files/patch-plugger.c' chmod 0644 'files/patch-plugger.c' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'plugger/Makefile' 'plugger.40/Makefile' Index: ./Makefile --- ./Makefile Sat Dec 15 06:29:57 2001 +++ ./Makefile Sun Mar 24 22:44:07 2002 @@ -2,12 +2,11 @@ # Date created: 11 Februrary 1999 # Whom: Jay Sachs # -# $FreeBSD: ports/www/plugger/Makefile,v 1.10 2001/12/15 14:29:57 lioux Exp $ +# $FreeBSD$ # 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 @@ 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,32 @@ 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 + +.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 +67,8 @@ ${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 @@ -48,4 +78,4 @@ post-install: @${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/X11R6:${PREFIX}:' -.include +.include diff -u 'plugger/distinfo' 'plugger.40/distinfo' Index: ./distinfo --- ./distinfo Thu Apr 5 23:05:55 2001 +++ ./distinfo Sun Mar 24 18:37:09 2002 @@ -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 -u 'plugger/files/patch-aa' 'plugger.40/files/patch-aa' Index: ./files/patch-aa --- ./files/patch-aa Tue Sep 4 09:32:20 2001 +++ ./files/patch-aa Sun Mar 24 18:45:46 2002 @@ -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 + BIN_FILES=plugger.so plugger-$(VERSION) - 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) + 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) - plugger.so: plugger.o common.o + all: plugger.so plugger-$(VERSION) diff -u /dev/null 'plugger.40/files/patch-plugger-helper.c' Index: ./files/patch-plugger-helper.c --- ./files/patch-plugger-helper.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-plugger-helper.c Sun Mar 24 20:15:56 2002 @@ -0,0 +1,77 @@ +--- plugger-helper.c.orig Sun Mar 24 19:36:03 2002 ++++ plugger-helper.c Sun Mar 24 20:13:49 2002 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -355,10 +356,10 @@ + /* Time to steal the lock! */ + mode=PropModeReplace; + gettimeofday(&tv, 0); +- INC_TIME(&tv, 0, 10000 + (rand() & 16383)); ++ INC_TIME(&tv, 0, 10000 + (random() & 16383)); + break; + } +- my_usleep((rand() & 16383) + 2000); /* 0.18383 seconds */ ++ my_usleep((random() & 16383) + 2000); /* 0.18383 seconds */ + } + + D("XChangeProperty, mode=%d\n",mode); +@@ -401,6 +402,7 @@ + got_sigwinch=1; + } + ++#define LONG_CHARS 12 + + int main(int argc, char **argv) + { +@@ -493,30 +495,30 @@ + loops=MIN(repeats,10); + for(e=0;e/dev/null +- : mpg123 -q -b 128 "$file" +- nokill exits:xmms "$file" ++ : mpg123 -q -b 1024 "$file" ++# nokill exits:xmms "$file" # immortal on FreeBSD + : splay -t 200 "$file" + : amp -b 200 -q "$file" + : maplay "$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" diff -u 'plugger/pkg-message' 'plugger.40/pkg-message' Index: ./pkg-message --- ./pkg-message Tue Sep 4 09:32:20 2001 +++ ./pkg-message Sun Mar 24 20:48:10 2002 @@ -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 @@ ~/.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 -u 'plugger/pkg-plist' 'plugger.40/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Sat Dec 15 06:29:57 2001 +++ ./pkg-plist Sun Mar 24 21:17:43 2002 @@ -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 #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Sun Mar 24 22:57:03 2002 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 1657 1017038647 0100644 # p 'distinfo' 122 1017023829 0100644 # p 'files/patch-aa' 865 1017024346 0100644 # c 'files/patch-plugger-helper.c' 0 1017029756 0100644 # c 'files/patch-plugger.c' 0 1017032794 0100644 # p 'files/patch-pluggerrc' 897 1017037341 0100644 # p 'pkg-message' 1374 1017031690 0100644 # p 'pkg-plist' 620 1017033463 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Sun Mar 24 22:57:03 2002] #### #### Checksum: 466 16671 32628 #### --- update-plugger-4.0 ends here --- >Release-Note: >Audit-Trail: From: John Merryweather Cooper To: "FreeBSD-gnats-submit@freebsd.org" Cc: Subject: Re: ports/36277: [MAINTAINER UPDATE] Update www/plugger to plugger-4.0 Date: 24 Mar 2002 23:31:58 -0800 --=-piIMQ5GyQfnNxE6LyrJa Content-Type: text/plain Content-Transfer-Encoding: 7bit Minor "OOPS" in patch-plugger-helper.c: things will run o.k. (most of the time), but the length parameter is off for two of the snprintf() calls. See attached, updated patch-plugger-helper.c for the correct version. -- _ | |V| / ' || MacroHard -- \ \_| | | \_, || the perfection of form over | ----------------------------------|| substance, marketing over | Web: http://www.borgsdemons.com || performance, and greed over | AIM: johnmcooper || design . . . | =====================================================================/ Public Key: http://www.borgsdemons.com/Personal/pgpkey.asc | =====================================================================\ --=-piIMQ5GyQfnNxE6LyrJa Content-Disposition: attachment; filename=patch-plugger-helper.c Content-Transfer-Encoding: quoted-printable Content-Type: text/x-c; charset=ISO-8859-1 --- plugger-helper.c.orig Sun Dec 9 22:41:11 2001 +++ plugger-helper.c Sun Mar 24 23:29:20 2002 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -355,10 +356,10 @@ /* Time to steal the lock! */ mode=3DPropModeReplace; gettimeofday(&tv, 0); - INC_TIME(&tv, 0, 10000 + (rand() & 16383)); + INC_TIME(&tv, 0, 10000 + (random() & 16383)); break; } - my_usleep((rand() & 16383) + 2000); /* 0.18383 seconds */ + my_usleep((random() & 16383) + 2000); /* 0.18383 seconds */ } =20 D("XChangeProperty, mode=3D%d\n",mode); @@ -401,6 +402,7 @@ got_sigwinch=3D1; } =20 +#define LONG_CHARS 12 =20 int main(int argc, char **argv) { @@ -493,30 +495,30 @@ loops=3DMIN(repeats,10); for(e=3D0;e To: "FreeBSD-gnats-submit@freebsd.org" Cc: Subject: Re: ports/36277: [MAINTAINER UPDATE] Update www/plugger to plugger-4.0 Date: 03 Apr 2002 08:22:59 -0800 I've updated the diff to incorporate a fix suggested by Muhannad Asfour to correct the command line switches to start AbiWord for MS-Word documents, and I've included some fixes/improvements for MPEG audio play back (in particular, make sure mpg123 gets chosen over splay as the player--and if mpg123 is missing, pass the switches to splay in the correct order--it seems the authors of splay haven't discovered getopt() and friends yet). -- _ | |V| / ' || MacroHard -- \ \_| | | \_, || the perfection of form over | ----------------------------------|| substance, marketing over | Web: http://www.borgsdemons.com || performance, and greed over | AIM: johnmcooper || design . . . | =====================================================================/ Public Key: http://www.borgsdemons.com/Personal/pgpkey.asc | =====================================================================\ # This is a patch for plugger to update it to plugger.40 # # To apply this patch: # STEP 1: Chdir to the source directory. # STEP 2: Run the 'applypatch' program with this patch file as input. # # If you do not have 'applypatch', it is part of the 'makepatch' package # that you can fetch from the Comprehensive Perl Archive Network: # http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz # In the above URL, 'x' should be 2 or higher. # # To apply this patch without the use of 'applypatch': # STEP 1: Chdir to the source directory. # If you have a decent Bourne-type shell: # STEP 2: Run the shell with this file as input. # If you don't have such a shell, you may need to manually create # the files as shown below. # STEP 3: Run the 'patch' program with this file as input. # # These are the commands needed to create/delete files/directories: # touch 'files/patch-plugger-helper.c' chmod 0644 'files/patch-plugger-helper.c' touch 'files/patch-plugger.c' chmod 0644 'files/patch-plugger.c' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'plugger/Makefile' 'plugger.40/Makefile' Index: ./Makefile --- ./Makefile Sat Dec 15 06:29:57 2001 +++ ./Makefile Sun Mar 24 23:43:38 2002 @@ -2,12 +2,11 @@ # Date created: 11 Februrary 1999 # Whom: Jay Sachs # -# $FreeBSD: ports/www/plugger/Makefile,v 1.10 2001/12/15 14:29:57 lioux Exp $ +# $FreeBSD$ # 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 @@ 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,32 @@ 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 + +.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 +67,8 @@ ${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 @@ -48,4 +78,4 @@ post-install: @${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/X11R6:${PREFIX}:' -.include +.include diff -u 'plugger/distinfo' 'plugger.40/distinfo' Index: ./distinfo --- ./distinfo Thu Apr 5 23:05:55 2001 +++ ./distinfo Sun Mar 24 23:43:38 2002 @@ -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 -u 'plugger/files/patch-aa' 'plugger.40/files/patch-aa' Index: ./files/patch-aa --- ./files/patch-aa Tue Sep 4 09:32:20 2001 +++ ./files/patch-aa Sun Mar 24 23:43:38 2002 @@ -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 + BIN_FILES=plugger.so plugger-$(VERSION) - 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) + 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) - plugger.so: plugger.o common.o + all: plugger.so plugger-$(VERSION) diff -u /dev/null 'plugger.40/files/patch-plugger-helper.c' Index: ./files/patch-plugger-helper.c --- ./files/patch-plugger-helper.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-plugger-helper.c Sun Mar 24 23:43:38 2002 @@ -0,0 +1,77 @@ +--- plugger-helper.c.orig Sun Dec 9 22:41:11 2001 ++++ plugger-helper.c Sun Mar 24 23:29:20 2002 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -355,10 +356,10 @@ + /* Time to steal the lock! */ + mode=PropModeReplace; + gettimeofday(&tv, 0); +- INC_TIME(&tv, 0, 10000 + (rand() & 16383)); ++ INC_TIME(&tv, 0, 10000 + (random() & 16383)); + break; + } +- my_usleep((rand() & 16383) + 2000); /* 0.18383 seconds */ ++ my_usleep((random() & 16383) + 2000); /* 0.18383 seconds */ + } + + D("XChangeProperty, mode=%d\n",mode); +@@ -401,6 +402,7 @@ + got_sigwinch=1; + } + ++#define LONG_CHARS 12 + + int main(int argc, char **argv) + { +@@ -493,30 +495,30 @@ + loops=MIN(repeats,10); + for(e=0;e/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 -u 'plugger/pkg-message' 'plugger.40/pkg-message' Index: ./pkg-message --- ./pkg-message Tue Sep 4 09:32:20 2001 +++ ./pkg-message Sun Mar 24 23:43:38 2002 @@ -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 @@ ~/.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 -u 'plugger/pkg-plist' 'plugger.40/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Sat Dec 15 06:29:57 2001 +++ ./pkg-plist Sun Mar 24 23:43:38 2002 @@ -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 #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Wed Apr 3 08:20:50 2002 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 1657 1017042218 0100644 # p 'distinfo' 122 1017042218 0100644 # p 'files/patch-aa' 865 1017042218 0100644 # c 'files/patch-plugger-helper.c' 0 1017042218 0100644 # c 'files/patch-plugger.c' 0 1017042218 0100644 # p 'files/patch-pluggerrc' 897 1017849951 0100644 # p 'pkg-message' 1374 1017042218 0100644 # p 'pkg-plist' 620 1017042218 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Wed Apr 3 08:20:50 2002] #### #### Checksum: 479 17305 18910 #### Responsible-Changed-From-To: freebsd-ports->marcus Responsible-Changed-By: marcus Responsible-Changed-When: Sun Apr 7 11:23:43 PDT 2002 Responsible-Changed-Why: Per maintainer's request, I'll take this one. http://www.freebsd.org/cgi/query-pr.cgi?pr=36277 State-Changed-From-To: open->closed State-Changed-By: marcus State-Changed-When: Mon Apr 8 08:47:00 PDT 2002 State-Changed-Why: Committed, thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=36277 >Unformatted: