From owner-svn-ports-head@freebsd.org Mon Oct 19 20:17:59 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB49CA19A39; Mon, 19 Oct 2015 20:17:59 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72FB91833; Mon, 19 Oct 2015 20:17:59 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9JKHwLc025338; Mon, 19 Oct 2015 20:17:58 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9JKHwPb025336; Mon, 19 Oct 2015 20:17:58 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201510192017.t9JKHwPb025336@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 19 Oct 2015 20:17:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399724 - head/graphics/ming X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2015 20:17:59 -0000 Author: sunpoet Date: Mon Oct 19 20:17:58 2015 New Revision: 399724 URL: https://svnweb.freebsd.org/changeset/ports/399724 Log: - 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 Modified: head/graphics/ming/Makefile head/graphics/ming/pkg-plist Modified: head/graphics/ming/Makefile ============================================================================== --- head/graphics/ming/Makefile Mon Oct 19 20:17:53 2015 (r399723) +++ head/graphics/ming/Makefile Mon Oct 19 20:17:58 2015 (r399724) @@ -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}/ 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| 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 Modified: head/graphics/ming/pkg-plist ============================================================================== --- head/graphics/ming/pkg-plist Mon Oct 19 20:17:53 2015 (r399723) +++ head/graphics/ming/pkg-plist Mon Oct 19 20:17:58 2015 (r399724) @@ -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