From 85244f3c4f19ca5a1a28eb1e3181bfc7d094ddf5 Mon Sep 17 00:00:00 2001 From: asami Date: Fri, 7 Aug 1998 22:49:31 +0000 Subject: Make these ports (TenDRA, egcs, gcc28, glibstdc++28 and guavac, all under lang) use ${OSREL} as defined in bsd.port.mk rev 1.281 and 1.227.2.43. Note gcc28 is hopelessly broken, it uses an undefined variable ${GNUOSREL} and thus has an empty string wherever ${OSREL} should be. However, it's consistent with its own PLIST at the current state so I haven't "fixed" it yet. --- lang/TenDRA/Makefile | 6 +++--- lang/egcs/Makefile | 4 +++- lang/gcc-devel/Makefile | 4 +++- lang/gcc-ooo/Makefile | 4 +++- lang/gcc/Makefile | 4 +++- lang/gcc28/Makefile | 8 +++----- lang/gcc295/Makefile | 4 +++- lang/gcc30/Makefile | 4 +++- lang/gcc31/Makefile | 4 +++- lang/gcc32/Makefile | 4 +++- lang/gcc33/Makefile | 4 +++- lang/gcc34/Makefile | 4 +++- lang/gcc35/Makefile | 4 +++- lang/gcc40/Makefile | 4 +++- lang/gcc41/Makefile | 4 +++- lang/gcc42/Makefile | 4 +++- lang/gcc43/Makefile | 4 +++- lang/gcc44/Makefile | 4 +++- lang/gcc45/Makefile | 4 +++- lang/gcc46/Makefile | 4 +++- lang/gcc47/Makefile | 4 +++- lang/gcc48/Makefile | 4 +++- lang/glibstdc++28/Makefile | 7 +++---- 23 files changed, 69 insertions(+), 32 deletions(-) (limited to 'lang') diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile index 1c6c1c937823..43ce10ea0779 100644 --- a/lang/TenDRA/Makefile +++ b/lang/TenDRA/Makefile @@ -3,7 +3,7 @@ # Date created: 7 Apr 1998 # Whom: Robert Nordier # -# $Id: Makefile,v 1.3 1998/06/06 12:18:39 rnordier Exp $ +# $Id: Makefile,v 1.4 1998/06/09 13:21:03 rnordier Exp $ # DISTNAME= TenDRA-4.1.2 @@ -12,7 +12,7 @@ MASTER_SITES= ftp://alph.dera.gov.uk/pub/TenDRA/ MAINTAINER= rnordier@FreeBSD.ORG -OSREL!= uname -r +OSRELEASE!= uname -r PLIST= ${WRKDIR}/PLIST MAN1= calculus.1 disp.1 lexi.1 pl.1 sid.1 tcc.1 tchk.1 \ tcpplus.1 tdfc2.1 tld.1 tnc.1 trans.1 tspec.1 @@ -29,7 +29,7 @@ pre-configure: INSTALL >INSTALL.build && \ chmod a+x INSTALL.build && \ chmod a-x INSTALL) - @${SED} 's:%OSREL%:${OSREL}:' ${PKGDIR}/PLIST >${PLIST} + @${SED} 's:%OSREL%:${OSRELEASE}:' ${PKGDIR}/PLIST >${PLIST} do-build: @(PATH=${WRKSRC}/bin:$$PATH && \ diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/egcs/Makefile +++ b/lang/egcs/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc-devel/Makefile +++ b/lang/gcc-devel/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile index 313da1a79294..b291227c906e 100644 --- a/lang/gcc28/Makefile +++ b/lang/gcc28/Makefile @@ -4,7 +4,7 @@ # Date created: 17 Jan 1998 # Whom: David O'Brien # -# $Id: Makefile,v 1.10 1998/06/10 20:16:08 asami Exp $ +# $Id: Makefile,v 1.11 1998/06/30 21:10:21 jdp Exp $ # DISTNAME= gcc-2.8.1 @@ -13,10 +13,8 @@ MASTER_SITES= ${MASTER_SITE_GNU} MAINTAINER= obrien@FreeBSD.org -GNUOSREL!= uname -r | sed -e 's/[-(].*//' - PLIST= ${WRKDIR}/PLIST.fixedup -GNUHOST= i386-unknown-freebsd${GNUOSREL} +GNUHOST= i386-unknown-freebsd${OSREL} CONFIGURE_ARGS= --with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/2.8.1/include/g++ GNU_CONFIGURE= yes USE_GMAKE= yes @@ -24,7 +22,7 @@ ALL_TARGET= bootstrap MAN1= cccp28.1 g++28.1 gcc28.1 pre-fetch: - @${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OSNAME} ${GNUOSREL}" + @${ECHO} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}" post-patch: @(cd ${WRKSRC}/config/i386/ ; \ diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc295/Makefile +++ b/lang/gcc295/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc30/Makefile +++ b/lang/gcc30/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc31/Makefile +++ b/lang/gcc31/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc32/Makefile +++ b/lang/gcc32/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc35/Makefile +++ b/lang/gcc35/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc40/Makefile +++ b/lang/gcc40/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc41/Makefile +++ b/lang/gcc41/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc42/Makefile +++ b/lang/gcc42/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc43/Makefile +++ b/lang/gcc43/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc44/Makefile +++ b/lang/gcc44/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc47/Makefile +++ b/lang/gcc47/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index a4e8ff528a83..aecafb9769f6 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -4,7 +4,7 @@ # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.22 1998/07/16 06:23:40 obrien Exp $ +# $Id: Makefile,v 1.23 1998/07/26 23:43:34 obrien Exp $ # DISTNAME= egcs-19980721 @@ -16,6 +16,8 @@ MASTER_SITES= ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-07-21/ \ MAINTAINER= obrien@FreeBSD.org EGCS_REV= egcs-2.91.51 +# XXX +#GNUHOST= i386-unknown-freebsd${OSREL} GNUHOST= i386-unknown-freebsd${GNUOSREL} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile index 0e1a66aaab30..a401f1283eff 100644 --- a/lang/glibstdc++28/Makefile +++ b/lang/glibstdc++28/Makefile @@ -4,7 +4,7 @@ # Date created: 03 Mar 1998 # Whom: David O'Brien # -# $Id: Makefile,v 1.2 1998/03/11 12:25:31 obrien Exp $ +# $Id: Makefile,v 1.3 1998/04/20 10:36:05 obrien Exp $ # DISTNAME= libstdc++-2.8.1.1 @@ -21,14 +21,13 @@ RUN_DEPENDS= gcc28:${PORTSDIR}/lang/gcc28 \ CC= gcc28 CXX= g++28 -GNUOSREL!= uname -r | sed -e 's/[-(].*//' -GCC28DIR= lib/gcc-lib/i386-unknown-freebsd${GNUOSREL}/2.8.1 +GCC28DIR= lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1 GNU_CONFIGURE= yes USE_GMAKE= yes PLIST= ${WRKDIR}/PLIST.fixedup pre-install: - ${SED} -e 's:%%GNUOSREL%%:${GNUOSREL}:' \ + ${SED} -e 's:%%GNUOSREL%%:${OSREL}:' \ -e 's:%%GCC28SUBDIR%%:${GCC28DIR}:' \ ${PKGDIR}/PLIST > ${PLIST} -- cgit