--- Makefile.old        Mon Oct  9 07:01:50 2006
+++ Makefile    Mon Oct  9 07:16:02 2006
@@ -10,7 +10,7 @@
 CATEGORIES=    devel ruby
 MASTER_SITES=  http://cvs.m17n.org/cgi-bin/viewcvs/${PORTNAME}/
 PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-DISTNAME=      TZFile-${PORTVERSION}${EXTRACT_SUFX}\?tarball=1\&only_with_tag=${PORTNAME}-${PORTVERSION:S/./_/g}\&cvsroot=ruby\&
+DISTNAME=      ${PORTNAME}
 DIST_SUBDIR=   ruby
 
 MAINTAINER=    ports@FreeBSD.org
@@ -27,6 +27,11 @@
 DOCS=          ${RUBY_RD_HTML_FILES}
 
 .include <bsd.port.pre.mk>
+
+do-fetch:
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
+       ${SETENV} ${FETCH_ENV} ${FETCH_CMD} -o ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} http://cvs.m17n.org/viewcvs/ruby/tzfile.tar.gz?only_with_tag=tzfile-0_1\&view=tar
+.endif
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/tzfile.rb ${RUBY_SITELIBDIR}/