Update to Ming 0.1.0.

7 files changed, 45 insertions, 25 deletions

diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 989acc9bf9e8..790887a82889 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ming
-PORTVERSION=	0.0.9b
-PORTREVISION=	1
+PORTVERSION=	0.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.opaque.net/ming/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-examples${EXTRACT_SUFX}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
@@ -24,7 +24,6 @@ UTILS=		gif2dbl \
 		gif2mask \
 		listfdb \
 		listjpeg \
-		listmp3 \
 		listswf \
 		makefdb \
 		png2dbl \
@@ -37,10 +36,11 @@ DOCS_UTIL=	README \
 		TODO
 
 post-extract:
+	${LN} -s ${WRKDIR}/${PORTNAME}-examples ${WRKSRC}/../examples
 	${MKDIR} ${WRKSRC}/c++
 	${CP} ${WRKSRC}/../c++_ext/ming.h ${WRKSRC}/c++/
 	cd ${WRKSRC}/../util && \
-	${RM} bindump.c hexdump.c
+	${RM} bindump.c hexdump.c listmp3.c
 
 post-patch:
 	${PERL} -i -p \
@@ -48,7 +48,6 @@ post-patch:
 		-e 's:"\.\./\.\./ming\.h":<ming.h>:g;' \
 		${WRKSRC}/../examples/c/* \
 		${WRKSRC}/../examples/c++/* \
-		${WRKSRC}/../examples/common/* \
 		${WRKSRC}/c++/ming.h
 
 pre-build:
@@ -66,8 +65,6 @@ post-build:
 	cd ${WRKSRC}/../util && \
 	${CC} ${CFLAGS} -L${PREFIX}/lib -o listjpeg listjpeg.o
 	cd ${WRKSRC}/../util && \
-	${CC} ${CFLAGS} -L${PREFIX}/lib -o listmp3 listmp3.o
-	cd ${WRKSRC}/../util && \
 	${CC} ${CFLAGS} -L${PREFIX}/lib -o listswf listswf.o blocktypes.o decompile.o read.o -lz
 	cd ${WRKSRC}/../util && \
 	${CC} ${CFLAGS} -L${PREFIX}/lib -o makefdb makefdb.o blocktypes.o read.o
diff --git a/graphics/ming/distinfo b/graphics/ming/distinfo
index 43e0762517f6..5a4f8b75a38d 100644
--- a/graphics/ming/distinfo
+++ b/graphics/ming/distinfo
@@ -1 +1,2 @@
-MD5 (ming-0.0.9b.tgz) = 4b3117322e0af30a19514240f1df9566
+MD5 (ming-0.1.0.tgz) = 46c50300dfd0d077c23c53dfcc4d3c41
+MD5 (ming-examples.tgz) = 13b3103becb9ec0d797179c56142bb6c
diff --git a/graphics/ming/files/Makefile b/graphics/ming/files/Makefile
index ab2b8c4cd8d1..24ae2a568547 100644
--- a/graphics/ming/files/Makefile
+++ b/graphics/ming/files/Makefile
@@ -12,6 +12,7 @@ SRCS=		blocklist.c \
 		movieclip.c \
 		position.c \
 		shape_util.c \
+		text_util.c \
 		actioncompiler/compile.c \
 		actioncompiler/compileaction.c \
 		actioncompiler/compiler.tab.c \
@@ -52,7 +53,8 @@ INCS=		blocklist.h \
 		movie.h \
 		movieclip.h \
 		position.h \
-		shape_util.h
+		shape_util.h \
+		text_util.h
 
 NOMAN=		YES
 LIBDIR=		${LOCALBASE}/lib
diff --git a/graphics/ming/pkg-plist b/graphics/ming/pkg-plist
index a516b8f43752..50a354ec2bb1 100644
--- a/graphics/ming/pkg-plist
+++ b/graphics/ming/pkg-plist
@@ -2,7 +2,6 @@ bin/gif2dbl
 bin/gif2mask
 bin/listfdb
 bin/listjpeg
-bin/listmp3
 bin/listswf
 bin/makefdb
 bin/png2dbl
@@ -17,6 +16,7 @@ include/ming/movie.h
 include/ming/movieclip.h
 include/ming/position.h
 include/ming/shape_util.h
+include/ming/text_util.h
 include/ming/blocks/swf.h
 include/ming/c++/ming.h
 @dirrm include/ming/blocks
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 3457cb4ba2bb..da5c5d08b46d 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	ming
-PORTVERSION=	0.0.9b
+PORTVERSION=	0.1.0
 CATEGORIES=	graphics python
-MASTER_SITES=	http://www.opaque.net/ming/
+MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	# none
 
 MAINTAINER=	knu@FreeBSD.org
 
+BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/ming:patch
 LIB_DEPENDS=	ming.2:${PORTSDIR}/graphics/ming
 
 USE_PYTHON=	yes
@@ -25,6 +26,10 @@ MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VERSION}"
 
 EXAMPLES=	shape.py test.py ../examples/python/*.py
 
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${LN} -s `cd ${PORTSDIR}/graphics/ming && ${MAKE} -V WRKDIR`/* ${WRKDIR}/
+
 post-extract:
 	${LN} -sf ../ming.i ${WRKSRC}/
 
diff --git a/graphics/py-ming/files/patch-Makefile b/graphics/py-ming/files/patch-Makefile
index bfb35330acab..c876db7624bd 100644
--- a/graphics/py-ming/files/patch-Makefile
+++ b/graphics/py-ming/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Jan  5 08:05:13 2001
-+++ Makefile	Sat Jan 20 05:05:03 2001
-@@ -1,12 +1,12 @@
+--- Makefile.orig	Mon Mar 19 10:26:33 2001
++++ Makefile	Tue Mar 20 18:28:05 2001
+@@ -1,13 +1,13 @@
  #PYINCDIR = /usr/local/include/python2.0
  #PYLIBDIR = /usr/local/lib/python2.0
  
@@ -9,16 +9,26 @@
 +PYINCDIR = ${LOCALBASE}/include/${PYTHON_VERSION}
 +PYLIBDIR = ${LOCALBASE}/lib/${PYTHON_VERSION}
  
- all:
+-all:
++all: mingcmodule.so
+ 
+ mingcmodule.so: ming_wrap.o ../libming.a
+-	gcc -g -Wall -shared -o mingcmodule.so ming_wrap.o ../libming.a
++	${CC} -g -Wall -L .. -shared -o mingcmodule.so ming_wrap.o -L${LOCALBASE}/lib -lming
+ 
+ mingc.pyd: ming_wrap.o
+ 	dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \
+@@ -15,7 +15,7 @@
+ 	  --target=i386-mingw32 -Llib/ -lpython15
+ 
+ ming_wrap.o: ming_wrap.c
 -	gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
--	gcc -g -Wall -L .. -shared -o mingcmodule.so ming_wrap.o  -lming
 +	${CC} ${CFLAGS} -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
-+	${CC} -g -Wall -L .. -shared -o mingcmodule.so ming_wrap.o -L${LOCALBASE}/lib -lming
  
  swig:
  	swig -I.. -python ming.i
-@@ -15,4 +15,4 @@
- 	rm -f mingcmodule.so core *~ *.o
+@@ -24,4 +24,4 @@
+ 	rm -f mingcmodule.so core *~ *.o ming.pyc
  
  install:
 -	cp mingcmodule.so ming.py ${PYLIBDIR}/site-packages
diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile
index f74857b0b9a4..395997c7f5d8 100644
--- a/graphics/ruby-ming/Makefile
+++ b/graphics/ruby-ming/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	ming
-PORTVERSION=	0.0.9b
+PORTVERSION=	0.1.0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://www.opaque.net/ming/
+MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.tgz
+DISTFILES=	# none
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/SWIG-devel
+BUILD_DEPENDS=	swig1.3:${PORTSDIR}/devel/SWIG-devel \
+		${NONEXISTENT}:${PORTSDIR}/graphics/ming:patch
 LIB_DEPENDS=	ming.2:${PORTSDIR}/graphics/ming
 
 USE_RUBY=	yes
@@ -31,6 +32,10 @@ SWIG=		swig1.3
 
 EXAMPLES=	shape.rb test.rb
 
+do-extract:
+	${MKDIR} ${WRKDIR}
+	${LN} -s `cd ${PORTSDIR}/graphics/ming && ${MAKE} -V WRKDIR`/* ${WRKDIR}/
+
 post-extract:
 	${LN} -sf ../ming.i ${WRKSRC}/