2 files changed, 51 insertions, 40 deletions

diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 4f925af2a1c4..4c9d068df9ab 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -4,7 +4,7 @@
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/01/16 10:15:13 obrien Exp $
+# $Id: Makefile,v 1.2 1998/03/04 09:19:21 obrien Exp $
 #
 
 DISTNAME=	gcc-2.8.0
@@ -13,27 +13,38 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 
 MAINTAINER=	obrien@FreeBSD.org
 
+GNUOSREL!=	uname -r | sed -e 's/[-(].*//'
+
+PLIST=          ${WRKDIR}/PLIST.fixedup
+GNUHOST=	i386-unknown-freebsd${GNUOSREL}
+CONFIGURE_ARGS=	--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.0/include/g++
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
 ALL_TARGET=	bootstrap
 MAN1=		cccp28.1 g++28.1 gcc28.1
 
+pre-fetch:
+	@${ECHO} "GCC 2.8 for ${OSNAME} ${GNUOSREL}"
+
+pre-install:
+	@${SED} -e 's:%GNUOSREL%:${GNUOSREL}:' ${PKGDIR}/PLIST \
+		> ${PLIST
+
 post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/gcov \
 	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/i386-unknown-freebsd-gcc \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1obj \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1plus \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/2.8.0/cpp ; \
+	${PREFIX}/bin/${GNUHOST}-gcc \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.0/cc1 \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.0/cc1obj \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.0/cc1plus \
+	${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.0/cpp ; \
 		do strip $$prog ; \
 		done)
 	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/gcc28
 	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/g++28
-	${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/cccp28.1
-	${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
-	${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
+	@${MV} ${PREFIX}/man/man1/cccp.1 ${PREFIX}/man/man1/cccp28.1
+	@${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/g++28.1
+	@${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/gcc28.1
 
 .include <bsd.port.mk>
diff --git a/lang/gcc28/pkg-plist b/lang/gcc28/pkg-plist
index 2a0678e68dec..370d6f149b0a 100644
--- a/lang/gcc28/pkg-plist
+++ b/lang/gcc28/pkg-plist
@@ -5,7 +5,7 @@ bin/unprotoize
 bin/gcov
 bin/gcc
 bin/gcc28
-bin/i386-unknown-freebsd-gcc
+bin/i386-unknown-freebsd%GNUOSREL%-gcc
 @unexec install-info --delete
 info/cpp.info
 info/cpp.info-1
@@ -41,35 +41,35 @@ info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
 @exec install-info
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/math.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/syslimits.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/typeinfo
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/exception
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/new
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/new.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/limits.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/README
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/hash.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/objc-list.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/sarray.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/objc.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/objc-api.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/NXConstStr.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/Object.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/Protocol.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/encoding.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/typedstream.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/objc/thr.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/include/float.h
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1plus
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/cc1obj
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/specs
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/SYSCALLS.c.X
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/cpp
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/libgcc.a
-lib/gcc-lib/i386-unknown-freebsd/2.8.0/libobjc.a
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/math.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/syslimits.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/typeinfo
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/exception
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/new
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/new.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/limits.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/README
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/hash.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/objc-list.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/sarray.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/objc.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/objc-api.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/NXConstStr.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/Object.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/Protocol.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/encoding.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/typedstream.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/objc/thr.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/include/float.h
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/cc1
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/cc1plus
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/cc1obj
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/specs
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/SYSCALLS.c.X
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/cpp
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/libgcc.a
+lib/gcc-lib/i386-unknown-freebsd%GNUOSREL%/2.8.0/libobjc.a
 man/man1/cccp28.1.gz
 man/man1/g++28.1.gz
 man/man1/gcc28.1.gz
-i386-unknown-freebsd/include/assert.h
+i386-unknown-freebsd%GNUOSREL%/include/assert.h