Update to 1.0.

5 files changed, 28 insertions, 58 deletions

diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
index 0e45d8156298..96c1353f557e 100644
--- a/www/mplayer-plugin/Makefile
+++ b/www/mplayer-plugin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayerplug-in
-PORTVERSION=	0.95
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	www multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mplayerplug-in
@@ -21,11 +20,14 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/Source/mplayerplug-in.c
 
diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo
index 62da8cd3f94c..85558888b1c0 100644
--- a/www/mplayer-plugin/distinfo
+++ b/www/mplayer-plugin/distinfo
@@ -1 +1 @@
-MD5 (mplayerplug-in-0.95.tar.gz) = bab0cfa1f65748153c2675504424399d
+MD5 (mplayerplug-in-1.0.tar.gz) = 35b4c1146549fd516bf3bd042708a6f6
diff --git a/www/mplayer-plugin/files/patch-Makefile b/www/mplayer-plugin/files/patch-Makefile
deleted file mode 100644
index 54d381a1e0e1..000000000000
--- a/www/mplayer-plugin/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Tue Sep  9 17:02:57 2003
-+++ Makefile	Sun Oct  5 02:29:28 2003
-@@ -12,9 +12,9 @@
- 
- PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I/usr/X11R6/include
- 
--CC= gcc
--OPTIMIZER= -g
--CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include
-+CC?= gcc
-+OPTIMIZER=
-+CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include
- STRICTFLAGS= -O3 -Wall -W -Wno-unused-variable -Wno-unused-parameter -Wwrite-strings -Werror
- LDFLAGS= -lpthread
- OBJ= mplayerplug-in.o support.o stubs.o ui.o
-@@ -24,7 +24,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 Source/mplayerplug-in.h
- #	$(CC) -c $(STRICTFLAGS) $(CFLAGS) Source/mplayerplug-in.c
diff --git a/www/mplayer-plugin/files/patch-Makefile.in b/www/mplayer-plugin/files/patch-Makefile.in
new file mode 100644
index 000000000000..0875ccb724ce
--- /dev/null
+++ b/www/mplayer-plugin/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Sat Nov 15 23:40:13 2003
++++ Makefile.in	Thu Dec 25 00:33:26 2003
+@@ -14,7 +14,7 @@
+ 
+ CC= @CC@
+ OPTIMIZER= -g
+-CFLAGS= @CFLAGS@ -DXP_UNIX -Iinclude -fPIC
++CFLAGS= @CFLAGS@ @CPPFLAGS@ -DXP_UNIX -Iinclude -fPIC
+ LDFLAGS= @LIBS@
+ OBJ= mplayerplug-in.o support.o stubs.o ui.o
+ INSTALL = @INSTALL@ -d
+@@ -23,7 +23,7 @@
+ default all: $(SHAREDTARGET)
+ 
+ $(SHAREDTARGET): $(OBJ)
+-	$(CC) -shared -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
++	$(CC) -shared -lXt -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS) @LDFLAGS@
+ 
+ mplayerplug-in.o: Source/mplayerplug-in.c Source/mplayerplug-in.h config.h
+ 	$(CC) -c $(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 81eb502fe5df..2a6cf664938e 100644
--- a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
+++ b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c
@@ -1,14 +1,5 @@
 --- Source/mplayerplug-in.c.orig	Fri Oct  3 07:54:52 2003
 +++ Source/mplayerplug-in.c	Sun Oct  5 00:02:12 2003
-@@ -28,7 +28,7 @@
-  */
- 
- #include "mplayerplug-in.h"
--pthread_mutex_t playlist_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+pthread_mutex_t playlist_mutex;
- 
- // This routine is only called when the plugin library is newer than the pluginrc file
- 
 @@ -71,7 +71,7 @@
      }
  
@@ -27,22 +18,3 @@
  	}
  
  	if (customtypes != NULL) {
-@@ -274,6 +274,7 @@
-     char parse[1000];
-     char logfile[1000];
-     char *cp;
-+    pthread_mutexattr_t attr;
- 
-     if (instance == NULL)
- 	return NPERR_INVALID_INSTANCE_ERROR;
-@@ -281,6 +282,10 @@
-     instance->pdata = NPN_MemAlloc(sizeof(PluginInstance));
-     This = (PluginInstance *) instance->pdata;
-     InitPrivateData(instance);
-+    pthread_mutexattr_init(&attr);
-+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+    pthread_mutex_init(&playlist_mutex, &attr);
-+    pthread_mutexattr_destroy(&attr);
- 
-     DESTROYED = 0;
-