From owner-dev-commits-ports-all@freebsd.org Sun Aug 8 14:58:31 2021 Return-Path: Delivered-To: dev-commits-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 770F065859E; Sun, 8 Aug 2021 14:58:31 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GjMm62LC1z4jh4; Sun, 8 Aug 2021 14:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4790164F6; Sun, 8 Aug 2021 14:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 178EwTIn024155; Sun, 8 Aug 2021 14:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178EwTDh024154; Sun, 8 Aug 2021 14:58:29 GMT (envelope-from git) Date: Sun, 8 Aug 2021 14:58:29 GMT Message-Id: <202108081458.178EwTDh024154@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: cf08ab4fffe1 - main - graphics/ming: Replace configure.in patch with upstream one MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf08ab4fffe11f3e31168be094f936f443ed4db5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 14:58:31 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf08ab4fffe11f3e31168be094f936f443ed4db5 commit cf08ab4fffe11f3e31168be094f936f443ed4db5 Author: Po-Chuan Hsieh AuthorDate: 2021-08-08 14:34:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-08-08 14:53:58 +0000 graphics/ming: Replace configure.in patch with upstream one - Remove no-op BINARY_ALIAS Obtained from: https://github.com/libming/libming/commit/a89a619e187ebe070db2a1760f3b90489bfff382 --- graphics/ming/Makefile | 2 - graphics/ming/files/patch-configure.in | 73 ++++++++++++++++++++++++++++++---- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile index 270af1bf4025..0a9095756cf9 100644 --- a/graphics/ming/Makefile +++ b/graphics/ming/Makefile @@ -40,8 +40,6 @@ SHEBANG_FILES= util/cws2fws OPTIONS_DEFINE= DOCS -BINARY_ALIAS= freetype-config=true - post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/ming/ ${STAGEDIR}${PREFIX}/include/ming/blocks/ ${STAGEDIR}${PREFIX}/include/ming/util/ cd ${WRKSRC}/util/ && ${INSTALL_SCRIPT} cws2fws ming-config ${STAGEDIR}${PREFIX}/bin/ diff --git a/graphics/ming/files/patch-configure.in b/graphics/ming/files/patch-configure.in index fd885cbf0481..1b79fe266905 100644 --- a/graphics/ming/files/patch-configure.in +++ b/graphics/ming/files/patch-configure.in @@ -1,13 +1,70 @@ ---- configure.in.orig 2021-08-07 06:13:17 UTC +Obtained from: https://github.com/libming/libming/commit/a89a619e187ebe070db2a1760f3b90489bfff382 + +--- configure.in.orig 2017-04-07 08:12:56 UTC +++ configure.in -@@ -272,8 +272,8 @@ if test "$freetype_support" = "yes"; then - ft_config="$freetype_config" - fi +@@ -247,7 +247,7 @@ AC_CHECK_LIB(X11, XGetImage, XLIB="-lX11", XLIB="") + AC_ARG_ENABLE( + [freetype], +-[ --enable-freetype Enable freetype support (default: enabled)], ++[ --disable-freetype Disable freetype support (default: enabled)], + [case "${enableval}" in + yes) freetype_support=yes ;; + no) freetype_support=no ;; +@@ -257,26 +257,10 @@ freetype_support=yes) + + if test "$freetype_support" = "yes"; then + dnl Check for the freetype library +- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes) +- if test "$freetype_config" = "yes"; then +- AC_PATH_PROG(ft_config,freetype-config,no) +- if test "$ft_config" = "no"; then +- echo "To compile ming please install freetype:" +- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev" +- echo "" +- echo "or disable the freetype configuration option:" +- echo " --disable-freetype" +- AC_MSG_ERROR([Could not detect freetype-config!]) +- fi +- else +- ft_config="$freetype_config" +- fi +- - FREETYPE_CFLAGS="`$ft_config --cflags`" - FREETYPE_LIBS="`$ft_config --libs`" -+ FREETYPE_CFLAGS="`pkg-config freetype2 --cflags`" -+ FREETYPE_LIBS="`pkg-config freetype2 --libs`" +- +- AC_SUBST(FREETYPE_LIBS) +- AC_SUBST(FREETYPE_CFLAGS) ++ PKG_PROG_PKG_CONFIG ++ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true, ++ AC_MSG_ERROR([Could not find freetype]) ++ ) + fi + + dnl Check for the ungif or gif (new or old) libraries +@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then + AC_DEFINE([USE_ZLIB], [1], [Use zlib]) + fi + +-AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x) +-if test -n "${ft_config}"; then +- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) ++AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x) ++if test x${HAS_FREETYPE} = xtrue ; then ++ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library]) + fi + + AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes) +@@ -504,10 +488,10 @@ else + echo " ZLIB enabled ($ZLIB)" + fi + +-if test x"$ft_config" = "x"; then ++if test x"$HAS_FREETYPE" = "x"; then + echo " Freetype library disabled" + else +- echo " Freetype library enabled ($ft_config)" ++ echo " Freetype library enabled ($FREETYPE_LIBS)" + fi - AC_SUBST(FREETYPE_LIBS) - AC_SUBST(FREETYPE_CFLAGS) + if test x"$GIFLIB" = "x" -o x"$GIFINC" = "x"; then