Cleanup DIST* variables.

When appropriate: - Try to use DISTVERSION{SUF,PRE}FIX - Replace PORTNAME-PORTVERSION by DISTNAME - Convert MASTER_SITES to use macros - Other light cleanup With hat: portmgr Sponsored by: Absolight
freebsd · May 11, 2015 · d843ecd · d843ecd
1 parent 925f560
commit d843ecd
Show file tree

Hide file tree

Showing 285 changed files with 410 additions and 582 deletions.
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
@@ -4,10 +4,10 @@ PORTNAME=	deco
 PORTVERSION=	1.6.3
 PORTREVISION=	1
 CATEGORIES=	archivers
-MASTER_SITES=	http://hartlich.com/deco/download/:site1 \
+MASTER_SITES=	http://hartlich.com/deco/download/ \
 		http://hartlich.com/deco/archive/download/:site2
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz:site1 \
-		${PORTNAME}-archive-1.6.tar.gz:site2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-archive-1.6${EXTRACT_SUFX}:site2
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Program to extract various archive file formats

diff --git a/archivers/linux-f10-upx/Makefile b/archivers/linux-f10-upx/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=		3.03
 CATEGORIES=		archivers linux
 MASTER_SITES=		LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 PKGNAMEPREFIX=		linux-f10-
-DISTNAME=		${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=		emulation@FreeBSD.org
 COMMENT=		UPX, a high-performance executable packer (Linux Fedora 10)

diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.91
 CATEGORIES=	archivers
 MASTER_SITES=	http://upx.sourceforge.net/download/\
 		SF/sevenzip/7-Zip/${LZMA_VER}:lzma
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}\
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} \
 		7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
 
 MAINTAINER=	fjoe@FreeBSD.org

diff --git a/audio/guspat/Makefile b/audio/guspat/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://plamo.linet.gr.jp/pub/Plamo-src/contrib/Sound/timidity/ \
 		LOCAL/nork
