Date: Wed, 11 Feb 2004 18:41:36 -0800 From: "\"John Merryweather Cooper,Home Office,,(509) 338-9391 \" <John Merryweather Cooper" <coop9211@uidaho.edu> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/62720: [MAINTAINER-UPDATE] update www/plugger to 5.0 Message-ID: <1076553696.0@borgdemon.losaca.adelphia.net> Resent-Message-ID: <200402120250.i1C2oEN4084637@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62720 >Category: ports >Synopsis: [MAINTAINER-UPDATE] update www/plugger to 5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 11 18:50:13 PST 2004 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper,Home Office,,(509) 338-9391 >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD borgdemon.losaca.adelphia.net 4.9-STABLE FreeBSD 4.9-STABLE #11: Sun Feb i386 >Description: * Update to 5.0 * Helper applications will be farmed out to new ports >How-To-Repeat: N/A >Fix: --- update-plugger-5.0 begins here --- # This is a patch for plugger to update it to plugger-5.0 # # 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/delete # 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: # rm -f 'pkg-message-mplayer' rm -f 'pkg-message' rm -f 'files/patch-pluggerrc' rm -f 'files/patch-aa' touch 'files/patch-plugger-controller.c' chmod 0644 'files/patch-plugger-controller.c' touch 'pkg-install' chmod 0644 'pkg-install' # # This command terminates the shell and need not be executed manually. exit # #### End of Preamble #### #### Patch data follows #### diff -u 'plugger/Makefile' 'plugger-5.0/Makefile' Index: ./Makefile --- ./Makefile Thu Feb 5 14:03:59 2004 +++ ./Makefile Wed Feb 11 18:13:46 2004 @@ -2,105 +2,86 @@ # Date created: 11 Februrary 1999 # Whom: Jay Sachs <sachs@cs.williams.edu> # -# $FreeBSD: ports/www/plugger/Makefile,v 1.21 2004/02/04 05:09:34 marcus Exp $ +# $FreeBSD$ # PORTNAME= plugger -PORTVERSION= 4.0 -PORTREVISION= 4 +PORTVERSION= 5.0 CATEGORIES= www audio graphics multimedia -MASTER_SITES= http://fredrik.hubbe.net/plugger/ \ - ${MASTER_SITE_NETSCAPE} -MASTER_SITE_SUBDIR= sdk/plugin/unix -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} unix-sdk-3.0b5.tar.Z +MASTER_SITES= http://fredrik.hubbe.net/plugger/ MAINTAINER= coop9211@uidaho.edu COMMENT= A multimedia front-end plugin for Mozilla or Opera -RUN_DEPENDS= ${LOCALBASE}/bin/nspptview:${PORTSDIR}/textproc/xlhtml \ - ${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \ - ${LOCALBASE}/bin/sidplay:${PORTSDIR}/audio/sidplay \ - ${LOCALBASE}/bin/wavplay:${PORTSDIR}/audio/wavplay \ - ${LOCALBASE}/bin/xmp:${PORTSDIR}/audio/xmp \ - ${X11BASE}/bin/gqview:${PORTSDIR}/graphics/gqview \ - ${LOCALBASE}/bin/display:${PORTSDIR}/graphics/ImageMagick \ - ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \ - ${X11BASE}/bin/gv:${PORTSDIR}/print/gv \ - ${X11BASE}/bin/xanim:${PORTSDIR}/multimedia/xanim \ - ${LOCALBASE}/bin/acroread5:${PORTSDIR}/print/acroread5 - USE_X_PREFIX= yes USE_REINPLACE= yes MAN7= plugger.7 -MANCOMPRESSED= no ALL_TARGET= freebsd-elf +PKGDEINSTALL= ${PKGINSTALL} .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/mplayer) -WITH_MPLAYER = yes -.endif - -.if exists(${LOCALBASE}/bin/mtvp) -WITH_MTV = yes -.endif - -.if exists(${X11BASE}/lib/libgnomeprintui-2-2.so.0) -WITH_GNOME2 = yes -.endif - -.if defined(WITH_MPLAYER) -RUN_DEPENDS+= ${LOCALBASE}/bin/mplayer:${PORTSDIR}/multimedia/mplayer -.endif - -.if defined(WITH_MTV) -RUN_DEPENDS+= ${LOCALBASE}/bin/mtvp:${PORTSDIR}/multimedia/mtv -.endif - -.if defined(WITH_GNOME2) -RUN_DEPENDS+= ${X11BASE}/bin/gnumeric:${PORTSDIR}/math/gnumeric2 \ - ${X11BASE}/bin/abiword:${PORTSDIR}/editors/AbiWord2 -.else -RUN_DEPENDS+= ${X11BASE}/bin/gnumeric:${PORTSDIR}/math/gnumeric -.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 - -.if !defined(WITH_GNOME2) - @${ECHO_MSG} "Enable Gnome/2 AbiWord and Gnumeric by defining" - @${ECHO_MSG} "WITH_GNOME2." -.endif - post-patch: - @${MV} ${WRKSRC}/plugger.c ${WRKSRC}/plugger.c.orig - @${SED} \ - -e 's#/usr/local/#${PREFIX}/#' \ - ${WRKSRC}/plugger.c.orig > ${WRKSRC}/plugger.c -# CC safeness - @${REINPLACE_CMD} -e 's|CC=gcc|CC=${CC}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|g' \ + ${WRKSRC}/plugger.c + @${REINPLACE_CMD} -e 's|CC=gcc|CC=${CC}|g' \ + -e 's|LD=gcc|LD=${CC}|g' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}|g' \ + ${WRKSRC}/Makefile + +pre-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ + ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ ${PREFIX}/bin @${MKDIR} ${PREFIX}/lib/browser_plugins + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ + ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \ + ${PREFIX}/bin @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ ${PREFIX}/lib/browser_plugins/npplugger.so + @if [ -f ${PREFIX}/etc/pluggerrc-${PORTVERSION} ]; then \ + ${MV} ${PREFIX}/etc/pluggerrc-${PORTVERSION} \ + ${PREFIX}/etc/pluggerrc-${PORTVERSION}.old; \ + fi + @${INSTALL_DATA} ${WRKSRC}/pluggerrc \ + ${PREFIX}/etc/pluggerrc-${PORTVERSION}.sample @${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7 - @${INSTALL_DATA} ${WRKSRC}/pluggerrc ${PREFIX}/etc/pluggerrc.sample - @${INSTALL_DATA} -b ${WRKSRC}/pluggerrc ${PREFIX}/etc + +local-install: + @${MKDIR} ${HOME}/.mozilla/plugins + @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ + ${HOME}/.mozilla/plugins/npplugger.so + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ + ${HOME}/.mozilla + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \ + ${HOME}/.mozilla + @if [ -f ${HOME}/.mozilla/pluggerrc-${PORTVERSION} ]; then \ + ${MV} ${HOME}/.mozilla/pluggerrc-${PORTVERSION} \ + ${HOME}/.mozilla/pluggerrc-${PORTVERSION}.old; \ + fi + @${INSTALL_DATA} ${WRKSRC}/pluggerrc \ + ${HOME}/.mozilla/pluggerrc-${PORTVERSION} + +local-opera-install: + @${MKDIR} ${HOME}/.opera/plugins + @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ + ${HOME}/.opera/plugins/npplugger.so + @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ + ${HOME}/.opera + @if [ -f ${HOME}/.opera/pluggerrc-${PORTVERSION} ]; then \ + ${MV} ${HOME}/.opera/pluggerrc-${PORTVERSION} \ + ${HOME}/.opera/pluggerrc-${PORTVERSION}.old; \ + fi + @${INSTALL_DATA} ${WRKSRC}/pluggerrc \ + ${HOME}/.opera/pluggerrc-${PORTVERSION} post-install: - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' -.if defined(WITH_MPLAYER) - @${CAT} ${PKGMESSAGE}-mplayer -.endif + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} \ + ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.post.mk> diff -u 'plugger/distinfo' 'plugger-5.0/distinfo' Index: ./distinfo --- ./distinfo Mon Apr 8 08:46:44 2002 +++ ./distinfo Wed Feb 11 16:03:42 2004 @@ -1,2 +1,2 @@ -MD5 (plugger-4.0.tar.gz) = bf39c1405760183a01b8ec8fbfa6d430 -MD5 (unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e +MD5 (plugger-5.0.tar.gz) = c2b263c7c34f759fb8b2e29b243b5ca1 +SIZE (plugger-5.0.tar.gz) = 55005 diff -u /dev/null 'plugger-5.0/files/patch-plugger-controller.c' Index: ./files/patch-plugger-controller.c --- ./files/patch-plugger-controller.c Wed Dec 31 16:00:00 1969 +++ ./files/patch-plugger-controller.c Wed Feb 11 16:25:04 2004 @@ -0,0 +1,11 @@ +--- plugger-controller.c.old Wed Feb 11 16:22:04 2004 ++++ plugger-controller.c Wed Feb 11 16:23:47 2004 +@@ -136,7 +136,7 @@ + if(!pid) + { + char *cmd[4]; +- setpgrp(); ++ setpgrp(0, 0); + cmd[0]="/bin/sh"; + cmd[1]="-c"; + cmd[2]=argv[1]; diff -u 'plugger/files/patch-plugger-helper.c' 'plugger-5.0/files/patch-plugger-helper.c' Index: ./files/patch-plugger-helper.c --- ./files/patch-plugger-helper.c Mon Apr 8 08:49:08 2002 +++ ./files/patch-plugger-helper.c Wed Feb 11 16:21:03 2004 @@ -1,77 +1,11 @@ ---- 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 <sys/stat.h> - #include <sys/wait.h> - #include <errno.h> -+#include <stdlib.h> - #include <sys/time.h> - #include <X11/X.h> - #include <X11/Xos.h> -@@ -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; - } +--- plugger-helper.c.old Wed Feb 11 16:19:27 2004 ++++ plugger-helper.c Wed Feb 11 16:20:30 2004 +@@ -76,7 +76,7 @@ -+#define LONG_CHARS 12 - - int main(int argc, char **argv) + static void very_low_run(char **argv) { -@@ -493,30 +495,30 @@ - loops=MIN(repeats,10); - for(e=0;e<loops;e++) - { -- strcat(foo," "); -- strcat(foo,file); -+ strncat(foo," ", 1); -+ strncat(foo,file,strlen(file)); - } - }else{ -- sprintf(foo,"file=%s",file); -+ snprintf(foo,strlen(file)+1+5,"file=%s",file); - } - putenv(foo); - foo+=strlen(foo)+1; - } - - /* setup environment variable $env */ -- sprintf(foo,"window=%ld",(long)WINDOW); -+ snprintf(foo,LONG_CHARS+7+1,"window=%ld",(long)WINDOW); - putenv(foo); - foo+=strlen(foo)+1; - - /* setup environment variable $repeat */ -- sprintf(foo,"repeat=%ld",(long)repeats); -+ snprintf(foo,LONG_CHARS+7+1,"repeat=%ld",(long)repeats); - putenv(foo); - foo+=strlen(foo)+1; - - /* setup environment variable $DISPLAY */ - if(displayname) - { -- sprintf(foo,"DISPLAY=%s",displayname); -+ snprintf(foo,strlen(displayname)+1+8,"DISPLAY=%s",displayname); - D("putenv(%s)\n",foo); - putenv(foo); - foo+=strlen(foo)+1; -@@ -526,7 +528,7 @@ - /* setup environment variable $mimetype */ - if(mimetype) - { -- sprintf(foo,"mimetype=%s",mimetype); -+ snprintf(foo,strlen(mimetype)+1+9,"mimetype=%s",mimetype); - D("putenv(%s)\n",foo); - putenv(foo); - foo+=strlen(foo)+1; +- setpgrp(); ++ setpgrp(0, 0); + #ifdef H_NOISY + if(flags & H_NOISY) + { diff -u 'plugger/files/patch-plugger.c' 'plugger-5.0/files/patch-plugger.c' Index: ./files/patch-plugger.c --- ./files/patch-plugger.c Mon Apr 8 08:49:08 2002 +++ ./files/patch-plugger.c Wed Feb 11 16:17:44 2004 @@ -1,44 +1,11 @@ ---- plugger.c.orig Sun Mar 24 20:58:49 2002 -+++ plugger.c Sun Mar 24 21:06:15 2002 -@@ -437,33 +437,31 @@ - D("find_helper_file '%s'\n",basename); - if((tmp=getenv("HOME")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/.netscape/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+11+strlen(basename)+1,"%s/.netscape/%s",tmp,basename); - if(cb(fname,data)) return 1; -- sprintf(fname,"%s/.mozilla/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+10+strlen(basename)+1,"%s/.mozilla/%s",tmp,basename); - if(cb(fname,data)) return 1; -- sprintf(fname,"%s/.opera/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+8+strlen(basename)+1,"%s/.opera/%s",tmp,basename); - if(cb(fname,data)) return 1; - } +--- plugger.c.old Wed Feb 11 16:15:56 2004 ++++ plugger.c Wed Feb 11 16:17:04 2004 +@@ -189,7 +189,7 @@ + int signum; + alarm(0); + if(!(THIS->flags & H_DAEMON)) +- setpgrp(); ++ setpgrp(0, 0); - if((tmp=getenv("MOZILLA_HOME")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+1+strlen(basename)+1,"%s/%s",tmp,basename); - if(cb(fname, data)) return 1; - } + for(signum=0;signum<NSIG;signum++) signal(signum, SIG_DFL); - if((tmp=getenv("OPERA_DIR")) && strlen(tmp)<8000) - { -- sprintf(fname,"%s/%s",tmp,basename); -+ snprintf(fname,strlen(tmp)+1+strlen(basename)+1,"%s/%s",tmp,basename); - if(cb(fname, data)) return 1; - } - -- sprintf(fname,"/usr/local/netscape/%s",basename); -+ snprintf(fname,strlen(basename)+5+1,"/etc/%s",basename); - if(cb(fname, data)) return 1; -- sprintf(fname,"/etc/%s",basename); -+ snprintf(fname,strlen(basename)+9+1,"/usr/etc/%s",basename); - if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/etc/%s",basename); -- if(cb(fname, data)) return 1; -- sprintf(fname,"/usr/local/etc/%s",basename); -+ snprintf(fname,strlen(basename)+15+1,"/usr/local/etc/%s",basename); - if(cb(fname, data)) return 1; - if(cb(basename, data)) return 1; - diff -u /dev/null 'plugger-5.0/pkg-install' Index: ./pkg-install --- ./pkg-install Wed Dec 31 16:00:00 1969 +++ ./pkg-install Wed Feb 11 18:22:37 2004 @@ -0,0 +1,56 @@ +#!/bin/sh +# $FreeBSD$ + +[ $# != 2 ] && exit 1 +PKGNAME=$1 +ACTION=$2 + +FILES_DELETE="pluggerrc-5.0.old" + +ETCDIR=${PKG_PREFIX}/etc + +RM=/bin/rm +CP=/bin/cp +ECHO=/bin/echo + +case "$ACTION" in + +POST-INSTALL) + if [ ! -f ${ETCDIR}/pluggerrc-5.0 ]; then + ${CP} ${ETCDIR}/pluggerrc-5.0.sample ${ETCDIR}/pluggerrc-5.0 + fi + ;; + +DEINSTALL) + for file in ${FILES_DELETE} + do + if [ -f ${ETCDIR}/${file} ]; then + ${RM} ${ETCDIR}/${file} + fi + done + ;; + +PRE-INSTALL) + ${ECHO} + ${ECHO} "Run ''make local-install'' as user to locally" + ${ECHO} "install plugger for Mozilla" + ${ECHO} + ${ECHO} "Run ''make local-opera-install'' as user to locally" + ${ECHO} "install plugger for Opera" + ${ECHO} + ;; + +POST-DEINSTALL) + ${ECHO} + ${ECHO} "If you are permanently removing this port," + ${ECHO} "you should do a ''rm -f ${ETCDIR}/pluggerrc-5.0''" + ${ECHO} "to remove it." + ${ECHO} + ;; + +*) + exit 1 + ;; +esac + +exit diff -u 'plugger/pkg-plist' 'plugger-5.0/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Sun Nov 30 02:45:12 2003 +++ ./pkg-plist Wed Feb 11 18:15:19 2004 @@ -1,6 +1,5 @@ -bin/plugger-4.0 +bin/plugger-5.0 +bin/plugger-controller +etc/pluggerrc-5.0.sample lib/browser_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 -etc/pluggerrc.sample -@exec if [ ! -f %D/etc/pluggerrc ]; then cp %D/etc/pluggerrc.sample %D/etc/pluggerrc ; fi +@dirrm lib/browser_plugins #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Wed Feb 11 18:27:36 2004 # Generated by : makepatch 2.00 # Recurse directories : Yes # r 'pkg-message-mplayer' 845 0 # r 'pkg-message' 1344 0 # r 'files/patch-pluggerrc' 6617 0 # r 'files/patch-aa' 1516 0 # p 'Makefile' 3070 1076552026 0100644 # p 'distinfo' 122 1076544222 0100644 # c 'files/patch-plugger-controller.c' 0 1076545504 0100644 # p 'files/patch-plugger-helper.c' 2058 1076545263 0100644 # p 'files/patch-plugger.c' 1704 1076545064 0100644 # c 'pkg-install' 0 1076552557 0100644 # p 'pkg-plist' 636 1076552119 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Wed Feb 11 18:27:36 2004] #### #### Checksum: 471 15065 43574 #### --- update-plugger-5.0 ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1076553696.0>