diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-09-19 05:28:34 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-09-19 05:59:53 +0000 |
| commit | e85cafc787e87081a359f5cafb448e97f07637c6 (patch) | |
| tree | 58ca826d7adc03b0f5ea0e214dc7cd9b78187768 | |
| parent | ccc0b6055dbd8b78f21c93d46d2e7319c32bd609 (diff) | |
graphics/py-ming: Replace configure.in patch with upstream one
- Remove no-op BINARY_ALIAS
Obtained from: https://github.com/libming/libming/commit/a89a619e187ebe070db2a1760f3b90489bfff382
| -rw-r--r-- | graphics/py-ming/Makefile | 2 | ||||
| -rw-r--r-- | graphics/py-ming/files/patch-configure.in | 73 |
2 files changed, 65 insertions, 10 deletions
diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile index 7ad254947cca..65e0047939d1 100644 --- a/graphics/py-ming/Makefile +++ b/graphics/py-ming/Makefile @@ -35,8 +35,6 @@ GH_PROJECT= libming PORTSCOUT= limit:^ming- -BINARY_ALIAS= freetype-config=true - post-patch: @${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/py_ext/Makefile.am @${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in diff --git a/graphics/py-ming/files/patch-configure.in b/graphics/py-ming/files/patch-configure.in index 65d382927611..1b79fe266905 100644 --- a/graphics/py-ming/files/patch-configure.in +++ b/graphics/py-ming/files/patch-configure.in @@ -1,13 +1,70 @@ ---- configure.in.orig 2021-08-10 15:11:31 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 |