Date: Tue, 12 Jul 2016 17:43:54 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418431 - in head/graphics/libimg: . files Message-ID: <201607121743.u6CHhsID034435@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Tue Jul 12 17:43:54 2016 New Revision: 418431 URL: https://svnweb.freebsd.org/changeset/ports/418431 Log: Upgrade from 1.4.2 to 1.4.6. Respect EXAMPLES-option, add license-definition and define TEST_TARGET. Reported by: trasz Modified: head/graphics/libimg/Makefile head/graphics/libimg/distinfo head/graphics/libimg/files/patch-png head/graphics/libimg/pkg-plist Modified: head/graphics/libimg/Makefile ============================================================================== --- head/graphics/libimg/Makefile Tue Jul 12 17:16:44 2016 (r418430) +++ head/graphics/libimg/Makefile Tue Jul 12 17:43:54 2016 (r418431) @@ -2,43 +2,53 @@ # $FreeBSD$ PORTNAME= libimg -PORTVERSION= 1.4.2 -PORTREVISION= 2 +PORTVERSION= 1.4.6 CATEGORIES?= graphics tk -MASTER_SITES= SF/tkimg/tkimg/${PORTVERSION:R} -DISTNAME= tkimg${PORTVERSION} +MASTER_SITES= SF/tkimg/tkimg/${PORTVERSION:R}/tkimg%20${PORTVERSION} +DISTNAME= Img-Source-${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= Library of image format handlers for Tk4.1 and later +LICENSE= TCLTK +LICENSE_NAME= Tcl/Tk +LICENSE_FILE= ${WRKSRC}/license.terms +LICENSE_PERMS= auto-accept pkg-sell pkg-mirror dist-sell dist-mirror + BUILD_DEPENDS= dtplite:devel/tcllib LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -PLIST_SUB+= SHLIB_NAME="${SHLIB_NAME}" \ - SHLIB_LINK="${SHLIB_LINK}" +PLIST_SUB+= PORTVERSION=${PORTVERSION} -WRKSRC= ${WRKDIR}/tkimg${PORTVERSION:R} -USES= autoreconf jpeg tk:tea tar:bzip2 +WRKSRC= ${WRKDIR}/tkimg +USES= autoreconf jpeg tk:tea zip USE_XORG= x11 xext xft xrender xscrnsaver +TEST_TARGET= test +OPTIONS_DEFINE= EXAMPLES +OPTIONS_SUB= yes # We don't need the bundled libraries: -EXTRACT_AFTER_ARGS= --exclude '*/libz/*' --exclude zlib \ - --exclude 'config.*' --exclude Makefile \ - --exclude '*/compat/*' --exclude '*/libtiff/*' \ - --exclude '*/libjpeg/*' --exclude '*/libpng/*' +EXTRACT_AFTER_ARGS= -x '*/libz/*' -x zlib \ + -x 'config.*' -x Makefile \ + -x '*/compat/*' -x '*/libtiff/*' \ + -x '*/libjpeg/*' -x '*/libpng/*' -a -d ${WRKDIR} MAKE_ARGS+= INSTALL_ROOT="${STAGEDIR}" +MAKE_ENV+= LANG= CONFIGURE_ENV= WRKDIR="${WRKDIR}" post-patch: ${REINPLACE_CMD} -E -e 's,"(zlib|tiff|jpeg|png)tcl.h",<\1.h>,' \ -e 's,jpeg\.h,jpeglib.h,' ${WRKSRC}/*/*.[ch] .for d in jpeg png tiff zlib - touch ${WRKDIR}/$dtclConfig.sh + ${TOUCH} ${WRKDIR}/$dtclConfig.sh .endfor +pre-configure: + ${CHMOD} +x ${WRKSRC}/${CONFIGURE_SCRIPT} + post-configure: .for l in jpeg png tiff # Link with -l$l @@ -47,9 +57,13 @@ post-configure: ${WRKSRC}/$l/Makefile .endfor +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MEXAMPLES} post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/msgs/ ${INSTALL_DATA} ${WRKSRC}/msgs/*.msg ${STAGEDIR}${EXAMPLESDIR}/msgs/ ${INSTALL_SCRIPT} ${WRKSRC}/demo.tcl ${WRKSRC}/tkv.tcl ${STAGEDIR}${EXAMPLESDIR}/ +.endif .include <bsd.port.mk> Modified: head/graphics/libimg/distinfo ============================================================================== --- head/graphics/libimg/distinfo Tue Jul 12 17:16:44 2016 (r418430) +++ head/graphics/libimg/distinfo Tue Jul 12 17:43:54 2016 (r418431) @@ -1,2 +1,3 @@ -SHA256 (tkimg1.4.2.tar.bz2) = bcced9c9e799e256683885ab703bc6777c95e415ed6f0b8c18793057fd87b866 -SIZE (tkimg1.4.2.tar.bz2) = 5541116 +TIMESTAMP = 1468304268 +SHA256 (Img-Source-1.4.6.zip) = 1f8c40f63dd2de175c23356e5dcf108c2bba63007c2b332689e7a696aa7656ae +SIZE (Img-Source-1.4.6.zip) = 7971935 Modified: head/graphics/libimg/files/patch-png ============================================================================== --- head/graphics/libimg/files/patch-png Tue Jul 12 17:16:44 2016 (r418430) +++ head/graphics/libimg/files/patch-png Tue Jul 12 17:43:54 2016 (r418431) @@ -18,22 +18,3 @@ - } return TCL_OK; } -@@ -465,7 +463,7 @@ - } - -- if (png_get_sRGB && png_get_sRGB(png_ptr, info_ptr, &intent)) { -+ if (png_get_sRGB(png_ptr, info_ptr, &intent)) { - png_set_sRGB(png_ptr, info_ptr, intent); -- } else if (png_get_gAMA) { -+ } else { - double gamma; - if (!png_get_gAMA(png_ptr, info_ptr, &gamma)) { -@@ -659,7 +657,5 @@ - PNG_FILTER_TYPE_BASE); - -- if (png_set_gAMA) { -- png_set_gAMA(png_ptr, info_ptr, 1.0); -- } -+ png_set_gAMA(png_ptr, info_ptr, 1.0); - - if (tagcount > 0) { Modified: head/graphics/libimg/pkg-plist ============================================================================== --- head/graphics/libimg/pkg-plist Tue Jul 12 17:16:44 2016 (r418430) +++ head/graphics/libimg/pkg-plist Tue Jul 12 17:43:54 2016 (r418431) @@ -1,12 +1,12 @@ -%%EXAMPLESDIR%%/demo.tcl -%%EXAMPLESDIR%%/tkv.tcl -%%EXAMPLESDIR%%/msgs/de.msg -%%EXAMPLESDIR%%/msgs/el.msg -%%EXAMPLESDIR%%/msgs/en.msg -%%EXAMPLESDIR%%/msgs/es.msg -%%EXAMPLESDIR%%/msgs/fr.msg -%%EXAMPLESDIR%%/msgs/ja.msg -%%EXAMPLESDIR%%/msgs/nl.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/demo.tcl +%%EXAMPLES%%%%EXAMPLESDIR%%/tkv.tcl +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/de.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/el.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/en.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/es.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/fr.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/ja.msg +%%EXAMPLES%%%%EXAMPLESDIR%%/msgs/nl.msg man/mann/img-bmp.n.gz man/mann/img-dted.n.gz man/mann/img-gif.n.gz @@ -26,26 +26,26 @@ man/mann/img-window.n.gz man/mann/img-xbm.n.gz man/mann/img-xpm.n.gz man/mann/img.n.gz -lib/Img/libtkimg142.so.1 -lib/Img/libtkimgbmp142.so.1 -lib/Img/libtkimgdted142.so.1 -lib/Img/libtkimggif142.so.1 -lib/Img/libtkimgico142.so.1 -lib/Img/libtkimgjpeg142.so.1 -lib/Img/libtkimgpcx142.so.1 -lib/Img/libtkimgpixmap142.so.1 -lib/Img/libtkimgpng142.so.1 -lib/Img/libtkimgppm142.so.1 -lib/Img/libtkimgps142.so.1 -lib/Img/libtkimgraw142.so.1 -lib/Img/libtkimgsgi142.so.1 -lib/Img/libtkimgstub142.a -lib/Img/libtkimgsun142.so.1 -lib/Img/libtkimgtga142.so.1 -lib/Img/libtkimgxbm142.so.1 -lib/Img/libtkimgtiff142.so.1 -lib/Img/libtkimgwindow142.so.1 -lib/Img/libtkimgxpm142.so.1 +lib/Img/libtkimg%%PORTVERSION%%.so +lib/Img/libtkimgbmp%%PORTVERSION%%.so +lib/Img/libtkimgdted%%PORTVERSION%%.so +lib/Img/libtkimggif%%PORTVERSION%%.so +lib/Img/libtkimgico%%PORTVERSION%%.so +lib/Img/libtkimgjpeg%%PORTVERSION%%.so +lib/Img/libtkimgpcx%%PORTVERSION%%.so +lib/Img/libtkimgpixmap%%PORTVERSION%%.so +lib/Img/libtkimgpng%%PORTVERSION%%.so +lib/Img/libtkimgppm%%PORTVERSION%%.so +lib/Img/libtkimgps%%PORTVERSION%%.so +lib/Img/libtkimgraw%%PORTVERSION%%.so +lib/Img/libtkimgsgi%%PORTVERSION%%.so +lib/Img/libtkimgstub%%PORTVERSION%%.a +lib/Img/libtkimgsun%%PORTVERSION%%.so +lib/Img/libtkimgtga%%PORTVERSION%%.so +lib/Img/libtkimgxbm%%PORTVERSION%%.so +lib/Img/libtkimgtiff%%PORTVERSION%%.so +lib/Img/libtkimgwindow%%PORTVERSION%%.so +lib/Img/libtkimgxpm%%PORTVERSION%%.so lib/Img/pkgIndex.tcl lib/Img/tkimgConfig.sh @comment include/tkimg.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607121743.u6CHhsID034435>