Attachment 184777 Details for Bug 221027 – Set MAKEINFO to the full path of makeinfo

[patch] Set MAKEINFO to the full path of makeinfo

makeinfo.diff (text/plain), 11.61 KB, created by Jung-uk Kim on 2017-07-27 21:00:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2017-07-27 21:00:55 UTC

Size: 11.61 KB

patch

obsolete

>Index: Mk/Uses/makeinfo.mk
>===================================================================
>--- Mk/Uses/makeinfo.mk	(revision 446755)
>+++ Mk/Uses/makeinfo.mk	(working copy)
>@@ -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
>Index: audio/glame/Makefile
>===================================================================
>--- audio/glame/Makefile	(revision 446755)
>+++ audio/glame/Makefile	(working copy)
>@@ -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
>Index: databases/bbdb/Makefile
>===================================================================
>--- databases/bbdb/Makefile	(revision 446755)
>+++ databases/bbdb/Makefile	(working copy)
>@@ -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
>Index: deskutils/gcal/Makefile
>===================================================================
>--- deskutils/gcal/Makefile	(revision 446755)
>+++ deskutils/gcal/Makefile	(working copy)
>@@ -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
> 
>Index: devel/cutils/Makefile
>===================================================================
>--- devel/cutils/Makefile	(revision 446755)
>+++ devel/cutils/Makefile	(working copy)
>@@ -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
> 
>Index: devel/libmatheval/Makefile
>===================================================================
>--- devel/libmatheval/Makefile	(revision 446755)
>+++ devel/libmatheval/Makefile	(working copy)
>@@ -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
>Index: devel/m4/Makefile
>===================================================================
>--- devel/m4/Makefile	(revision 446755)
>+++ devel/m4/Makefile	(working copy)
>@@ -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
> 
>Index: devel/monotone/Makefile
>===================================================================
>--- devel/monotone/Makefile	(revision 446755)
>+++ devel/monotone/Makefile	(working copy)
>@@ -25,7 +25,7 @@ USES=		cpe gmake iconv localbase lua:51 makeinfo p
> USE_PERL5=	build
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
>+CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
> 
> INFO=		monotone
> PORTDOCS=	*
>Index: devel/openocd/Makefile
>===================================================================
>--- devel/openocd/Makefile	(revision 446755)
>+++ devel/openocd/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	openocd
> PORTVERSION=	0.10.0
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF
> 
>@@ -9,13 +10,10 @@ MASTER_SITES=	SF
> MAINTAINER=	skreuzer@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 Deb
> 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
> 
>Index: editors/flim/Makefile
>===================================================================
>--- editors/flim/Makefile	(revision 446755)
>+++ editors/flim/Makefile	(working copy)
>@@ -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,7 +109,7 @@ 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} ; \
>@@ -116,7 +116,7 @@ info-build:
> 	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
> 
>Index: editors/semi/Makefile
>===================================================================
>--- editors/semi/Makefile	(revision 446755)
>+++ editors/semi/Makefile	(working copy)
>@@ -57,7 +57,7 @@ RUN_DEPENDS+=	flim-${EMACS_PORT_NAME}>0:editors/fl
> 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,7 +102,7 @@ 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} ; \
>@@ -109,7 +109,7 @@ info-build:
> 	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
> 
>Index: ftp/wget/Makefile
>===================================================================
>--- ftp/wget/Makefile	(revision 446755)
>+++ ftp/wget/Makefile	(working copy)
>@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	DOCS IDN IPV6 MANPAGES METALINK NL
> 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
> 
>Index: games/heroes/Makefile
>===================================================================
>--- games/heroes/Makefile	(revision 446755)
>+++ games/heroes/Makefile	(working copy)
>@@ -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
>Index: graphics/aalib/Makefile
>===================================================================
>--- graphics/aalib/Makefile	(revision 446755)
>+++ graphics/aalib/Makefile	(working copy)
>@@ -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' \
>Index: graphics/enblend/Makefile
>===================================================================
>--- graphics/enblend/Makefile	(revision 446755)
>+++ graphics/enblend/Makefile	(working copy)
>@@ -28,10 +28,7 @@ BROKEN_powerpc64=	fails to configure: libvigraimpe
> 
> 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
>Index: math/gmp/Makefile
>===================================================================
>--- math/gmp/Makefile	(revision 446755)
>+++ math/gmp/Makefile	(working copy)
>@@ -16,7 +16,7 @@ CPU_OPTS_DESC=	Enable assembly optimizations for y
> 
> 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 \
>Index: math/mingw32-libgmp/Makefile
>===================================================================
>--- math/mingw32-libgmp/Makefile	(revision 446755)
>+++ math/mingw32-libgmp/Makefile	(working copy)
>@@ -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} \
>Index: security/libgcrypt/Makefile
>===================================================================
>--- security/libgcrypt/Makefile	(revision 446755)
>+++ security/libgcrypt/Makefile	(working copy)
>@@ -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
>Index: textproc/flex/Makefile
>===================================================================
>--- textproc/flex/Makefile	(revision 446755)
>+++ textproc/flex/Makefile	(working copy)
>@@ -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
>Index: textproc/gsed/Makefile
>===================================================================
>--- textproc/gsed/Makefile	(revision 446755)
>+++ textproc/gsed/Makefile	(working copy)
>@@ -12,7 +12,7 @@ MAINTAINER=	johans@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

Actions: View | Diff

Attachments on bug 221027: 184739 | 184777