Date: Fri, 8 Jul 2016 11:24:18 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418216 - in head: . Mk/Uses devel devel/gmake devel/gmake/files devel/slibtool misc/help2man print/texinfo Message-ID: <201607081124.u68BOIRR047687@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Jul 8 11:24:18 2016 New Revision: 418216 URL: https://svnweb.freebsd.org/changeset/ports/418216 Log: Remove a patch from devel/gmake so the port no longer depends on print/texinfo which requires gmake. To break this circular dependency gmake-lite was introduced. This can be removed now as well. PR: 210623 Reviewed by: bapt Exp-run by: antoine Approved by: portmgr (antoine) Deleted: head/devel/gmake/files/patch-doc_make.text Modified: head/MOVED head/Mk/Uses/gmake.mk head/devel/Makefile head/devel/gmake/Makefile head/devel/slibtool/Makefile head/misc/help2man/Makefile head/print/texinfo/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Jul 8 10:09:14 2016 (r418215) +++ head/MOVED Fri Jul 8 11:24:18 2016 (r418216) @@ -8608,3 +8608,4 @@ sysutils/moosefs-client|sysutils/moosefs sysutils/moosefs-master|sysutils/moosefs2-master|2016-07-07|Moved to a numbered port name sysutils/moosefs-metalogger|sysutils/moosefs2-metalogger|2016-07-07|Moved to a numbered port name sysutils/moosefs-netdump|sysutils/moosefs2-netdump|2016-07-07|Moved to a numbered port name +devel/gmake-lite|devel/gmake|2016-07-08|No longer needed Modified: head/Mk/Uses/gmake.mk ============================================================================== --- head/Mk/Uses/gmake.mk Fri Jul 8 10:09:14 2016 (r418215) +++ head/Mk/Uses/gmake.mk Fri Jul 8 11:24:18 2016 (r418216) @@ -3,7 +3,7 @@ # Provide support to use the GNU make # # Feature: gmake -# Usage: USES=gmake[:lite] +# Usage: USES=gmake # # MAINTAINER: portmgr@FreeBSD.org @@ -11,19 +11,11 @@ _INCLUDE_USES_GMAKE_MK= yes .if !empty(gmake_ARGS) -.if ${gmake_ARGS} == lite -_GMAKE_EXT= -lite -.else -IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument: lite -.endif -.endif - -.if defined(DIET) -_GMAKE_EXT= -lite +IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake takes no arguments .endif -BUILD_DEPENDS+= gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT} -CONFIGURE_ENV+= MAKE=gmake${_GMAKE_EXT} -MAKE_CMD= gmake${_GMAKE_EXT} +BUILD_DEPENDS+= gmake:devel/gmake +CONFIGURE_ENV+= MAKE=gmake +MAKE_CMD= gmake .endif Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Fri Jul 8 10:09:14 2016 (r418215) +++ head/devel/Makefile Fri Jul 8 11:24:18 2016 (r418216) @@ -695,7 +695,6 @@ SUBDIR += glrparser SUBDIR += glui SUBDIR += gmake - SUBDIR += gmake-lite SUBDIR += gnatcoll SUBDIR += gnatpython SUBDIR += gnome-builder Modified: head/devel/gmake/Makefile ============================================================================== --- head/devel/gmake/Makefile Fri Jul 8 10:09:14 2016 (r418215) +++ head/devel/gmake/Makefile Fri Jul 8 11:24:18 2016 (r418216) @@ -3,6 +3,7 @@ PORTNAME= gmake PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNU/make DISTNAME= make-${PORTVERSION} @@ -19,11 +20,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g \ --without-guile -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" # fmake does not like PO_DEPENDS_ON_POT being undefined MAKE_ARGS= PO_DEPENDS_ON_POT= -USES= cpe makeinfo tar:bzip2 +USES= cpe tar:bzip2 CPE_VENDOR= gnu OPTIONS_DEFINE= NLS Modified: head/devel/slibtool/Makefile ============================================================================== --- head/devel/slibtool/Makefile Fri Jul 8 10:09:14 2016 (r418215) +++ head/devel/slibtool/Makefile Fri Jul 8 11:24:18 2016 (r418216) @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING.SLIBTOOL HAS_CONFIGURE= yes -USES= gmake:lite tar:xz +USES= gmake tar:xz post-patch: ${REINPLACE_CMD} -e "s/make/${MAKE_CMD}/g" ${WRKSRC}/configure Modified: head/misc/help2man/Makefile ============================================================================== --- head/misc/help2man/Makefile Fri Jul 8 10:09:14 2016 (r418215) +++ head/misc/help2man/Makefile Fri Jul 8 11:24:18 2016 (r418216) @@ -17,8 +17,7 @@ OPTIONS_DEFINE= NLS LIBS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes -# keep gmake:lite has a dependency to avoid circular dependency -USES= gmake:lite perl5 +USES= gmake perl5 INFO= ${PORTNAME} PLIST_FILES= bin/${PORTNAME} \ Modified: head/print/texinfo/Makefile ============================================================================== --- head/print/texinfo/Makefile Fri Jul 8 10:09:14 2016 (r418215) +++ head/print/texinfo/Makefile Fri Jul 8 11:24:18 2016 (r418216) @@ -25,10 +25,10 @@ NLS_CONFIGURE_ENABLE= nls GNU_CONFIGURE= yes INSTALL_TARGET= install install-tex PKGDEINSTALL= ${PKGINSTALL} -USES+= charsetfix cpe gmake:lite ncurses perl5 tar:xz +USES+= charsetfix cpe gmake ncurses perl5 tar:xz MAKE_ARGS= TEXMF=${LOCALBASE}/${TEXMF} PERL=${LOCALBASE}/bin/perl -INFO= texinfo info-stnd info +INFO= texinfo info-stnd CPE_VENDOR= gnu CPE_VERSION= ${PORTVERSION:R}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607081124.u68BOIRR047687>