View | Details | Raw Unified | Return to bug 221027 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/makeinfo.mk (-1 / +4 lines)
Lines 15-22 _INCLUDE_USES_MAKEINFO_MK= yes Link Here
15
IGNORE=	USES=makeinfo - expects no arguments
15
IGNORE=	USES=makeinfo - expects no arguments
16
.endif
16
.endif
17
17
18
.if !exists(/usr/bin/makeinfo)
18
.if exists(/usr/bin/makeinfo)
19
MAKEINFO?=	/usr/bin/makeinfo
20
.else
19
BUILD_DEPENDS+=	makeinfo:print/texinfo
21
BUILD_DEPENDS+=	makeinfo:print/texinfo
22
MAKEINFO?=	${LOCALBASE}/bin/makeinfo
20
.endif
23
.endif
21
24
22
.endif
25
.endif
(-)audio/glame/Makefile (-1 / +1 lines)
Lines 18-24 LIB_DEPENDS= libmp3lame.so:audio/lame \ Link Here
18
		libguile.so:lang/guile
18
		libguile.so:lang/guile
19
19
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
21
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
22
USES=		gettext gmake pathfix pkgconfig libtool makeinfo
22
USES=		gettext gmake pathfix pkgconfig libtool makeinfo
23
USE_GNOME=	gnomeprefix libgnomeui
23
USE_GNOME=	gnomeprefix libgnomeui
24
USE_XORG=	xbitmaps x11
24
USE_XORG=	xbitmaps x11
(-)databases/bbdb/Makefile (-1 / +1 lines)
Lines 15-21 USE_EMACS= yes Link Here
15
15
16
USES=		makeinfo
16
USES=		makeinfo
17
ALL_TARGET=	bbdb info
17
ALL_TARGET=	bbdb info
18
MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"makeinfo --no-split\""
18
MAKE_ARGS=	MAKE="${MAKE} clean MAKEINFO=\"${MAKEINFO} --no-split\""
19
BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
19
BBDB_LISPDIR=	${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
20
PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
20
PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
21
MAKE_JOBS_UNSAFE=	yes
21
MAKE_JOBS_UNSAFE=	yes
(-)deskutils/gcal/Makefile (-1 / +1 lines)
Lines 12-18 COMMENT= GNU Gregorian calendar program Link Here
12
LICENSE=	GPLv3+
12
LICENSE=	GPLv3+
13
13
14
GNU_CONFIGURE=	yes
14
GNU_CONFIGURE=	yes
15
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
15
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
16
USES=		charsetfix shebangfix makeinfo tar:xz
16
USES=		charsetfix shebangfix makeinfo tar:xz
17
SHEBANG_FILES=	misc/gcalltx/gcalltxp.in misc/gcalltx/gcalltx.pl
17
SHEBANG_FILES=	misc/gcalltx/gcalltxp.in misc/gcalltx/gcalltx.pl
18
18
(-)devel/cutils/Makefile (-1 / +1 lines)
Lines 11-17 COMMENT= Miscellaneous C programmer's utilities Link Here
11
11
12
USES=		makeinfo
12
USES=		makeinfo
13
GNU_CONFIGURE=	yes
13
GNU_CONFIGURE=	yes
14
MAKE_ENV=	MAKEINFO=makeinfo
14
MAKE_ENV=	MAKEINFO="${MAKEINFO}"
15
INFO=		cutils
15
INFO=		cutils
16
MAKE_JOBS_UNSAFE=	yes
16
MAKE_JOBS_UNSAFE=	yes
17
17
(-)devel/libmatheval/Makefile (-1 / +1 lines)
Lines 14-20 BUILD_DEPENDS= flex>=2.5.39_1:textproc/flex Link Here
14
LIB_DEPENDS=	libguile.so:lang/guile
14
LIB_DEPENDS=	libguile.so:lang/guile
15
15
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="makeinfo --no-split"
17
CONFIGURE_ENV=	LEXLIB=-lfl_pic MAKEINFO="${MAKEINFO} --no-split"
18
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
19
USES=		libtool localbase makeinfo pathfix
19
USES=		libtool localbase makeinfo pathfix
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
(-)devel/m4/Makefile (-1 / +1 lines)
Lines 17-23 OPTIONS_DEFINE= LIBSIGSEGV EXAMPLES Link Here
17
LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv)
17
LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv)
18
18
19
CONFIGURE_ARGS=	--program-prefix=g
19
CONFIGURE_ARGS=	--program-prefix=g
20
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
20
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
USES=		makeinfo tar:xz
22
USES=		makeinfo tar:xz
23
23
(-)devel/monotone/Makefile (-1 / +1 lines)
Lines 25-31 USES= cpe gmake iconv localbase lua:51 makeinfo p Link Here
25
USE_PERL5=	build
25
USE_PERL5=	build
26
26
27
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
28
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
28
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
29
29
30
INFO=		monotone
30
INFO=		monotone
31
PORTDOCS=	*
31
PORTDOCS=	*
(-)devel/openocd/Makefile (-4 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	openocd
4
PORTNAME=	openocd
5
PORTVERSION=	0.10.0
5
PORTVERSION=	0.10.0
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	SF
8
MASTER_SITES=	SF
8
9
Lines 9-21 MASTER_SITES= SF Link Here
9
MAINTAINER=	skreuzer@FreeBSD.org
10
MAINTAINER=	skreuzer@FreeBSD.org
10
COMMENT=	Open On-Chip Debugger
11
COMMENT=	Open On-Chip Debugger
11
12
12
BUILD_DEPENDS=	${LOCALBASE}/bin/makeinfo:print/texinfo
13
14
BROKEN_powerpc64=	fails to configure: error: C compiler cannot create executables
13
BROKEN_powerpc64=	fails to configure: error: C compiler cannot create executables
15
14
16
GNU_CONFIGURE=	yes
15
GNU_CONFIGURE=	yes
17
CONFIGURE_ARGS+=	--disable-werror
16
CONFIGURE_ARGS+=	--disable-werror
18
CONFIGURE_ENV=	MAKEINFO=${LOCALBASE}/bin/makeinfo
19
17
20
OPTIONS_DEFINE=	DOXYGEN JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
18
OPTIONS_DEFINE=	DOXYGEN JIMTCL VERBOSE JTAG_IO USB_IO PARPORT DUMMY FT2232 FTDI \
21
	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
19
	USBBLASTER EP93XX AT91RM9200 PRESTO USBPROG JLINK VSLLINK RLINK ULINK \
Lines 56-62 CMSISDAP_DESC= Support for CMSIS-DAP Compliant Deb Link Here
56
TIICDI_DESC=	Support for the TI ICDI JTAG Programmer
54
TIICDI_DESC=	Support for the TI ICDI JTAG Programmer
57
USB_COMMS_DESC=	Enable verbose USB communication messages
55
USB_COMMS_DESC=	Enable verbose USB communication messages
58
56
59
USES=		gmake libtool pkgconfig tar:bzip2
57
USES=		gmake libtool makeinfo pkgconfig tar:bzip2
60
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wno-error=unused-command-line-argument
58
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib -Wno-error=unused-command-line-argument
61
INFO=		openocd
59
INFO=		openocd
62
60
(-)editors/flim/Makefile (-3 / +3 lines)
Lines 60-66 BUILD_DEPENDS+= nkf:japanese/nkf Link Here
60
.endif
60
.endif
61
61
62
# makeinfo stuff
62
# makeinfo stuff
63
MAKEINFO=		makeinfo --no-split --no-validate
63
MAKEINFO_FLAGS=		--no-split --no-validate
64
MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
64
MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
65
MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
65
MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
66
66
Lines 109-115 info-build: Link Here
109
	for i in mime-en.texi; do \
109
	for i in mime-en.texi; do \
110
		${MV} $${i} $${i}.jis ; \
110
		${MV} $${i} $${i}.jis ; \
111
		${CAT} $${i}.jis | nkf -e > $${i} ; \
111
		${CAT} $${i}.jis | nkf -e > $${i} ; \
112
		${MAKEINFO} $${i} || ${TRUE} ; \
112
		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
113
	done)
