Fix packaging which was quite broken. On the way, update PORTVERSION to

match the new versioning scheme in GCC-land and adjust the renaming of
gccbug to the scheme used by the other programs installed by this port.

26 files changed, 78 insertions, 91 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 3ab667bf30ae..364ac5ba9453 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -10,10 +10,10 @@ SNAPDATE=	2003-12-31
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
-PORTVERSION=	3.4
+PORTVERSION=	3.4.0
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
-VERSIONSTRING=	${PORTVERSION}-${PORTREVISION}
+VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -44,11 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
-GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${GCC_VER}
-PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
+TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
@@ -143,7 +142,7 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
 		${PREFIX}/man/man1/${f}-34.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug34
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 182357f13a85..63ed478b829e 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -9,7 +9,7 @@ bin/%%GNU_HOST%%-gcc34
 bin/%%GNU_HOST%%-g++34
 bin/%%GNU_HOST%%-gcj
 bin/%%GNU_HOST%%-gcjh
-bin/gccbug-%%GCC_VER%%
+bin/gccbug34
 bin/gcj34
 bin/gcjh34
 bin/gij34