Index: Keywords/info.yaml
===================================================================
--- Keywords/info.yaml	(revision 358961)
+++ Keywords/info.yaml	(working copy)
@@ -5,11 +5,11 @@
 actions: [file]
 post-install: |
   file=%D/%@
-  install-info --quiet %D/%@ %D/info/dir
+  ginstall-info --quiet %D/%@ %D/info/dir
 post-deinstall: |
   file=%D/%@
-  install-info --quiet --delete %D/%@ %D/info/dir
-  if [ $(info -d ${file%/*}  --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then
+  ginstall-info --quiet --delete %D/%@ %D/info/dir
+  if [ $(ginfo -d ${file%/*}  --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then
     rm -f ${file%/*}/dir
   fi
   if [ ${file%/*} != "%D/info" ]; then
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 358961)
+++ Mk/bsd.port.mk	(working copy)
@@ -2908,12 +2908,9 @@
 .endif
 
 .if defined(INFO)
-#.if !exists(/usr/bin/install-info)
-#.if ${.CURDIR} != ${PORTSDIR}/print/texinfo
-#BUILD_DEPENDS+=	makeinfo:${PORTSDIR}/print/texinfo
-#RUN_DEPENDS+=	install-info:${PORTSDIR}/print/texinfo
-#.endif
-#.endif
+BUILD_DEPENDS+=	ginstall-info:${PORTSDIR}/print/pkg-texinfo
+RUN_DEPENDS+=	ginstall-info:${PORTSDIR}/print/pkg-texinfo
+
 . for D in ${INFO:H}
 RD:=	${D}
 .  if ${RD} != "."
@@ -5653,15 +5650,15 @@
 # Process GNU INFO files at package install/deinstall time
 .for i in ${INFO}
 .if defined(NO_STAGE)
-	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
+	ginstall-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
 .endif
 .if !defined(WITH_PKGNG)
-	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+	@${ECHO_CMD} "@unexec ginstall-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec [ \`info -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
+	@${ECHO_CMD} "@unexec [ \`ginfo -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
 		>> ${TMPPLIST}
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
+	@${ECHO_CMD} "@exec ginstall-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
 		>> ${TMPPLIST}
 .else
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* 2>/dev/null | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}
Index: Mk/Uses/makeinfo.mk
===================================================================
--- Mk/Uses/makeinfo.mk	(revision 0)
+++ Mk/Uses/makeinfo.mk	(working copy)
@@ -0,0 +1,20 @@
+# $FreeBSD$
+#
+# Handle build depends on makeinfo
+#
+# Feature:	bison
+# Usage:	USES=bison or USES=bison:ARGS
+# Valid ARGS:	build (default, implicit), run, both
+#
+# MAINTAINER: portmgr@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_MAKEINFO_MK)
+_INCLUDE_USES_MAKEINFO_MK=	yes
+
+.if defined(makeinfo_ARGS)
+IGNORE=	USES=makeinfo expects no arguments
+.endif
+BUILD_DEPENDS+=	makeinfo:${PORTSDIR}/print/texinfo
+
+.endif
+

Property changes on: Mk/Uses/makeinfo.mk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property