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.

8 files changed, 10 insertions, 117 deletions

diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index d8130ae28dc..246e674512f 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2003/07/04 16:11:57 seb Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/04 16:27:27 seb Exp $
 #
 
 DISTNAME=		gcc-3.3
-PKGREVISION=		2
+PKGREVISION=		3
 PKGNAME=		${DISTNAME:C|gcc|gcc3|}
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-3.3/}
@@ -22,7 +22,7 @@ USE_GMAKE=		YES
 
 HAS_CONFIGURE=		YES
 
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
+CONFIGURE_ARGS+=	--infodir=${GCC_PREFIX}/info
 CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
 UNLIMIT_RESOURCES=	datasize
 
@@ -34,7 +34,9 @@ TEXINFO_REQD=		4.2
 
 .include "../../mk/bsd.prefs.mk"
 
-INFO_FILES=		cpp.info g77.info gcc.info
+USE_NEW_TEXINFO=	YES
+INFO_DIR=		${GCC_PREFIX:S|^${PREFIX}/||}/info
+INFO_FILES=		cpp.info g77.info gcc.info gccint.info cppinternals.info
 .if defined(PKG_GCC3_JAVA)
 INFO_FILES+=		fastjar.info gcj.info
 .endif
@@ -102,9 +104,6 @@ post-install:
 	${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc
 #	${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77
 	${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-.if defined(PKG_GCC3_JAVA)
-	${CAT} ${PKGDIR}/PLIST.java >> ${PLIST_SRC}
-.endif
 	${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
@@ -112,7 +111,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/gcc3/PLIST b/lang/gcc3/PLIST
index 10cac3e6f58..fed56294a6e 100644
--- a/lang/gcc3/PLIST
+++ b/lang/gcc3/PLIST
@@ -1,18 +1,3 @@
-@comment $NetBSD: PLIST,v 1.7 2003/07/04 16:11:57 seb Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir
-info/cpp.info
-@exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir
-info/g77.info
-@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir
-info/gcc.info
-@exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gccint.info %D/info/dir
-info/gccint.info
-@exec ${INSTALL_INFO} %D/info/gccint.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/cppinternals.info %D/info/dir
-info/cppinternals.info
-@exec ${INSTALL_INFO} %D/info/cppinternals.info %D/info/dir
+@comment $NetBSD: PLIST,v 1.8 2003/07/04 16:27:27 seb Exp $
 share/examples/${DISTNAME}/mk.conf
 @dirrm share/examples/${DISTNAME}
diff --git a/lang/gcc3/PLIST.java b/lang/gcc3/PLIST.java
deleted file mode 100644
index e299f9941af..00000000000
--- a/lang/gcc3/PLIST.java
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.java,v 1.1 2003/07/03 16:16:30 drochner Exp $
-@unexec ${INSTALL_INFO} --delete %D/info/fastjar.info %D/info/dir
-info/fastjar.info
-@exec ${INSTALL_INFO} %D/info/fastjar.info %D/info/dir
-@unexec ${INSTALL_INFO} --delete %D/info/gcj.info %D/info/dir
-info/gcj.info
-@exec ${INSTALL_INFO} %D/info/gcj.info %D/info/dir
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index f3ba3bd4469..85f4c0adf0e 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/07/02 19:51:44 drochner Exp $
+$NetBSD: distinfo,v 1.10 2003/07/04 16:27:28 seb Exp $
 
 SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
 Size (gcc-3.3.tar.bz2) = 23447616 bytes
-SHA1 (patch-aa) = 029b1f58f75f3a28b69894dfc87e5fa5eab257d9
-SHA1 (patch-ab) = 3cb04098b3d97b1da9d24d64197dcea2771c9624
-SHA1 (patch-ac) = 1bd470366c793bfb12895e365ac4e9f3e5fda101
-SHA1 (patch-ad) = b4023140daf745d613b26909247bdf9e4066c8a4
+SHA1 (patch-ab) = 8e899db69149894e737e1f68372f3eef9c403635
 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
diff --git a/lang/gcc3/patches/patch-aa b/lang/gcc3/patches/patch-aa
deleted file mode 100644
index 27366ef41e1..00000000000
--- a/lang/gcc3/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/05/25 16:29:21 grant Exp $
-
---- Makefile.in.orig	Wed May 14 10:18:14 2003
-+++ Makefile.in
-@@ -153,11 +153,11 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
- 
- # For an installed makeinfo, we require it to be from texinfo 4.2 or
- # higher, else we use the "missing" dummy.
--MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
--	then echo $$r/texinfo/makeinfo/makeinfo ; \
--	else if (makeinfo --version \
--	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
--        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
-+#MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
-+#	then echo $$r/texinfo/makeinfo/makeinfo ; \
-+#	else if (makeinfo --version \
-+#	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
-+#        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
- 
- # This just becomes part of the MAKEINFO definition passed down to
- # sub-makes.  It lets flags be given on the command line while still
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
index 3c002f47ffb..c1cc573947a 100644
--- a/lang/gcc3/patches/patch-ab
+++ b/lang/gcc3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2003/05/24 18:38:58 jschauma Exp $
+$NetBSD: patch-ab,v 1.3 2003/07/04 16:27:29 seb Exp $
 
 --- gcc/Makefile.in.orig	Tue Jan 28 16:54:07 2003
 +++ gcc/Makefile.in	Sat May 24 13:01:38 2003
@@ -10,17 +10,3 @@ $NetBSD: patch-ab,v 1.2 2003/05/24 18:38:58 jschauma Exp $
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
    -DDEFAULT_TARGET_VERSION=\"$(version)\" \
-@@ -2662,11 +2663,11 @@
- 	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \
- 	  done; \
- 	else true; fi
--	-if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-+	-if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
- 	  if [ -f $(DESTDIR)$(infodir)/dir ] ; then \
- 	    for f in cpp.info gcc.info gccint.info cppinternals.info; do \
- 		if [ -f $(DESTDIR)$(infodir)/$$f ]; then \
--		  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
-+		  ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \
- 		else true; fi; \
- 	    done; \
- 	  else true; fi; \
diff --git a/lang/gcc3/patches/patch-ac b/lang/gcc3/patches/patch-ac
deleted file mode 100644
index 00da245b9ca..00000000000
--- a/lang/gcc3/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/05/24 18:38:59 jschauma Exp $
-
---- gcc/f/Make-lang.in.orig	Sat May 24 12:59:15 2003
-+++ gcc/f/Make-lang.in	Sat May 24 13:00:08 2003
-@@ -277,9 +277,9 @@
- 	  chmod a-x $(DESTDIR)$(infodir)/g77.info*; \
- 	else true; fi
- 	@if [ -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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
--	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
-+	    ${INSTALL_INFO} --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
- 	  else : ; fi; \
- 	else : ; fi
- 
-@@ -297,9 +297,9 @@
- 	else true; fi
- 
- f77.uninstall: installdirs
--	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
--	  echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
--	  install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(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=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \
-+	  ${INSTALL_INFO} --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
- 	else : ; fi
- 	rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
- 	rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
diff --git a/lang/gcc3/patches/patch-ad b/lang/gcc3/patches/patch-ad
deleted file mode 100644
index 7559581015c..00000000000
--- a/lang/gcc3/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/05/24 18:38:59 jschauma Exp $
-
---- gcc/java/Make-lang.in.orig	Sat May 24 13:53:25 2003
-+++ gcc/java/Make-lang.in	Sat May 24 13:53:47 2003
-@@ -207,8 +207,8 @@
- 	  else true; fi; \
- 	else true; fi
- 	-if [ -f jc1$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gcj.info ]; then \
--	  if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
--	    install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \
-+	  if $(SHELL) -c '${INSTALL_INFO} --version' >/dev/null 2>&1; then \
-+	    ${INSTALL_INFO} --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \
- 	  else true; fi; \
- 	else true; fi
-