113
	done)
114
.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
114
.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
115
	@(cd ${WRKSRC} ; \
115
	@(cd ${WRKSRC} ; \
Lines 116-122 info-build: Link Here
116
	for i in mime-ja.texi; do \
116
	for i in mime-ja.texi; do \
117
		${MV} $${i} $${i}.jis ; \
117
		${MV} $${i} $${i}.jis ; \
118
		${CAT} $${i}.jis | nkf -e > $${i} ; \
118
		${CAT} $${i}.jis | nkf -e > $${i} ; \
119
		${MAKEINFO} $${i} || ${TRUE} ; \
119
		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
120
	done)
120
	done)
121
.endif
121
.endif
122
122
(-)editors/semi/Makefile (-3 / +3 lines)
Lines 57-63 RUN_DEPENDS+= flim-${EMACS_PORT_NAME}>0:editors/fl Link Here
57
BUILD_DEPENDS+=	nkf:japanese/nkf
57
BUILD_DEPENDS+=	nkf:japanese/nkf
58
.endif
58
.endif
59
59
60
MAKEINFO=		makeinfo --no-split --no-validate
60
MAKEINFO_FLAGS=		--no-split --no-validate
61
MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
61
MAKEINFO_EMACS=		${EMACS_CMD} -no-site-file -no-init-file -batch
62
MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
62
MAKEINFO_EMACS_FLAGS=	-e texinfo-format-buffer -f save-buffer
63
63
Lines 102-108 info-build: Link Here
102
	for i in mime-ui-en.texi; do \
