Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk	(revision 359301)
+++ Mk/bsd.port.mk	(working copy)
@@ -2914,8 +2914,7 @@
 .endif
 
 .if defined(INFO)
-BUILD_DEPENDS+=	ginstall-info:${PORTSDIR}/print/texinfo-lite
-RUN_DEPENDS+=	ginstall-info:${PORTSDIR}/print/texinfo-lite
+RUN_DEPENDS+=	indexinfo:${PORTSDIR}/print/indexinfo
 
 . for D in ${INFO:H}
 RD:=	${D}
@@ -5659,13 +5658,9 @@
 	ginstall-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
 .endif
 .if !defined(WITH_PKGNG)
-	@${ECHO_CMD} "@unexec ginstall-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
-		>> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec [ \`ginfo -d %D/${INFO_PATH}  --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
-		>> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST}
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ginstall-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
-		>> ${TMPPLIST}
+	@${ECHO_CMD} "@exec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST}
 .else
 	@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* 2>/dev/null | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}
 .endif
@@ -5678,7 +5673,7 @@
 .endif
 .endif
 .if (${PREFIX} != "/usr")
-	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST}
 .if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE})
 	@${ECHO_CMD} "@dirrmtry ${INFO_PATH}" >> ${TMPPLIST}
 .endif
Index: Keywords/info.yaml
===================================================================
--- Keywords/info.yaml	(revision 359301)
+++ Keywords/info.yaml	(working copy)
@@ -4,14 +4,6 @@
 
 actions: [file]
 post-install: |
-  file=%D/%@
-  ginstall-info --quiet %D/%@ %D/info/dir
+  indexinfo %D/info
 post-deinstall: |
-  file=%D/%@
-  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
-     rmdir ${file%/*} 2> /dev/null || true
-  fi
+  indexinfo %D/info
Index: print/Makefile
===================================================================
--- print/Makefile	(revision 359301)
+++ print/Makefile	(working copy)
@@ -115,6 +115,7 @@
     SUBDIR += html2ps
     SUBDIR += hyperlatex
     SUBDIR += ifxetex
+    SUBDIR += indexinfo
     SUBDIR += it-acroread8
     SUBDIR += jabref
     SUBDIR += jadetex
Index: print/indexinfo/Makefile
===================================================================
--- print/indexinfo/Makefile	(revision 0)
+++ print/indexinfo/Makefile	(working copy)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	indexinfo
+PORTVERSION=	0.1
+CATEGORIES=	print ports-mgmt
+MASTER_SITES=	http://files.etoilebsd.net/indexinfo/
+
+MAINTAINER=	bapt@FreeBSD.org
+COMMENT=	Utility to regenerate the GNU info page index
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+GNU_CONFIGURE=	yes
+PLIST_FILES=	bin/indexinfo
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.mk>

Property changes on: print/indexinfo/Makefile
___________________________________________________________________
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
Index: print/indexinfo/distinfo
===================================================================
--- print/indexinfo/distinfo	(revision 0)
+++ print/indexinfo/distinfo	(working copy)
@@ -0,0 +1,2 @@
+SHA256 (indexinfo-0.1.tar.gz) = 8d86271e8ef52207a10a7c76f28e36dc2c45fa0d5b4265db4985dd117cbc3f8a
+SIZE (indexinfo-0.1.tar.gz) = 77954

Property changes on: print/indexinfo/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: print/indexinfo/pkg-descr
===================================================================
--- print/indexinfo/pkg-descr	(revision 0)
+++ print/indexinfo/pkg-descr	(working copy)
@@ -0,0 +1,3 @@
+Small utility designed to regenerate the GNU info page indexes
+
+WWW: http://fossil.etoilebsd.net/indexinfo

Property changes on: print/indexinfo/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property