Remove instllation of `libiberty.a', add prefixes to gcov & gccbug & manpages.

  Now this port doesn't install non-unique files.

4 files changed, 48 insertions, 12 deletions

diff --git a/devel/mipsel-linux-gcc/Makefile b/devel/mipsel-linux-gcc/Makefile
index 5cf47f17ac1e..579aaf389b0f 100644
--- a/devel/mipsel-linux-gcc/Makefile
+++ b/devel/mipsel-linux-gcc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	2.97
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 #MASTER_SITES=   ftp://ftp.agendacomputing.com/pub/dev/snow/snap-02212000/src/
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -19,9 +19,9 @@ COMMENT=	Gcc-2.97 for mipsel-linux cross-development with SNOW ABI
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
-		${LOCALBASE}/${PKGNAMEPREFIX:S/-$//}/include/stdio.h:${PORTSDIR}/devel/agenda-headers \
-		${LOCALBASE}/${PKGNAMEPREFIX:S/-$//}/lib/crti.o:${PORTSDIR}/devel/agenda-static-libs \
-		${LOCALBASE}/${PKGNAMEPREFIX:S/-$//}/lib/libc.a:${PORTSDIR}/devel/agenda-static-libs
+		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/include/stdio.h:${PORTSDIR}/devel/agenda-headers \
+		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/lib/crti.o:${PORTSDIR}/devel/agenda-static-libs \
+		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/lib/libc.a:${PORTSDIR}/devel/agenda-static-libs
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--enable-languages=c,c++ \
 		--enable-soft-float \
 		--enable-multilib \
-		--disable-shared
+		--disable-shared \
+		--disable-nls
 
 ONLY_FOR_ARCHS=	i386 alpha
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
@@ -39,14 +40,15 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 USE_PERL5=	yes
 LIBTOOLFILES=	configure gcc/configure
-MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cpp.1 gcov.1
+MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 \
+		${PKGNAMEPREFIX}cpp.1 ${PKGNAMEPREFIX}gcov.1
 
 GCC_REV=	2.97
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} GCC_TARG=${PKGNAMEPREFIX:S/-$//} \
 		GCC_REV=${GCC_REV}
 
-BINARIES=	gcc g++ c++ cpp
+BINARIES=	gcc g++ c++ cpp gcov
 
 post-configure:
 	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
diff --git a/devel/mipsel-linux-gcc/files/patch-Makefile.in b/devel/mipsel-linux-gcc/files/patch-Makefile.in
new file mode 100644
index 000000000000..0f16a0b5a25d
--- /dev/null
+++ b/devel/mipsel-linux-gcc/files/patch-Makefile.in
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	Wed Oct 15 19:57:01 2003
++++ Makefile.in	Wed Oct 15 19:57:13 2003
+@@ -664,7 +664,6 @@
+ 	install-itcl \
+ 	install-ld \
+ 	install-libgui \
+-	install-libiberty \
+ 	install-libtool \
+ 	install-m4 \
+ 	install-make \
diff --git a/devel/mipsel-linux-gcc/files/patch-gcc-Makefile.in b/devel/mipsel-linux-gcc/files/patch-gcc-Makefile.in
new file mode 100644
index 000000000000..537fac769656
--- /dev/null
+++ b/devel/mipsel-linux-gcc/files/patch-gcc-Makefile.in
@@ -0,0 +1,26 @@
+--- gcc/Makefile.in.orig	Wed Oct 15 19:58:25 2003
++++ gcc/Makefile.in	Wed Oct 15 20:06:54 2003
+@@ -521,8 +521,8 @@
+ CPP_INSTALL_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
+ PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
+ UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
+-GCOV_INSTALL_NAME = `t='$(program_transform_name)'; echo gcov | sed -e $$t`
+-GCCBUG_INSTALL_NAME = `t='$(program_transform_name)'; echo gccbug | sed -e $$t`
++GCOV_INSTALL_NAME = `t='$(program_transform_cross_name)'; echo gcov | sed -e $$t`
++GCCBUG_INSTALL_NAME = `t='$(program_transform_cross_name)'; echo gccbug | sed -e $$t`
+ 
+ # Actual name to use when installing a cross-compiler.
+ GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
+@@ -2600,10 +2600,10 @@
+ 	  chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
+ 	fi
+ 	-rm -f $(man1dir)/cpp$(manext)
+-	-$(INSTALL_DATA) $(srcdir)/cpp.1 $(man1dir)/cpp$(manext)
++	-$(INSTALL_DATA) $(srcdir)/cpp.1 $(man1dir)/$(CPP_CROSS_NAME)$(manext)
+ 	-chmod a-x $(man1dir)/cpp$(manext)
+ 	-rm -f $(man1dir)/gcov$(manext)
+-	-$(INSTALL_DATA) $(srcdir)/gcov.1 $(man1dir)/gcov$(manext)
++	-$(INSTALL_DATA) $(srcdir)/gcov.1 $(man1dir)/$(GCOV_INSTALL_NAME)$(manext)
+ 	-chmod a-x $(man1dir)/gcov$(manext)
+ 
+ # Install the library.
diff --git a/devel/mipsel-linux-gcc/pkg-plist b/devel/mipsel-linux-gcc/pkg-plist
index c222c3669c2a..4509450d02a7 100644
--- a/devel/mipsel-linux-gcc/pkg-plist
+++ b/devel/mipsel-linux-gcc/pkg-plist
@@ -2,13 +2,13 @@
 %%GCC_TARG%%/bin/cpp
 %%GCC_TARG%%/bin/g++
 %%GCC_TARG%%/bin/gcc
+%%GCC_TARG%%/bin/gcov
 bin/%%GCC_TARG%%-c++
-bin/%%GCC_TARG%%-c++filt
 bin/%%GCC_TARG%%-cpp
 bin/%%GCC_TARG%%-g++
 bin/%%GCC_TARG%%-gcc
-bin/gccbug
-bin/gcov
+bin/%%GCC_TARG%%-gccbug
+bin/%%GCC_TARG%%-gcov
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/cc1plus
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/collect2
@@ -31,8 +31,6 @@ lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/libgcc.a
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/single/libgcc.a
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/specs
 lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/tradcpp0
-lib/libiberty.a
-share/locale/sv/LC_MESSAGES/gcc.mo
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/single
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%/include
 @dirrm lib/gcc-lib/%%GCC_TARG%%/%%GCC_REV%%