- Change language bindings (p5-ming and py-ming) from slave ports to normal ports

- Use USES=localbase
- Use PORTDOCS
- Do not install png2dbl.c
- Convert to new options target helper
- Cleanup Makefile
- Bump PORTREVISION for package change

2 files changed, 11 insertions, 50 deletions

diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index dbd356ac9bd3..64780598b6fc 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.4.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -19,24 +20,17 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 
 CONFLICTS_INSTALL=	ja-ming-[0-9]*
 
-.if defined(SLAVEPORT)
-LIB_DEPENDS+=	libming.so:${PORTSDIR}/graphics/ming
-.else
 OPTIONS_DEFINE=	DOCS
-.endif
 
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include/ming
-CPPFLAGS+=	-I. -I.. -I${LOCALBASE}/include
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/ming
 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+=		autoreconf bison gmake libtool pathfix shebangfix
+USES=		autoreconf bison gmake libtool localbase pathfix shebangfix
 
-DOCS=		HISTORY NEWS README TODO
-DOCS_UTIL=	README TIPS TODO swftoperl.html
+PORTDOCS=	*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	lib${PORTNAME}
@@ -45,40 +39,16 @@ 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.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.am
-	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in
-	@${LN} -sf ${LOCALBASE}/include/ming ${WRKSRC}/src
-
 post-install:
-.if !defined(SLAVEPORT)
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/ming/ ${STAGEDIR}${PREFIX}/include/ming/blocks/ ${STAGEDIR}${PREFIX}/include/ming/util/
-	cd ${WRKSRC}/ && ${INSTALL_SCRIPT} util/cws2fws util/ming-config ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC}/util/ && ${INSTALL_SCRIPT} cws2fws ming-config ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} *.h src/*.h ${STAGEDIR}${PREFIX}/include/ming/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} src/blocks/*.h ${STAGEDIR}${PREFIX}/include/ming/blocks/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} util/png2dbl.c util/*.h ${STAGEDIR}${PREFIX}/include/ming/util/
+	cd ${WRKSRC}/src/blocks/ && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/ming/blocks/
+	cd ${WRKSRC}/util/ && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/ming/util/
+
+post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/util/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/util/ && ${INSTALL_DATA} ${DOCS_UTIL} ${STAGEDIR}${DOCSDIR}/util/
-.endif
-.if defined(SLAVEPORT) && ${SLAVEPORT} == "p5"
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
-	cd ${INSTALL_WRKSRC}/examples/ && ${INSTALL_DATA} *.cgi ${STAGEDIR}${EXAMPLESDIR}/
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so
-.endif
-.if defined(SLAVEPORT) && ${SLAVEPORT} == "py"
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_mingc.so
-.endif
+	cd ${WRKSRC}/ && ${INSTALL_DATA} HISTORY NEWS README TODO ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/util/ && ${INSTALL_DATA} README TIPS TODO swftoperl.html ${STAGEDIR}${DOCSDIR}/util/
 
 .include <bsd.port.mk>
diff --git a/graphics/ming/pkg-plist b/graphics/ming/pkg-plist
index 7ec47e92287b..d68d764b9394 100644
--- a/graphics/ming/pkg-plist
+++ b/graphics/ming/pkg-plist
@@ -95,7 +95,6 @@ include/ming/util/output.h
 include/ming/util/outputdecl.h
 include/ming/util/parser.h
 include/ming/util/parserdecl.h
-include/ming/util/png2dbl.c
 include/ming/util/read.h
 include/ming/util/swfoutput.h
 include/ming/util/swftypes.h
@@ -105,11 +104,3 @@ lib/libming.so
 lib/libming.so.1
 lib/libming.so.1.4.6
 libdata/pkgconfig/libming.pc
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/util/README
-%%PORTDOCS%%%%DOCSDIR%%/util/TIPS
-%%PORTDOCS%%%%DOCSDIR%%/util/TODO
-%%PORTDOCS%%%%DOCSDIR%%/util/swftoperl.html