USE_NEW_TEXINFO is now ubiquitous. Remove conditionals on it.

Also remove the older texinfo.mk framework as well as the previous
handling of INFO_FILES, all this is not used anymore.

3 files changed, 13 insertions, 122 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 508a8637ca1..7982bda08ea 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1233 2003/08/08 12:04:40 agc Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1234 2003/08/09 10:24:54 seb Exp $
 #
 # This file is in the public domain.
 #
@@ -553,12 +553,12 @@ PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_ARCHLIB:S/^${LOCALBASE}\///}
 # base vs. GNU tools
 . include "../../mk/tools.mk"
 
-.if defined(USE_NEW_TEXINFO)
-INFO_FILES?=
+# Handle info files
+#
+INFO_FILES?=			# default to no info files to handle 
 USE_MAKEINFO?=	no		# default to not using makeinfo
-.  if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO])
-.    include "../../mk/texinfo.mk"
-.  endif
+.if !empty(INFO_FILES) || empty(USE_MAKEINFO:M[nN][oO])
+. include "../../mk/texinfo.mk"
 .endif
 
 .if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS])
@@ -2437,13 +2437,6 @@ real-su-install: ${MESSAGE}
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-install
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install
 	${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
-.if !defined(USE_NEW_TEXINFO)
-.  for f in ${INFO_FILES}
-	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/${f}"; \
-	${INSTALL_INFO} --remove --info-dir=${PREFIX}/info ${PREFIX}/info/${f}; \
-	${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/${f}
-.  endfor
-.endif # !USE_NEW_TEXINFO
 	@# PLIST must be generated at this late point (instead of
 	@# depending on it somewhere earlier), as the
 	@# pre/do/post-install aren't run then yet:
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk
index 78e22080f8c..bc5c9415d1a 100644
--- a/mk/buildlink2/bsd.buildlink2.mk
+++ b/mk/buildlink2/bsd.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink2.mk,v 1.92 2003/07/31 13:50:13 seb Exp $
+# $NetBSD: bsd.buildlink2.mk,v 1.93 2003/08/09 10:24:54 seb Exp $
 #
 # An example package buildlink2.mk file:
 #
@@ -1025,7 +1025,6 @@ ${BUILDLINK_DIR}/${_prog_}: ${_GNU_MISSING}
 .  endfor
 .endfor
 
-.if defined(USE_NEW_TEXINFO)
 # install-info and makeinfo handling.
 #
 # Create an install-info script that is a "no operation" command
@@ -1049,7 +1048,7 @@ ${BUILDLINK_DIR}/bin/install-info:
 CONFIGURE_ENV+=	MAKEINFO="${BUILDLINK_DIR}/bin/makeinfo"
 MAKE_ENV+=	MAKEINFO="${BUILDLINK_DIR}/bin/makeinfo"
 
-.  if empty(USE_MAKEINFO:M[nN][oO])
+.if empty(USE_MAKEINFO:M[nN][oO])
 do-buildlink: makeinfo-wrapper
 makeinfo-wrapper: ${BUILDLINK_DIR}/bin/makeinfo
 ${BUILDLINK_DIR}/bin/makeinfo:
@@ -1061,7 +1060,7 @@ ${BUILDLINK_DIR}/bin/makeinfo:
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} 'exec ${MAKEINFO} "$$@"' >> ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.  else # !USE_MAKEINFO
+.else # !USE_MAKEINFO
 do-buildlink: hide-makeinfo
 hide-makeinfo: ${BUILDLINK_DIR}/bin/makeinfo
 ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING}
@@ -1073,5 +1072,4 @@ ${BUILDLINK_DIR}/bin/makeinfo: ${_GNU_MISSING}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	${ECHO} 'exit 1' >>  ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET}
-.  endif # USE_MAKEINFO
-.endif # USE_NEW_TEXINFO
+.endif # USE_MAKEINFO
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 50935aa9d15..fef7303e2df 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,25 +1,12 @@
-# $NetBSD: texinfo.mk,v 1.19 2003/07/31 22:05:38 seb Exp $
+# $NetBSD: texinfo.mk,v 1.20 2003/08/09 10:24:54 seb Exp $
 #
-# This Makefile fragment is included by bsd.pkg.mk when INFO_FILES and
-# USE_NEW_TEXINFO are defined.
-#
-# Or...
-#
-# This Makefile fragment is included by packages that provide info files
-# and do not _yet_ use the new framework.
+# This Makefile fragment is included by bsd.pkg.mk when INFO_FILES is
+# not empty or USE_MAKEINFO is not "no".
 #
 
 .if !defined(TEXINFO_MK)
 TEXINFO_MK=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-#
-# This switch is here only until all packages are converted to use
-# the new framework.
-#
-.if defined(USE_NEW_TEXINFO)
-
 .if !empty(INFO_FILES)
 #
 # Handle install-info.
@@ -150,91 +137,4 @@ MAKE_ENV+=		MAKEINFO="${FALSE}"
 .  endif
 .endif # USE_MAKEINFO
 
