diff --git a/devel/newt/Makefile b/devel/newt/Makefile index 1080c5998aef..596020b9cd44 100644 --- a/devel/newt/Makefile +++ b/devel/newt/Makefile @@ -1,77 +1,77 @@ PORTNAME= newt -PORTVERSION= 0.52.20 -PORTREVISION= 2 +PORTVERSION= 0.52.21 CATEGORIES= devel MASTER_SITES= https://releases.pagure.org/newt/ MAINTAINER= ports@FreeBSD.org COMMENT= Not Eriks Windowing Toolkit: console I/O handling library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libslang.so:devel/libslang2 \ - libpopt.so:devel/popt +LIB_DEPENDS= libpopt.so:devel/popt \ + libslang.so:devel/libslang2 USES= autoreconf gmake localbase ncurses pathfix +USE_LDCONFIG= yes GNU_CONFIGURE= yes MAKE_ENV= PCFLAGS="${CFLAGS}" -USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lncurses -PLIST_SUB= SOVERSION="${SOVERSION}" \ - VERSION="${PORTVERSION}" - +BINARY_ALIAS= python3=${PYTHON_VERSION} SUB_FILES= pkgIndex.tcl SUB_LIST= VERSION="${PORTVERSION}" +PLIST_SUB= SOVERSION="${SOVERSION}" \ + VERSION="${PORTVERSION}" + OPTIONS_DEFINE= NLS PYTHON TCL OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls PYTHON_USES= python PYTHON_CONFIGURE_WITH= python TCL_USES= tcl -TCL_CONFIGURE_ENV= ac_cv_c_tclconfig=${TCL_LIBDIR:Q} TCL_CONFIGURE_WITH= tcl +TCL_CONFIGURE_ENV= ac_cv_c_tclconfig=${TCL_LIBDIR:Q} TCL_CPPFLAGS= -I${TCL_INCLUDEDIR:Q} SOVERSION= ${PORTVERSION:R:E} post-patch: @${REINPLACE_CMD} -e 's|-DUSE_INTERP_RESULT||' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e \ 's|@CPP@|@CC@ -E| ; \ s|-D_GNU_SOURCE|| ; \ s| -g | |g ; \ /make -C/s|^|#| ; \ /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in post-patch-PYTHON-on: @${REINPLACE_CMD} -e \ '/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure.ac post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so post-install-NLS-on: @(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} ${MAKE_ARGS} \ datadir=${STAGEDIR}${PREFIX}/share ${INSTALL_TARGET}) post-install-PYTHON-on: @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_snack.so post-install-TCL-on: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION} (cd ${WRKSRC} && ${INSTALL_LIB} whiptcl.so \ ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}) (cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl \ ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}) .include diff --git a/devel/newt/distinfo b/devel/newt/distinfo index 38ab26fec151..b624417f0c36 100644 --- a/devel/newt/distinfo +++ b/devel/newt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489932281 -SHA256 (newt-0.52.20.tar.gz) = 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc -SIZE (newt-0.52.20.tar.gz) = 181163 +TIMESTAMP = 1633990735 +SHA256 (newt-0.52.21.tar.gz) = 265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31 +SIZE (newt-0.52.21.tar.gz) = 174895 diff --git a/devel/newt/files/patch-configure.ac b/devel/newt/files/patch-configure.ac index 6d93d5cd8d6a..0aa883a8777a 100644 --- a/devel/newt/files/patch-configure.ac +++ b/devel/newt/files/patch-configure.ac @@ -1,29 +1,20 @@ ---- configure.ac.orig 2017-03-17 10:36:31 UTC +--- configure.ac.orig 2019-05-27 12:57:40 UTC +++ configure.ac -@@ -2,7 +2,7 @@ AC_INIT([newt_pr.h]) - - PACKAGE=newt - VERSION=0.52.20 --SONAME=0.52 -+SONAME=52 - - AC_CONFIG_HEADER([config.h]) - -@@ -24,7 +24,7 @@ AC_CHECK_SIZEOF([void *]) +@@ -23,7 +23,7 @@ AC_CHECK_SIZEOF([void *]) AC_MSG_CHECKING([for GNU ld]) LD=`$CC -print-prog-name=ld 2>&5` -if test `$LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld"` = 0; then +if test `$LD -v 2>&1 | $ac_cv_path_GREP -c -E "GNU ld|compatible with GNU linkers"` = 0; then # Not GNU_LD="" AC_MSG_RESULT([no]) -@@ -102,7 +102,7 @@ else +@@ -107,7 +107,7 @@ else AC_SUBST([TCL_LIB_FLAG]) WHIPTCLLIB=whiptcl # needed with tcl8.6 - CPPFLAGS="$CPPFLAGS -DUSE_INTERP_RESULT" + CPPFLAGS="$CPPFLAGS " else AC_MSG_RESULT([NOT found]) fi