indexinfo is lighter and does a better job that texinfo-lite

6 files changed, 1 insertions, 130 deletions

diff --git a/MOVED b/MOVED
index 18982a9e02cf..1e285a04abed 100644
--- a/MOVED
+++ b/MOVED
@@ -6237,3 +6237,4 @@ x11-clocks/wmitime||2014-07-04|Has expired
 x11/xorg-edit||2014-07-04|Has expired: Depends on older version of wxGTK
 net/ttbudget||2014-07-06|Has expired: does not build, mastersite disapperead, not staged
 sysutil/psgconf||2014-07-06|Removed: abandonware
+print/texinfo-lite/print/indexinfo|2014-07-06|Replaced by indexinfo to handle info page index
diff --git a/print/Makefile b/print/Makefile
index 2f0b214ee453..c9c0a1f0a521 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -303,7 +303,6 @@
     SUBDIR += tex-xetex
     SUBDIR += tex-xmltex
     SUBDIR += texinfo
-    SUBDIR += texinfo-lite
     SUBDIR += texlive-base
     SUBDIR += texlive-docs
     SUBDIR += texlive-full
diff --git a/print/texinfo-lite/Makefile b/print/texinfo-lite/Makefile
deleted file mode 100644
index df2d72559175..000000000000
--- a/print/texinfo-lite/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	texinfo
-PORTVERSION=	5.2
-CATEGORIES=	print ports-mgmt
-MASTER_SITES=	GNU
-PKGNAMESUFFIX=	-lite
-
-MAINTAINER=	bapt@FreeBSD.org
-COMMENT=	Minimal version of texinfo
-
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		tar:xz
-
-PLIST_FILES=	bin/ginstall-info \
-		bin/ginfo
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls
-CONFIGURE_ENV=	PERL=${TRUE} ac_cv_path_PERL=${TRUE}
-
-BUILD_WRKSRC=	${WRKSRC}/gnulib/lib
-
-post-build:
-		cd ${WRKSRC}/install-info; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
-		cd ${WRKSRC}/info; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS}
-
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/install-info/ginstall-info ${STAGEDIR}${PREFIX}/bin/ginstall-info
-		${INSTALL_PROGRAM} ${WRKSRC}/info/ginfo ${STAGEDIR}${PREFIX}/bin/ginfo
-
-.include <bsd.port.mk>
diff --git a/print/texinfo-lite/distinfo b/print/texinfo-lite/distinfo
deleted file mode 100644
index 49716d4d2c3e..000000000000
--- a/print/texinfo-lite/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (texinfo-5.2.tar.xz) = 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda
-SIZE (texinfo-5.2.tar.xz) = 3812944
diff --git a/print/texinfo-lite/files/patch-install-info_install-info.c b/print/texinfo-lite/files/patch-install-info_install-info.c
deleted file mode 100644
index c9252d8193ad..000000000000
--- a/print/texinfo-lite/files/patch-install-info_install-info.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- install-info/install-info.c.orig	2013-01-07 00:18:56.000000000 +0100
-+++ install-info/install-info.c	2013-02-19 09:15:24.000000000 +0100
-@@ -26,6 +26,7 @@
- #define TAB_WIDTH 8
- 
- static char *progname = "install-info";
-+static char *default_section = NULL;
- 
- struct spec_entry;
- struct spec_section;
-@@ -146,6 +147,8 @@ struct option longopts[] =
-   { "calign",    required_argument, NULL, 'C'},
-   { "debug",     no_argument, NULL, 'g' },
-   { "delete",    no_argument, NULL, 'r' },
-+  { "defentry",  required_argument, NULL, 'E' },
-+  { "defsection",  required_argument, NULL, 'S' },
-   { "dir-file",  required_argument, NULL, 'd' },
-   { "entry",     required_argument, NULL, 'e' },
-   { "name",      required_argument, NULL, 't' },
-@@ -543,6 +546,10 @@ Options:\n\
-  --debug             report what is being done.\n\
-  --delete            delete existing entries for INFO-FILE from DIR-FILE;\n\
-                       don't insert any new entries.\n\
-+ --defentry=TEXT     like --entry, but only use TEXT if an entry\n\
-+                      is not present in INFO-FILE.\n\
-+ --defsection=TEXT   like --section, but only use TEXT if a section\n\
-+                      is not present in INFO-FILE.\n\
-  --description=TEXT  the description of the entry is TEXT; used with\n\
-                       the --name option to become synonymous with the\n\
-                       --entry option.\n\
-@@ -1857,6 +1864,8 @@ main (int argc, char *argv[])
-   struct spec_entry *entries_to_add = NULL;
-   struct spec_entry *entries_to_add_from_file = NULL;
-   int n_entries_to_add = 0;
-+  struct spec_entry *default_entries_to_add = NULL;
-+  int n_default_entries_to_add = 0;
- 
-   /* Record the old text of the dir file, as plain characters,
-      as lines, and as nodes.  */
-@@ -2041,6 +2050,7 @@ main (int argc, char *argv[])
-           }
-           break;
- 
-+	case 'E':
-         case 'e':
-           {
-             struct spec_entry *next
-@@ -2055,12 +2065,18 @@ main (int argc, char *argv[])
-             next->text_len = olen;
-             next->entry_sections = NULL;
-             next->entry_sections_tail = NULL;
--            next->next = entries_to_add;
-             next->missing_name = 0;
-             next->missing_basename = 0;
-             next->missing_description = 0;
--            entries_to_add = next;
--            n_entries_to_add++;
-+	    if (opt == 'e') {
-+		next->next = entries_to_add;
-+		entries_to_add = next;
-+		n_entries_to_add++;
-+	    } else {
-+		next->next = default_entries_to_add;
-+		default_entries_to_add = next;
-+		n_default_entries_to_add++;
-+	    }
-           }
-           break;
- 
-@@ -2127,6 +2143,10 @@ main (int argc, char *argv[])
-           }
-           break;
- 
-+	case 'S':
-+	  default_section = optarg;
-+	  break;
-+
-         case 's':
-           {
-             struct spec_section *next
-@@ -2315,7 +2335,7 @@ There is NO WARRANTY, to the extent perm
-         {
-           input_sections = (struct spec_section *)
-             xmalloc (sizeof (struct spec_section));
--          input_sections->name = "Miscellaneous";
-+          input_sections->name = default_section ? default_section : "Miscellaneous";
-           input_sections->next = NULL;
-           input_sections->missing = 1;
-         }
diff --git a/print/texinfo-lite/pkg-descr b/print/texinfo-lite/pkg-descr
deleted file mode 100644
index aaa6e657f89f..000000000000
--- a/print/texinfo-lite/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Stripped down version of texinfo (only install-info part) to handle installation
-of GNU info files
-
-WWW: http://www.gnu.org/software/texinfo/