102
	for i in mime-ui-en.texi; do \
103
		${MV} $${i} $${i}.jis ; \
103
		${MV} $${i} $${i}.jis ; \
104
		${CAT} $${i}.jis | nkf -e > $${i} ; \
104
		${CAT} $${i}.jis | nkf -e > $${i} ; \
105
		${MAKEINFO} $${i} || ${TRUE} ; \
105
		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
106
	done)
106
	done)
107
.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
107
.if defined(EMACS_HAS_MULE) && (${EMACS_HAS_MULE} == "YES")
108
	@(cd ${WRKSRC} ; \
108
	@(cd ${WRKSRC} ; \
Lines 109-115 info-build: Link Here
109
	for i in mime-ui-ja.texi; do \
109
	for i in mime-ui-ja.texi; do \
110
		${MV} $${i} $${i}.jis ; \
110
		${MV} $${i} $${i}.jis ; \
111
		${CAT} $${i}.jis | nkf -e > $${i} ; \
111
		${CAT} $${i}.jis | nkf -e > $${i} ; \
112
		${MAKEINFO} $${i} || ${TRUE} ; \
112
		${MAKEINFO} ${MAKEINFO_FLAGS} $${i} || ${TRUE} ; \
113
	done)
113
	done)
114
.endif
114
.endif
115
115
(-)ftp/wget/Makefile (-1 / +1 lines)
Lines 27-33 OPTIONS_DEFINE= DOCS IDN IPV6 MANPAGES METALINK NL Link Here
27
OPTIONS_DEFAULT=DOCS IDN IPV6 MANPAGES NLS OPENSSL
27
OPTIONS_DEFAULT=DOCS IDN IPV6 MANPAGES NLS OPENSSL
28
28
29
DOCS_DESC=	Install info page
29
DOCS_DESC=	Install info page
30
DOCS_CONFIGURE_ENV=	MAKEINFO=makeinfo
30
DOCS_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO}"
31
DOCS_INFO=	wget
31
DOCS_INFO=	wget
32
DOCS_USES=	makeinfo
32
DOCS_USES=	makeinfo
33
33
(-)games/heroes/Makefile (-1 / +1 lines)
Lines 33-39 MUSICSRC= ${WRKDIR}/${MUSICDISTNAME} Link Here
33
USE_SDL=	mixer sdl
33
USE_SDL=	mixer sdl
34
USES=		gettext gmake iconv makeinfo
34
USES=		gettext gmake iconv makeinfo
35
GNU_CONFIGURE=	yes
35
GNU_CONFIGURE=	yes
36
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
36
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
37
CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
37
CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
38
38
39
OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
39
OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
(-)graphics/aalib/Makefile (-1 / +1 lines)
Lines 38-44 post-extract: Link Here
38
post-patch:
38
post-patch:
39
	@${RM} ${WRKSRC}/config.cache
39
	@${RM} ${WRKSRC}/config.cache
40
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
40
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
41
		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
41
		s|MAKEINFO=makeinfo|MAKEINFO="${MAKEINFO} --no-split"|g' \
42
		${WRKSRC}/configure
42
		${WRKSRC}/configure
43
	@${REINPLACE_CMD} \
43
	@${REINPLACE_CMD} \
44
		-e 's|AC_DEFUN(AM_PATH_AALIB|AC_DEFUN([AM_PATH_AALIB]|g' \
44
		-e 's|AC_DEFUN(AM_PATH_AALIB|AC_DEFUN([AM_PATH_AALIB]|g' \