-DISTFILES=	${PORTNAME}-${PORTVERSION}-required${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-optional${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-required${EXTRACT_SUFX} \
+		${DISTNAME}-optional${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Izumo collection of Gravis Ultrasound MIDI patches

diff --git a/audio/libaacplus/Makefile b/audio/libaacplus/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	libaacplus
 PORTVERSION=	2.0.2
 PORTREVISION=	7
 CATEGORIES=	audio
-MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/:site1\
-		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2\
+MASTER_SITES=	http://tipok.org.ua/downloads/media/aacplus/libaacplus/ \
+		ftp://ftp.3gpp.org/Specs/archive/26_series/26.410/:site2 \
 		http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/:site2
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:site1\
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${SRC26410}:site2
 
 MAINTAINER=	takefu@airport.fm

diff --git a/audio/mp3c/Makefile b/audio/mp3c/Makefile
@@ -6,9 +6,9 @@ PORTVERSION=	0.31
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.wspse.de/linux/wspse/:src
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:src \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
 		cdrip.sh
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	joris@vandalon.nl
 COMMENT=	CD to mp3c converter with a console frontend

diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	2.0.3
 PORTREVISION=	11
 CATEGORIES=	biology
 MASTER_SITES=	SF/${PORTNAME}/ProtoMol/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-tar.gz
-EXTRACT_SUFX=	# empty
+DISTFILES=	${DISTNAME}-tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OO, component based, framework for molecular dynamics (MD) simulations

diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	alliance
-PORTVERSION=	5.0.20120515
+DISTVERSION=	5.0-20120515
 CATEGORIES=	cad
 MASTER_SITES=	http://ftp.lyx.org/lip6/softs/alliance/distribution/5.0/ \
 		http://ftp.jussieu.fr/lip6/softs/alliance/distribution/5.0/ \
 		http://www-asim.lip6.fr/pub/alliance/distribution/5.0/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complete set of CAD tools and libraries for VLSI design

diff --git a/cad/electric/Makefile b/cad/electric/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	electric
 PORTVERSION=	7.0.0
 PORTREVISION=	4
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/^(...)\./\1/}
 
 MAINTAINER=	ports@FreeBSD.org

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnucap
-PORTVERSION=	2009.12.07
+DISTVERSION=	2009-12-07
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.gnucap.org/devel/archive/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU Circuit Analysis Package

diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/Tochnog%20Latest%20January%202014
 DISTFILES=	Sources${EXTRACT_SUFX} gid${EXTRACT_SUFX} \
 		tools${EXTRACT_SUFX} test${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${DISTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free explicit/implicit Finite Element Program

diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	cce
 PORTVERSION=	0.51
+DISTVERSIONSUFFIX=	-02132004-dist
 PORTREVISION=	2
 CATEGORIES=	chinese
 MASTER_SITES=	SF/${PORTNAME}2k/${PORTNAME}/Ver_${PORTVERSION}_02132004
-DISTNAME=	${PORTNAME}-${PORTVERSION}-02132004-dist
 
 PATCH_SITES=	http://www.chinatinco.com/freebsd/cce/ \
 		http://www.525183.com/freebsd/cce/ \

diff --git a/chinese/fqterm/Makefile b/chinese/fqterm/Makefile
@@ -3,11 +3,10 @@
 
 PORTNAME=	fqterm
 PORTVERSION=	0.9.3
+DISTVERSIONSUFFIX=	-src-r569
 PORTREVISION=	8
 CATEGORIES=	chinese
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src-r569${SUTRACT_SUFFIX}
+MASTER_SITES=	GOOGLE_CODE/${PORTNAME}
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	BBS client for BSD/Linux

diff --git a/chinese/ibus-chewing/Makefile b/chinese/ibus-chewing/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	ibus-chewing
 PORTVERSION=	1.4.14
 CATEGORIES=	chinese
-DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	eric@camachat.org
 COMMENT=	Chewing engine for IBus

diff --git a/chinese/ibus-chewing/distinfo b/chinese/ibus-chewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ibus-chewing-1.4.14-Source_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
-SIZE (ibus-chewing-1.4.14-Source_GH0.tar.gz) = 91669
+SHA256 (definite-ibus-chewing-1.4.14_GH0.tar.gz) = a3f4ad50b3e3216a6074f66f52400d9b9527f799b3449dfdd3143c7e8e4a2691
+SIZE (definite-ibus-chewing-1.4.14_GH0.tar.gz) = 91669
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
@@ -4,10 +4,10 @@
 PORTNAME=	reciteword
 PORTVERSION=	0.8.5
 CATEGORIES=	chinese
-MASTER_SITES=	SF:src \
+MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}-books/${PORTVERSION}:books \
 		SF/${PORTNAME}/${PORTNAME}-dicts/0.8.2:dicts
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.bz2:src \
+DISTFILES=	${DISTNAME}.tar.bz2 \
 		${PORTNAME}-books-${PORTVERSION}.tar.bz2:books \
 		${PORTNAME}-dicts-0.8.2.tar.bz2:dicts
 

diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile
@@ -7,7 +7,6 @@ PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/${PORTNAME}/LIRC/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/p1/-pre1/}
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Linux Infrared Remote Control

diff --git a/comms/ncid/Makefile b/comms/ncid/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ncid
 PORTVERSION=	1.0
 CATEGORIES=	comms
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.1//g}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	cpm@fbsd.es

diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7.17
 PORTREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	darcsis@gmail.com
 COMMENT=	Pdf2djvu creates DjVu files from PDF files

diff --git a/databases/flamerobin/Makefile b/databases/flamerobin/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	flamerobin
 PORTVERSION=	0.9.2
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org

diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
@@ -4,11 +4,10 @@
 PORTNAME=	hbase
 PORTVERSION=	0.98.9
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE} \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		LOCAL/demon/:maven \
 		http://people.freebsd.org/~demon/:maven
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} FreeBSD-hbase-${PORTVERSION}-maven-repository.tar.gz:maven
 DIST_SUBDIR=	hadoop
 
 MAINTAINER=	demon@FreeBSD.org

diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	commons-dbutils
 PORTVERSION=	1.6
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 

diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	mybatis
 PORTVERSION=	3.0.3
 PORTREVISION=	1
 CATEGORIES=	databases devel java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	java-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX}
 

diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mysql-connector-c
 PORTVERSION=	6.1.5
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-C
+MASTER_SITES=	MYSQL/Connector-C
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org

diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	mysql-connector-odbc
 PORTVERSION=	5.3.4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	Connector-ODBC/5.3
