svn commit: r446854 - in head: Mk/Uses audio/glame databases/bbdb deskutils/gcal devel/cutils devel/libmatheval devel/m4 devel/monotone devel/openocd editors/flim editors/semi ftp/wget games/heroes...

Fri Jul 28 21:45:24 UTC 2017

Author: jkim
Date: Fri Jul 28 21:45:20 2017
New Revision: 446854
URL: https://svnweb.freebsd.org/changeset/ports/446854

Log:
  Set MAKEINFO to the full path of makeinfo when USES=makeinfo is set.
  
  PR:		221027
  Reviewed by:	mat
  Approved by:	portmgr (antoine)

Modified:
  head/Mk/Uses/makeinfo.mk
  head/audio/glame/Makefile
  head/databases/bbdb/Makefile
  head/deskutils/gcal/Makefile
  head/devel/cutils/Makefile
  head/devel/libmatheval/Makefile
  head/devel/m4/Makefile
  head/devel/monotone/Makefile
  head/devel/openocd/Makefile
  head/editors/flim/Makefile
  head/editors/semi/Makefile
  head/ftp/wget/Makefile
  head/games/heroes/Makefile
  head/graphics/aalib/Makefile
  head/graphics/enblend/Makefile
  head/math/gmp/Makefile
  head/math/mingw32-libgmp/Makefile
  head/security/libgcrypt/Makefile
  head/textproc/flex/Makefile
  head/textproc/gsed/Makefile

Modified: head/Mk/Uses/makeinfo.mk
==============================================================================

--- head/Mk/Uses/makeinfo.mk	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/Mk/Uses/makeinfo.mk	Fri Jul 28 21:45:20 2017	(r446854)
@@ -15,8 +15,11 @@ _INCLUDE_USES_MAKEINFO_MK=	yes
 IGNORE=	USES=makeinfo - expects no arguments
 .endif
 
-.if !exists(/usr/bin/makeinfo)
+.if exists(/usr/bin/makeinfo)
+MAKEINFO?=	/usr/bin/makeinfo
+.else
 BUILD_DEPENDS+=	makeinfo:print/texinfo
+MAKEINFO?=	${LOCALBASE}/bin/makeinfo
 .endif
 
 .endif

Modified: head/audio/glame/Makefile
==============================================================================
--- head/audio/glame/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/audio/glame/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libmp3lame.so:audio/lame \
 		libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 USES=		gettext gmake pathfix pkgconfig libtool makeinfo
 USE_GNOME=	gnomeprefix libgnomeui
 USE_XORG=	xbitmaps x11

Modified: head/databases/bbdb/Makefile
==============================================================================
--- head/databases/bbdb/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/databases/bbdb/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -15,7 +15,7 @@ USE_EMACS=	yes
 
 USES=		makeinfo
 ALL_TARGET=	bbdb info
-MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"makeinfo --no-split\""
+MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"${MAKEINFO} --no-split\""
 BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 MAKE_JOBS_UNSAFE=	yes

Modified: head/deskutils/gcal/Makefile
==============================================================================
--- head/deskutils/gcal/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/deskutils/gcal/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -12,7 +12,7 @@ COMMENT=	GNU Gregorian calendar program
 LICENSE=	GPLv3+
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 USES=		charsetfix shebangfix makeinfo tar:xz
 SHEBANG_FILES=	misc/gcalltx/gcalltxp.in misc/gcalltx/gcalltx.pl
 

Modified: head/devel/cutils/Makefile
==============================================================================
--- head/devel/cutils/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/devel/cutils/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -11,7 +11,7 @@ COMMENT=	Miscellaneous C programmer's utilities
 
 USES=		makeinfo
 GNU_CONFIGURE=	yes
-MAKE_ENV=	MAKEINFO=makeinfo
+MAKE_ENV=	MAKEINFO="${MAKEINFO}"
 INFO=		cutils
 MAKE_JOBS_UNSAFE=	yes
 

Modified: head/devel/libmatheval/Makefile
==============================================================================
--- head/devel/libmatheval/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/devel/libmatheval/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	flex>=2.5.39_1:textproc/flex
 LIB_DEPENDS=	libguile.so:lang/guile
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="${MAKEINFO} --no-split"
 USE_LDCONFIG=	yes
 USES=		libtool localbase makeinfo pathfix
 INSTALL_TARGET=	install-strip

Modified: head/devel/m4/Makefile
==============================================================================
--- head/devel/m4/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/devel/m4/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	LIBSIGSEGV EXAMPLES
 LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv)
 
 CONFIGURE_ARGS=	--program-prefix=g
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 GNU_CONFIGURE=	yes
 USES=		makeinfo tar:xz
 

Modified: head/devel/monotone/Makefile
==============================================================================
--- head/devel/monotone/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/devel/monotone/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -25,7 +25,7 @@ USES=		cpe gmake iconv localbase lua:51 makeinfo perl5
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 
 INFO=		monotone
 PORTDOCS=	*

Modified: head/devel/openocd/Makefile
==============================================================================
--- head/devel/openocd/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/devel/openocd/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -3,19 +3,17 @@
 
 PORTNAME=	openocd
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	skreuzer at FreeBSD.org
 COMMENT=	Open On-Chip Debugger
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
-
 BROKEN_powerpc64=	fails to configure: error: C compiler cannot create executables
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-werror
-CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
 
 OPTIONS_DEFINE=	DOXYGEN JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
 	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
@@ -56,7 +54,7 @@ CMSISDAP_DESC=	Support for CMSIS-DAP Compliant Debugge
 TIICDI_DESC=	Support for the TI ICDI JTAG Programmer
 USB_COMMS_DESC=	Enable verbose USB communication messages
 
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool makeinfo pkgconfig tar:bzip2
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wno-error=unused-command-line-argument
 INFO=		openocd
 

