From owner-svn-ports-all@freebsd.org Sun Sep 22 17:55:03 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 928A512847D; Sun, 22 Sep 2019 17:55:03 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46bw8R3Ffcz42y2; Sun, 22 Sep 2019 17:55:03 +0000 (UTC) (envelope-from dinoex@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52FA5229F; Sun, 22 Sep 2019 17:55:03 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8MHt3ne096111; Sun, 22 Sep 2019 17:55:03 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8MHt3Wj096110; Sun, 22 Sep 2019 17:55:03 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201909221755.x8MHt3Wj096110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sun, 22 Sep 2019 17:55:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512598 - head/graphics/gd X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: head/graphics/gd X-SVN-Commit-Revision: 512598 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2019 17:55:03 -0000 Author: dinoex Date: Sun Sep 22 17:55:02 2019 New Revision: 512598 URL: https://svnweb.freebsd.org/changeset/ports/512598 Log: - fix missing include path if all options are off PR: 240752 - new option PNG JPEG FREETYPE - enable option ICONV by default Modified: head/graphics/gd/Makefile head/graphics/gd/pkg-plist Modified: head/graphics/gd/Makefile ============================================================================== --- head/graphics/gd/Makefile Sun Sep 22 17:53:42 2019 (r512597) +++ head/graphics/gd/Makefile Sun Sep 22 17:55:02 2019 (r512598) @@ -3,7 +3,7 @@ PORTNAME= libgd PORTVERSION= 2.2.5 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ @@ -14,31 +14,42 @@ COMMENT?= Graphics library for fast creation of images LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libfreetype.so:print/freetype2 - CONFLICTS= bazaar-1.* -USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg +USES= tar:xz pkgconfig pathfix libtool:keepla shebangfix SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes TEST_TARGET= check -OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP TIFF -OPTIONS_DEFAULT=FONTCONFIG WEBP TIFF +OPTIONS_DEFINE= PNG JPEG WEBP TIFF FREETYPE FONTCONFIG XPM ICONV +OPTIONS_DEFAULT=PNG JPEG WEBP TIFF FREETYPE FONTCONFIG ICONV NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes +PNG_LIB_DEPENDS= libpng.so:graphics/png +PNG_CONFIGURE_OFF= --without-png +PNG_CPPFLAGS= -I${LOCALBASE}/include +JPEG_USES= jpeg +JPEG_CONFIGURE_OFF= --without-jpeg +JPEG_CPPFLAGS= -I${LOCALBASE}/include +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_OFF= --without-webp +WEBP_CPPFLAGS= -I${LOCALBASE}/include +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff +TIFF_CONFIGURE_OFF= --without-tiff +TIFF_CPPFLAGS= -I${LOCALBASE}/include +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_CONFIGURE_OFF= --without-freetype +FREETYPE_CPPFLAGS= -I${LOCALBASE}/include FONTCONFIG_LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_OFF= --with-fontconfig=no -ICONV_USES= iconv -ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} +FONTCONFIG_CPPFLAGS= -I${LOCALBASE}/include XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no -WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_CONFIGURE_OFF= --without-webp -TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_CONFIGURE_OFF= --without-tiff +ICONV_USES= iconv +ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} .include Modified: head/graphics/gd/pkg-plist ============================================================================== --- head/graphics/gd/pkg-plist Sun Sep 22 17:53:42 2019 (r512597) +++ head/graphics/gd/pkg-plist Sun Sep 22 17:55:02 2019 (r512598) @@ -1,16 +1,16 @@ -bin/annotate +%%FREETYPE%%bin/annotate bin/bdftogd bin/gd2copypal bin/gd2togif -bin/gd2topng +%%PNG%%bin/gd2topng bin/gdcmpgif bin/gdlib-config -bin/gdparttopng -bin/gdtopng +%%PNG%%bin/gdparttopng +%%PNG%%bin/gdtopng bin/giftogd2 -bin/pngtogd -bin/pngtogd2 -bin/webpng +%%PNG%%bin/pngtogd +%%PNG%%bin/pngtogd2 +%%PNG%%bin/webpng include/entities.h include/gd.h include/gd_color_map.h