(-)graphics/enblend/Makefile (-4 / +1 lines)
Lines 28-37 BROKEN_powerpc64= fails to configure: libvigraimpe Link Here
28
28
29
USE_AUTOTOOLS=	automake:env autoconf:env
29
USE_AUTOTOOLS=	automake:env autoconf:env
30
USES=		compiler:features gmake jpeg localbase makeinfo
30
USES=		compiler:features gmake jpeg localbase makeinfo
31
# We need a newer version of makeinfo for this.
31
CONFIGURE_ARGS=	--with-boost-filesystem
32
# Remove this line when we remove texinfo from the base system.
33
CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo" \
34
		--with-boost-filesystem
35
32
36
USE_GL=		glew glut
33
USE_GL=		glew glut
37
GNU_CONFIGURE=	yes
34
GNU_CONFIGURE=	yes
(-)math/gmp/Makefile (-1 / +1 lines)
Lines 16-22 CPU_OPTS_DESC= Enable assembly optimizations for y Link Here
16
16
17
USES=		libtool makeinfo tar:xz
17
USES=		libtool makeinfo tar:xz
18
HAS_CONFIGURE=	yes
18
HAS_CONFIGURE=	yes
19
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
19
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
20
CONFIGURE_ARGS=	--prefix=${PREFIX} \
20
CONFIGURE_ARGS=	--prefix=${PREFIX} \
21
		--infodir=${PREFIX}/info \
21
		--infodir=${PREFIX}/info \
22
		--mandir=${PREFIX}/man \
22
		--mandir=${PREFIX}/man \
(-)math/mingw32-libgmp/Makefile (-1 / +1 lines)
Lines 23-29 GNU_CONFIGURE= yes Link Here
23
CC=		${PKGNAMEPREFIX}gcc
23
CC=		${PKGNAMEPREFIX}gcc
24
CXX=		${PKGNAMEPREFIX}c++
24
CXX=		${PKGNAMEPREFIX}c++
25
CFLAGS+=	-I/usr/include
25
CFLAGS+=	-I/usr/include
26
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split" \
26
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split" \
27
		PREFIX="${PREFIX}/${GMP_TARG}" \
27
		PREFIX="${PREFIX}/${GMP_TARG}" \
28
		M4="/usr/bin/m4"
28
		M4="/usr/bin/m4"
29
CONFIGURE_ARGS=	--enable-cxx --host=${GMP_TARG} \
29
CONFIGURE_ARGS=	--enable-cxx --host=${GMP_TARG} \
(-)security/libgcrypt/Makefile (-1 / +1 lines)
Lines 19-25 CPE_VENDOR= gnupg Link Here
19
USE_CSTD=	gnu89
19
USE_CSTD=	gnu89
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--disable-drng-support --enable-static=yes
21
CONFIGURE_ARGS=	--disable-drng-support --enable-static=yes
22
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
22
CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
23
CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
23
CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
24
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
25
TEST_TARGET=	check
25
TEST_TARGET=	check
(-)textproc/flex/Makefile (-1 / +1 lines)
Lines 16-22 USES= bison gmake libtool makeinfo tar:xz Link Here
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
# install flex header to its own dir to avoid conflict with system flex.
17
# install flex header to its own dir to avoid conflict with system flex.
18
CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
18
CONFIGURE_ARGS=	--includedir=${PREFIX}/include/flex --disable-shared
19
CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="makeinfo --no-split"
19
CONFIGURE_ENV=	M4=${LOCALBASE}/bin/gm4 MAKEINFO="${MAKEINFO} --no-split"
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
21
21
22
INFO=		flex
22
INFO=		flex
(-)textproc/gsed/Makefile (-1 / +1 lines)
Lines 12-18 MAINTAINER= johans@FreeBSD.org Link Here
12
COMMENT=	The GNU stream editor
12
COMMENT=	The GNU stream editor
13
13
14
GNU_CONFIGURE=	yes
14
GNU_CONFIGURE=	yes
15
CONFIGURE_ENV+=	MAKEINFO="makeinfo --no-split"
15
CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO} --no-split"
16
16
17
USES=		charsetfix makeinfo gmake
17
USES=		charsetfix makeinfo gmake
18
PATCH_SUBDIRS=	. doc lib sed
18
PATCH_SUBDIRS=	. doc lib sed

Return to bug 221027