- Update to 0.4.7

- Add LICENSE_FILE

Changes:	https://github.com/libming/libming/blob/master/NEWS

13 files changed, 22 insertions, 147 deletions

diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index bc5a9c1c28e5..dbd356ac9bd3 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -2,16 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	ming
-PORTVERSION=	0.4.5
-PORTREVISION?=	6
+PORTVERSION=	0.4.7
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/Releases/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Flash 4/5 movie output library with many languages support
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgif.so:${PORTSDIR}/graphics/giflib \
@@ -27,33 +27,37 @@ OPTIONS_DEFINE=	DOCS
 
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/ming
 CPPFLAGS+=	-I. -I.. -I${LOCALBASE}/include
-LDFLAGS+=	-L. -L.. -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+LDFLAGS+=	-L. -L.. -L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
+PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
-USES+=		bison gmake libtool pathfix shebangfix
+USES+=		autoreconf bison gmake libtool pathfix shebangfix
 
 DOCS=		HISTORY NEWS README TODO
 DOCS_UTIL=	README TIPS TODO swftoperl.html
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	lib${PORTNAME}
+GH_PROJECT=	lib${PORTNAME}
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION:S|.|_|g}
+
 SHEBANG_FILES=	util/cws2fws
 
 SLAVEDIRS=	graphics/p5-ming graphics/py-ming
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|ungif|gif|g' ${WRKSRC}/configure ${WRKSRC}/docs/man/Makefile \
-		${WRKSRC}/perl_ext/Makefile.PL ${WRKSRC}/py_ext/setup.py.in
-	@${REINPLACE_CMD} -e '/PrintGifError();/d' ${WRKSRC}/src/blocks/gifdbl.c \
-		${WRKSRC}/util/gif2dbl.c ${WRKSRC}/util/gif2mask.c
-	@${REINPLACE_CMD} -e 's|#if GIFLIB_GIFERRORSTRING|#if 0|' ${WRKSRC}/src/libming.h
+#	@${REINPLACE_CMD} -e 's|ungif|gif|g' ${WRKSRC}/configure.in ${WRKSRC}/docs/man/Makefile.am ${WRKSRC}/perl_ext/Makefile.PL ${WRKSRC}/py_ext/setup.py.in
+#	@${REINPLACE_CMD} -e '/PrintGifError();/d' ${WRKSRC}/src/blocks/gifdbl.c ${WRKSRC}/util/gif2dbl.c ${WRKSRC}/util/gif2mask.c
+#	@${REINPLACE_CMD} -e 's|#if GIFLIB_GIFERRORSTRING|#if 0|' ${WRKSRC}/src/libming.h
 # patch for graphics/p5-ming
 	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' ${WRKSRC}/perl_ext/Makefile.PL
 	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' ${WRKSRC}/perl_ext/Makefile.PL ${WRKSRC}/perl_ext/mkdoc
 	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' ${WRKSRC}/perl_ext/Exports.c
 	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/perl_ext/examples/*.cgi
 # patch for graphics/py-ming
-	@${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/py_ext/Makefile.in
+	@${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/py_ext/Makefile.am
 	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in
 	@${LN} -sf ${LOCALBASE}/include/ming ${WRKSRC}/src
 
diff --git a/graphics/ming/distinfo b/graphics/ming/distinfo
index 6740d7c2207b..74e50c23ad43 100644
--- a/graphics/ming/distinfo
+++ b/graphics/ming/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ming-0.4.5.tar.gz) = f73f171424b5907efbba0be0824ab9dd425c61544229c1825c32bff565e65143
-SIZE (ming-0.4.5.tar.gz) = 15029578
+SHA256 (libming-libming-0.4.7-ming-0_4_7_GH0.tar.gz) = 118aa1338dd74b34dd2cd22bce286ca0571e8b9aa433999646d1c0157ea9a7dc
+SIZE (libming-libming-0.4.7-ming-0_4_7_GH0.tar.gz) = 14903570
diff --git a/graphics/ming/files/patch-src_blocks_gifdbl.c b/graphics/ming/files/patch-src_blocks_gifdbl.c
deleted file mode 100644
index a50c9a07a820..000000000000
--- a/graphics/ming/files/patch-src_blocks_gifdbl.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/blocks/gifdbl.c.orig	2010-10-10 07:19:23 UTC
-+++ src/blocks/gifdbl.c
-@@ -227,7 +227,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
- 	SWFDBLBitmapData ret;
- 	struct dbl_data gifdata;
- 
-+#if GIFLIB_MAJOR >= 5
-+	if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
- 	if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
- 		return NULL;
- 	if(!readGif(file, &gifdata))
- 		return NULL;
-@@ -246,7 +250,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
- 	SWFDBLBitmapData ret;
- 	struct dbl_data gifdata;
- 
-+#if GIFLIB_MAJOR >= 5
-+	if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL)
-+#else
- 	if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)
-+#endif
- 		return NULL;
- 	if(!readGif(file, &gifdata))
- 		return NULL;
diff --git a/graphics/ming/files/patch-util_gif2dbl.c b/graphics/ming/files/patch-util_gif2dbl.c
deleted file mode 100644
index 56deec29a5c6..000000000000
--- a/graphics/ming/files/patch-util_gif2dbl.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/gif2dbl.c.orig	2013-06-08 14:08:51 UTC
-+++ util/gif2dbl.c
-@@ -59,7 +59,11 @@ unsigned char *readGif(char *fileName, i
-   unsigned char *p;
-   int i, nColors, size, alpha, bgColor, alignedWidth;
- 
-+#if GIFLIB_MAJOR >= 5
-+  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
-   if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
-     error("Error opening file");
- 
-   if(DGifSlurp(file) != GIF_OK)
diff --git a/graphics/ming/files/patch-util_gif2mask.c b/graphics/ming/files/patch-util_gif2mask.c
deleted file mode 100644
index d7b315faf109..000000000000
--- a/graphics/ming/files/patch-util_gif2mask.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- util/gif2mask.c.orig	2013-06-08 14:08:51 UTC
-+++ util/gif2mask.c
-@@ -28,7 +28,11 @@ unsigned char *readGif(char *fileName, i
-   unsigned char *data;
-   int i, nColors, size;
- 
-+#if GIFLIB_MAJOR >= 5
-+  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
-   if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
-     error("Error opening file");
- 
-   if(DGifSlurp(file) != GIF_OK)
diff --git a/graphics/ming/pkg-plist b/graphics/ming/pkg-plist
index ef27d7f53354..7ec47e92287b 100644
--- a/graphics/ming/pkg-plist
+++ b/graphics/ming/pkg-plist
@@ -103,7 +103,7 @@ include/ming/util/vasprintf.h
 lib/libming.a
 lib/libming.so
 lib/libming.so.1
-lib/libming.so.1.4.4
+lib/libming.so.1.4.6
 libdata/pkgconfig/libming.pc
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index a5ff780ea99c..79750cd34a82 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	ming
-PORTREVISION=	4
 CATEGORIES=	graphics perl5
 PKGNAMEPREFIX=	p5-
 
@@ -11,6 +10,8 @@ COMMENT=	Perl5 module for Ming which allows you to create Flash 4/5 movies
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/graphics/p5-ming/files/patch-Makefile.in b/graphics/p5-ming/files/patch-Makefile.in
deleted file mode 100644
index 410714cc29ce..000000000000
--- a/graphics/p5-ming/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2011-10-26 15:30:21.000000000 +0800
-+++ Makefile.in	2011-11-20 17:27:39.085225614 +0800
-@@ -431,7 +431,7 @@
- 	$(MAKE) -f Makefile.perl
- 
- install: Makefile.perl
--	$(MAKE) -f Makefile.perl install PREFIX=$(prefix)
-+	$(MAKE) -f Makefile.perl pure_install PREFIX=$(prefix)
- 
- Makefile.perl: Makefile.PL
- 	srcdir=$(srcdir) builddir=$(abs_builddir) $(PERL) $< PREFIX=$(prefix) FIRST_MAKEFILE=Makefile.perl
diff --git a/graphics/p5-ming/files/patch-perl_swf.h b/graphics/p5-ming/files/patch-perl_swf.h
deleted file mode 100644
index d8fe92d25b44..000000000000
--- a/graphics/p5-ming/files/patch-perl_swf.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- perl_swf.h.orig	2011-10-26 14:33:18.000000000 +0800
-+++ perl_swf.h	2011-11-20 18:01:38.397227987 +0800
-@@ -66,5 +66,9 @@
- void swf_stash_refcnt_inc(SV *sv_key, SV *sv_value);
- void swf_stash_refcnt_dec(SV *sv_key);
- 
-+#ifndef GvCV_set
-+#define GvCV_set(gv, cv) (GvCV(gv) = cv)
-+#endif
-+
- #endif /* PERL_SWF_H_INCLUDED */
- 
diff --git a/graphics/p5-ming/files/patch-src_blocks_gifdbl.c b/graphics/p5-ming/files/patch-src_blocks_gifdbl.c
deleted file mode 100644
index 9de9ec94ed3d..000000000000
--- a/graphics/p5-ming/files/patch-src_blocks_gifdbl.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ../src/blocks/gifdbl.c.orig	2010-10-10 07:19:23 UTC
-+++ ../src/blocks/gifdbl.c
-@@ -227,7 +227,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
- 	SWFDBLBitmapData ret;
- 	struct dbl_data gifdata;
- 
-+#if GIFLIB_MAJOR >= 5
-+	if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
- 	if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
- 		return NULL;
- 	if(!readGif(file, &gifdata))
- 		return NULL;
-@@ -246,7 +250,11 @@ SWFDBLBitmapData newSWFDBLBitmapData_fro
- 	SWFDBLBitmapData ret;
- 	struct dbl_data gifdata;
- 
-+#if GIFLIB_MAJOR >= 5
-+	if((file = DGifOpen(input, (InputFunc) gifReadFunc, NULL)) == NULL)
-+#else
- 	if((file = DGifOpen(input, (InputFunc) gifReadFunc)) == NULL)
-+#endif
- 		return NULL;
- 	if(!readGif(file, &gifdata))
- 		return NULL;
diff --git a/graphics/p5-ming/files/patch-util_gif2dbl.c b/graphics/p5-ming/files/patch-util_gif2dbl.c
deleted file mode 100644
index 740bb75ebcc3..000000000000
--- a/graphics/p5-ming/files/patch-util_gif2dbl.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../util/gif2dbl.c.orig	2013-06-08 14:08:51 UTC
-+++ ../util/gif2dbl.c
-@@ -59,7 +59,11 @@ unsigned char *readGif(char *fileName, i
-   unsigned char *p;
-   int i, nColors, size, alpha, bgColor, alignedWidth;
- 
-+#if GIFLIB_MAJOR >= 5
-+  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
-   if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
-     error("Error opening file");
- 
-   if(DGifSlurp(file) != GIF_OK)
diff --git a/graphics/p5-ming/files/patch-util_gif2mask.c b/graphics/p5-ming/files/patch-util_gif2mask.c
deleted file mode 100644
index 84401fb53480..000000000000
--- a/graphics/p5-ming/files/patch-util_gif2mask.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../util/gif2mask.c.orig	2013-06-08 14:08:51 UTC
-+++ ../util/gif2mask.c
-@@ -28,7 +28,11 @@ unsigned char *readGif(char *fileName, i
-   unsigned char *data;
-   int i, nColors, size;
- 
-+#if GIFLIB_MAJOR >= 5
-+  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
-+#else
-   if((file = DGifOpenFileName(fileName)) == NULL)
-+#endif
-     error("Error opening file");
- 
-   if(DGifSlurp(file) != GIF_OK)
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index a74971100c2b..d99084ef9424 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	ming
-PORTREVISION=	4
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,6 +10,8 @@ COMMENT=	Python module for Ming which allows you to create Flash 4/5 movies
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE_GPL2
+LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE
 
 CONFIGURE_ARGS=	--enable-python
 USE_PYTHON=	autoplist distutils