Convert to USE_NEW_TEXINFO.

Remove or trim "info related" patch files.
Install info files in package specific directory.
Hence the PLIST files are now nearly empty...

This should finish making these two packages really non-conflicting.

Bump PKGREVISION.

6 files changed, 7 insertions, 141 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 29f951b17b2..b462266ee35 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2003/07/04 16:11:55 seb Exp $
+# $NetBSD: Makefile,v 1.62 2003/07/04 16:27:24 seb Exp $
 
 DISTNAME=		gcc-2.95.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 #
@@ -29,13 +29,15 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_DIRS=		${WRKDIR}/objdir
 BUILD_DIRS=		${CONFIGURE_DIRS}
 
+USE_NEW_TEXINFO=	YES
+INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
 INFO_FILES=		chill.info cpp.info g77.info gcc.info
 
 .include "../../mk/bsd.prefs.mk"
 
 GCC_PREFIX=		${PREFIX}/${PKGNAME_NOREV}
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+CONFIGURE_ARGS+=	--infodir=${GCC_PREFIX}/info
 
 .if ${OPSYS} == "SunOS"
 CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
@@ -111,7 +113,6 @@ post-install:
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
 
-.include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # Make bootstrap with compiler != gcc possible.
diff --git a/lang/gcc/PLIST b/lang/gcc/PLIST
index 32d35c80583..d7ce7b87998 100644
--- a/lang/gcc/PLIST
+++ b/lang/gcc/PLIST
@@ -1,69 +1,3 @@
-@comment $NetBSD: PLIST,v 1.9 2003/07/04 16:11:56 seb Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/chill.info %D/info/dir
-info/chill.info
-@exec ${INSTALL_INFO} %D/info/chill.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir
-info/cpp.info
-@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
-@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir
-info/g77.info
-@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir
-info/g77.info-1
-info/g77.info-10
-info/g77.info-11
-info/g77.info-12
-info/g77.info-13
-info/g77.info-14
-info/g77.info-15
-info/g77.info-16
-info/g77.info-17
-info/g77.info-18
-info/g77.info-19
-info/g77.info-2
-info/g77.info-20
-info/g77.info-21
-info/g77.info-3
-info/g77.info-4
-info/g77.info-5
-info/g77.info-6
-info/g77.info-7
-info/g77.info-8
-info/g77.info-9
-@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir
-info/gcc.info
-@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir
-info/gcc.info-1
-info/gcc.info-10
-info/gcc.info-11
-info/gcc.info-12
-info/gcc.info-13
-info/gcc.info-14
-info/gcc.info-15
-info/gcc.info-16
-info/gcc.info-17
-info/gcc.info-18
-info/gcc.info-19
-info/gcc.info-2
-info/gcc.info-20
-info/gcc.info-21
-info/gcc.info-22
-info/gcc.info-23
-info/gcc.info-24
-info/gcc.info-25
-info/gcc.info-26
-info/gcc.info-27
-info/gcc.info-28
-info/gcc.info-29
-info/gcc.info-3
-info/gcc.info-30
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
+@comment $NetBSD: PLIST,v 1.10 2003/07/04 16:27:24 seb Exp $
 share/examples/${DISTNAME}/mk.conf
 @dirrm share/examples/${DISTNAME}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 0cf68ac284b..24bf75083dc 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2003/06/24 16:50:46 jmc Exp $
+$NetBSD: distinfo,v 1.19 2003/07/04 16:27:24 seb Exp $
 
 SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622
 Size (gcc-2.95.3.tar.gz) = 12911721 bytes
@@ -9,6 +9,3 @@ SHA1 (patch-ab) = 0a9df2c9abb9a3965c085769eb09a6912f894388
 SHA1 (patch-ac) = f42b5ab389c3a51991e61cdb7533875003308001
 SHA1 (patch-ad) = 2fb8cda55220bd202a4b7948277d00f293718caf
 SHA1 (patch-ae) = b9721d3e89a93736b926e1efcfb9d0fb4904277f
