Index: branches/2021Q1/devel/newt/Makefile =================================================================== --- branches/2021Q1/devel/newt/Makefile (revision 566475) +++ branches/2021Q1/devel/newt/Makefile (revision 566476) @@ -1,81 +1,79 @@ # $FreeBSD$ PORTNAME= newt PORTVERSION= 0.52.20 -PORTREVISION= 1 +PORTREVISION= 2 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 -USES= gmake ncurses pathfix +USES= autoreconf gmake localbase ncurses pathfix 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}" SUB_FILES= pkgIndex.tcl SUB_LIST= 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_CPPFLAGS= -I${TCL_INCLUDEDIR:Q} SOVERSION= ${PORTVERSION:R:E} post-patch: + @${REINPLACE_CMD} -e 's|-DUSE_INTERP_RESULT||' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e \ - '/^SONAME/s|=.*|=${SOVERSION}| ; \ - s|-DUSE_INTERP_RESULT||' ${WRKSRC}/configure - @${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 + '/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 Index: branches/2021Q1/devel/newt/files/patch-configure.ac =================================================================== --- branches/2021Q1/devel/newt/files/patch-configure.ac (nonexistent) +++ branches/2021Q1/devel/newt/files/patch-configure.ac (revision 566476) @@ -0,0 +1,29 @@ +--- configure.ac.orig 2017-03-17 10:36:31 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 *]) + 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 + 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 Property changes on: branches/2021Q1/devel/newt/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 566475) +++ branches/2021Q1 (revision 566476) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r566474