Date: Sat, 16 Nov 2002 21:27:40 -0800 (PST) From: John Merryweather Cooper <coop9211@uidaho.edu> To: FreeBSD-gnats-submit@freebsd.org Cc: gnome@freebsd.org, adam@vectors.cx Subject: [MAINTAINER-UPDATE] Adjust www/plugger to install in new plugin directory, etc. Message-ID: <200211170527.gAH5Re4Q034589@pc016247.reshall.uidaho.edu>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: John Merryweather Cooper >Organization: >Confidential: no >Synopsis: [MAINTAINER-UPDATE] Adjust www/plugger to install in new plugin directory, etc. >Severity: non-critical >Priority: low >Category: ports >Class: maintainer-update >Release: FreeBSD 4.7-STABLE i386 >Environment: System: FreeBSD PC016247.reshall.uidaho.edu 4.7-STABLE FreeBSD 4.7-STABLE #62: Thu Nov 14 16:16:48 PST 2002 root@PC016247.reshall.uidaho.edu:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: On the request of Adam Weinberger and others, I've modifed www/plugger to be Gnome/2 aware. Also, I've adjust the installation to place the plugin in the new FreeBSD standard plugin directory. >How-To-Repeat: N/A >Fix: --- update-plugger-4.0_2 begins here --- # This is a patch for plugger to update it to plugger-4.0_2 # # 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. # STEP 2: Run the 'patch' program with this file as input. # #### End of Preamble #### #### Patch data follows #### diff -u 'plugger/Makefile' 'plugger-4.0_2/Makefile' Index: ./Makefile --- ./Makefile Sat Nov 9 14:59:59 2002 +++ ./Makefile Sat Nov 16 21:03:39 2002 @@ -2,12 +2,12 @@ # Date created: 11 Februrary 1999 # Whom: Jay Sachs <sachs@cs.williams.edu> # -# $FreeBSD: ports/www/plugger/Makefile,v 1.14 2002/11/09 17:14:30 sada Exp $ +# $FreeBSD$ # PORTNAME= plugger PORTVERSION= 4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www audio graphics MASTER_SITES= http://fredrik.hubbe.net/plugger/ \ ${MASTER_SITE_NETSCAPE} @@ -16,8 +16,7 @@ MAINTAINER= coop9211@uidaho.edu -RUN_DEPENDS= ${X11BASE}/bin/mozilla:${PORTSDIR}/www/mozilla \ - ${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \ +RUN_DEPENDS= ${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \ ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \ ${LOCALBASE}/bin/mpg123:${PORTSDIR}/audio/mpg123 \ ${LOCALBASE}/bin/wavplay:${PORTSDIR}/audio/wavplay \ @@ -27,7 +26,6 @@ ${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/acroread5:${PORTSDIR}/print/acroread5 USE_X_PREFIX= yes @@ -47,6 +45,10 @@ WITH_MTV = yes .endif +.if exists(${X11BASE}/lib/libgnomeprintui-2.so.0) +WITH_GNOME2 = yes +.endif + .if defined(WITH_MPLAYER) RUN_DEPENDS+= ${LOCALBASE}/bin/mplayer:${PORTSDIR}/graphics/mplayer .endif @@ -55,6 +57,12 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/mtvp:${PORTSDIR}/graphics/mtv .endif +.if defined(WITH_GNOME2) +RUN_DEPENDS+= ${X11BASE}/bin/gnumeric:${PORTSDIR}/math/gnumeric2 +.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." @@ -64,6 +72,11 @@ @${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} \ @@ -75,8 +88,9 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \ ${PREFIX}/bin + @${MKDIR} ${PREFIX}/lib/browser_plugins @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \ - ${PREFIX}/lib/mozilla/plugins/npplugger.so + ${PREFIX}/lib/browser_plugins/npplugger.so @${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7 @${INSTALL_DATA} ${WRKSRC}/pluggerrc ${PREFIX}/etc/pluggerrc.sample @${INSTALL_DATA} -b ${WRKSRC}/pluggerrc ${PREFIX}/etc diff -u 'plugger/pkg-comment' 'plugger-4.0_2/pkg-comment' Index: ./pkg-comment --- ./pkg-comment Tue Sep 4 09:32:20 2001 +++ ./pkg-comment Sat Nov 16 21:16:25 2002 @@ -1 +1 @@ -A multimedia front-end plugin for Mozilla +A multimedia front-end plugin for Mozilla or Opera diff -u 'plugger/pkg-plist' 'plugger-4.0_2/pkg-plist' Index: ./pkg-plist --- ./pkg-plist Mon Apr 8 21:49:51 2002 +++ ./pkg-plist Sat Nov 16 21:00:58 2002 @@ -1,5 +1,5 @@ bin/plugger-4.0 -lib/mozilla/plugins/npplugger.so +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 #### End of Patch data #### #### ApplyPatch data follows #### # Data version : 1.0 # Date generated : Sat Nov 16 21:21:07 2002 # Generated by : makepatch 2.00 # Recurse directories : Yes # p 'Makefile' 2558 1037509419 0100644 # p 'pkg-comment' 42 1037510185 0100644 # p 'pkg-plist' 636 1037509258 0100644 #### End of ApplyPatch data #### #### End of Patch kit [created: Sat Nov 16 21:21:07 2002] #### #### Checksum: 133 4745 46595 #### --- update-plugger-4.0_2 ends here --- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211170527.gAH5Re4Q034589>