From 290cdcd62c756e9daf40360bfb957912e7d5b2a0 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Tue, 19 May 2009 02:10:13 +0000
Subject: [PATCH] Make the determination of SUFFIX more general and the one of
 CONFIGURE_SCRIPT more robust.

---
 lang/gcc43/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 282f0778d7c1..e1ce4c1d4dd2 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -29,7 +29,7 @@ DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-SUFFIX=		${PORTVERSION:C/([0-9]).([0-9]).*/\1\2/}
+SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha ia64 powerpc
 USE_BISON=	build
@@ -41,7 +41,7 @@ MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
-CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
+CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 .include <bsd.port.pre.mk>