fix package:

unify info files rather than fixing pkg-plist at every future update.
remove %D/lib/gcc-lib/blah if empty.

Non-response from:	maintainer

3 files changed, 15 insertions, 59 deletions

diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index c7f1cf79c7d4..8d3614b159b0 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gcc30
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/releases/gcc-${GCC_REV}/  \
 		${MASTER_SITE_SOURCEWARE}
@@ -46,6 +47,7 @@ USE_GMAKE=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
 		--with-gxx-include-dir=${TARGLIB}/include/g++
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .else
@@ -68,6 +70,7 @@ pre-configure:
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
+	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -118,6 +121,7 @@ post-install:
 	cd ${PREFIX} ;\
 	    find ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
+	(${ECHO} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.gcc-lib
 	${ECHO} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
 	${ECHO} "/Insert PLIST.gcc-lib"		>> ${WRKDIR}/ex.script
 	${ECHO} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc30/files/patch-vb b/lang/gcc30/files/patch-vb
new file mode 100644
index 000000000000..353fda9f7c4c
--- /dev/null
+++ b/lang/gcc30/files/patch-vb
@@ -0,0 +1,11 @@
+--- ../gcc-3.0.1/Makefile.in.orig	Fri Jun  8 12:23:56 2001
++++ ../gcc-3.0.1/Makefile.in	Sat Sep  1 18:57:21 2001
+@@ -143,7 +143,7 @@
+ 
+ MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
+ 	then echo $$r/texinfo/makeinfo/makeinfo ; \
+-	else echo makeinfo ; fi`
++	else echo makeinfo --no-split ; 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/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index 923e479e884d..ea1b620564b4 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -26,68 +26,9 @@ bin/jcf-dump
 @comment	info/c-tree.info-2
 @comment	info/c-tree.info-3
 info/cpp.info
-info/cpp.info-1
-info/cpp.info-2
-info/cpp.info-3
 info/cppinternals.info
 info/g77.info
-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
 info/gcc.info
-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-30
-info/gcc.info-31
-info/gcc.info-32
-info/gcc.info-33
-info/gcc.info-34
-info/gcc.info-35
-info/gcc.info-3
-info/gcc.info-4
-info/gcc.info-5
-info/gcc.info-6
-info/gcc.info-7
-info/gcc.info-8
-info/gcc.info-9
 info/gcj.info
 @exec install-info %D/info/c-tree.info %D/info/dir
 @exec install-info %D/info/cppinternals.info %D/info/dir