+MASTER_SITES=	MYSQL/Connector-ODBC/5.3
 PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 

diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile
@@ -7,7 +7,6 @@ CATEGORIES=	databases
 MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	caml${PORTNAME}-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jaapb@kerguelen.org
 COMMENT=	OCaml binding to the NDBM and GDBM database library
@@ -16,6 +15,7 @@ LICENSE=	LGPL20
 
 CONFLICTS=	ocaml-[0-3]* ocaml-nox11-[0-3]*
 
+USES=		tar:tgz
 HAS_CONFIGURE=	yes
 USE_OCAML=	yes
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}

diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	DB
 PORTVERSION=	1.7.14
 PORTEPOCH=	1
 CATEGORIES=	databases www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Database Abstraction Layer

diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
@@ -5,9 +5,9 @@ PORTNAME=	pyspatialite
 PORTVERSION=	3.0.1
 PORTREVISION=	5
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP:pyspatialite
+MASTER_SITES=	CHEESESHOP/source/p/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-0${EXTRACT_SUFX}:pyspatialite
+DISTNAME=	${PORTNAME}-${PORTVERSION}-alpha-0
 
 MAINTAINER=	coder@tuxfamily.org
 COMMENT=	DB-API 2.0 interface for SQLite 3.x with Spatialite
@@ -24,7 +24,6 @@ USES=		iconv python
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	pyspatialite
 
-
 .include <bsd.port.pre.mk>
 
 .if empty(ICONV_LIB)

diff --git a/deskutils/ganttproject/Makefile b/deskutils/ganttproject/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	ganttproject
 PORTVERSION=	2.6.2
 PORTREVISION=	1
 CATEGORIES=	deskutils java
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-r1544
 
 MAINTAINER=	ports@FreeBSD.org

diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	treesheets
 PORTVERSION=	0.0.20150405
 CATEGORIES=	deskutils
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lightside@gmx.com
 COMMENT=	Free form data organizer

diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (treesheets-0.0.20150405_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb
-SIZE (treesheets-0.0.20150405_GH0.tar.gz) = 1788802
+SHA256 (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = d16f215a857054098b10f5402ef35efe37ada6f8d91161af12c5f1d2fc8b97fb
+SIZE (aardappel-treesheets-0.0.20150405-b994c63_GH0.tar.gz) = 1788802
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	apache-ant
 PORTVERSION=	1.9.4
 CATEGORIES=	devel java
-MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:bin,} \
+MASTER_SITES=	APACHE/ant/binaries/:bin \
 		LOCAL/hq:man
 DISTFILES=	${ANT_DISTFILE}:bin \
 		${MANPAGE_DISTFILE}:man

diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	cdk
-PORTVERSION=	5.0.20120323
+DISTVERSION=	5.0-20120323
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/cdk/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses Development Kit for speedy development of full screen programs

diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
@@ -7,15 +7,14 @@ PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.spinellis.gr/cscout/ \
 		http://www.dmst.aueb.gr/dds/cscout/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-neutral${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-fbsd-${ARCH}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}-neutral${EXTRACT_SUFX} \
+		${DISTNAME}-fbsd-${ARCH}${EXTRACT_SUFX}
 
 MAINTAINER=	dds@FreeBSD.org
 COMMENT=	Source code analyzer and refactoring browser for C program collections
 
 LIB_DEPENDS+=	libc.so.6:${PORTSDIR}/misc/compat6x
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 ONLY_FOR_ARCHS_REASON=	The port fetches and installs precompiled binaries

diff --git a/devel/cvsmonitor/Makefile b/devel/cvsmonitor/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cvsmonitor
-PORTVERSION=	0.6.3
+DISTVERSION=	0-6-3
 PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Stable
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Monitor activity on a CVS Repository

diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
@@ -5,10 +5,9 @@ PORTNAME=	gdb
 PORTVERSION=	6.6
 PORTREVISION?=	3
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:S,$,:gdb,}	\
+MASTER_SITES=   GNU/gdb/ \
 		http://aldan.algebra.com/~mi/:gdbtk
-MASTER_SITE_SUBDIR=gdb/:gdb
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gdb
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT?=	GNU GDB of newer version than comes with the system