Modified: head/editors/flim/Makefile
==============================================================================
--- head/editors/flim/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/editors/flim/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -60,7 +60,7 @@ BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
 # makeinfo stuff
-MAKEINFO=		makeinfo --no-split --no-validate
+MAKEINFO_FLAGS=		--no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
@@ -109,14 +109,14 @@ info-build:
 	for i in mime-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
+		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
+		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
 	done)
 .endif
 

Modified: head/editors/semi/Makefile
==============================================================================
--- head/editors/semi/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/editors/semi/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -57,7 +57,7 @@ RUN_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/flim
 BUILD_DEPENDS+=	nkf:japanese/nkf
 .endif
 
-MAKEINFO=		makeinfo --no-split --no-validate
+MAKEINFO_FLAGS=		--no-split --no-validate
 MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
 MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
 
@@ -102,14 +102,14 @@ info-build:
 	for i in mime-ui-en.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
+		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
 	done)
 .if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
 	@(cd ${WRKSRC} ; \
 	for i in mime-ui-ja.texi; do \
 		${MV} $${i} $${i}.jis ; \
 		${CAT} $${i}.jis | nkf -e > $${i} ; \
-		${MAKEINFO} $${i} || ${TRUE} ; \
+		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
 	done)
 .endif
 

Modified: head/ftp/wget/Makefile
==============================================================================
--- head/ftp/wget/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/ftp/wget/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS IDN IPV6 MANPAGES METALINK NLS PC
 OPTIONS_DEFAULT=DOCS IDN IPV6 MANPAGES NLS OPENSSL
 
 DOCS_DESC=	Install info page
-DOCS_CONFIGURE_ENV=	MAKEINFO=makeinfo
+DOCS_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO}"
 DOCS_INFO=	wget
 DOCS_USES=	makeinfo
 

Modified: head/games/heroes/Makefile
==============================================================================
--- head/games/heroes/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/games/heroes/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -33,7 +33,7 @@ MUSICSRC=	${WRKDIR}/${MUSICDISTNAME}
 USE_SDL=	mixer sdl
 USES=		gettext gmake iconv makeinfo
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS

Modified: head/graphics/aalib/Makefile
==============================================================================
--- head/graphics/aalib/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/graphics/aalib/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -38,7 +38,7 @@ post-extract:
 post-patch:
 	@${RM} ${WRKSRC}/config.cache
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
-		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
+		s|MAKEINFO=makeinfo|MAKEINFO="${MAKEINFO} --no-split"|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e 's|AC_DEFUN(AM_PATH_AALIB|AC_DEFUN([AM_PATH_AALIB]|g' \

Modified: head/graphics/enblend/Makefile
==============================================================================
--- head/graphics/enblend/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/graphics/enblend/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -28,10 +28,7 @@ BROKEN_powerpc64=	fails to configure: libvigraimpex is
 
 USE_AUTOTOOLS=	automake:env autoconf:env
 USES=		compiler:features gmake jpeg localbase makeinfo
-# We need a newer version of makeinfo for this.
-# Remove this line when we remove texinfo from the base system.
-CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo" \
-		--with-boost-filesystem
+CONFIGURE_ARGS=	--with-boost-filesystem
 
 USE_GL=		glew glut
 GNU_CONFIGURE=	yes

Modified: head/math/gmp/Makefile
==============================================================================
--- head/math/gmp/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/math/gmp/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -16,7 +16,7 @@ CPU_OPTS_DESC=	Enable assembly optimizations for your 
 
 USES=		libtool makeinfo tar:xz
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--infodir=${PREFIX}/info \
 		--mandir=${PREFIX}/man \

Modified: head/math/mingw32-libgmp/Makefile
==============================================================================
--- head/math/mingw32-libgmp/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/math/mingw32-libgmp/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 CC=		${PKGNAMEPREFIX}gcc
 CXX=		${PKGNAMEPREFIX}c++
 CFLAGS+=	-I/usr/include
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split" \
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split" \
 		PREFIX="${PREFIX}/${GMP_TARG}" \
 		M4="/usr/bin/m4"
 CONFIGURE_ARGS=	--enable-cxx --host=${GMP_TARG} \

Modified: head/security/libgcrypt/Makefile
==============================================================================
--- head/security/libgcrypt/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/security/libgcrypt/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -19,7 +19,7 @@ CPE_VENDOR=	gnupg
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support --enable-static=yes
-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 USE_LDCONFIG=	yes
 TEST_TARGET=	check

Modified: head/textproc/flex/Makefile
==============================================================================
--- head/textproc/flex/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/textproc/flex/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -16,7 +16,7 @@ USES=		bison gmake libtool makeinfo tar:xz
 GNU_CONFIGURE=	yes
 # install flex header to its own dir to avoid conflict with system flex.
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
-CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="${MAKEINFO} --no-split"
 INSTALL_TARGET=	install-strip
 
 INFO=		flex

Modified: head/textproc/gsed/Makefile
==============================================================================
--- head/textproc/gsed/Makefile	Fri Jul 28 21:30:50 2017	(r446853)
+++ head/textproc/gsed/Makefile	Fri Jul 28 21:45:20 2017	(r446854)
@@ -12,7 +12,7 @@ MAINTAINER=	johans at FreeBSD.org
 COMMENT=	The GNU stream editor
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
+CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO} --no-split"
 
 USES=		charsetfix makeinfo gmake
 PATCH_SUBDIRS=	. doc lib sed
