Update ming to 0.3.0.

ChangeLog is too large, so omit it.

7 files changed, 44 insertions, 80 deletions

diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index 39eac569f28..2bb3f32574f 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:30:15 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/09/13 15:53:51 obache Exp $
 #
 
-DISTNAME=		${MING_DISTNAME}
-PKGNAME=		${MING_PKGNAME}
+DISTNAME=		ming-0.3.0
 CATEGORIES=		multimedia
-MASTER_SITES=		${MING_MASTER_SITES}
-EXTRACT_SUFX=		${MING_EXTRACT_SUFX}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ming/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		obache@NetBSD.org
 HOMEPAGE=		http://ming.sourceforge.net/
 COMMENT=		Create SWF (Macromedia Flash) files with this library
 
-.include "../../multimedia/ming/Makefile.common"
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		bison flex
+GNU_CONFIGURE=		yes
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ming/Makefile.common b/multimedia/ming/Makefile.common
deleted file mode 100644
index 9421a1c335d..00000000000
--- a/multimedia/ming/Makefile.common
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-#
-
-MING_DISTNAME=		ming-0.2a
-MING_PKGNAME=		ming-0.2
-MING_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ming/}
-MING_EXTRACT_SUFX=	.tgz
-
-DISTINFO_FILE?=		${.CURDIR}/../../multimedia/ming/distinfo
-COMMON_FILESDIR?=	${.CURDIR}/../../multimedia/ming/files
-PATCHDIR?=		${.CURDIR}/../../multimedia/ming/patches
diff --git a/multimedia/ming/PLIST b/multimedia/ming/PLIST
index 0ac9d9a9f98..be2858d3c72 100644
--- a/multimedia/ming/PLIST
+++ b/multimedia/ming/PLIST
@@ -1,7 +1,28 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/09/13 15:53:51 obache Exp $
+bin/dbl2png
+bin/gif2dbl
+bin/gif2mask
+bin/listaction
+bin/listaction_d
+bin/listfdb
+bin/listjpeg
+bin/listmp3
+bin/listswf
+bin/listswf_d
+bin/makefdb
+bin/makeswf
+bin/ming-config
+bin/png2dbl
+bin/png2swf
+bin/raw2adpcm
+bin/swftoperl
+bin/swftophp
+bin/swftopython
 include/ming.h
+include/ming_config.h
 include/mingpp.h
 lib/libming.a
 lib/libming.so
 lib/libming.so.0
-lib/libming.so.0.2
+lib/libming.so.0.3.0
+man/man1/makeswf.1
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index f010fd04c90..093452f68a7 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/09/13 15:53:51 obache Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MING_BUILDLINK3_MK:=	${MING_BUILDLINK3_MK}+
@@ -12,8 +12,12 @@ BUILDLINK_PACKAGES+=	ming
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ming
 
 .if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ming+=	ming>=0.2
+BUILDLINK_API_DEPENDS.ming+=	ming>=0.3.0
 BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
 .endif	# MING_BUILDLINK3_MK
 
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
index b18b34c86f0..45191cc5f74 100644
--- a/multimedia/ming/distinfo
+++ b/multimedia/ming/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
+$NetBSD: distinfo,v 1.2 2006/09/13 15:53:51 obache Exp $
 
-SHA1 (ming-0.2a.tgz) = 9f8b4d9afcee51351b326e6f072352cc8ac013f5
-RMD160 (ming-0.2a.tgz) = 2dc888ca8ffda1e219002081973de8855b3faf61
-Size (ming-0.2a.tgz) = 316447 bytes
-SHA1 (patch-aa) = ac4794d4d8684475d0166707f112cfb263defacb
-SHA1 (patch-ab) = 82ce4f817902e0a589bf1bb0db5e5a1e4018eae6
+SHA1 (ming-0.3.0.tar.gz) = 3920de3070fa66b26fe53765298175789aacdb70
+RMD160 (ming-0.3.0.tar.gz) = b41c93e28c221d9ae35666f34ca3ed37bbb0dfcb
+Size (ming-0.3.0.tar.gz) = 287330 bytes
diff --git a/multimedia/ming/patches/patch-aa b/multimedia/ming/patches/patch-aa
deleted file mode 100644
index 4653d2fd8cd..00000000000
--- a/multimedia/ming/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
---- Makefile.orig	Fri Aug 17 19:05:49 2001
-+++ Makefile	Sat Jan  3 22:31:08 2004
-@@ -1,15 +1,15 @@
- #CC = gcc -g -pg -a	# profiling flags
- #CC = gcc -O5
--CC = gcc -g -Wall
-+#CC = gcc -g -Wall
- 
- #PREFIX = /usr/local
--PREFIX = /usr
-+#PREFIX = /usr
- LIBDIR = ${PREFIX}/lib
- INCLUDEDIR = ${PREFIX}/include
- 
--all: dynamic #static
-+all: dynamic static
- 
--install: install-common install-dynamic #install-static
-+install: install-common install-dynamic install-static
- 
- install-common:
- 	install -d ${LIBDIR}
diff --git a/multimedia/ming/patches/patch-ab b/multimedia/ming/patches/patch-ab
deleted file mode 100644
index 794e20753d3..00000000000
--- a/multimedia/ming/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/11/04 02:59:54 minskim Exp $
-
---- py_ext/Makefile.orig	2001-08-18 02:05:55.000000000 +0900
-+++ py_ext/Makefile
-@@ -7,7 +7,7 @@ PYLIBDIR = /usr/local/lib/python2.0
- all:
- 
- mingcmodule.so: ming_wrap.o
--	gcc -g -Wall -shared -o mingcmodule.so ming_wrap.o -lming
-+	${CC} ${LDFLAGS} -shared -o mingcmodule.so ming_wrap.o -lming
- 
- mingc.pyd: ming_wrap.o
- 	dllwrap --dllname mingc.pyd --driver-name gcc --def mingc.def \
-@@ -15,7 +15,7 @@ mingc.pyd: ming_wrap.o
- 	  --target=i386-mingw32 -Llib/ -lpython15
- 
- ming_wrap.o: ming_wrap.c
--	gcc -g -Wall -I .. -I ${PYINCDIR} -fpic -c ming_wrap.c
-+	${CC} ${CFLAGS} -I .. -fpic -c ming_wrap.c
- 
- ../libming.a:
- 	cd ..; make static
-@@ -27,4 +27,4 @@ clean:
- 	rm -f mingcmodule.so core *~ *.o ming.pyc
- 
- install:
--	cp mingcmodule.so ming.py ${PYLIBDIR}/site-packages
-+	${BSD_INSTALL_DATA} mingcmodule.so ming.py ${PREFIX}/${PYSITELIB}