Move graphics/ming to multimedia/ming.

10 files changed, 4 insertions, 116 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index f4391e18241..1fb572762f9 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11786 2005/11/04 02:54:28 minskim Exp $
+$NetBSD: CHANGES,v 1.11787 2005/11/04 03:01:58 minskim Exp $
 
 Changes to the packages collection and infrastructure in 2005:
 
@@ -5036,4 +5036,4 @@ Changes to the packages collection and infrastructure in 2005:
 	Updated www/trac to 0.9 [epg 2005-11-03]
 	Updated devel/intel-iscsi to 20040115nb2 [agc 2005-11-03]
 	Added sysutils/pdumpfs version 1.3 [minskim 2005-11-04]
-	Added graphics/ming version 0.2 [minskim 2005-11-04]
+	Added multimedia/ming version 0.2 [minskim 2005-11-04]
diff --git a/graphics/ming/DESCR b/graphics/ming/DESCR
deleted file mode 100644
index 855ec482d23..00000000000
--- a/graphics/ming/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Ming is a C library for generating SWF ("Flash") format movies, plus a
-set of wrappers for using the library from C++ and popular scripting
-languages like PHP, Python, and Ruby.
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
deleted file mode 100644
index 68256ba6fa8..00000000000
--- a/graphics/ming/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 02:47:10 minskim Exp $
-#
-
-DISTNAME=		${MING_DISTNAME}
-PKGNAME=		${MING_PKGNAME}
-CATEGORIES=		graphics
-MASTER_SITES=		${MING_MASTER_SITES}
-EXTRACT_SUFX=		${MING_EXTRACT_SUFX}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://ming.sourceforge.net/
-COMMENT=		Create SWF (Macromedia Flash) files with this library
-
-.include "../../graphics/ming/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ming/Makefile.common b/graphics/ming/Makefile.common
deleted file mode 100644
index 3896c3a1de8..00000000000
--- a/graphics/ming/Makefile.common
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2005/11/04 02:51:30 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}/../../graphics/ming/distinfo
-COMMON_FILESDIR?=	${.CURDIR}/../../graphics/ming/files
-PATCHDIR?=		${.CURDIR}/../../graphics/ming/patches
diff --git a/graphics/ming/PLIST b/graphics/ming/PLIST
deleted file mode 100644
index df629c8a00c..00000000000
--- a/graphics/ming/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/04 02:47:10 minskim Exp $
-include/ming.h
-include/mingpp.h
-lib/libming.a
-lib/libming.so
-lib/libming.so.0
-lib/libming.so.0.2
diff --git a/graphics/ming/buildlink3.mk b/graphics/ming/buildlink3.mk
deleted file mode 100644
index 131baa4970d..00000000000
--- a/graphics/ming/buildlink3.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/11/04 02:47:10 minskim Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-MING_BUILDLINK3_MK:=	${MING_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	ming
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nming}
-BUILDLINK_PACKAGES+=	ming
-
-.if !empty(MING_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.ming+=	ming>=0.2
-BUILDLINK_PKGSRCDIR.ming?=	../../graphics/ming
-.endif	# MING_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/ming/distinfo b/graphics/ming/distinfo
deleted file mode 100644
index a94c4bbc0ce..00000000000
--- a/graphics/ming/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/04 02:47:10 minskim 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
diff --git a/graphics/ming/patches/patch-aa b/graphics/ming/patches/patch-aa
deleted file mode 100644
index 4508625d666..00000000000
--- a/graphics/ming/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/04 02:47:10 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/graphics/ming/patches/patch-ab b/graphics/ming/patches/patch-ab
deleted file mode 100644
index 3dfcb260878..00000000000
--- a/graphics/ming/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/11/04 02:47:10 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}
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 5d63363b695..bc419a5679f 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/10/21 07:46:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.75 2005/11/04 03:01:59 minskim Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -46,6 +46,7 @@ SUBDIR+=	libogg
 SUBDIR+=	libtheora
 SUBDIR+=	lsdvd
 SUBDIR+=	mencoder
+SUBDIR+=	ming
 SUBDIR+=	mjpegtools
 SUBDIR+=	mkvtoolnix
 SUBDIR+=	mmg