-##############################################################
-.else # !USE_NEW_TEXINFO
-# Obsolete handling below... Will go away ASAP.
-
-# Does the system have the GNU texinfo tools and if yes, what version are they?
-_INSTALL_INFO=
-.for _i_ in /usr/bin/install-info /sbin/install-info
-.  if exists(${_i_})
-_INSTALL_INFO=	${_i_}
-.  endif
-.endfor
-.if !empty(_INSTALL_INFO)
-.  if !defined(INSTALL_INFO_VERSION)
-_INSTALL_INFO_VERSION_OUTPUT!=  ${_INSTALL_INFO} --version 2>/dev/null || ${ECHO}
-# If the install-info version contains useful information outside [0-9].[0-9],
-# the following would have to be changed as well as the comparison below
-INSTALL_INFO_VERSION=${_INSTALL_INFO_VERSION_OUTPUT:M[0-9]*.[0-9]*:C/[^0-9.]//}
-MAKEFLAGS+=		INSTALL_INFO_VERSION=${INSTALL_INFO_VERSION}
-.  endif
-.endif
-
-# Minimum required version for the GNU texinfo tools.
-TEXINFO_REQD?=	3.12
-
-# Sort out if we need the version provided by devel/gtexinfo.
-.if defined(INSTALL_INFO_VERSION)
-.  if ${INSTALL_INFO_VERSION} < ${TEXINFO_REQD}
-_NEED_TEXINFO=	# defined
-.  endif
-.else
-_NEED_TEXINFO=	# defined
-.endif
-
-.if defined(_NEED_TEXINFO)
-DEPENDS+=		gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
-_GTEXINFO_PREFIX_DEFAULT=${LOCALBASE}
-EVAL_PREFIX+=		_GTEXINFO_PREFIX=gtexinfo
-INSTALL_INFO=	${_GTEXINFO_PREFIX}/bin/install-info
-MAKEINFO=	${_GTEXINFO_PREFIX}/bin/makeinfo
-.else
-INSTALL_INFO=	${_INSTALL_INFO}
-MAKEINFO=	/usr/bin/makeinfo	# we assume it!
-.endif
-
-#
-# Advertise in environment which install-info and makeinfo should be used.
-#
-CONFIGURE_ENV+=	MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}"
-MAKE_ENV+=	MAKEINFO="${MAKEINFO}" INSTALL_INFO="${INSTALL_INFO}"
-
-#
-# Another way would be to use ${SED} to substitute @MAKEINFO@, @INSTALL_INFO@
-# and bare makeinfo and install-info words  in target rules commands and in
-# Makefiles variable assignments for the files matching ${TEXINFO_PATTERNS}.
-#
-# Note: there are embedded tabs in some variables below.
-#
-TEXINFO_OVERRIDE?=	NO
-
-.if defined(TEXINFO_OVERRIDE) && (${TEXINFO_OVERRIDE} == "YES")
-TEXINFO_PATTERNS+=	Makefile.in
-# replace @MAKEINFO@ and @INSTALL_INFO@ respectively with ${MAKEINFO} and
-# ${INSTALL_INFO}
-TEXINFO_VAR_SUBST+=	MAKEINFO=${MAKEINFO:Q}
-TEXINFO_VAR_SUBST+=	INSTALL_INFO=${INSTALL_INFO:Q}
-TEXINFO_SUBST_SED+=	${TEXINFO_VAR_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
-# replace bare makeinfo and install-info in MAKEINFO and INSTALL_INFO variables
-# assignments
-TEXINFO_SUBST_SED+=	-e 's!^MAKEINFO[ 	]*=[ 	]*makeinfo[ 	]*\(.*\)$$!MAKEINFO = ${MAKEINFO} \1!'
-TEXINFO_SUBST_SED+=	-e 's!^INSTALL_INFO[ 	]*=[ 	]*install-info[ 	]*\(.*\)$$!INSTALL_INFO = ${INSTALL_INFO} \1!'
-# replace bare makeinfo and install-info commands in Makefile target rules
-TEXINFO_SUBST_SED+=	-e "s!^\(	.*\)\([ 	]\)makeinfo\([ 	]\)!\1\2${MAKEINFO}\3!g"
-TEXINFO_SUBST_SED+=	-e "s!^\(	.*\)\([ 	'(]\)install-info\([ 	]\)!\1\2${INSTALL_INFO}\3!g"
-
-_CONFIGURE_PREREQ+=	texinfo-override
-texinfo-override:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	(for _PATTERN in ${TEXINFO_PATTERNS}; do			\
-	  ${FIND} ${WRKSRC} -type f -name "$$_PATTERN" -print;		\
-	done; ) | ( while read _F ; do					\
-		${SED} ${TEXINFO_SUBST_SED} "$$_F" > "$$_F.new" &&	\
-		${MV} "$$_F.new" "$$_F";				\
-	done )
-.endif # TEXINFO_OVERRIDE
-
-.endif # USE_NEW_TEXINFO
-
 .endif # TEXINFO_MK