- Update to 0.4.12

PR:		ports/73081
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Approved by:	maintainer timeout (2 weeks)

5 files changed, 17 insertions, 33 deletions

diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile
index 1a4093856016..560ee3b8703a 100644
--- a/www/flashplugin-mozilla/Makefile
+++ b/www/flashplugin-mozilla/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME?=	flashplugin-mozilla
-PORTVERSION=	0.4.10
-PORTREVISION=	7
+PORTVERSION=	0.4.12
 CATEGORIES=	www
-MASTER_SITES=	http://www.swift-tools.net/Flash/
-DISTNAME=	flash-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gplflash
+DISTNAME=	gplflash-${PORTVERSION}
 
 MAINTAINER=	llwang@infor.org
 COMMENT=	A GPL standalone Flash (TM) plugin for Mozilla web browser
@@ -19,12 +18,19 @@ COMMENT=	A GPL standalone Flash (TM) plugin for Mozilla web browser
 LIB_DEPENDS=	flash.0:${PORTSDIR}/graphics/libflash
 RUN_DEPENDS?=	mozilla:${PORTSDIR}/www/mozilla
 
-USE_X_PREFIX=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}/plugin
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/Plugin
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
 PLUGIN_DIR?=	lib/browser_plugins
 PLIST_SUB+=	PLUGIN_DIR=${PLUGIN_DIR}
 
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -shared -fPIC -DXP_UNIX \
+		-I${.CURDIR}../lib -I${LOCALBASE}/include -I${X11BASE}/include \
+		-o npflash.so plugin.c npunix.c \
+		-L${LOCALBASE}/lib -L${X11BASE}/lib -lflash -lXt
+
 do-install:
 	@${MKDIR} ${PREFIX}/${PLUGIN_DIR}
 	@${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${PREFIX}/${PLUGIN_DIR}
diff --git a/www/flashplugin-mozilla/distinfo b/www/flashplugin-mozilla/distinfo
index 7d51a977af73..9343a34ff8a0 100644
--- a/www/flashplugin-mozilla/distinfo
+++ b/www/flashplugin-mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (flash-0.4.10.tgz) = 1473f085c599d8076fa866cd91e11598
-SIZE (flash-0.4.10.tgz) = 358995
+MD5 (gplflash-0.4.12.tar.bz2) = 7d53803486b255665a80cd834ee3c463
+SIZE (gplflash-0.4.12.tar.bz2) = 378727
diff --git a/www/flashplugin-mozilla/files/patch-aa b/www/flashplugin-mozilla/files/patch-aa
deleted file mode 100644
index c046f612b722..000000000000
--- a/www/flashplugin-mozilla/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Tue Sep 28 05:13:38 1999
-+++ Makefile	Sat Mar 13 20:06:26 2004
-@@ -35,8 +35,8 @@
- # Linux
- SHARED=-shared
- 
--CFLAGS=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include
--LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a
-+CFLAGS+=  $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include -fPIC
-+LDFLAGS= -L${LOCALBASE}/lib -lflash -ljpeg -lz -L$(X11BASE)/lib -lXt
- 
- SRC= plugin.c npunix.c
- OBJ= plugin.o npunix.o
-@@ -45,7 +45,7 @@
- 
- default all: $(SHAREDTARGET)
- 
--$(SHAREDTARGET): $(OBJ) $(FLASH)/libflash.a
-+$(SHAREDTARGET): $(OBJ)
- 	$(LD) $(SHARED) -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
- 
- plugin.o: $(FLASH)/flash.h
diff --git a/www/flashplugin-mozilla/pkg-descr b/www/flashplugin-mozilla/pkg-descr
index 2e20e96a9afd..1982f8c4b438 100644
--- a/www/flashplugin-mozilla/pkg-descr
+++ b/www/flashplugin-mozilla/pkg-descr
@@ -2,4 +2,4 @@ This is GPL standalone Flash (TM) Plugin, that comes with FlashLib
 (libflash) distribution.
 
 Author:	Olivier Debon <olivier@debon.net>
-WWW:	http://www.swift-tools.net/Flash/
+WWW:	http://gplflash.sourceforge.net/
diff --git a/www/flashplugin-mozilla/pkg-plist b/www/flashplugin-mozilla/pkg-plist
index 8ff3d6b3c29b..5c3eb594adb3 100644
--- a/www/flashplugin-mozilla/pkg-plist
+++ b/www/flashplugin-mozilla/pkg-plist
@@ -1,2 +1,2 @@
 %%PLUGIN_DIR%%/npflash.so
-@unexec rmdir %%PLUGIN_DIR%% 2>/dev/null || true
+@unexec rmdir %D/%%PLUGIN_DIR%% 2>/dev/null || true