3 files changed, 20 insertions, 50 deletions

diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 17b9819e3c95..3e067509e832 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	plugger
-PORTVERSION= 	3.0
+PORTVERSION= 	3.2
 CATEGORIES=	www
-MASTER_SITES=	http://www.hubbe.net/~hubbe/plugger/ \
+MASTER_SITES=	http://fredrik.hubbe.net/plugger/ \
 		ftp://ftp.netscape.com/pub/sdk/plugin/unix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} unix-sdk-3.0b5.tar.Z
 
@@ -18,15 +18,18 @@ RUN_DEPENDS=	${LOCALBASE}/lib/netscape/plugins:${PORTSDIR}/www/netscape47-naviga
 
 MAN7=		plugger.7
 MANCOMPRESSED=	no
+ALL_TARGET=	freebsd-aout
 
 post-patch:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old
+	${MV} ${WRKSRC}/plugger.c ${WRKSRC}/plugger.c.orig
 	${SED} \
 	  -e 's#/usr/local/#${PREFIX}/#' \
-	  -e 's#/usr/X11/#${X11BASE}/#' \
-	  -e 's#/etc/pluggerrc#${PREFIX}/etc/pluggerrc.sample#' \
-	  -e 's# /etc/ # ${PREFIX}/etc/pluggerrc.sample #' \
-	  ${WRKSRC}/Makefile.old > ${WRKSRC}/Makefile
+	  ${WRKSRC}/plugger.c.orig > ${WRKSRC}/plugger.c
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/plugger.so ${PREFIX}/lib/netscape/plugins
+	${INSTALL_MAN}  ${WRKSRC}/plugger.7  ${MANPREFIX}/man/man7
+	${INSTALL_DATA} ${WRKSRC}/pluggerrc  ${PREFIX}/etc/pluggerrc.sample
 
 post-install:
 	@${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
diff --git a/www/plugger/distinfo b/www/plugger/distinfo
index fb29d7504798..2f88556130bb 100644
--- a/www/plugger/distinfo
+++ b/www/plugger/distinfo
@@ -1,2 +1,2 @@
-MD5 (plugger-3.0.tar.gz) = 98f073487375d398b1cd0b657fcfce63
+MD5 (plugger-3.2.tar.gz) = b8132298f9d40bd87bc511ff7721b89f
 MD5 (unix-sdk-3.0b5.tar.Z) = 1e43785d5697c60937e8d6236e7d7d7e
diff --git a/www/plugger/files/patch-aa b/www/plugger/files/patch-aa
index 71753807c2a9..8b9d26e9a6c9 100644
--- a/www/plugger/files/patch-aa
+++ b/www/plugger/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Wed Jan  6 21:43:26 1999
-+++ Makefile	Fri Jun 25 15:29:30 1999
+--- Makefile~	Wed Nov 10 02:09:52 1999
++++ Makefile	Sun May 21 23:52:36 2000
 @@ -1,12 +1,12 @@
  # Where is your Plugin Source Development Kit from Netscape?
 -SDK=/home/hubbe/src/PluginSDK30b5
@@ -9,44 +9,11 @@
 -X11=/usr/X11/
 +X11=${X11BASE}
  
- # Linux
--CC=gcc -fpic
--LD=gcc -shared 
-+#CC=gcc -fpic
-+#LD=gcc -shared 
+ # Choose compiler
+-CC=gcc
+-LD=gcc
++#CC=gcc
++#LD=gcc
+ BINFORMAT=bin
  
- # Solaris
- #CC=gcc -fpic
-@@ -18,8 +18,8 @@
- #LD=ld -shared
- 
- # FreeBSD (a.out netscape)
--#CC=gcc -fpic -aout
--#LD=gcc -shared  -aout
-+CC=gcc -fpic -aout
-+LD=gcc -shared  -aout
- 
- # For other systems, look at the example makefiles in the
- # PluginSDK30b5/examples/UnixTemplate/Unix directory
-@@ -41,6 +41,8 @@
- DEFINES=$(STREAM) -DVERSION=\"$(VERSION)\"  # -DDEBUG # -DPLUGIN_TRACE
- CFLAGS=-O -I$(SDK)/include -I$(X11)/include -DXP_UNIX $(DEFINES) 
- 
-+all: $(BIN_FILES)
-+
- plugger.so: plugger.o common.o
- 	$(LD) -o plugger.so plugger.o common.o
- 
-@@ -61,9 +63,9 @@
- 	if [ ! -f $$HOME/.netscape/pluggerrc ]; then cp pluggerrc $$HOME/.netscape ; fi
- 
- install: plugger.so
--	cp plugger.so /usr/local/lib/netscape/plugins/
--	if [ ! -f /etc/pluggerrc ]; then cp pluggerrc /etc/ ; fi
--	cp plugger.7 /usr/local/man/man7/
-+	cp plugger.so ${PREFIX}/lib/netscape/plugins/
-+	if [ ! -f ${PREFIX}/etc/pluggerrc.sample ]; then cp pluggerrc ${PREFIX}/etc/pluggerrc.sample ; fi
-+	cp plugger.7 ${PREFIX}/man/man7/
- 
- plugger-$(VERSION).tar.gz: $(BASE_FILES) $(SOURCE_FILES)
- 	( DIR=`pwd`;\
+ any: