Index: head/lang/gcc44/Makefile
===================================================================
--- head/lang/gcc44/Makefile	(revision 234654)
+++ head/lang/gcc44/Makefile	(revision 234655)
@@ -1,181 +1,181 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc44
 # Date created:				2008-03-01
 # Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.4.1
-PORTREVISION=	20090519
+PORTVERSION=	4.4.1.20090526
 CATEGORIES=	lang java
-VERSIONSTRING=	4.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.4
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		mpfr.3:${PORTSDIR}/math/mpfr
 
 .if defined(MAINTAINER_MODE)
 DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
+VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[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
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-gmp=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
+		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 
 .if ! defined(WITHOUT_JAVA)
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
 		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
 		gjar${SUFFIX}.1 \
 		gjarsigner${SUFFIX}.1 \
 		gjavah${SUFFIX}.1 \
 		gjdoc${SUFFIX}.1 \
 		gkeytool${SUFFIX}.1 \
 		gnative2ascii${SUFFIX}.1 \
 		gorbd${SUFFIX}.1 \
 		grmic${SUFFIX}.1 \
 		grmid${SUFFIX}.1 \
 		grmiregistry${SUFFIX}.1 \
 		gserialver${SUFFIX}.1 \
 		gtnameserv${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-convert${SUFFIX}.1 \
 		rebuild-gcj-db${SUFFIX}.1
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 
 .if defined(WITH_JAVA_AWT)
 LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
 USE_GNOME=	gtk20 libartlgpl2
 CONFIGURE_ARGS+=	--enable-java-awt=gtk,xlib \
 			--enable-gtk-cairo
 .endif
 
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
-	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
+	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 .if ! defined(WITHOUT_JAVA)
 	@DSIZ=700000; DSIZBYTE=734003200; \
 	if [ `ulimit -d` -lt $$DSIZ ]; then \
 	  echo "You need to increase the datasize limit to at least $$DSIZ \
 	    (and set kern.maxdsiz=\"$$DSIZBYTE\" in /boot/loader.conf) to \
 	    build with Java support." | ${FMT} -s; \
 	  exit 1; \
 	fi
 .endif
 
 pre-extract:
 	@# Building libgcj with lang/gcc295 installed is causing a failure
 	@# about "hidden symbol `__eprintf'" in libgcc.a(_eprintf.o).
 	@if type gcc295 >/dev/null ; then \
 	  echo "This port will not build in the presence of lang/gcc295."; \
 	  exit 1; \
 	fi
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 full-regression-test: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	${RM} -f ${TARGLIB}/*.la
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>

Property changes on: head/lang/gcc44/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.385
\ No newline at end of property
+1.386
\ No newline at end of property
Index: head/lang/gcc44/distinfo
===================================================================
--- head/lang/gcc44/distinfo	(revision 234654)
+++ head/lang/gcc44/distinfo	(revision 234655)
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.4-20090519.tar.bz2) = bad7074674025035c0443e4043cfb2eb
-SHA256 (gcc-core-4.4-20090519.tar.bz2) = 7f801627ff865d0b40cd3a418641d0b0740b505ba1974047e2a20b89cfa581b8
-SIZE (gcc-core-4.4-20090519.tar.bz2) = 22414965
-MD5 (gcc-fortran-4.4-20090519.tar.bz2) = 3d597a58340850b49c796933bd8e0dc2
-SHA256 (gcc-fortran-4.4-20090519.tar.bz2) = 473779a154c5ab03749bf7e4abf07e0aa26a3712de22286221889558bf9e51ec
-SIZE (gcc-fortran-4.4-20090519.tar.bz2) = 1299203
-MD5 (gcc-g++-4.4-20090519.tar.bz2) = f2aacc2e6545e9ab25def6fe38eea6c8
-SHA256 (gcc-g++-4.4-20090519.tar.bz2) = 177652d43a3caa9a983eab5bc69f889fb878ade9a6e516d4ea76ab313d4646db
-SIZE (gcc-g++-4.4-20090519.tar.bz2) = 5913013
-MD5 (gcc-objc-4.4-20090519.tar.bz2) = 36a1547e2942f0381a57edd6c3f839b8
-SHA256 (gcc-objc-4.4-20090519.tar.bz2) = c4c6552ab573868306e5573f9796764de7f00974ae7dd9685997d87dfefff723
-SIZE (gcc-objc-4.4-20090519.tar.bz2) = 239651
-MD5 (gcc-testsuite-4.4-20090519.tar.bz2) = 8901d4d5cf45fda91412e7805a616df9
-SHA256 (gcc-testsuite-4.4-20090519.tar.bz2) = 1b129575d68dc3729a9848fc46a70bfb4f51622a24dd0ca338694144e1ad30dd
-SIZE (gcc-testsuite-4.4-20090519.tar.bz2) = 5055251
-MD5 (gcc-java-4.4-20090519.tar.bz2) = fe752db53f664fc1abf91791ed24c29c
-SHA256 (gcc-java-4.4-20090519.tar.bz2) = f9d4d992ad9e12df6eacbb5837485808706bfaf42e9346fb6c1deff28b898870
-SIZE (gcc-java-4.4-20090519.tar.bz2) = 19019641
+MD5 (gcc-core-4.4-20090526.tar.bz2) = 28fb87be8f769c5c2672909bb1ec50b5
+SHA256 (gcc-core-4.4-20090526.tar.bz2) = c9dbff5990f4d3307e96731563786923bd3b145a92876816f1b9f1fc666b974b
+SIZE (gcc-core-4.4-20090526.tar.bz2) = 22411372
+MD5 (gcc-fortran-4.4-20090526.tar.bz2) = 95bd07d3981887247a05b4aaac69c79b
+SHA256 (gcc-fortran-4.4-20090526.tar.bz2) = 34fed10adfc1af6e193e1206815abfb2d8b821240a38982c46a0d3abe052cc33
+SIZE (gcc-fortran-4.4-20090526.tar.bz2) = 1298716
+MD5 (gcc-g++-4.4-20090526.tar.bz2) = 4997cd49b6bb7658e80977c09611db81
+SHA256 (gcc-g++-4.4-20090526.tar.bz2) = 43729e9a0afb025bbe7dbc04d9130c715fee37328886821b9a671a0b15be7fc9
+SIZE (gcc-g++-4.4-20090526.tar.bz2) = 5911007
+MD5 (gcc-objc-4.4-20090526.tar.bz2) = 50caff347e5c18689539b4e32430de06
+SHA256 (gcc-objc-4.4-20090526.tar.bz2) = 4c4248a0cd575cd23881a09757862eecad16f709c6019b440adf3d731325be44
+SIZE (gcc-objc-4.4-20090526.tar.bz2) = 239669
+MD5 (gcc-testsuite-4.4-20090526.tar.bz2) = 4de945e3861fcf4b466342d8d482843e
+SHA256 (gcc-testsuite-4.4-20090526.tar.bz2) = d146ef60054dc25d7be0f5b6ed90e9ab41e98b2020afaf7b7ea5a8f289443f64
+SIZE (gcc-testsuite-4.4-20090526.tar.bz2) = 5055104
+MD5 (gcc-java-4.4-20090526.tar.bz2) = 1d1bf1cbbc5423cacf94069166c2ea85
+SHA256 (gcc-java-4.4-20090526.tar.bz2) = 501497e380dc220ead4629feadea31e9b6661df34b710ebc56afb4fac125e984
+SIZE (gcc-java-4.4-20090526.tar.bz2) = 19021035

Property changes on: head/lang/gcc44/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.265
\ No newline at end of property
+1.266
\ No newline at end of property