Date: Wed, 7 Jul 2004 04:33:33 -0700 From: "John Merryweather Cooper" <johnmary@adelphia.net> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/68766: [MAINTAINER-UPDATE] Update www/plugger to 5.1.2 Message-ID: <1089200013.0@68-169-191-150.losaca.adelphia.net> Resent-Message-ID: <200407071140.i67BeNqe002039@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68766
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] Update www/plugger to 5.1.2
>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 Jul 07 11:40:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: John Merryweather Cooper
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 5.2-CURRENT #1: Wed Jun 30 13:09:09 PDT 2004
root@borgdemon.losaca.adelphia.net:/usr/obj/usr/src/sys/ATHLON
>Description:
Update www/plugger to 5.1.2.
Major overhaul of the code!
>How-To-Repeat:
N/A
>Fix:
--- update-plugger-5.1.2 begins here ---
# NOTE: Not tested on -STABLE (tested on -CURRENT).
#
# 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 'files/patch-plugger.c'
rm -f 'files/patch-plugger-helper.c'
rm -f 'files/patch-plugger-controller.c'
touch 'files/patch-Makefile.in'
chmod 0644 'files/patch-Makefile.in'
touch 'files/patch-configure'
chmod 0644 'files/patch-configure'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####
#### Patch data follows ####
diff -u '/usr/ports/www/plugger/Makefile' '/usr/ports/local/plugger/Makefile'
Index: ./Makefile
--- ./Makefile Tue Jun 29 19:05:17 2004
+++ ./Makefile Wed Jul 7 04:19:39 2004
@@ -2,12 +2,11 @@
# Date created: 11 Februrary 1999
# Whom: Jay Sachs <sachs@cs.williams.edu>
#
-# $FreeBSD: ports/www/plugger/Makefile,v 1.24 2004/02/22 07:57:36 marcus Exp $
+# $FreeBSD$
#
PORTNAME= plugger
-PORTVERSION= 5.0
-PORTREVISION= 2
+PORTVERSION= 5.1.2
CATEGORIES= www audio graphics multimedia
MASTER_SITES= http://fredrik.hubbe.net/plugger/
@@ -16,26 +15,14 @@
USE_X_PREFIX= yes
USE_REINPLACE= yes
+GNU_CONFIGURE= yes
MAN7= plugger.7
-ALL_TARGET= freebsd-elf
PKGDEINSTALL= ${PKGINSTALL}
.include <bsd.port.pre.mk>
post-patch:
- @${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
- @${REINPLACE_CMD} -e 's|oowriter|openoffice-1.1-swriter|g' \
- -e 's|oocalc|openoffice-1.1-scalc|g' \
- -e 's|ooimpress|openoffice-1.1-simpress|g' \
- -e 's|oodraw|openoffice-1.1-sdraw|g' \
- -e 's|oomath|openoffice-1.1-smath|g' \
- ${WRKSRC}/pluggerrc
@${REINPLACE_CMD} -e \
's|/usr/X11R6/lib/xscreensaver|${X11BASE}/bin/xscreensaver-hacks|g' \
${WRKSRC}/pluggerrc
@@ -47,11 +34,11 @@
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_SCRIPT} ${WRKSRC}/plugger-oohelper \
+ ${PREFIX}/bin
+ @${MKDIR} ${PREFIX}/lib/browser_plugins
@${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \
${PREFIX}/lib/browser_plugins/npplugger.so
@if [ -f ${PREFIX}/etc/pluggerrc-${PORTVERSION} ]; then \
@@ -63,32 +50,29 @@
@${INSTALL_MAN} ${WRKSRC}/plugger.7 ${MANPREFIX}/man/man7
local-install:
- @${MKDIR} ${HOME}/.mozilla/plugins
- @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \
- ${HOME}/.mozilla/plugins/npplugger.so
+ @${MKDIR} ${HOME}/.plugger
@${INSTALL_PROGRAM} ${WRKSRC}/plugger-${PORTVERSION} \
- ${HOME}/.mozilla
+ ${HOME}/.plugger
@${INSTALL_PROGRAM} ${WRKSRC}/plugger-controller \
- ${HOME}/.mozilla
- @if [ -f ${HOME}/.mozilla/pluggerrc-${PORTVERSION} ]; then \
- ${MV} ${HOME}/.mozilla/pluggerrc-${PORTVERSION} \
- ${HOME}/.mozilla/pluggerrc-${PORTVERSION}.old; \
+ ${HOME}/.plugger
+ @${INSTALL_SCRIPT} ${WRKSRC}/plugger-oohelper \
+ ${HOME}/.plugger
+ @if [ -f ${HOME}/.plugger/pluggerrc-${PORTVERSION} ]; then \
+ ${MV} ${HOME}/.plugger/pluggerrc-${PORTVERSION} \
+ ${HOME}/.plugger/pluggerrc-${PORTVERSION}.old; \
fi
@${INSTALL_DATA} ${WRKSRC}/pluggerrc \
- ${HOME}/.mozilla/pluggerrc-${PORTVERSION}
+ ${HOME}/.plugger/pluggerrc-${PORTVERSION}
+
+local-mozilla-install: local-install
+ @${MKDIR} ${HOME}/.mozilla/plugins
+ @${INSTALL_PROGRAM} ${WRKSRC}/plugger.so \
+ ${HOME}/.mozilla/plugins/npplugger.so
-local-opera-install:
+local-opera-install: local-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:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff -u '/usr/ports/www/plugger/distinfo' '/usr/ports/local/plugger/distinfo'
Index: ./distinfo
--- ./distinfo Tue Jun 29 19:05:17 2004
+++ ./distinfo Wed Jul 7 02:23:46 2004
@@ -1,2 +1,2 @@
-MD5 (plugger-5.0.tar.gz) = c2b263c7c34f759fb8b2e29b243b5ca1
-SIZE (plugger-5.0.tar.gz) = 55005
+MD5 (plugger-5.1.2.tar.gz) = d3b93e7c8179e232fb796357b4b23099
+SIZE (plugger-5.1.2.tar.gz) = 75875
diff -u /dev/null '/usr/ports/local/plugger/files/patch-Makefile.in'
Index: ./files/patch-Makefile.in
--- ./files/patch-Makefile.in Wed Dec 31 16:00:00 1969
+++ ./files/patch-Makefile.in Wed Jul 7 03:22:18 2004
@@ -0,0 +1,29 @@
+--- Makefile.in.orig Wed Jul 7 03:13:00 2004
++++ Makefile.in Wed Jul 7 03:21:47 2004
+@@ -30,7 +30,7 @@
+ CC=@CC@
+ LD=@LD@
+ BINFORMAT=bin
+-OPT_FLAGS=-O2
++OPT_FLAGS=@CFLAGS@
+
+ @SET_MAKE@
+
+@@ -66,7 +66,7 @@
+ DEBUG= # -DDEBUG # -DPLUGIN_TRACE
+ DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\" $(DEBUG)
+ COMMON_CFLAGS=$(OPT_FLAGS) -I$(SDK)/include -I@x_includes@ -DXP_UNIX $(DEFINES)
+-COMMON_LDFLAGS=
++COMMON_LDFLAGS=@LDFLAGS@
+ NORM_CFLAGS=
+ NORM_LDFLAGS=
+ XCFLAGS=@XCFLAGS@ @X_CFLAGS@
+@@ -79,7 +79,7 @@
+ LDFLAGS=$(COMMON_LDFLAGS) $(NORM_LDFLAGS)
+ SHARED_CFLAGS=$(COMMON_CFLAGS) $(XCFLAGS)
+
+-## Targes
++## Targets
+ all: plugger.so plugger-$(VERSION) plugger-controller
+
+
diff -u /dev/null '/usr/ports/local/plugger/files/patch-configure'
Index: ./files/patch-configure
--- ./files/patch-configure Wed Dec 31 16:00:00 1969
+++ ./files/patch-configure Wed Jul 7 02:50:20 2004
@@ -0,0 +1,15 @@
+--- configure.orig Wed Jul 7 02:41:28 2004
++++ configure Wed Jul 7 02:49:41 2004
+@@ -1819,10 +1819,10 @@
+ XLDFLAGS='-expect_unresolved "*" -shared -msym -O3'
+ ;;
+
+- FreeBSD)
++ FreeBSD*)
+ case "`file /bin/ls`" in
+ *ELF*)
+- XCFLAGS=-fpic
++ XCFLAGS=-fPIC
+ XLDFLAGS=-shared
+ ;;
+ *)
diff -u '/usr/ports/www/plugger/pkg-install' '/usr/ports/local/plugger/pkg-install'
Index: ./pkg-install
--- ./pkg-install Wed Feb 11 23:49:47 2004
+++ ./pkg-install Wed Jul 7 04:22:23 2004
@@ -1,11 +1,11 @@
#!/bin/sh
-# $FreeBSD: ports/www/plugger/pkg-install,v 1.1 2004/02/12 07:49:47 marcus Exp $
+# $FreeBSD$
[ $# != 2 ] && exit 1
PKGNAME=$1
ACTION=$2
-FILES_DELETE="pluggerrc-5.0.old"
+FILES_DELETE="pluggerrc-5.1.2.old"
ETCDIR=${PKG_PREFIX}/etc
@@ -16,8 +16,8 @@
case "$ACTION" in
POST-INSTALL)
- if [ ! -f ${ETCDIR}/pluggerrc-5.0 ]; then
- ${CP} ${ETCDIR}/pluggerrc-5.0.sample ${ETCDIR}/pluggerrc-5.0
+ if [ ! -f ${ETCDIR}/pluggerrc-5.1.2 ]; then
+ ${CP} ${ETCDIR}/pluggerrc-5.1.2.sample ${ETCDIR}/pluggerrc-5.1.2
fi
;;
@@ -32,18 +32,21 @@
PRE-INSTALL)
${ECHO}
- ${ECHO} "Run ''make local-install'' as user to locally"
+ ${ECHO} "Run ''make local-mozilla-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}
+ ${ECHO} "NOTE: For plugger-oohelper to work, [o|s]office must be"
+ ${ECHO} "in the PATH."
+ ${ECHO}
;;
POST-DEINSTALL)
${ECHO}
${ECHO} "If you are permanently removing this port,"
- ${ECHO} "you should do a ''rm -f ${ETCDIR}/pluggerrc-5.0''"
+ ${ECHO} "you should do a ''rm -f ${ETCDIR}/pluggerrc-5.1.2''"
${ECHO} "to remove it."
${ECHO}
;;
diff -u '/usr/ports/www/plugger/pkg-plist' '/usr/ports/local/plugger/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist Tue Jun 29 19:05:17 2004
+++ ./pkg-plist Wed Jul 7 04:05:39 2004
@@ -1,5 +1,6 @@
-bin/plugger-5.0
+bin/plugger-5.1.2
bin/plugger-controller
-etc/pluggerrc-5.0.sample
+bin/plugger-oohelper
+etc/pluggerrc-5.1.2.sample
lib/browser_plugins/npplugger.so
@dirrm lib/browser_plugins
#### End of Patch data ####
#### ApplyPatch data follows ####
# Data version : 1.0
# Date generated : Wed Jul 7 04:28:31 2004
# Generated by : makepatch 2.00
# Recurse directories : Yes
# r 'files/patch-plugger.c' 278 0
# r 'files/patch-plugger-helper.c' 234 0
# r 'files/patch-plugger-controller.c' 258 0
# p 'Makefile' 3078 1089199179 0100644
# p 'distinfo' 94 1089192226 0100644
# c 'files/patch-Makefile.in' 0 1089195738 0100644
# c 'files/patch-configure' 0 1089193820 0100644
# p 'pkg-install' 951 1089199343 0100644
# p 'pkg-plist' 124 1089198339 0100644
#### End of ApplyPatch data ####
#### End of Patch kit [created: Wed Jul 7 04:28:31 2004] ####
#### Checksum: 293 9295 57250 ####
--- update-plugger-5.1.2 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1089200013.0>