ports/57553: Update port: www/mplayer-plugin 0.91 -> 0.95

[Jeremy Messenger]

>Number:         57553
>Category:       ports
>Synopsis:       Update port: www/mplayer-plugin 0.91 -> 0.95
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 03 17:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Mezz
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz at mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386

>Description:
Update to 0.95.

>How-To-Repeat:
n/a

>Fix:
I hope, I did it correct with the thread. So, please check on the thread that I
have fixed them. It works perfect now in libc_r, but I can't test it with KSE
nor 1:1 because of possible Nvidia driver's fault that make MPlayer doesn't work.

--- mplayer-plugin.diff begins here ---
diff -ur mplayer-plugin.orig/Makefile mplayer-plugin/Makefile
--- mplayer-plugin.orig/Makefile	Mon Sep 29 03:29:41 2003
+++ mplayer-plugin/Makefile	Fri Oct  3 18:02:52 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayerplug-in
-PORTVERSION=	0.91
-PORTREVISION=	1
+PORTVERSION=	0.95
 CATEGORIES=	www multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mplayerplug-in
@@ -23,8 +22,8 @@
 USE_GMAKE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/Source/mplayerplug-in.c
 
diff -ur mplayer-plugin.orig/distinfo mplayer-plugin/distinfo
--- mplayer-plugin.orig/distinfo	Mon Sep 29 03:29:41 2003
+++ mplayer-plugin/distinfo	Fri Oct  3 17:33:07 2003
@@ -1 +1 @@
-MD5 (mplayerplug-in-0.91.tar.gz) = 0007f154903e4eb0cbffbf61740fc806
+MD5 (mplayerplug-in-0.95.tar.gz) = bab0cfa1f65748153c2675504424399d
diff -ur mplayer-plugin.orig/files/patch-Makefile mplayer-plugin/files/patch-Makefile
--- mplayer-plugin.orig/files/patch-Makefile	Mon Sep 29 03:29:41 2003
+++ mplayer-plugin/files/patch-Makefile	Fri Oct  3 19:20:25 2003
@@ -1,24 +1,30 @@
---- Makefile.orig	Fri Sep  5 21:48:28 2003
-+++ Makefile	Mon Sep 29 00:42:38 2003
-@@ -12,9 +12,9 @@
+--- Makefile.orig	Fri Oct  3 18:44:47 2003
++++ Makefile	Fri Oct  3 18:47:27 2003
+@@ -10,13 +10,13 @@
+ # PLUGIN_TRACE	Enable this define to get debug prints whenever the plugin
+ #		api gets control.
  
- PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I/usr/X11R6/include
+-PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I/usr/X11R6/include
++PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I%%X11BASE%%/include
  
 -CC= gcc
 -OPTIMIZER= -g
 -CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include
 +CC?= gcc
 +OPTIMIZER=
-+CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include
- #`pkg-config gtk+-2.0 --cflags`
++CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include -D_THREAD_SAFE -D_REENTRANT
  STRICTFLAGS= -O3 -Wall -W -Wno-unused-variable -Wno-unused-parameter -Wwrite-strings -Werror
- #LDFLAGS   = `pkg-config gtk+-2.0 --libs`
-@@ -25,7 +25,7 @@
+-LDFLAGS= -lpthread
++LDFLAGS= %%PTHREAD_LIBS%%
+ OBJ= mplayerplug-in.o support.o stubs.o ui.o
+ 
+ SHAREDTARGET=mplayerplug-in.so
+@@ -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)
++	$(CC) -shared -L%%X11BASE%%/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 -ur mplayer-plugin.orig/files/patch-Source_mplayerplug-in.c mplayer-plugin/files/patch-Source_mplayerplug-in.c
--- mplayer-plugin.orig/files/patch-Source_mplayerplug-in.c	Mon Sep 29 03:29:41 2003
+++ mplayer-plugin/files/patch-Source_mplayerplug-in.c	Fri Oct  3 18:23:15 2003
@@ -1,6 +1,15 @@
---- 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 @@
+--- Source/mplayerplug-in.c.orig	Fri Oct  3 18:21:55 2003
++++ Source/mplayerplug-in.c	Fri Oct  3 18:22:30 2003
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "mplayerplug-in.h"
+-pthread_mutex_t playlist_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++pthread_mutex_t playlist_mutex = PTHREAD_MUTEX_INITIALIZER;
+ 
+ // This routine is only called when the plugin library is newer than the pluginrc file
+ 
+@@ -71,7 +71,7 @@
      }
  
      if (config == NULL) {
--- mplayer-plugin.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: