8 files changed, 39 insertions, 44 deletions

diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index 9ad6bbc96d6b..3ea271ec2ff3 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -12,17 +12,18 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gplflash
 DISTNAME=	gplflash-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	llwang@infor.org
 COMMENT=	GPL standalone Flash (TM) player
 
 LIB_DEPENDS=	flash.0:${PORTSDIR}/graphics/libflash
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/player
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-MAKEFILE=	${FILESDIR}/Makefile
-
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 PLIST_FILES=	bin/swfplayer
 
 .include <bsd.port.mk>
diff --git a/graphics/flashplayer/files/Makefile b/graphics/flashplayer/files/Makefile
deleted file mode 100644
index de1dd0330786..000000000000
--- a/graphics/flashplayer/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG_CXX=	swfplayer
-SRCS=		main.c
-CFLAGS=		${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include
-LDADD=		-L${LOCALBASE}/lib -lflash -L${X11BASE}/lib -lX11 -lXext -lm
-NOMAN=		YES
-BINDIR=		${X11BASE}/bin
-
-.include <bsd.prog.mk>
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 26202a8e99c1..7db2e461a705 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -12,17 +12,20 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gplflash
 DISTNAME=	gplflash-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	llwang@infor.org
 COMMENT=	GPL Flash (TM) Library
 
 LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib
-
+USE_LIBTOOL_VER=	15
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"	\
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_BZIP2=	yes
+USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
-MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ARGS=	NOPROFILE=true
 
 .include <bsd.port.mk>
diff --git a/graphics/libflash/files/Makefile b/graphics/libflash/files/Makefile
deleted file mode 100644
index 93851f4dc06a..000000000000
--- a/graphics/libflash/files/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-LIB=		flash
-SHLIB_MAJOR?=	0
-SHLIB_MINOR?=	4
-CXXFLAGS+=	-fno-rtti -DXP_UNIX	\
-		-I${LOCALBASE}/include	\
-		-DCHECK_TEXT_PLAIN
-LDADD=		-lz \
-		-L${LOCALBASE}/lib -ljpeg -lmad
-SRCS=		adpcm.cc bitmap.cc button.cc character.cc cxform.cc \
-		displaylist.cc flash.cc font.cc graphic.cc graphic16.cc \
-		graphic24.cc graphic32.cc matrix.cc movie.cc \
-		program.cc script.cc shape.cc sound.cc \
-		sprite.cc sqrt.cc text.cc
-INCS=		flash.h
-NOMAN=		YES
-LIBDIR=		${LOCALBASE}/lib
-INCSDIR=	${LOCALBASE}/include
-INCDIR=		${INCSDIR}		# for pre-bsd.incs.mk API
-
-.include <bsd.lib.mk>
diff --git a/graphics/libflash/files/patch-ah b/graphics/libflash/files/patch-ah
index 80628391a448..d261e922672f 100644
--- a/graphics/libflash/files/patch-ah
+++ b/graphics/libflash/files/patch-ah
@@ -1,5 +1,5 @@
---- cxform.cc.orig	Tue May  2 04:18:33 2000
-+++ cxform.cc	Thu Oct 12 14:44:03 2000
+--- lib/cxform.cc.orig	Tue May  2 04:18:33 2000
++++ lib/cxform.cc	Thu Oct 12 14:44:03 2000
 @@ -26,6 +26,10 @@
  static char *rcsid = "$Id";
  #endif
diff --git a/graphics/libflash/files/patch-ai b/graphics/libflash/files/patch-ai
index 8036f800a439..afbe537fd99b 100644
--- a/graphics/libflash/files/patch-ai
+++ b/graphics/libflash/files/patch-ai
@@ -1,5 +1,5 @@
---- sound.cc.orig	Sat Oct 16 03:16:19 2004
-+++ sound.cc	Sat Oct 23 17:44:05 2004
+--- lib/sound.cc.orig	Sat Oct 16 03:16:19 2004
++++ lib/sound.cc	Sat Oct 23 17:44:05 2004
 @@ -20,7 +20,7 @@
  //  Author : Olivier Debon  <odebon@club-internet.fr>
  //
diff --git a/graphics/libflash/files/patch-configure b/graphics/libflash/files/patch-configure
new file mode 100644
index 000000000000..cfe5a0d9a69f
--- /dev/null
+++ b/graphics/libflash/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Oct 15 13:35:02 2004
++++ configure	Wed Nov 17 16:04:44 2004
+@@ -1529,7 +1529,7 @@
+ 
+ # libtool versioning
+ LT_RELEASE=$FLASH_MAJOR_VERSION.$FLASH_MINOR_VERSION
+-LT_CURRENT=`expr $FLASH_MICRO_VERSION - $FLASH_INTERFACE_AGE`
++LT_CURRENT=$FLASH_MAJOR_VERSION
+ LT_REVISION=$FLASH_INTERFACE_AGE
+ LT_AGE=`expr $FLASH_BINARY_AGE - $FLASH_INTERFACE_AGE`
+ 
diff --git a/graphics/libflash/files/patch-lib::Makefile.in b/graphics/libflash/files/patch-lib::Makefile.in
new file mode 100644
index 000000000000..1f77e520cd00
--- /dev/null
+++ b/graphics/libflash/files/patch-lib::Makefile.in
@@ -0,0 +1,12 @@
+--- lib/Makefile.in.orig	Fri Oct 15 13:34:57 2004
++++ lib/Makefile.in	Wed Nov 17 16:03:58 2004
+@@ -256,8 +256,7 @@
+ 
+ libflash_includedir = $(includedir)
+ libflash_la_LDFLAGS = \
+-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
+-	-release $(LT_RELEASE) 					\
++	-version-info $(LT_CURRENT)				\
+ 	-export-dynamic						\
+ 	$(LIBJPEG) $(LIBZ) $(LIBMAD)
+