aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haro <mharo@FreeBSD.org>2000-04-08 21:25:03 +0000
committerMichael Haro <mharo@FreeBSD.org>2000-04-08 21:25:03 +0000
commitbcd8ffd9d02ae8abfa24cfffffc4c496a55b29e2 (patch)
tree3e83c1f293779db0f23c9e63d65d38cccd689551
parent756191223822e770f94301c2b8942dccf13cc264 (diff)
downloadports-bcd8ffd9d02ae8abfa24cfffffc4c496a55b29e2.tar.gz
ports-bcd8ffd9d02ae8abfa24cfffffc4c496a55b29e2.zip
Notes
-rw-r--r--audio/amp/Makefile4
-rw-r--r--audio/ascd/Makefile7
-rw-r--r--audio/aumix/Makefile4
-rw-r--r--audio/bladeenc/Makefile6
-rw-r--r--audio/cam/Makefile4
-rw-r--r--audio/cd-console/Makefile4
-rw-r--r--audio/cdd/Makefile4
-rw-r--r--audio/cdindex/Makefile4
-rw-r--r--audio/cdplay/Makefile4
-rw-r--r--audio/cdrdao/Makefile6
-rw-r--r--audio/cmp3/Makefile6
-rw-r--r--audio/dagrab/Makefile6
-rw-r--r--audio/dap/Makefile6
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/gmixer/Makefile4
-rw-r--r--audio/gnapster/Makefile4
-rw-r--r--audio/gnome-audio/Makefile6
-rw-r--r--audio/gnome-media/Makefile8
-rw-r--r--audio/gnomeaudio/Makefile6
-rw-r--r--audio/gnomeaudio2/Makefile6
-rw-r--r--audio/gnomemedia/Makefile8
-rw-r--r--audio/gnomemedia2/Makefile8
-rw-r--r--audio/gogo/Makefile6
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/gqmpeg/Makefile4
-rw-r--r--audio/gramofile/Makefile4
-rw-r--r--audio/gsm/Makefile6
-rw-r--r--audio/icecast/Makefile4
-rw-r--r--audio/icecast2/Makefile4
-rw-r--r--audio/id3ed/Makefile4
-rw-r--r--audio/id3ren/Makefile6
-rw-r--r--audio/juke/Makefile4
-rw-r--r--audio/kdemultimedia11/Makefile4
-rw-r--r--audio/kdemultimedia2/Makefile4
-rw-r--r--audio/kdemultimedia3/Makefile4
-rw-r--r--audio/kmikmod/Makefile4
-rw-r--r--audio/kmp3/Makefile4
-rw-r--r--audio/kmpg/Makefile4
-rw-r--r--audio/knapster/Makefile4
-rw-r--r--audio/krio/Makefile6
-rw-r--r--audio/lame/Makefile6
-rw-r--r--audio/libaudiofile/Makefile6
-rw-r--r--audio/libcdaudio/Makefile4
-rw-r--r--audio/libmikmod/Makefile4
-rw-r--r--audio/libsidplay/Makefile6
-rw-r--r--audio/libsidplay2/Makefile6
-rw-r--r--audio/libworkman/Makefile6
-rw-r--r--audio/linux-realplayer/Makefile8
-rw-r--r--audio/maplay/Makefile6
-rw-r--r--audio/mikmod/Makefile4
-rw-r--r--audio/mixer.app/Makefile6
-rw-r--r--audio/mp3blaster/Makefile5
-rw-r--r--audio/mp3encode/Makefile6
-rw-r--r--audio/mp3info/Makefile4
-rw-r--r--audio/mp3rename/Makefile16
-rw-r--r--audio/mpegaudio/Makefile6
-rw-r--r--audio/mpg123.el/Makefile6
-rw-r--r--audio/mpg123/Makefile4
-rw-r--r--audio/mpmf20/Makefile6
-rw-r--r--audio/mxv/Makefile6
-rw-r--r--audio/napster/Makefile6
-rw-r--r--audio/nas/Makefile4
-rw-r--r--audio/nspmod/Makefile4
-rw-r--r--audio/play/Makefile4
-rw-r--r--audio/playmidi/Makefile4
-rw-r--r--audio/pysol-sound-server/Makefile4
-rw-r--r--audio/radio/Makefile6
-rw-r--r--audio/raproxy/Makefile6
-rw-r--r--audio/replay/Makefile6
-rw-r--r--audio/rio/Makefile6
-rw-r--r--audio/ripenc/Makefile6
-rw-r--r--audio/ripit-atapi/Makefile6
-rw-r--r--audio/ripit/Makefile4
-rw-r--r--audio/rosegarden/Makefile5
-rw-r--r--audio/rplay/Makefile8
-rw-r--r--audio/rsynth/Makefile4
-rw-r--r--audio/s3mod/Makefile6
-rw-r--r--audio/shorten/Makefile6
-rw-r--r--audio/sidplay/Makefile6
-rw-r--r--audio/snowstar/Makefile4
-rw-r--r--audio/soundtracker/Makefile4
-rw-r--r--audio/sox/Makefile4
-rw-r--r--audio/splay/Makefile4
-rw-r--r--audio/splaytk/Makefile6
-rw-r--r--audio/tclmidi/Makefile10
-rw-r--r--audio/timidity++-emacs/Makefile7
-rw-r--r--audio/timidity++-gtk/Makefile1
-rw-r--r--audio/timidity++-motif/Makefile1
-rw-r--r--audio/timidity++-slang/Makefile1
-rw-r--r--audio/timidity++-tcltk/Makefile1
-rw-r--r--audio/timidity++-xaw/Makefile1
-rw-r--r--audio/timidity++-xskin/Makefile1
-rw-r--r--audio/timidity++/Makefile6
-rw-r--r--audio/timidity/Makefile18
-rw-r--r--audio/tosha/Makefile4
-rw-r--r--audio/tracker/Makefile4
-rw-r--r--audio/waveplay/Makefile6
-rw-r--r--audio/wmcdplay/Makefile6
-rw-r--r--audio/wmmixer/Makefile6
-rw-r--r--audio/wmmp3/Makefile4
-rw-r--r--audio/wmtune/Makefile4
-rw-r--r--audio/workman/Makefile6
-rw-r--r--audio/wsoundprefs/Makefile5
-rw-r--r--audio/wsoundserver/Makefile4
-rw-r--r--audio/x11amp/Makefile6
-rw-r--r--audio/xamp/Makefile5
-rw-r--r--audio/xcd/Makefile4
-rw-r--r--audio/xcdplayer/Makefile6
-rw-r--r--audio/xhippo/Makefile4
-rw-r--r--audio/xmcd/Makefile4
-rw-r--r--audio/xmix/Makefile4
-rw-r--r--audio/xmixer/Makefile4
-rw-r--r--audio/xmmix/Makefile4
-rw-r--r--audio/xmms-liveice/Makefile6
-rw-r--r--audio/xmms/Makefile4
-rw-r--r--audio/xmp/Makefile4
-rw-r--r--audio/xmpeg3/Makefile6
-rw-r--r--audio/xmradio/Makefile5
-rw-r--r--audio/xtuner/Makefile8
-rw-r--r--audio/yamt/Makefile4
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/kdemultimedia4/Makefile4
-rw-r--r--multimedia/linux-realplayer/Makefile8
-rw-r--r--multimedia/xmms/Makefile4
-rw-r--r--sysutils/cdrdao/Makefile6
125 files changed, 318 insertions, 325 deletions
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 492213ef96c0..e4ba570ec96b 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: amp
-# Version required: 0.7.6
# Date created: Jun 23 1997
# Whom: Vanilla I. Shu <vanilla@MinJe.com.TW>
#
# $FreeBSD$
#
-DISTNAME= amp-0.7.6
+PORTNAME= amp
+PORTVERSION= 0.7.6
CATEGORIES= audio
#MASTER_SITES= ftp://ftp.rasip.fer.hr/pub/mpeg/
# the author's site seems dead.
diff --git a/audio/ascd/Makefile b/audio/ascd/Makefile
index acc0e1f4dd5a..8550b19c0f00 100644
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: ascd
-# Version required: 0.13.2
# Date created: 29 November 1998
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= ascd-0.13.2-src
-PKGNAME= ascd-0.13.2
+PORTNAME= ascd
+PORTVERSION= 0.13.2
CATEGORIES= audio afterstep windowmaker
MASTER_SITES= http://worldserver.oleane.com/rsn/Archives/
-DISTFILES= ${DISTNAME}.tgz ${DATAFILES}
+DISTFILES= ${DISTNAME}-src.tgz ${DATAFILES}
MAINTAINER= jim@FreeBSD.org
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 6e93712af1f1..b68ef02ef003 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: aumix
-# Version required: 2.5
# Date created: 21 May 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= aumix-2.5
+PORTNAME= aumix
+PORTVERSION= 2.5
CATEGORIES= audio
MASTER_SITES= http://jpj.net/~trevor/aumix/ \
http://jpj.net/~trevor/aumix/old/ \
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index 3928002d0af5..473233d34a47 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: BladeEnc
-# Version required: 0.92
# Date created: Thu Jan 14 23:28:40 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bladeenc-0.92.0-src-stable
-PKGNAME= bladeenc-0.92
+PORTNAME= bladeenc
+PORTVERSION= 0.92
CATEGORIES= audio
MASTER_SITES= http://bladeenc.mp3.no/source/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
+EXTRACT_SUFX= .0-src-stable.tar.gz
MAINTAINER= dirk@FreeBSD.org
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 4b5f4fe4a911..37a59412618c 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cam
-# Version required: 1.02
# Date created: Tue Nov 12 15:54:21 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cam-1.02
+PORTNAME= cam
+PORTVERSION= 1.02
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/mixers
diff --git a/audio/cd-console/Makefile b/audio/cd-console/Makefile
index 61a1cd1b5b81..cefed8de465a 100644
--- a/audio/cd-console/Makefile
+++ b/audio/cd-console/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cd-console
-# Version required: 2.1
# Date created: Sun Nov 28 19:55:19 EST 1999
# Whom: jdunn@aquezada.com
#
# $FreeBSD$
#
-DISTNAME= cd-console-2.3
+PORTNAME= cd-console
+PORTVERSION= 2.3
CATEGORIES= audio
MASTER_SITES= http://www.cs.helsinki.fi/~salerma/cd-console/ \
ftp://ftp.aquezada.com/pub/cd-console/
diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile
index ffe9528cd8c4..ee8e33049e47 100644
--- a/audio/cdd/Makefile
+++ b/audio/cdd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdd
-# Version required: none
# Date created: Wed Dec 23 11:15:30 CET 1998
# Whom: luigi@iet.unipi.it
#
# $FreeBSD$
#
-DISTNAME= cdd-1.0
+PORTNAME= cdd
+PORTVERSION= 1.0
CATEGORIES= audio
MASTER_SITES= http://www.iet.unipi.it/~luigi/cdd/
EXTRACT_SUFX= .tgz
diff --git a/audio/cdindex/Makefile b/audio/cdindex/Makefile
index e5dbcb1286eb..6f73806fd790 100644
--- a/audio/cdindex/Makefile
+++ b/audio/cdindex/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdindex
-# Version required: 1.1.0
# Date created: 15 June 1999
# Whom: Marc E E van Woerkom <van.woerkom@netcologne.de>
#
# $FreeBSD$
#
-DISTNAME= cdindex-1.1.0
+PORTNAME= cdindex
+PORTVERSION= 1.1.0
CATEGORIES= audio
MASTER_SITES= ftp://ftp.cdindex.org/pub/cdindex/
diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 303f66e53121..101ebe884cc0 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdplay
-# Version required: 0.92
# Date created: 8 July 1997
# Whom: Antti Kaipila <anttik@iki.fi>
#
# $FreeBSD$
#
-DISTNAME= cdplay-0.92
+PORTNAME= cdplay
+PORTVERSION= 0.92
CATEGORIES= audio
MASTER_SITES= ftp://ftp.one.sci.fi/pub/cdplay/
diff --git a/audio/cdrdao/Makefile b/audio/cdrdao/Makefile
index 0984c59e05ec..7eace10ec83b 100644
--- a/audio/cdrdao/Makefile
+++ b/audio/cdrdao/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: cdrdao
-# Version required: 1.1.2
# Date created: 7 April 1999
# Whom: futatuki
#
@@ -10,10 +9,11 @@
# If you don't want to use pthreads, set DONT_USE_PTHREADS = yes
# If you want the graphical X toc file editor, set XCDRDAO = yes
-DISTNAME= cdrdao-1.1.3.src
-PKGNAME= cdrdao-1.1.3
+PORTNAME= cdrdao
+PORTVERSION= 1.1.3
CATEGORIES= audio
MASTER_SITES= http://www.ping.de/sites/daneb/
+EXTRACT_SUFX= .src.tar.gz
MAINTAINER= futatuki@debug.gr.jp
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index e5f61bdffea0..9ffffde8e8cf 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cmp3
-# Version required: 2.0pre4
# Date created: 10 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= cmp3-2.0pre4
-PKGNAME= cmp3-2.0p4
+PORTNAME= cmp3
+PORTVERSION= 2.0.p4
CATEGORIES= audio
MASTER_SITES= http://www.personal.psu.edu/users/n/k/nkk104/cmp3/
+DISTNAME= cmp3-2.0pre4
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/audio/dagrab/Makefile b/audio/dagrab/Makefile
index d68f69525fac..d0a821cd0ed1 100644
--- a/audio/dagrab/Makefile
+++ b/audio/dagrab/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: dagrab
-# Version required: 0.3.4
# Date created: 2nd, Jan 1999
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
#
-DISTNAME= dagrab-0.3.4
+PORTNAME= dagrab
+PORTVERSION= 0.3.4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/cdrom
PATCH_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
-PATCHFILES= dagrab-0.3.4-freebsd.patch.gz
+PATCHFILES= ${DISTNAME}-freebsd.patch.gz
MAINTAINER= clkao@CirX.ORG
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 0b1315d54126..786bf3bbc6dc 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,15 +1,15 @@
# ports collection makefile for: dap
-# Version required: 2.0.2
# Date created: 23 August 1998
# Whom: yoshiaki Uchikawa
#
# $FreeBSD$
#
-DISTNAME= DAPSource
-PKGNAME= dap-2.0.2
+PORTNAME= dap
+PORTVERSION= 2.0.2
CATEGORIES= audio
MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/
+DISTNAME= DAPSource
MAINTAINER= yoshiaki@kt.rim.or.jp
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index a7f01e9fad3a..f349a27616ed 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: esound
-# Version required: 0.2.18
# Date created: 19 July 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= esound-0.2.18
+PORTNAME= esound
+PORTVERSION= 0.2.18
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/esound
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile
index 949dfd0c224b..73daa0ca4d94 100644
--- a/audio/gmixer/Makefile
+++ b/audio/gmixer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gmixer
-# Version required: 0.98c
# Date created: 25 February 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gmixer-0.98c
+PORTNAME= gmixer
+PORTVERSION= 0.98c
CATEGORIES= audio
MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
diff --git a/audio/gnapster/Makefile b/audio/gnapster/Makefile
index c8a3d6a1e6b6..3b6ec93cca08 100644
--- a/audio/gnapster/Makefile
+++ b/audio/gnapster/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnapster
-# Version required: 1.3.8
# Date created: 24 December 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnapster-1.3.8
+PORTNAME= gnapster
+PORTVERSION= 1.3.8
CATEGORIES= audio
MASTER_SITES= http://www.gotlinux.org/~jasta/files/
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 45105558f0ad..0232dfb10729 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeaudio
-# Version required: 1.0.0
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-audio-1.0.0
-PKGNAME= gnomeaudio-1.0.0
+PORTNAME= gnomeaudio
+PORTVERSION= 1.0.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index a3436288f637..927b46daee27 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: gnome-media
-# Version required: 1.0.51
+# New ports collection makefile for: gnomemedia
# Date created: 20 January 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $FreeBSD$
#
-DISTNAME= gnome-media-1.0.51
-PKGNAME= gnomemedia-1.0.51
+PORTNAME= gnomemedia
+PORTVERSION= 1.0.51
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-media
+DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 45105558f0ad..0232dfb10729 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeaudio
-# Version required: 1.0.0
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-audio-1.0.0
-PKGNAME= gnomeaudio-1.0.0
+PORTNAME= gnomeaudio
+PORTVERSION= 1.0.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 45105558f0ad..0232dfb10729 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeaudio
-# Version required: 1.0.0
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-audio-1.0.0
-PKGNAME= gnomeaudio-1.0.0
+PORTNAME= gnomeaudio
+PORTVERSION= 1.0.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-audio
+DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index a3436288f637..927b46daee27 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: gnome-media
-# Version required: 1.0.51
+# New ports collection makefile for: gnomemedia
# Date created: 20 January 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $FreeBSD$
#
-DISTNAME= gnome-media-1.0.51
-PKGNAME= gnomemedia-1.0.51
+PORTNAME= gnomemedia
+PORTVERSION= 1.0.51
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-media
+DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index a3436288f637..927b46daee27 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for: gnome-media
-# Version required: 1.0.51
+# New ports collection makefile for: gnomemedia
# Date created: 20 January 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $FreeBSD$
#
-DISTNAME= gnome-media-1.0.51
-PKGNAME= gnomemedia-1.0.51
+PORTNAME= gnomemedia
+PORTVERSION= 1.0.51
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-media
+DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index d54c32b0b620..f72ab8c90234 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gogo no coder
-# Version required: 2.26a
# Date created: 01 July 1999
# Whom: Yukihiro Nakai <Nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= gogo226a
-PKGNAME= gogo-2.26a
+PORTNAME= gogo
+PORTVERSION= 2.26a
CATEGORIES= audio
MASTER_SITES= http://homepage1.nifty.com/herumi/soft/gogo2/src/
+DISTNAME= gogo226a
EXTRACT_SUFX= .tgz
MAINTAINER= nakai@FreeBSD.org
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 1b9f76c86f4f..9f3145881527 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gqmpeg
-# Version required: 0.6.3
# Date Created: 28 Oct 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gqmpeg-0.6.3
+PORTNAME= gqmpeg
+PORTVERSION= 0.6.3
CATEGORIES= audio
MASTER_SITES= http://gqview.netpedia.net/ \
http://www.geocities.com/SiliconValley/Haven/5235/
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 1b9f76c86f4f..9f3145881527 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gqmpeg
-# Version required: 0.6.3
# Date Created: 28 Oct 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gqmpeg-0.6.3
+PORTNAME= gqmpeg
+PORTVERSION= 0.6.3
CATEGORIES= audio
MASTER_SITES= http://gqview.netpedia.net/ \
http://www.geocities.com/SiliconValley/Haven/5235/
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 70bd8db389a6..b83c007b20c2 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gramofile
-# Version required: 1.6
# Date created: Fri Jan 28 18:40:38 CET 2000
# Whom: nox@jelal.kn-bremen.de
#
# $FreeBSD$
#
-DISTNAME= gramofile-1.6
+PORTNAME= gramofile
+PORTVERSION= 1.6
CATEGORIES= audio
MASTER_SITES= http://panic.et.tudelft.nl/~costar/gramofile/
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 2c629025d152..0a5c6d71db3d 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: gsm
-# Version required: gsm-1.0.10
# Date created: 5 January 1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= gsm-1.0.10
+PORTNAME= gsm
+PORTVERSION= 1.0.10
CATEGORIES= audio
MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
MAINTAINER= ports@FreeBSD.org
-WRKSRC= ${WRKDIR}/gsm-1.0-pl10
+WRKSRC= ${WRKDIR}/gsm-1.0-pl10
MAN1= toast.1
MAN3= gsm.3 gsm_explode.3 gsm_option.3 gsm_print.3
MLINKS= toast.1 untoast.1 toast.1 tcat.1
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index a990e301ccaf..0bbb8c5100b1 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icecast
-# Version required: 1.3.0
# Date created: 28 Jan 1999
# Whom: Chip Marshall <chip@eboai.org>
#
# $FreeBSD$
#
-DISTNAME= icecast-1.3.0
+PORTNAME= icecast
+PORTVERSION= 1.3.0
CATEGORIES= audio net
MASTER_SITES= http://www.icecast.org/releases/ \
ftp://ftp.eboai.org/pub/icecast/
diff --git a/audio/icecast2/Makefile b/audio/icecast2/Makefile
index a990e301ccaf..0bbb8c5100b1 100644
--- a/audio/icecast2/Makefile
+++ b/audio/icecast2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icecast
-# Version required: 1.3.0
# Date created: 28 Jan 1999
# Whom: Chip Marshall <chip@eboai.org>
#
# $FreeBSD$
#
-DISTNAME= icecast-1.3.0
+PORTNAME= icecast
+PORTVERSION= 1.3.0
CATEGORIES= audio net
MASTER_SITES= http://www.icecast.org/releases/ \
ftp://ftp.eboai.org/pub/icecast/
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 80989073b698..52ca28734a86 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: id3ed
-# Version required: 1.10
# Date created: 05 June 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= id3ed-1.10
+PORTNAME= id3ed
+PORTVERSION= 1.10
CATEGORIES= audio
MASTER_SITES= http://www.azstarnet.com/~donut/id3ed/ \
http://www.treefort.org/~donut/id3ed/ \
diff --git a/audio/id3ren/Makefile b/audio/id3ren/Makefile
index 65f254a8f3d8..c3650815172e 100644
--- a/audio/id3ren/Makefile
+++ b/audio/id3ren/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: id3ren
-# Version required: 0.97a
# Date created: 28 February 1999
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= id3ren97a
-PKGNAME= id3ren-0.97a
+PORTNAME= id3ren
+PORTVERSION= 0.97a
CATEGORIES= audio
MASTER_SITES= http://tscnet.com/pages/badcrc/apps/id3ren/
+DISTNAME= id3ren97a
MAINTAINER= jonny@jonny.eng.br
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index fb1ef289b754..a9b61e5dda80 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: juke
-# Version required: 0.5
# Date created: 2 May 1999
# Whom: oyvindmo@initio.no
#
# $FreeBSD$
#
-DISTNAME= juke-0.5
+PORTNAME= juke
+PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= http://www.nocrew.org/software/juke/archive/
diff --git a/audio/kdemultimedia11/Makefile b/audio/kdemultimedia11/Makefile
index c8e0e3009f1a..a790c0467e1b 100644
--- a/audio/kdemultimedia11/Makefile
+++ b/audio/kdemultimedia11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdemultimedia
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdemultimedia-1.1.2
+PORTNAME= kdemultimedia
+PORTVERSION= 1.1.2
CATEGORIES= audio kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index c8e0e3009f1a..a790c0467e1b 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdemultimedia
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdemultimedia-1.1.2
+PORTNAME= kdemultimedia
+PORTVERSION= 1.1.2
CATEGORIES= audio kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index c8e0e3009f1a..a790c0467e1b 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdemultimedia
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdemultimedia-1.1.2
+PORTNAME= kdemultimedia
+PORTVERSION= 1.1.2
CATEGORIES= audio kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/audio/kmikmod/Makefile b/audio/kmikmod/Makefile
index cb912c55095a..a9f45ef93653 100644
--- a/audio/kmikmod/Makefile
+++ b/audio/kmikmod/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kmikmod
-# Version required: 2.04
# Date created: 1 March 1999
# Whom: Tom Hukins <tom@eborcom.com>
#
# $FreeBSD$
#
-DISTNAME= kmikmod-2.04
+PORTNAME= kmikmod
+PORTVERSION= 2.04
CATEGORIES= audio kde
MASTER_SITES= http://people.FreeBSD.org/~tom/distfiles/
diff --git a/audio/kmp3/Makefile b/audio/kmp3/Makefile
index 1c5ff84b1316..f27c3627e985 100644
--- a/audio/kmp3/Makefile
+++ b/audio/kmp3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kmpg
-# Version required: 1.0
# Date created: 24 May 1999
# Whom: Oscar Bonilla <obonilla@fisicc-ufm.edu>
#
# $FreeBSD$
#
-DISTNAME= kmp3-1.0
+PORTNAME= kmp3
+PORTVERSION= 1.0
CATEGORIES= audio kde
MASTER_SITES= http://www.kmp3.org/tarballs/
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index ff5acec34d8f..b24236f61c74 100644
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kmpg
-# Version required: 0.4.3a
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <hanspb@persbraten.vgs.no>
#
# $FreeBSD$
#
-DISTNAME= kmpg-0.4.3a
+PORTNAME= kmpg
+PORTVERSION= 0.4.3a
CATEGORIES= audio kde
MASTER_SITES= http://people.FreeBSD.org/~tom/distfiles/
diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile
index 3476c2898b97..0fb20d54972b 100644
--- a/audio/knapster/Makefile
+++ b/audio/knapster/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: knapster
-# Version required: 0.8
# Date created: 06 January 2000
# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= knapster-0.8
+PORTNAME= knapster
+PORTVERSION= 0.8
CATEGORIES= audio kde
MASTER_SITES= http://knapster.netpedia.net/packages/
diff --git a/audio/krio/Makefile b/audio/krio/Makefile
index 306e43b7ec17..935e185a8e20 100644
--- a/audio/krio/Makefile
+++ b/audio/krio/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: krio
-# Version required: 19990721
# Date created: 22 Sep 1999
# Whom: ak@freenet.co.uk
#
# $FreeBSD$
#
-DISTNAME= Krio-19990721
-PKGNAME= krio-19990721
+PORTNAME= krio
+PORTVERSION= 1999.07.21
CATEGORIES= audio kde
MASTER_SITES= ftp://ftp.13th-floor.org/pub/krio/
+DISTNAME= Krio-19990721
MAINTAINER= ak@freenet.co.uk
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 1a3213533fd2..3316929728b8 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,15 +1,15 @@
# ports collection makefile for: lame
-# Version required: 3.50
# Date created: 11 January 1998
# Whom: yoshiaki Uchikawa
#
# $FreeBSD$
#
-DISTNAME= dist10
-PKGNAME= lame-3.51
+PORTNAME= lame
+PORTVERSION= 3.51
CATEGORIES= audio
MASTER_SITES= ftp://ftp.sunet.se/pub/multimedia/Berkeley/mpeg2/conformance-bitstreams/audio/mpeg2/software/technical_report/
+DISTNAME= dist10
PATCH_SITES= http://www.sulaco.org/mp3/download/patches/
PATCHFILES= lame3.51.patch.gz
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index d09d51ce8643..9d27e6934b26 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: libaudiofile
-# Version required: 0.1.9
# Date created: 22 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= audiofile-0.1.9
-PKGNAME= libaudiofile-0.1.9
+PORTNAME= libaudiofile
+PORTVERSION= 0.1.9
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/audiofile
+DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index c73014f86416..82b18f13f52e 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libcdaudio
-# Version required: 0.99.4
# Date created: 01 June 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libcdaudio-0.99.4
+PORTNAME= libcdaudio
+PORTVERSION= 0.99.4
CATEGORIES= audio
MASTER_SITES= ftp://cdcd.undergrid.net/libcdaudio/
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 14a74ded72d9..eed7736bfc14 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,12 +1,12 @@
# ports collection makefile for: libmikmod
-# Version required: 3.1.9
# Date created: Sun Apr 11 13:06:01 PDT 1999
# Whom: Michael Haro <mharo@area51.fremont.ca.us>
#
# $FreeBSD$
#
-DISTNAME= libmikmod-3.1.9
+PORTNAME= libmikmod
+PORTVERSION= 3.1.9
CATEGORIES= audio
MASTER_SITES= http://www.mikmod.darkorb.net/libmikmod/
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index f4c87f3d32c3..6ae475b43dcc 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sidplay
-# Version required: 1.36.31
# Date created: 31 October 1996
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= sidplay-1_36_35
-PKGNAME= sidplay-1.36.35
+PORTNAME= sidplay
+PORTVERSION= 1.36.35
CATEGORIES= audio emulators
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
+DISTNAME= ${PORTNAME}-1_36_35
EXTRACT_SUFX= .tgz
MAINTAINER= sec@42.org
diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile
index f4c87f3d32c3..6ae475b43dcc 100644
--- a/audio/libsidplay2/Makefile
+++ b/audio/libsidplay2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sidplay
-# Version required: 1.36.31
# Date created: 31 October 1996
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= sidplay-1_36_35
-PKGNAME= sidplay-1.36.35
+PORTNAME= sidplay
+PORTVERSION= 1.36.35
CATEGORIES= audio emulators
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
+DISTNAME= ${PORTNAME}-1_36_35
EXTRACT_SUFX= .tgz
MAINTAINER= sec@42.org
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index b66e85558df1..eee4d4cb716e 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: libworkman
-# Version required: 1.4
# Date created: 8 August 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libworkman-1999-06-20
-PKGNAME= libworkman-1.4
+PORTNAME= libworkman
+PORTVERSION= 1.4
CATEGORIES= audio
MASTER_SITES= ftp://ftp.midwinter.com/WorkMan/SNAPSHOTS/ \
http://people.FreeBSD.org/~jim/distfiles/
+DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= jim@FreeBSD.org
diff --git a/audio/linux-realplayer/Makefile b/audio/linux-realplayer/Makefile
index 0a7dfdcac67b..f059ef49f093 100644
--- a/audio/linux-realplayer/Makefile
+++ b/audio/linux-realplayer/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: linux-realplayer
-# Version required: 5.0
# Date created: 31 January 1999
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
#
-DISTNAME= rv50_linux20
-PKGNAME= linux-realplayer-5.0
+PORTNAME= linux-realplayer
+PORTVERSION= 5.0
CATEGORIES= audio linux
-MASTER_SITES=
+MASTER_SITES= # fetch manually
+DISTNAME= rv50_linux20
MAINTAINER= kris@FreeBSD.org
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index 2e4d65a80ce9..8578e2c72869 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: maplay
-# Version required: 1.2
# Date created: Feb 13 1995
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= maplay1_2
-PKGNAME= maplay-1.2
+PORTNAME= maplay
+PORTVERSION= 1.2
CATEGORIES= audio
MASTER_SITES= http://www.iuma.com/IUMA/ftp/audio_utils/mpeg_players/Workstations/
+DISTNAME= maplay1_2
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 283f3b4251d0..165a76569e17 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,12 +1,12 @@
# ports collection makefile for: mikmod304
-# Version required: 3.1.6
# Date created: 16 November 1998
# Whom: yoshiaki Uchikawa
#
# $FreeBSD$
#
-DISTNAME= mikmod-3.1.6
+PORTNAME= mikmod
+PORTVERSION= 3.1.6
CATEGORIES= audio
MASTER_SITES= http://www.multimania.com/miodrag/mikmod/mikmod/ \
http://mikmod.darkorb.net/mikmod/
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 1e1165527784..6004e8b7ed32 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mixer.app
-# Version required: 1.4.1
# Date created: 16 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Mixer.app-1.4.1
-PKGNAME= mixer.app-1.4.1
+PORTNAME= mixer.app
+PORTVERSION= 1.4.1
CATEGORIES= audio
MASTER_SITES= http://www.fukt.hk-r.se/~per/mixer/
+DISTNAME= Mixer.app-${PORTVERSION}
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 3d72a9747145..a8cf0a4e2ab0 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: mp3blaster
-# Version required: 2.0b17
# Date created: 5 January 2000
# Whom: Michael Vasilenko <acid@stu.cn.ua>
#
# $FreeBSD$
#
-DISTNAME= mp3blaster-2.0b17
+PORTNAME= mp3blaster
+PORTVERSION= 2.0.b17
CATEGORIES= audio
MASTER_SITES= ftp://mud.stack.nl/pub/mp3blaster/ \
http://mp3blaster.linuxave.net/src/
+DISTNAME= ${PORTNAME}-2.0b17
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mp3encode/Makefile b/audio/mp3encode/Makefile
index 4fd5a8b1ba8e..1516e69f4efc 100644
--- a/audio/mp3encode/Makefile
+++ b/audio/mp3encode/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mp3encode
-# Version required: 1.10
# Date created: 5th August, 1998
# Whom: Joel Sutton <jsutton@bbcon.com.au>
#
# $FreeBSD$
#
-DISTNAME= dist10
-PKGNAME= mp3encode-1.10
+PORTNAME= mp3encode
+PORTVERSION= 1.10
CATEGORIES= audio
MASTER_SITES= ftp://ftp.sunet.se/pub/multimedia/Berkeley/mpeg2/conformance-bitstreams/audio/mpeg2/software/technical_report/
+DISTNAME= dist10
MAINTAINER= jsutton@bbcon.com.au
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index 48535a63c208..74062bdda684 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mp3info
-# Version required: 0.2.15
# Date created: 19 June 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= mp3info-0.2.16
+PORTNAME= mp3info
+PORTVERSION= 0.2.16
CATEGORIES= audio
MASTER_SITES= ftp://bimbo.hive.no/pub/mp3info/ \
${MASTER_SITE_SUNSITE}
diff --git a/audio/mp3rename/Makefile b/audio/mp3rename/Makefile
index dac49c037d11..dfc543a85cd4 100644
--- a/audio/mp3rename/Makefile
+++ b/audio/mp3rename/Makefile
@@ -1,21 +1,21 @@
# New ports collection makefile for: mp3rename
-# Version required: 0.4
# Date created: 6 Januari 2000
# Whom: Sander Janssen <janssen@rendo.dekooi.nl>
#
# $FreeBSD$
#
-DISTNAME= mp3rename-0.4
-CATEGORIES= audio
-MASTER_SITES= http://www.rendo.dekooi.nl/~janssen/
+PORTNAME= mp3rename
+PORTVERSION= 0.4
+CATEGORIES= audio
+MASTER_SITES= http://www.rendo.dekooi.nl/~janssen/
-MAINTAINER= janssen@rendo.dekooi.nl
+MAINTAINER= janssen@rendo.dekooi.nl
-FETCH_BEFORE_ARGS= -b
+FETCH_BEFORE_ARGS= -b
-MAN1= mp3rename.1
-MANCOMPRESSED= yes
+MAN1= mp3rename.1
+MANCOMPRESSED= yes
post-install:
strip ${PREFIX}/bin/mp3rename
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 2471185323b4..36fb161fd53c 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpegaudio
-# Version required: 3.9
# Date created: 1 July 1996
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= mpegaudio
-PKGNAME= mpegaudio-3.9
+PORTNAME= mpegaudio
+PORTVERSION= 3.9
CATEGORIES= audio
MASTER_SITES= ftp://ftp.iuma.com/audio_utils/converters/source/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= torstenb@FreeBSD.org
diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index 8041e6d9d512..f821f59c092d 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpg123.el
-# Version required: 1.5
# Date created: 99/10/6
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mpg123.el
-PKGNAME= mpg123.el-1.5
+PORTNAME= mpg123.el
+PORTVERSION= 1.5
CATEGORIES= audio elisp
MASTER_SITES= http://www.gentei.org/~yuuji/software/mpg123el/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= # empty
MAINTAINER= taoka@FreeBSD.org
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 3646400a3da5..0f5f9506a830 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpg123
-# Version required: 0.59r
# Date created: 25 June 1997
# Whom: Carey Jones <mcj@acquiesce.org>
#
# $FreeBSD$
#
-DISTNAME= mpg123-0.59r
+PORTNAME= mpg123
+PORTVERSION= 0.59r
CATEGORIES= audio ipv6
MASTER_SITES= http://www.mpg123.de/mpg123/ \
http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \
diff --git a/audio/mpmf20/Makefile b/audio/mpmf20/Makefile
index f1789ff65a9f..c14ad40b6983 100644
--- a/audio/mpmf20/Makefile
+++ b/audio/mpmf20/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: mpmf20
-# Version required: 1.01
# Date created: 22 September 1999
# Whom: Markus Holmberg <saska@acc.umu.se>
#
# $FreeBSD$
#
-DISTNAME= mpmf20
-PKGNAME= mpmf20-1.01
+PORTNAME= mpmf20
+PORTVERSION= 1.01
CATEGORIES= audio
MASTER_SITES= http://www.world.co.uk/sba/ \
http://www.acc.umu.se/~markush/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/mxv/Makefile b/audio/mxv/Makefile
index b5ba87f172ca..ed51867fb94c 100644
--- a/audio/mxv/Makefile
+++ b/audio/mxv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mxv
-# Version required: 1.20
# Date created: 17 March 1997
# Whom: davidn@blaze.net.au
#
# $FreeBSD$
#
-DISTNAME= mxv-v1.20-source
-PKGNAME= mxv-1.20
+PORTNAME= mxv
+PORTVERSION= 1.20
CATEGORIES= audio
MASTER_SITES= ftp://ftp.create.ucsb.edu/pub/MixViews/source/
+DISTNAME= ${PORTNAME}-v${PORTVERSION}-source
MAINTAINER= davidn@blaze.net.au
diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index cd3ba77b5118..a2f99058e114 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: napster
-# Version required: 0.9BETA
# Date created: Thu Nov 18 01:07:00 PST 1999
# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= nap-bsd-0.9BETA
-PKGNAME= napster-0.9b
+PORTNAME= napster
+PORTVERSION= 0.9b
CATEGORIES= audio net
MASTER_SITES= http://www.gis.net/~nite/
+DISTNAME= nap-bsd-0.9BETA
MAINTAINER= dburr@FreeBSD.org
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 41899d5d78bb..b903c11b3f52 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nas (formerly netaudio)
-# Version required: 1.4
# Date created: 03 Nov 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= nas-1.4
+PORTNAME= nas
+PORTVERSION= 1.4
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
http://radscan.com/nas/
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 42fa3c9e767b..98b0eb7c6d14 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nspmod-0.1
-# Version required: 0.1
# Date created: 1 Jun 1997
# Whom: jmg
#
# $FreeBSD$
#
-DISTNAME= nspmod-0.1
+PORTNAME= nspmod
+PORTVERSION= 0.1
CATEGORIES= audio
MASTER_SITES= http://www.jeton.or.jp/users/toru/www/orgsoft/nspmod/ \
${MASTER_SITE_SUNSITE}
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 4c49cb4acf36..c90f598b8e2c 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: play
-# Version required: 1.0
# Date created: 20 May 1998
# Whom: Masanori Kiriake <seiken@nbs.co.jp>
#
# $FreeBSD$
#
-DISTNAME= play-1.0
+PORTNAME= play
+PORTVERSION= 1.0
CATEGORIES= audio
MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index 9bbe5a930cb0..5fb66ec21a37 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: playmidi
-# Version required: 2.4
# Date created: 27 Feb 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= playmidi-2.4
+PORTNAME= playmidi
+PORTVERSION= 2.4
CATEGORIES= audio
MASTER_SITES= http://nl.linux.org/~diz/playmidi/
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index 2a6307cab91c..db15010ec694 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pysol-sound-server
-# Version required: 2.10
# Date created: 7 January 2000
# Whom: Maxim Sobolev
#
# $FreeBSD$
#
-DISTNAME= pysol-sound-server-2.10
+PORTNAME= pysol-sound-server
+PORTVERSION= 2.10
CATEGORIES= audio games
MASTER_SITES= http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/pysol-sound-server/
diff --git a/audio/radio/Makefile b/audio/radio/Makefile
index b19fea5ab6b3..18c457fa625b 100644
--- a/audio/radio/Makefile
+++ b/audio/radio/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: radio
-# Version required: 2.0.4
# Date created: 5 July 1995
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
-DISTNAME= radio2.0.4
-PKGNAME= radio-2.0.4
+PORTNAME= radio
+PORTVERSION= 2.0.4
CATEGORIES= audio net
MASTER_SITES= ftp://ftp.cwi.nl/pub/audio/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= janek@gaja.ipan.lublin.pl
diff --git a/audio/raproxy/Makefile b/audio/raproxy/Makefile
index 7e87279b4e20..b8c27aaaca6a 100644
--- a/audio/raproxy/Makefile
+++ b/audio/raproxy/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: raproxy
-# Version required: 3.0b1
# Date created: January 24, 1999
# Whom: mi@aldan.algebra.com
#
# $FreeBSD$
#
-DISTNAME= raproxy3.0b1
-PKGNAME= raproxy-3.0b1
+PORTNAME= raproxy
+PORTVERSION= 3.0b1
CATEGORIES= audio net
MASTER_SITES= http://docs.real.com/proxykit/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= nsayer@freebsd.org
diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 6e8f2466a662..6413ab593e0d 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: replay
-# Version required: 0.61
# Date created: Oct 27 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= replay-source-dgtk_0.61
-PKGNAME= replay-0.61
+PORTNAME= replay
+PORTVERSION= 0.61
CATEGORIES= audio
MASTER_SITES= http://replay.replicant.nu/files/ \
ftp://ftp.icemark.ch/pub/replay/ \
ftp://k2.lund.se/pub/replay/
+DISTNAME= ${PORTNAME}-source-dgtk_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index 7fe1b1a73257..4ae77f4de769 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rio
-# Version required: 1.06
# Date created: 29 April 1999
# Whom: Nick Sayer <nsayer@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= rio006
-PKGNAME= rio-1.06
+PORTNAME= rio
+PORTVERSION= 1.06
CATEGORIES= audio
MASTER_SITES= http://www.world.co.uk/sba/
+DISTNAME= rio006
EXTRACT_SUFX= .tgz
MAINTAINER= derm@ibm.net
diff --git a/audio/ripenc/Makefile b/audio/ripenc/Makefile
index f23bea162e32..f5a4563db06f 100644
--- a/audio/ripenc/Makefile
+++ b/audio/ripenc/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ripenc
# URL: http://www.asde.com/~mjparme/index.htm
-# Version required: 0.7
# Date created: 28 February 1999
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= ripenc0.7
-PKGNAME= ripenc-0.7
+PORTNAME= ripenc
+PORTVERSION= 0.7
CATEGORIES= audio
MASTER_SITES= http://www.asde.com/~mjparme/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jonny@jonny.eng.br
diff --git a/audio/ripit-atapi/Makefile b/audio/ripit-atapi/Makefile
index 7ac3173dd9f2..5970fb45e748 100644
--- a/audio/ripit-atapi/Makefile
+++ b/audio/ripit-atapi/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ripit-atapi
-# Version required: 1.5
# Date created: 9 Sep 1999
# Whom: Donald Burr <dburr@FreeBSD.ORG>
#
# $FreeBSD$
#
-DISTNAME= ripit-1.5
-PKGNAME= ripit-atapi-1.5
+PORTNAME= ripit-atapi
+PORTVERSION= 1.5
CATEGORIES= audio
MASTER_SITES= http://www.initio.no/~oyvindmo/distfiles/
+DISTNAME= ripit-1.5
MAINTAINER= dburr@FreeBSD.ORG
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index 5acf77e755a4..d3513451f7e2 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ripit
-# Version required: 1.5
# Date created: 2 May 1999
# Whom: oyvindmo@initio.no
#
# $FreeBSD$
#
-DISTNAME= ripit-1.5
+PORTNAME= ripit
+PORTVERSION= 1.5
CATEGORIES= audio
MASTER_SITES= http://www.initio.no/~oyvindmo/distfiles/
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 60c6ae46bf98..be637ceeb35a 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: rosegarden
-# Version required: 2.1pl2
# Date created: 04 Aug 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= rosegarden-2.1pl2
+PORTNAME= rosegarden
+PORTVERSION= 2.1.2
CATEGORIES= audio
MASTER_SITES= http://www.all-day-breakfast.com/rosegarden/patches/
+DISTNAME= ${PORTNAME}-2.1pl2
MAINTAINER= shanee@augusta.de
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 54e3a937766d..eb26a8ade3dc 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,22 +1,22 @@
# New ports collection makefile for: rplay - Network audio player
-# Version required: 3.2.0b6
# Date created: 16 March 1995
# Whom: rmallory@csusb.edu
#
# $FreeBSD$
#
-DISTNAME= rplay-3.2.0b6
+PORTNAME= rplay
+PORTVERSION= 3.2.0b6
CATEGORIES= audio
MASTER_SITES= http://rplay.doit.org/dist/
MAINTAINER= rmallory@csusb.edu
-LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
+LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
HAS_CONFIGURE= yes
USE_GMAKE= yes
-MAN1= rplay.1 xrplay.1 rplayd.1 rptp.1
+MAN1= rplay.1 xrplay.1 rplayd.1 rptp.1
MAN5= rplay.conf.5 rplay.hosts.5 rplay.servers.5
post-install:
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 4edeb25b59b7..8a7e399622ac 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rsynth
-# Version required: 2.0
# Date created: 03 Jan 1995
# Whom: faulkner@mpd.tandem.com
#
# $FreeBSD$
#
-DISTNAME= rsynth-2.0
+PORTNAME= rsynth
+PORTVERSION= 2.0
CATEGORIES= audio
MASTER_SITES= ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/
diff --git a/audio/s3mod/Makefile b/audio/s3mod/Makefile
index d9392bbcd6d9..88c5cf99cb0a 100644
--- a/audio/s3mod/Makefile
+++ b/audio/s3mod/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: s3mod
-# Version required: 1.09
# Date created: 9 March 1995
# Whom: ugen
#
# $FreeBSD$
#
-DISTNAME= s3mod-v1.09
-PKGNAME= s3mod-1.09
+PORTNAME= s3mod
+PORTVERSION= 1.09
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/players
+DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= ugen@FreeBSD.org
diff --git a/audio/shorten/Makefile b/audio/shorten/Makefile
index 53b64e2f6b93..eec3080ddffb 100644
--- a/audio/shorten/Makefile
+++ b/audio/shorten/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: shorten
-# Version required: 2.3
# Date created: 17 Feb 1999
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= shorten
-PKGNAME= shorten-2.3a
+PORTNAME= shorten
+PORTVERSION= 2.3a
CATEGORIES= audio archivers
MASTER_SITES= ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/coding/
+DISTNAME= ${PORTNAME}
MAINTAINER= sec@42.org
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index f4c87f3d32c3..6ae475b43dcc 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sidplay
-# Version required: 1.36.31
# Date created: 31 October 1996
# Whom: Stefan Zehl <sec@42.org>
#
# $FreeBSD$
#
-DISTNAME= sidplay-1_36_35
-PKGNAME= sidplay-1.36.35
+PORTNAME= sidplay
+PORTVERSION= 1.36.35
CATEGORIES= audio emulators
MASTER_SITES= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
+DISTNAME= ${PORTNAME}-1_36_35
EXTRACT_SUFX= .tgz
MAINTAINER= sec@42.org
diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile
index 04963f6adc38..1cfcb06725d6 100644
--- a/audio/snowstar/Makefile
+++ b/audio/snowstar/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: snowstar
-# Version required: 0.75.5
# Date created: 21 April 1999
# Whom: fenner
#
# $FreeBSD$
-DISTNAME= snowstar-0.75.5
+PORTNAME= snowstar
+PORTVERSION= 0.75.5
CATEGORIES= audio
MASTER_SITES= http://www.daft.com/~armadilo/projects/snowstar/
EXTRACT_SUFX= .tar
diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index c7d585ba49b0..1c21963526ad 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: soundtracker
-# Version required: 0.3.10
# Date created: 28 November 1999
# Whom: kzentner
#
# $FreeBSD$
#
-DISTNAME= soundtracker-0.3.10
+PORTNAME= soundtracker
+PORTVERSION= 0.3.10
CATEGORIES= audio
MASTER_SITES= ftp://ftp.soundtracker.org/pub/soundtracker/v0.3/
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index fa7a23c1d637..c28f15fb2123 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sox - Sound Exchange
-# Version required: 12p12
# Date created: 17 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= sox-12.16
+PORTNAME= sox
+PORTVERSION= 12.16
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/convert
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 0b0d322c2258..dfe3f2709e20 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: splay
-# Version required: 0.8.2
# Date created: 1 Apr 1997
# Whom: junker@jazz.snu.ac.kr
#
@@ -8,7 +7,8 @@
# pthread library can be used, but sound quality is buggy
#
-DISTNAME= splay-0.8.2
+PORTNAME= splay
+PORTVERSION= 0.8.2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index a6ac4e63d66d..293509a9d4fd 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: splaytk
-# Version required: 2.0
# Date created: 19 Apr 1998
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= splaytk-2.0
+PORTNAME= splaytk
+PORTVERSION= 2.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/players
@@ -16,7 +16,7 @@ MAINTAINER= brett@peloton.runet.edu
RUN_DEPENDS= splay:${PORTSDIR}/audio/splay \
wish8.2:${PORTSDIR}/x11-toolkits/tk82
-WRKSRC= ${WRKDIR}/splay-tk-2.0
+WRKSRC= ${WRKDIR}/splay-tk-2.0
NO_BUILD= yes
diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index ac5ed6d328c0..5456f530f725 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: tclmidi
-# Version required: 3.1.0
# Date created: 14 May 1999
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= tclmidi-3.1
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.unina.it/pub/Other/music/midi/PROGRAMS/ \
+PORTNAME= tclmidi
+PORTVERSION= 3.1
+CATEGORIES= audio
+MASTER_SITES= ftp://ftp.unina.it/pub/Other/music/midi/PROGRAMS/ \
ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/ \
ftp://sunsite.mff.cuni.cz/MultiMedia/Audio/MIDI/PROGRAMS/
-MAINTAINER= shanee@augusta.de
+MAINTAINER= shanee@augusta.de
LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82
diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index 01b3c4ab1fc4..68e6c90595d5 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -1,22 +1,21 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
# $FreeBSD$
#
-DISTNAME= TiMidity++-${VERSION}
-PKGNAME= ${LANGPREFIX}timidity++-${INTERFACE}-${VERSION}
+PORTNAME= ${LANGPREF}timidity++-${INTERFACE}
+PORTVERSION= 2.9.0
CATEGORIES= audio
MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/
+DISTNAME= TiMidity++-${PORTVERSION}
MAINTAINER= yatt@msc.biglobe.ne.jp
RUN_DEPENDS= ${PREFIX}/bin/timidity:${PORTSDIR}/audio/timidity++
LIB_DEPENDS= ${INTERFACE_DEPS}
-VERSION= 2.9.0
INTERFACE?= emacs
.if defined(JAPANESE)
LANGPREFIX= ja-
diff --git a/audio/timidity++-gtk/Makefile b/audio/timidity++-gtk/Makefile
index 45fe87868701..62b2f2ab020d 100644
--- a/audio/timidity++-gtk/Makefile
+++ b/audio/timidity++-gtk/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++-motif/Makefile b/audio/timidity++-motif/Makefile
index 19f722db9e04..8474a8ec60dd 100644
--- a/audio/timidity++-motif/Makefile
+++ b/audio/timidity++-motif/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++-slang/Makefile b/audio/timidity++-slang/Makefile
index 472ef34ce95f..fc1a31f345d2 100644
--- a/audio/timidity++-slang/Makefile
+++ b/audio/timidity++-slang/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++-tcltk/Makefile b/audio/timidity++-tcltk/Makefile
index 16d395c0b2bd..f83451fc61d9 100644
--- a/audio/timidity++-tcltk/Makefile
+++ b/audio/timidity++-tcltk/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++-xaw/Makefile b/audio/timidity++-xaw/Makefile
index a86d65b3cd81..bc3341e0053c 100644
--- a/audio/timidity++-xaw/Makefile
+++ b/audio/timidity++-xaw/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++-xskin/Makefile b/audio/timidity++-xskin/Makefile
index 40c492492ca4..8508c39e31d1 100644
--- a/audio/timidity++-xskin/Makefile
+++ b/audio/timidity++-xskin/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 5cffd2c3c71d..b1aafdfdc920 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: TiMidity++
-# Version required: 1.3.10
# Date created: 27 Feb 1999
# Whom: Yoichi Asai <yatt@msc.biglobe.ne.jp>
#
# $FreeBSD$
#
-DISTNAME= TiMidity++-2.9.0
-PKGNAME= timidity++-2.9.0
+PORTNAME= timidity++
+PORTVERSION= 2.9.0
CATEGORIES= audio
MASTER_SITES= http://www.goice.co.jp/member/mo/timidity/dist/
+DISTNAME= TiMidity++-${PORTVERSION}
MAINTAINER= yatt@msc.biglobe.ne.jp
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 963c0ea9e016..b2f2b14418f9 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,24 +1,24 @@
# New ports collection makefile for: timidity
# Homepage: http://www.cgs.fi/~tt/timidity/
-# Version required: 0.2i
# Date created: 17 Nov 1996
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= timidity-0.2i
-CATEGORIES= audio
-MASTER_SITES= ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
+PORTNAME= timidity
+PORTVERSION= 0.2i
+CATEGORIES= audio
+MASTER_SITES= ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
http://www.goice.co.jp/member/mo/timidity/dist/
-DISTFILES= ${TIINS} ${DISTNAME}.tar.gz
+DISTFILES= ${TIINS} ${DISTNAME}.tar.gz
+EXTRACT_ONLY= ${DISTNAME}.tar.gz
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
-NO_CDROM= "Uses copyrighted patches"
+NO_CDROM= "Uses copyrighted patches"
-TIINS= goemon.tgz
-EXTRACT_ONLY= ${DISTNAME}.tar.gz
+TIINS= goemon.tgz
INSTALL_TARGET= install.all
MAN1= timidity.1
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index cf4d50be8868..ac5a514ff24d 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tosha
-# Version required: 0.6
# Date created: 01 Jan 1999
# Whom: Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de>
#
# $FreeBSD$
#
-DISTNAME= tosha-0.6
+PORTNAME= tosha
+PORTVERSION= 0.6
CATEGORIES= audio
MASTER_SITES= ftp://ftp.tu-clausthal.de/pub/unix/audio/
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index f59db866da57..e2a6cf111cc3 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tracker
-# Version required: 5.3
# Date created: 2 Oct 1994
# Whom: swallace
#
# $FreeBSD$
#
-DISTNAME= tracker-5.3
+PORTNAME= tracker
+PORTVERSION= 5.3
CATEGORIES= audio
MASTER_SITES= ftp://ftp.uni-trier.de/pub/unix/audio/tracker/
EXTRACT_SUFX= .tgz
diff --git a/audio/waveplay/Makefile b/audio/waveplay/Makefile
index a3a101e44254..ca7176d011c2 100644
--- a/audio/waveplay/Makefile
+++ b/audio/waveplay/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: waveplay
-# Version required: 1.0
# Date created: 23 Jan 1999
# Whom: Yoshihide SONODA <ysonoda@dontaku.csce.kyushu-u.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= waveplay-19990123
-PKGNAME= waveplay-1.0
+PORTNAME= waveplay
+PORTVERSION= 1999.01.23
CATEGORIES= audio
MASTER_SITES= http://dontaku.csce.kyushu-u.ac.jp/~ysonoda/archives/program/FreeBSD/
+DISTNAME= waveplay-19990123
MAINTAINER= ysonoda@dontaku.csce.kyushu-u.ac.jp
diff --git a/audio/wmcdplay/Makefile b/audio/wmcdplay/Makefile
index 2cb84482bf38..273702fc6d03 100644
--- a/audio/wmcdplay/Makefile
+++ b/audio/wmcdplay/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmcdplay
-# Version required: 1.0b1
# Date created: 7 December 1998
# Whom: Chia-liang Kao <clkao@CirX.ORG>
#
# $FreeBSD$
#
-DISTNAME= wmcdplay-1.0-beta1
-PKGNAME= wmcdplay-1.0b1
+PORTNAME= wmcdplay
+PORTVERSION= 1.0b1
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/2471/files/
+DISTNAME= wmcdplay-1.0-beta1
EXTRACT_SUFX= .tgz
MAINTAINER= clkao@CirX.ORG
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 5263225cdd27..a15e07ce7606 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmmixer
-# Version required: 1.0b1
# Date created: 11 July 1998
# Whom: Rich Neswold <rneswold@mcs.net>
#
# $FreeBSD$
#
-DISTNAME= wmmixer-1.0-beta1
-PKGNAME= wmmixer-1.0b1
+PORTNAME= wmmixer
+PORTVERSION= 1.0b1
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/2471/files/
+DISTNAME= ${PORTNAME}-1.0-beta1
EXTRACT_SUFX= .tgz
MAINTAINER= rneswold@mcs.net
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 58184848b44e..70142508dfc3 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: wmmp3
-# Version required: 0.11
# Date created: 09 December 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
-DISTNAME= wmmp3-0.11
+PORTNAMEN= wmmp3
+PORTVERSION= 0.11
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile
index 106a0b2c2d94..e5bec7a8acb9 100644
--- a/audio/wmtune/Makefile
+++ b/audio/wmtune/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmtune
-# Version required: 1.0
# Date created: 28 September 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= wmtune-1.0
+PORTNAME= wmtune
+PORTVERSION= 1.0
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.fxp.org/~jedgar/distfiles/ \
http://www.soren.org/linux/wmtune/dl/ \
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index d6adecea8f51..61f0103f19cb 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: workman
-# Version required: 1.3a
# Date created: 25 Now 1995
# Whom: Donald Burr <d_burr@ix.netcom.com>
#
# $FreeBSD$
#
-DISTNAME= WorkMan-1.3a
-PKGNAME= workman-1.3a
+PORTNAME= workman
+PORTVERSION= 1.3a
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/WorkMan
+DISTNAME= WorkMan-${PORTVERSION}
MAINTAINER= d_burr@ix.netcom.com
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 91165674eeeb..994054d55590 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: wsoundPrefs
-# Version required: 1.0.2
# Date created: 12 December 1998
# Whom: gljohns@bellsouth.net
#
# $FreeBSD$
#
-DISTNAME= WSoundPrefs-1.0.2
+PORTNAME= wsoundprefs
+PORTVERSION= 1.0.2
CATEGORIES= audio windowmaker
MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+DISTFILE= WSoundPrefs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 08f358a46505..42c6e6b55411 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmsound
-# Version required: 0.9.0
# Date created: 9 December 1998
# Whom: gljohns@bellsouth.net
#
# $FreeBSD$
#
-DISTNAME= wmsound-0.9.5
+PORTNAME= wmsound
+PORTVERSION= 0.9.5
CATEGORIES= audio windowmaker
MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index bf2a3ebee916..aaef17667280 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: x11amp
-# Version required: 0.7
# Date created: 13 Jul 1998
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= x11amp-freebsd-0.8
-PKGNAME= x11amp-0.8
+PORTNAME= x11amp
+PORTVERSION= 0.8
CATEGORIES= audio
MASTER_SITES= ftp://www.se.opensound.com/pub/oss/ossapps/
+DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION}
EXTRACT_SUFX= .tar.gz
MAINTAINER= dburr@FreeBSD.org
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 5c1a0e6afd69..f0b49ca4009f 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: xamp
-# Version required: 0.8-7
# Date created: 29 July 1998
# Whom: Joe Jih-Shian Lu <jslu@dns.ntu.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= xamp-0.8-7
-PKGNAME= xamp-0.8.7
+PORTNAME= xamp
+PORTVERSION= 0.8-7
CATEGORIES= audio
MASTER_SITES= ftp://ftp.simcb.ru/pub/unix/x11/
EXTRACT_SUFX= .tgz
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 95874e29c525..ddbc8e9a37f8 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcd
-# Version required: 1.7
# Date created: 22 November 1994
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= xcd-1.7
+PORTNAME= xcd
+PORTVERSION= 1.7
CATEGORIES= audio tk82
MASTER_SITES= http://people.FreeBSD.org/~jmz/
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index 449d3b0eb2a6..8ebeb81d4392 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xcdplayer
-# Version required: 2.2
# Date created: 30 Sep 1994
# Whom: swallace
#
# $FreeBSD$
#
-DISTNAME= xcdplayer-2.2
+PORTNAME= xcdplayer
+PORTVERSION= 2.2
CATEGORIES= audio
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.cdrom.com/pub/X11/R5contrib/
@@ -14,7 +14,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= swallace@FreeBSD.org
-USE_IMAKE= yes
+USE_IMAKE= yes
MAN1= xcdplayer.1
.include <bsd.port.mk>
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 92a7b0f4f18c..cc5682b43576 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xhippo
-# Version required: 2.1
# Date created: 16 March 1999
# Whom: Rod Taylor <rod@zort.on.ca>
#
# $FreeBSD$
#
-DISTNAME= xhippo-2.1
+PORTNAME= xhippo
+PORTVERSION= 2.1
CATEGORIES= audio
MASTER_SITES= http://zenchaos.netpedia.net/software/
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index ed9636d5f24c..1fc845c73055 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmcd
-# Version required: 2.4
# Date created: 16 Februar 1995
# Whom: Gennady Sorokopud <gena@NetVision.net.il>
#
# $FreeBSD$
#
-DISTNAME= xmcd-2.6
+PORTNAME= xmcd
+PORTVERSION= 2.6
CATEGORIES= audio
MASTER_SITES= http://metalab.unc.edu/tkan/download/xmcd/src/
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 0f68e62d4a54..8c4eb26c14a5 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmix
-# Version required: 2.1
# Date created: 30 June 1995
# Whom: janek@gaja.ipan.lublin.pl
#
# $FreeBSD$
#
-DISTNAME= xmix-2.1
+PORTNAME= xmix
+PORTVERSION= 2.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/mixers
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index 20905683f95a..67b3407924e4 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmixer
-# Version required: 0.9.3
# Date created: 27 October 1999
# Whom: trevor@jpj.net
#
# $FreeBSD$
#
-DISTNAME= xmixer-0.9.3
+PORTNAME= xmixer
+PORTVERSION= 0.9.3
CATEGORIES= audio
MASTER_SITES= http://www.hdk-berlin.de/~rasca/
MASTER_SITE_SUBDIR= apps/sound/mixers
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 92e040f3224b..b52829d5c270 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmmix
-# Version required: 1.2
# Date created: Mon Aug 5 10:54:25 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xmmix-1.2
+PORTNAME= xmmix
+PORTVERSION= 1.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index 6f1429b7ef71..cf0b0c4a03f0 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmms-liveice
-# Version required: 1.0.0
# Date created: 5 Febrary 2000
# Whom: Espen Skoglund <esk@ira.uka.de>
#
# $FreeBSD$
#
-DISTNAME= liveice-xmms
-PKGNAME= xmms-liveice-1.0.0
+PORTNAME= xmms-liveice
+PORTVERSION= 1.0.0
CATEGORIES= audio
MASTER_SITES= http://star.arm.ac.uk/~spm/software/
+DISTNAME= liveice-xmms
MAINTAINER= esk@ira.uka.de
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 97807a893508..2ec648096871 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmms
-# Version required: 1.0.1
# Date created: 3 July 1999
# Whom: Espen Skoglund <esk@ira.uka.de>
#
# $FreeBSD$
#
-DISTNAME= xmms-1.0.1
+PORTNAME= xmms
+PORTVERSION= 1.0.1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.xmms.org/xmms/1.0/ \
ftp://ftp.uk.xmms.org/xmms/1.0/ \
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index f477c38a6b08..54cd51fc1bf7 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmp
-# Version required: xmp-2.0.1
# Date created: 18 September 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= xmp-2.0.1
+PORTNAME= xmp
+PORTVERSION= 2.0.1
CATEGORIES= audio
MASTER_SITES= http://xmp.helllabs.org/pkg/2.0.1/ \
http://xmp.linuxbox.com/pkg/2.0.1/
diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index 049f24639796..dc2f29ba3e2a 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xmpeg3
-# Version required: 1.0
# Date created: 7 July 1997
# Whom: doconnor@ist.flinders.edu.au
#
# $FreeBSD$
#
-DISTNAME= xmp3_1.0.0
-PKGNAME= xmpeg3-1.0
+PORTNAME= xmpeg3
+PORTVERSION= 1.0
CATEGORIES= audio tk82
MASTER_SITES= ftp://ftp.funet.fi/pub/sci/audio/mpeg/amp/
+DISTNAME= xmp3_1.0.0
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 173cc524eaa4..f390d468226d 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,13 +1,12 @@
-# $FreeBSD$
# New ports collection makefile for: xmradio
-# Version required: 0.8
# Date created: 1 Oct 1999
# Whom: runge@rostock.zgdv.de
#
# $FreeBSD$
#
-DISTNAME= xmradio-0.8
+PORTNAME= xmradio
+PORTVERSION= 0.8
CATEGORIES= audio
MASTER_SITES= http://www.egd.igd.fhg.de/~runge/radio/
diff --git a/audio/xtuner/Makefile b/audio/xtuner/Makefile
index 950e8d15814d..25ccd103421c 100644
--- a/audio/xtuner/Makefile
+++ b/audio/xtuner/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for: Xtuner-2.1
-# Version required: 2.1
+# New ports collection makefile for: Xtuner
# Date created: 19 December 96
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= Xtuner-2.1
-PKGNAME= xtuner-2.1
+PORTNAME= xtuner
+PORTVERSION= 2.1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
+DISTNAME= Xtuner-${PORTVERSION}
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 74277e2d6d20..bb5efa5cf6ad 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yamt
-# Version required: 0.4
# Date created: 9 January 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= yamt-0.4
+PORTNAME= yamt
+PORTVERSION= 0.4
CATEGORIES= audio gnome
MASTER_SITES= http://download.sourceforge.net/yamt/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index c8e0e3009f1a..a790c0467e1b 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdemultimedia
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdemultimedia-1.1.2
+PORTNAME= kdemultimedia
+PORTVERSION= 1.1.2
CATEGORIES= audio kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index c8e0e3009f1a..a790c0467e1b 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdemultimedia
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdemultimedia-1.1.2
+PORTNAME= kdemultimedia
+PORTVERSION= 1.1.2
CATEGORIES= audio kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 0a7dfdcac67b..f059ef49f093 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: linux-realplayer
-# Version required: 5.0
# Date created: 31 January 1999
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
#
-DISTNAME= rv50_linux20
-PKGNAME= linux-realplayer-5.0
+PORTNAME= linux-realplayer
+PORTVERSION= 5.0
CATEGORIES= audio linux
-MASTER_SITES=
+MASTER_SITES= # fetch manually
+DISTNAME= rv50_linux20
MAINTAINER= kris@FreeBSD.org
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 97807a893508..2ec648096871 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmms
-# Version required: 1.0.1
# Date created: 3 July 1999
# Whom: Espen Skoglund <esk@ira.uka.de>
#
# $FreeBSD$
#
-DISTNAME= xmms-1.0.1
+PORTNAME= xmms
+PORTVERSION= 1.0.1
CATEGORIES= audio
MASTER_SITES= ftp://ftp.xmms.org/xmms/1.0/ \
ftp://ftp.uk.xmms.org/xmms/1.0/ \
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 0984c59e05ec..7eace10ec83b 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: cdrdao
-# Version required: 1.1.2
# Date created: 7 April 1999
# Whom: futatuki
#
@@ -10,10 +9,11 @@
# If you don't want to use pthreads, set DONT_USE_PTHREADS = yes
# If you want the graphical X toc file editor, set XCDRDAO = yes
-DISTNAME= cdrdao-1.1.3.src
-PKGNAME= cdrdao-1.1.3
+PORTNAME= cdrdao
+PORTVERSION= 1.1.3
CATEGORIES= audio
MASTER_SITES= http://www.ping.de/sites/daneb/
+EXTRACT_SUFX= .src.tar.gz
MAINTAINER= futatuki@debug.gr.jp