-SHA1 (patch-af) = e8358ee07e83155a8b204d4a92e2e270dfeb704e
-SHA1 (patch-ag) = 8678d5ee522ca67a1842f190be6c6edc8821b2df
-SHA1 (patch-ah) = c087329327d27c21a7310614de19763d8bfc3aec
diff --git a/lang/gcc/patches/patch-af b/lang/gcc/patches/patch-af
deleted file mode 100644
index c8bf0deb516..00000000000
--- a/lang/gcc/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.7 2003/06/24 16:50:47 jmc Exp $
-
---- ../gcc-2.95.3/gcc/Makefile.in.orig	Sat May 24 14:56:02 2003
-+++ ../gcc-2.95.3/gcc/Makefile.in	Sat May 24 14:57:47 2003
-@@ -2559,10 +2559,10 @@
- 	for f in cpp.info* gcc.info*; do \
- 	    $(INSTALL_DATA) $$f $(infodir)/$$f; \
- 	done
--	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-+	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
- 	  if [ -f $(infodir)/dir ] ; then \
- 	    for f in cpp.info gcc.info; do \
--		install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \
-+		${INSTALL_INFO} --dir-file=$(infodir)/dir $(infodir)/$$f; \
- 	    done; \
- 	  else true; fi; \
- 	else true; fi;
diff --git a/lang/gcc/patches/patch-ag b/lang/gcc/patches/patch-ag
deleted file mode 100644
index 3deadf9114d..00000000000
--- a/lang/gcc/patches/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2003/06/24 16:50:47 jmc Exp $
-
---- ../gcc-2.95.3/gcc/f/Make-lang.in.orig	Sat May 24 14:56:08 2003
-+++ ../gcc-2.95.3/gcc/f/Make-lang.in	Sat May 24 14:58:41 2003
-@@ -355,9 +355,9 @@
- 	  chmod a-x $(infodir)/g77.info*; \
- 	else true; fi
- 	@if [ -f $(libsubdir)/lang-f77 -a -f $(srcdir)/f/g77.info ] ; then \
--	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	    echo " install-info --info-dir=$(infodir) $(infodir)/g77.info"; \
--	    install-info --info-dir=$(infodir) $(infodir)/g77.info || : ; \
-+	  if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	    echo " ${INSTALL_INFO} --info-dir=$(infodir) $(infodir)/g77.info"; \
-+	    ${INSTALL_INFO} --info-dir=$(infodir) $(infodir)/g77.info || : ; \
- 	  else : ; fi; \
- 	else : ; fi
- 	rm -f $(libsubdir)/lang-f77
-@@ -390,9 +390,9 @@
- 	  *) rm -f $(libsubdir)/lang-f77;; \
- 	esac
- 	@if [ -f $(libsubdir)/lang-f77 ] ; then \
--	  if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	    echo " install-info --delete --info-dir=$(infodir) $(infodir)/g77.info"; \
--	    install-info --delete --info-dir=$(infodir) $(infodir)/g77.info || : ; \
-+	  if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	    echo " ${INSTALL_INFO} --delete --info-dir=$(infodir) $(infodir)/g77.info"; \
-+	    ${INSTALL_INFO} --delete --info-dir=$(infodir) $(infodir)/g77.info || : ; \
- 	  else : ; fi; \
- 	else : ; fi
- 	-if [ -f $(libsubdir)/lang-f77 ]; then \
diff --git a/lang/gcc/patches/patch-ah b/lang/gcc/patches/patch-ah
deleted file mode 100644
index e88fd557c3a..00000000000
--- a/lang/gcc/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2003/06/24 16:50:47 jmc Exp $
-
---- ../gcc-2.95.3/texinfo/doc/Makefile.in.orig	Sat May 24 14:56:48 2003
-+++ ../gcc-2.95.3/texinfo/doc/Makefile.in	Sat May 24 14:59:51 2003
-@@ -182,12 +182,12 @@
- 
- uninstall-info:
- 	$(PRE_UNINSTALL)
--	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-+	@if $(SHELL) -c '${INSTALL_INFO} --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- 	  ii=yes; \
- 	else ii=; fi; \
- 	for file in $(INFO_DEPS); do \
- 	  test -z "$ii" \
--	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-+	    || ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
- 	done
- 	@$(NORMAL_UNINSTALL)
- 	for file in $(INFO_DEPS); do \