Shared libraries needs to be built with PIC code.

tolower needs unsigned char argument.
Fix a missing parameter type.
Bump revision.

8 files changed, 91 insertions, 2 deletions

diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index 4055eb4a4df..24d164fb2f0 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/02/13 11:49:44 obache Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/03 08:42:25 joerg Exp $
 #
 
 DISTNAME=		ming-0.3.0
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ming/}
 
diff --git a/multimedia/ming/distinfo b/multimedia/ming/distinfo
index 45191cc5f74..4195ef02544 100644
--- a/multimedia/ming/distinfo
+++ b/multimedia/ming/distinfo
@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.2 2006/09/13 15:53:51 obache Exp $
+$NetBSD: distinfo,v 1.3 2008/04/03 08:42:25 joerg Exp $
 
 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
+SHA1 (patch-aa) = 67f7e9b8fdaa576cdbc8a1421a0d1e100a0cac54
+SHA1 (patch-ab) = a2181033818a961c79e73dbb43aafdc5cce24efb
+SHA1 (patch-ac) = 474d92e059e6b3145af2f51fa7598dc39d2b81bf
+SHA1 (patch-ad) = a5297b1f432e07acc0ef4da554a43f38f75edcf2
+SHA1 (patch-ae) = ed8995b97a40f8f25c02b479bcc96f0e659e95df
+SHA1 (patch-af) = bcde050efd4cea85b955486c6052fdde69e1c2e7
diff --git a/multimedia/ming/patches/patch-aa b/multimedia/ming/patches/patch-aa
new file mode 100644
index 00000000000..8271432179b
--- /dev/null
+++ b/multimedia/ming/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/04/03 08:42:25 joerg Exp $
+
+--- Makefile.config.in.orig	2008-04-03 10:27:39.000000000 +0200
++++ Makefile.config.in
+@@ -43,3 +43,8 @@ EXTRA_BINS = @EXTRA_BINS@
+ # zlib required for both image formats and for compressed swf6
+ LIBS = $(ZLIB) $(MATHLIB) $(GIFLIB) $(PNGLIB)
+ EXTRA_LIBS = $(LIBS)
++
++.SUFFIXES: .po
++
++.c.po:
++	${CC} -o $@ -c -fPIC ${CFLAGS} ${CPPFLAGS} $<
diff --git a/multimedia/ming/patches/patch-ab b/multimedia/ming/patches/patch-ab
new file mode 100644
index 00000000000..10e40407de4
--- /dev/null
+++ b/multimedia/ming/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2008/04/03 08:42:25 joerg Exp $
+
+--- src/Makefile.orig	2008-04-03 10:28:28.000000000 +0200
++++ src/Makefile
+@@ -29,10 +29,10 @@ all: dynamic
+ 
+ dynamic: $(SHAREDLIB)
+ 
+-$(SHAREDLIB): $(OFILES)
++$(SHAREDLIB): $(OFILES:R:S/$/.po/g)
+ 	cd blocks && $(MAKE) CFLAGS="$(CFLAGS) -I.."
+ 	cd actioncompiler && $(MAKE) CFLAGS="$(CFLAGS) -I.."
+-	$(CC) $(OFILES) $(COMPILEROFILES) $(LDFLAGS) $(EXTRA_LIBS) blocks/*.o $(SHLIBLDFLAGS) -o $(SHAREDLIB)
++	$(CC) $(OFILES:R:S/$/.po/g) $(COMPILEROFILES:R:S/$/.po/g) $(LDFLAGS) $(EXTRA_LIBS) blocks/*.po $(SHLIBLDFLAGS) -o $(SHAREDLIB)
+ 	cp $(SHAREDLIB) ..
+ 	ln -fs $(SHAREDLIB) ../libming$(NOVAR_SHLIBEXT)
+ 	ln -fs $(SHAREDLIB) ../libming$(SHORT_SHLIBEXT)
diff --git a/multimedia/ming/patches/patch-ac b/multimedia/ming/patches/patch-ac
new file mode 100644
index 00000000000..7ed7c06dc42
--- /dev/null
+++ b/multimedia/ming/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/04/03 08:42:25 joerg Exp $
+
+--- src/blocks/Makefile.orig	2008-04-03 10:29:52.000000000 +0200
++++ src/blocks/Makefile
+@@ -39,7 +39,7 @@ OFILES = \
+ 	utf8.o \
+ 	videostream.o $(EXTRA_OBJS)
+ 
+-all: $(OFILES)
++all: $(OFILES) $(OFILES:R:S/$/.po/g)
+ 
+ clean:
+ 	rm -f *.o *.core core
diff --git a/multimedia/ming/patches/patch-ad b/multimedia/ming/patches/patch-ad
new file mode 100644
index 00000000000..6ab080ab0be
--- /dev/null
+++ b/multimedia/ming/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2008/04/03 08:42:25 joerg Exp $
+
+--- src/actioncompiler/Makefile.orig	2008-04-03 10:29:31.000000000 +0200
++++ src/actioncompiler/Makefile
+@@ -14,7 +14,7 @@ GENERATED = lex.swf4.c lex.swf5.c swf5co
+ 
+ OFILES = $(MOSTFILES) compileaction.o
+ 
+-all: $(OFILES)
++all: $(OFILES) $(OFILES:R:S/$/.po/g)
+ 
+ clean:
+ 	rm -f $(OFILES) $(GENERATED) compiler compiler.exe core test main.o \
diff --git a/multimedia/ming/patches/patch-ae b/multimedia/ming/patches/patch-ae
new file mode 100644
index 00000000000..5424c8a5a04
--- /dev/null
+++ b/multimedia/ming/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/04/03 08:42:25 joerg Exp $
+
+--- src/actioncompiler/compile.c.orig	2008-04-03 10:33:17.000000000 +0200
++++ src/actioncompiler/compile.c
+@@ -536,7 +536,7 @@ void lower(char *s)
+ {
+ 	while(*s)
+ 	{
+-		*s = tolower(*s);
++		*s = tolower((unsigned char)*s);
+ 		++s;
+ 	}
+ }
diff --git a/multimedia/ming/patches/patch-af b/multimedia/ming/patches/patch-af
new file mode 100644
index 00000000000..4364d5380ad
--- /dev/null
+++ b/multimedia/ming/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2008/04/03 08:42:25 joerg Exp $
+
+--- src/blocks/fromswf.c.orig	2008-04-03 10:34:05.000000000 +0200
++++ src/blocks/fromswf.c
+@@ -47,7 +47,7 @@ completeSWFPrebuiltClip(SWFBlock block)
+ }
+ 
+ int
+-SWFPrebuiltClipLength(block)
++SWFPrebuiltClipLength(SWFBlock block)
+ {	SWFPrebuiltClip clip = (SWFPrebuiltClip)block;
+ 	return SWFOutput_getLength(clip->display);
+ }