5 files changed, 26 insertions, 33 deletions

diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index 330d5ebaf7d3..160537d57dbd 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayerplug-in
-PORTVERSION=	0.80
-PORTREVISION=	1
+PORTVERSION=	0.91
 CATEGORIES=	www multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mplayerplug-in
@@ -32,5 +31,7 @@ do-install:
 	${MKDIR} ${PREFIX}/lib/browser_plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayerplug-in.so \
 		${PREFIX}/lib/browser_plugins
+	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
+		${PREFIX}/etc/mplayerplug-in.conf.dist
 
 .include <bsd.port.mk>
diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo
index c6802161521f..9d48bf94df57 100644
--- a/www/mplayer-plugin/distinfo
+++ b/www/mplayer-plugin/distinfo
@@ -1 +1 @@
-MD5 (mplayerplug-in-0.80.tar.gz) = 2ee4b6572758566d7079a7a06903a5fb
+MD5 (mplayerplug-in-0.91.tar.gz) = 0007f154903e4eb0cbffbf61740fc806
diff --git a/www/mplayer-plugin/files/patch-Makefile b/www/mplayer-plugin/files/patch-Makefile
index af2ae5878344..72a553f0f592 100644
--- a/www/mplayer-plugin/files/patch-Makefile
+++ b/www/mplayer-plugin/files/patch-Makefile
@@ -1,8 +1,8 @@
---- Makefile.orig	Sun Jan 19 10:12:43 2003
-+++ Makefile	Tue Feb 25 00:51:25 2003
-@@ -29,9 +29,9 @@
- # PLUGIN_DEFINES= -DXP_UNIX -DPLUGIN_TRACE
- PLUGIN_DEFINES= -DXP_UNIX -Iinclude -ISource/_gen -I/usr/X11R6/include
+--- Makefile.orig	Fri Sep  5 21:48:28 2003
++++ Makefile	Mon Sep 29 00:42:38 2003
+@@ -12,9 +12,9 @@
+ 
+ PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I/usr/X11R6/include
  
 -CC= gcc
 -OPTIMIZER= -g
@@ -10,15 +10,15 @@
 +CC?= gcc
 +OPTIMIZER=
 +CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include
- 
- SRC= Source/mplayerplug-in.c Source/stubs.c 
- OBJ= mplayerplug-in.o stubs.o
-@@ -41,7 +41,7 @@
+ #`pkg-config gtk+-2.0 --cflags`
+ STRICTFLAGS= -O3 -Wall -W -Wno-unused-variable -Wno-unused-parameter -Wwrite-strings -Werror
+ #LDFLAGS   = `pkg-config gtk+-2.0 --libs`
+@@ -25,7 +25,7 @@
  default all: $(SHAREDTARGET)
  
  $(SHAREDTARGET): $(OBJ)
 -	$(CC) -shared -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
 +	$(CC) -shared -L/usr/X11R6/lib -lXt -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
  
- mplayerplug-in.o: Source/mplayerplug-in.c
- 	$(CC) -c $(CFLAGS) Source/mplayerplug-in.c
+ mplayerplug-in.o: Source/mplayerplug-in.c Source/mplayerplug-in.h
+ #	$(CC) -c $(STRICTFLAGS) $(CFLAGS) Source/mplayerplug-in.c
diff --git a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
index 39253217acdb..463db10b7ad5 100644
--- a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
+++ b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
@@ -1,21 +1,11 @@
---- Source/mplayerplug-in.c.orig	Thu May 22 22:38:28 2003
-+++ Source/mplayerplug-in.c	Mon Jul 21 15:14:24 2003
-@@ -142,9 +142,6 @@
- 		"audio/mpeg3:mp3:MPEG audio;"
- 		"audio/x-mpeg3:mp3:MPEG audio;"
- 		"audio/mp3:mp3:MPEG audio;"
--		"audio/x-pn-realaudio:ram:RealAudio;"
--		"audio/x-pn-realaudio-plugin:rpm:RealAudio;"
--		"audio/x-realaudio:ra:RealAudio;"
- 		"video/fli:fli,flc:FLI animation;"
- 		"video/x-fli:fli,flc:FLI animation;"
- 		"video/x-ms-asf-plugin:asf,asx:Windows Media;"
-@@ -262,7 +262,7 @@
- 	}
+--- Source/mplayerplug-in.c.orig	Wed Sep 10 10:34:15 2003
++++ Source/mplayerplug-in.c	Mon Sep 29 00:43:56 2003
+@@ -67,7 +67,7 @@
+     }
  
- 	if (config == NULL) {
--		config = fopen("/etc/mplayerplug-in.conf","r");
-+		config = fopen("%%PREFIX%%/etc/mplayerplug-in.conf","r");
- 	}
+     if (config == NULL) {
+-	config = fopen("/etc/mplayerplug-in.conf", "r");
++	config = fopen("%%PREFIX%%/etc/mplayerplug-in.conf", "r");
+     }
  
- 	DEBUG = 0;
+     if (config == NULL) {
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
index c0666ea49714..578609b81e99 100644
--- a/www/mplayer-plugin/pkg-plist
+++ b/www/mplayer-plugin/pkg-plist
@@ -1,2 +1,4 @@
+@unexec if cmp -s %D/etc/mplayerplug-in.conf %D/etc/mplayerplug-in.conf.dist; then rm -f %D/etc/mplayerplug-in.conf; fi
+etc/mplayerplug-in.conf.dist
 lib/browser_plugins/mplayerplug-in.so
 @unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true