5 files changed, 53 insertions, 25 deletions

diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 5713bd1ae03e..3457cb4ba2bb 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ming
-PORTVERSION=	0.0.3a
-PORTREVISION=	1
+PORTVERSION=	0.0.9b
 CATEGORIES=	graphics python
 MASTER_SITES=	http://www.opaque.net/ming/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,23 +14,25 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	${SWIG}:${PORTSDIR}/devel/SWIG-devel
-LIB_DEPENDS=	ming.1:${PORTSDIR}/graphics/ming
+LIB_DEPENDS=	ming.2:${PORTSDIR}/graphics/ming
 
 USE_PYTHON=	yes
 
-MD5_FILE=	${PORTSDIR}/graphics/ming/distinfo
+MD5_FILE=	${.CURDIR}/../ming/distinfo
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/py_ext
-MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VERSION}" SWIG="${SWIG}"
+MAKE_ARGS=	PYTHON_VERSION="${PYTHON_VERSION}"
 
-SWIG=		swig1.3
-
-EXAMPLES=	shape.py test.py
+EXAMPLES=	shape.py test.py ../examples/python/*.py
 
 post-extract:
 	${LN} -sf ../ming.i ${WRKSRC}/
 
+post-patch:
+	${PERL} -i -p \
+		-e 's:\.\./common:../../ming/common:g;' \
+		${WRKSRC}/../examples/python/*
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/examples/${PYTHON_VERSION}/ming
diff --git a/graphics/py-ming/files/patch-Makefile b/graphics/py-ming/files/patch-Makefile
index 7da12fdc4941..bfb35330acab 100644
--- a/graphics/py-ming/files/patch-Makefile
+++ b/graphics/py-ming/files/patch-Makefile
@@ -1,18 +1,25 @@
---- Makefile.orig	Wed Oct 25 07:02:37 2000
-+++ Makefile	Wed Oct 25 13:11:16 2000
-@@ -1,11 +1,10 @@
+--- Makefile.orig	Fri Jan  5 08:05:13 2001
++++ Makefile	Sat Jan 20 05:05:03 2001
+@@ -1,12 +1,12 @@
+ #PYINCDIR = /usr/local/include/python2.0
+ #PYLIBDIR = /usr/local/lib/python2.0
+ 
+-PYINCDIR = /usr/include/python1.5
+-PYLIBDIR = /usr/lib/python1.5
++PYINCDIR = ${LOCALBASE}/include/${PYTHON_VERSION}
++PYLIBDIR = ${LOCALBASE}/lib/${PYTHON_VERSION}
+ 
  all:
--	swig -I.. -python ming.i
--	gcc -I .. -I /usr/include/python1.5/ -fpic -c ming_wrap.c
--	gcc -L .. -shared -o mingcmodule.so ming_wrap.o  -lming
-+	${SWIG} -I.. -python ming.i
-+	${CC} ${CFLAGS} -I${LOCALBASE}/include/ming -I${LOCALBASE}/include/${PYTHON_VERSION} -fpic -c ming_wrap.c
-+	${CC} -shared -o mingcmodule.so ming_wrap.o -L${LOCALBASE}/lib -lming
+-	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
  
- clean:
- 	rm -f mingcmodule.so core *~ *.o ming_wrap*
+ swig:
+ 	swig -I.. -python ming.i
+@@ -15,4 +15,4 @@
+ 	rm -f mingcmodule.so core *~ *.o
  
  install:
--	cp mingcmodule.so ming.py /usr/lib/python1.5/site-packages
--	chmod 755 /usr/lib/python1.5/site-packages/mingcmodule.so
-+	${BSD_INSTALL_DATA} mingcmodule.so ming.py ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages
+-	cp mingcmodule.so ming.py ${PYLIBDIR}/site-packages
++	${BSD_INSTALL_DATA} mingcmodule.so ming.py ${PYLIBDIR}/site-packages
diff --git a/graphics/py-ming/pkg-comment b/graphics/py-ming/pkg-comment
index 838d8b217b0e..abc75d69028c 100644
--- a/graphics/py-ming/pkg-comment
+++ b/graphics/py-ming/pkg-comment
@@ -1 +1 @@
-Python module for the Ming library which allows you to create Flash (TM) movies
+Python module for the Ming library which allows you to create Flash 4 movies
diff --git a/graphics/py-ming/pkg-descr b/graphics/py-ming/pkg-descr
index 6c66e42bfd19..396ebd5a5df6 100644
--- a/graphics/py-ming/pkg-descr
+++ b/graphics/py-ming/pkg-descr
@@ -1,5 +1,5 @@
 This is a Python module for the Ming.
-Ming allows you to create Flash (TM) movies.
+Ming allows you to create Flash 4 (TM) movies.
 
 Author:	Roberto Raggi <roberto@elecomsolutions.com> (author)
 	Fiore Basile <fiore@elecomsolutions.com> (contact)
diff --git a/graphics/py-ming/pkg-plist b/graphics/py-ming/pkg-plist
index a54644e14f6f..e28db7b3dd58 100644
--- a/graphics/py-ming/pkg-plist
+++ b/graphics/py-ming/pkg-plist
@@ -1,6 +1,26 @@
 lib/%%PYTHON_VERSION%%/site-packages/mingcmodule.so
 lib/%%PYTHON_VERSION%%/site-packages/ming.py
+share/examples/%%PYTHON_VERSION%%/ming/action.py
+share/examples/%%PYTHON_VERSION%%/ming/alphafill.py
+share/examples/%%PYTHON_VERSION%%/ming/animation.py
+share/examples/%%PYTHON_VERSION%%/ming/bitmapxform.py
+share/examples/%%PYTHON_VERSION%%/ming/button.py
+share/examples/%%PYTHON_VERSION%%/ming/cxform.py
+share/examples/%%PYTHON_VERSION%%/ming/drag.py
+share/examples/%%PYTHON_VERSION%%/ming/glyph.py
+share/examples/%%PYTHON_VERSION%%/ming/gradient.py
+share/examples/%%PYTHON_VERSION%%/ming/gradientxform.py
+share/examples/%%PYTHON_VERSION%%/ming/jpegfill.py
+share/examples/%%PYTHON_VERSION%%/ming/keypress.py
+share/examples/%%PYTHON_VERSION%%/ming/morph.py
+share/examples/%%PYTHON_VERSION%%/ming/mousetrack.py
+share/examples/%%PYTHON_VERSION%%/ming/newbutton.py
+share/examples/%%PYTHON_VERSION%%/ming/png.py
+share/examples/%%PYTHON_VERSION%%/ming/pngalpha.py
 share/examples/%%PYTHON_VERSION%%/ming/shape.py
+share/examples/%%PYTHON_VERSION%%/ming/sprite.py
+share/examples/%%PYTHON_VERSION%%/ming/streammp3.py
 share/examples/%%PYTHON_VERSION%%/ming/test.py
+share/examples/%%PYTHON_VERSION%%/ming/text.py
 @dirrm share/examples/%%PYTHON_VERSION%%/ming
 @unexec rmdir %D/share/examples/%%PYTHON_VERSION%% 2>/dev/null || true