aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/djvulibre/Makefile4
-rw-r--r--graphics/g2/Makefile4
-rw-r--r--graphics/gcolor/Makefile4
-rw-r--r--graphics/gd/Makefile4
-rw-r--r--graphics/gd1/Makefile4
-rw-r--r--graphics/gd2/Makefile4
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/geomview/Makefile4
-rw-r--r--graphics/gfont/Makefile4
-rw-r--r--graphics/gif2png/Makefile4
-rw-r--r--graphics/giflib/Makefile4
-rw-r--r--graphics/gifmerge/Makefile7
-rw-r--r--graphics/gifsicle/Makefile4
-rw-r--r--graphics/giftool/Makefile4
-rw-r--r--graphics/giftrans/Makefile4
-rw-r--r--graphics/gimp-app-devel/Makefile12
-rw-r--r--graphics/gimp-app/Makefile12
-rw-r--r--graphics/gimp-devel/Makefile12
-rw-r--r--graphics/gimp-manual-html/Makefile7
-rw-r--r--graphics/gimp-manual-pdf/Makefile1
-rw-r--r--graphics/gimp-manual-ps/Makefile1
-rw-r--r--graphics/gimp/Makefile12
-rw-r--r--graphics/gimp1/Makefile12
-rw-r--r--graphics/gimpshop/Makefile12
-rw-r--r--graphics/giram/Makefile6
-rw-r--r--graphics/gltk/Makefile6
-rw-r--r--graphics/glx/Makefile3
-rw-r--r--graphics/gnofract4d/Makefile4
-rw-r--r--graphics/gnomeiconedit/Makefile6
-rw-r--r--graphics/gphoto/Makefile4
-rw-r--r--graphics/gphoto2/Makefile4
-rw-r--r--graphics/gplot/Makefile8
-rw-r--r--graphics/gqview/Makefile6
-rw-r--r--graphics/gracula/Makefile4
-rw-r--r--graphics/graphviz/Makefile6
-rw-r--r--graphics/gridpix/Makefile6
-rw-r--r--graphics/gtkdps/Makefile6
-rw-r--r--graphics/gtkfig/Makefile4
-rw-r--r--graphics/gtkgraph/Makefile4
-rw-r--r--graphics/gtksee/Makefile4
-rw-r--r--graphics/gview/Makefile4
-rw-r--r--graphics/gxanim/Makefile4
-rw-r--r--graphics/hdf/Makefile6
-rw-r--r--graphics/hdf5/Makefile6
-rw-r--r--graphics/hobbes-icons-xpm/Makefile6
-rw-r--r--graphics/hppsmtools/Makefile4
-rw-r--r--graphics/hpscan/Makefile5
-rw-r--r--graphics/icod/Makefile6
-rw-r--r--graphics/imanager/Makefile6
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/imlib2-tmp/Makefile4
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/jbigkit/Makefile4
-rw-r--r--graphics/jgraph/Makefile9
-rw-r--r--graphics/jpeg-mmx/Makefile6
-rw-r--r--graphics/jpeg/Makefile6
-rw-r--r--graphics/juno-2/Makefile6
-rw-r--r--graphics/kdegraphics11/Makefile4
-rw-r--r--graphics/kdegraphics2/Makefile4
-rw-r--r--graphics/kdegraphics3/Makefile4
-rw-r--r--graphics/kdegraphics4/Makefile4
-rw-r--r--graphics/killustrator/Makefile4
-rw-r--r--graphics/kplot3d/Makefile4
-rw-r--r--graphics/lfview/Makefile8
-rw-r--r--graphics/libdjvu++/Makefile4
-rw-r--r--graphics/libggi/Makefile4
-rw-r--r--graphics/libimg/Makefile6
-rw-r--r--graphics/libungif/Makefile4
-rw-r--r--graphics/libwmf/Makefile4
-rw-r--r--graphics/linux_glide/Makefile7
-rw-r--r--graphics/linux_glx/Makefile5
-rw-r--r--graphics/linux_mesa/Makefile7
-rw-r--r--graphics/linux_mesa3/Makefile7
-rw-r--r--graphics/mpeg-lib/Makefile4
-rw-r--r--graphics/mpeg/Makefile6
-rw-r--r--graphics/mpeg2codec/Makefile4
-rw-r--r--graphics/mpeg2play/Makefile4
-rw-r--r--graphics/mpeg_encode/Makefile6
-rw-r--r--graphics/mpeg_play/Makefile4
-rw-r--r--graphics/mpeg_stat/Makefile6
-rw-r--r--graphics/mpegedit/Makefile6
-rw-r--r--graphics/mplex/Makefile5
-rw-r--r--graphics/mtv/Makefile4
-rw-r--r--graphics/netpbm/Makefile4
-rw-r--r--graphics/netshow/Makefile6
-rw-r--r--graphics/opendx-samples/Makefile6
-rw-r--r--graphics/opendx/Makefile6
-rw-r--r--graphics/opengl-man/Makefile4
-rw-r--r--graphics/p5-Chart-PNGgraph/Makefile4
-rw-r--r--graphics/p5-Chart/Makefile7
-rw-r--r--graphics/p5-GD-Graph/Makefile7
-rw-r--r--graphics/p5-GD-TextUtil/Makefile7
-rw-r--r--graphics/p5-GD/Makefile6
-rw-r--r--graphics/p5-GD1/Makefile6
-rw-r--r--graphics/p5-GD2/Makefile6
-rw-r--r--graphics/p5-Image-Size/Makefile6
-rw-r--r--graphics/p5-PGPLOT/Makefile6
-rw-r--r--graphics/p5-chart/Makefile7
-rw-r--r--graphics/pgperl/Makefile6
-rw-r--r--graphics/pgplot/Makefile6
-rw-r--r--graphics/photopc/Makefile4
-rw-r--r--graphics/piddle/Makefile7
-rw-r--r--graphics/pixmap/Makefile6
-rw-r--r--graphics/plotmtv/Makefile6
-rw-r--r--graphics/plotutils/Makefile4
-rw-r--r--graphics/png/Makefile6
-rw-r--r--graphics/png2html/Makefile4
-rw-r--r--graphics/pngcrush/Makefile4
-rw-r--r--graphics/povray/Makefile6
-rw-r--r--graphics/povray31/Makefile6
-rw-r--r--graphics/povray36/Makefile6
-rw-r--r--graphics/povray37/Makefile6
-rw-r--r--graphics/ppm2fli/Makefile6
-rw-r--r--graphics/pstoedit/Makefile6
-rw-r--r--graphics/py-imaging-handbook/Makefile5
-rw-r--r--graphics/py-imaging/Makefile7
-rw-r--r--graphics/py-opengl/Makefile7
-rw-r--r--graphics/qcread/Makefile4
-rw-r--r--graphics/qiv/Makefile4
-rw-r--r--graphics/qvplay/Makefile4
-rw-r--r--graphics/rayshade/Makefile6
-rw-r--r--graphics/sane-backends/Makefile4
-rw-r--r--graphics/sane-frontends/Makefile4
-rw-r--r--graphics/sane/Makefile4
-rw-r--r--graphics/sced/Makefile4
-rw-r--r--graphics/scwm-icons/Makefile4
-rw-r--r--graphics/skencil/Makefile4
-rw-r--r--graphics/sketch/Makefile4
-rw-r--r--graphics/smpeg/Makefile4
-rw-r--r--graphics/sodipodi/Makefile4
-rw-r--r--graphics/spigot/Makefile4
-rw-r--r--graphics/splitmpg/Makefile7
-rw-r--r--graphics/stamp/Makefile4
-rw-r--r--graphics/tgd/Makefile6
-rw-r--r--graphics/tgif-nls/Makefile6
-rw-r--r--graphics/tgif/Makefile4
-rw-r--r--graphics/tiff/Makefile6
-rw-r--r--graphics/tifmerge/Makefile6
-rw-r--r--graphics/tkxanim/Makefile4
-rw-r--r--graphics/togl/Makefile6
-rw-r--r--graphics/twinlib/Makefile9
-rw-r--r--graphics/txtmerge/Makefile6
-rw-r--r--graphics/urt/Makefile6
-rw-r--r--graphics/utah-glx/Makefile3
-rw-r--r--graphics/vcdgear/Makefile9
-rw-r--r--graphics/vcg/Makefile6
-rw-r--r--graphics/whirlgif/Makefile6
-rw-r--r--graphics/wmgrabimage/Makefile4
-rw-r--r--graphics/wmicons/Makefile4
-rw-r--r--graphics/xanim/Makefile6
-rw-r--r--graphics/xaos/Makefile6
-rw-r--r--graphics/xbmbrowser/Makefile6
-rw-r--r--graphics/xdgagrab/Makefile4
-rw-r--r--graphics/xdl/Makefile4
-rw-r--r--graphics/xfig-devel/Makefile6
-rw-r--r--graphics/xfig/Makefile6
-rw-r--r--graphics/xfpovray/Makefile4
-rw-r--r--graphics/xfractint/Makefile6
-rw-r--r--graphics/xgrasp/Makefile6
-rw-r--r--graphics/xli/Makefile4
-rw-r--r--graphics/xmagv/Makefile9
-rw-r--r--graphics/xmandel/Makefile6
-rw-r--r--graphics/xmfract/Makefile6
-rw-r--r--graphics/xmorph/Makefile6
-rw-r--r--graphics/xmountains/Makefile4
-rw-r--r--graphics/xmovie/Makefile6
-rw-r--r--graphics/xmrm/Makefile9
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xpdf/Makefile4
-rw-r--r--graphics/xpm/Makefile4
-rw-r--r--graphics/xpx/Makefile6
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--graphics/xwpick/Makefile4
-rw-r--r--graphics/zimg/Makefile4
-rw-r--r--multimedia/gxanim/Makefile4
-rw-r--r--multimedia/linux-xmovie/Makefile6
-rw-r--r--multimedia/mpeg/Makefile6
-rw-r--r--multimedia/mpeg2codec/Makefile4
-rw-r--r--multimedia/mpeg2play/Makefile4
-rw-r--r--multimedia/mpeg_encode/Makefile6
-rw-r--r--multimedia/mpeg_play/Makefile4
-rw-r--r--multimedia/mpeg_stat/Makefile6
-rw-r--r--multimedia/mpegedit/Makefile6
-rw-r--r--multimedia/mplex/Makefile5
-rw-r--r--multimedia/mtv/Makefile4
-rw-r--r--multimedia/netshow/Makefile6
-rw-r--r--multimedia/ppm2fli/Makefile6
-rw-r--r--multimedia/smpeg/Makefile4
-rw-r--r--multimedia/spigot/Makefile4
-rw-r--r--multimedia/splitmpg/Makefile7
-rw-r--r--multimedia/tkxanim/Makefile4
-rw-r--r--multimedia/vcdgear/Makefile9
-rw-r--r--multimedia/xanim/Makefile6
-rw-r--r--multimedia/xmovie/Makefile6
-rw-r--r--science/hdf/Makefile6
-rw-r--r--science/hdf5-18/Makefile6
-rw-r--r--science/hdf5/Makefile6
197 files changed, 523 insertions, 536 deletions
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 4b3bcce5127f..a4fba8207e4a 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libdjvu++
-# Version required: 2.1
# Date Created: 20 July 1999
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
-DISTNAME= libdjvu++-2.1
+PORTNAME= libdjvu++
+PORTVERSION= 2.1
CATEGORIES= graphics
MASTER_SITES= http://www.djvu.com/open/
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index f9457e30a66c..ba7cb21137cb 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: g2
-# Version required: 0.40
# Date created: 16 July 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= g2-0.40
+PORTNAME= g2
+PORTVERSION= 0.40
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index ce0e4c6505f8..849c46c33cb4 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gcolor
-# Version required: 0.4
# Date created: 20 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gcolor-0.4
+PORTNAME= gcolor
+PORTVERSION= 0.4
CATEGORIES= graphics gnome x11
MASTER_SITES= http://download.sourceforge.net/gcolor/
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index d6c0a9f45595..71ae522dc0c8 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8.1
+PORTNAME= gd
+PORTVERSION= 1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index d6c0a9f45595..71ae522dc0c8 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8.1
+PORTNAME= gd
+PORTVERSION= 1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index d6c0a9f45595..71ae522dc0c8 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gd
-# Version required: 1.8.1
# Date created: 27 Mar 1998
# Whom: jeff@cetlink.net
#
# $FreeBSD$
#
-DISTNAME= gd-1.8.1
+PORTNAME= gd
+PORTVERSION= 1.8.1
CATEGORIES= graphics
MASTER_SITES= http://www.boutell.com/gd/http/ \
ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index c97857c938d1..52fc9112d68e 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gdk-pixbuf
-# Version required: 0.6.0
# Date created: 5th October 1999
# Whom: Ade Lovett <ade@lovett.com>
#
# $FreeBSD$
#
-DISTNAME= gdk-pixbuf-0.6.0
+PORTNAME= gdk-pixbuf
+PORTVERSION= 0.6.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gdk-pixbuf
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 27dca3eb1fd5..8114fe243a21 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: geomview
-# Version required: 1.6.1
# Date created: 5 November 1996
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= geomview-1.6.1
+PORTNAME= geomview
+PORTVERSION= 1.6.1
CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.geom.umn.edu/pub/software/geomview/ \
ftp://ftp-sfb288.math.tu-berlin.de/pub/geomview/
diff --git a/graphics/gfont/Makefile b/graphics/gfont/Makefile
index bca7019bfecd..4538f59846d1 100644
--- a/graphics/gfont/Makefile
+++ b/graphics/gfont/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gfont
-# Version required: 1.0.2
# Date created: 09-Sep-1997
# Whom: Ralf S. Engelschall <rse@engelschall.com>
#
# $FreeBSD$
#
-DISTNAME= gfont-1.0.2
+PORTNAME= gfont
+PORTVERSION= 1.0.2
CATEGORIES= graphics print www
MASTER_SITES= http://www.engelschall.com/sw/gfont/distrib/ \
ftp://ftp.engelschall.com/sw/gfont/ \
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 07042a2eeadb..884a01a77a76 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gif2png
-# Version required: 2.3.0
# Date created: 30 Aug 1999
# Whom: saper@system.pl
#
# $FreeBSD$
#
-DISTNAME= gif2png-2.3.0
+PORTNAME= gif2png
+PORTVERSION= 2.3.0
CATEGORIES= graphics
MASTER_SITES= http://www.tuxedo.org/~esr/gif2png/
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 5bdad1781f64..16c29a08e4c1 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libungif
-# Version required: 4.1.0
# Date created: 03 May 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libungif-4.1.0
+PORTNAME= libungif
+PORTVERSION= 4.1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://prtr-13.ucsc.edu/pub/libungif/
diff --git a/graphics/gifmerge/Makefile b/graphics/gifmerge/Makefile
index fa470d4741a9..2eb3c68799af 100644
--- a/graphics/gifmerge/Makefile
+++ b/graphics/gifmerge/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: gifmerge
-# Version required: 1.33
# Date created: 20 Oct 1996
# Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= gifmerge
-PKGNAME= gifmerge-1.33
+PORTNAME= gifmerge
+PORTVERSION= 1.33
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tar
+DISTFILES= gifmerge.tar
MAINTAINER= nakai@FreeBSD.org
diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile
index eeb3ef22f393..1e261e2ba4cc 100644
--- a/graphics/gifsicle/Makefile
+++ b/graphics/gifsicle/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gifsicle
-# Version required: 1.16.1
# Date created: 19 December 1998
# Whom: Brad Hendrickse <bradh@iafrica.com>
#
# $FreeBSD$
#
-DISTNAME= gifsicle-1.16.1
+PORTNAME= gifsicle
+PORTVERSION= 1.16.1
CATEGORIES= graphics
MASTER_SITES= http://www.lcdf.org/gifsicle/
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index b9d710b83ec6..300212b89fcc 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: giftool
-# Version required: 1.0
# Date created: 14 October 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= giftool-1.0
+PORTNAME= giftool
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.sbs.de/pub/www/tools/giftool/
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index 6e94de05feae..20af43345ac3 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: giftrans
-# Version required: v1.12.2
# Date created: 14 October 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= giftrans-1.12.2
+PORTNAME= giftrans
+PORTVERSION= 1.12.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.rz.uni-karlsruhe.de/pub/net/www/tools/giftrans/
DISTFILES= giftrans.c giftrans.1
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 00f2e6a2c3c3..5b3eab4d2e80 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: gimp-manual-1.0.0
-# Version required: 1.0.0
# Date created: 5 June 1998
# Whom: Brett Taylor
#
# $FreeBSD$
#
-DISTNAME= GimpUserManual-1.0.0
-PKGNAME= GimpUserManual-${DOCFORMAT}-1.0.0
+PORTNAME= GimpUserManual
+PORTVERSION= 1.0.0
CATEGORIES= graphics
MASTER_SITES= ftp://manual.gimp.org/pub/manual/ \
http://peloton.runet.edu/distfiles/
+PKGNAMESUFFIX= -${DOCFORMAT}
+DISTNAME= GimpUserManual-${PORTVERSION}
MAINTAINER= brett@peloton.runet.edu
diff --git a/graphics/gimp-manual-pdf/Makefile b/graphics/gimp-manual-pdf/Makefile
index 35b13dffa2f5..8c1d5e4712d0 100644
--- a/graphics/gimp-manual-pdf/Makefile
+++ b/graphics/gimp-manual-pdf/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: gimp-manual-1.0.0 (PDF)
-# Version required: 1.0.0
# Date created: 5 June 1998
# Whom: Brett Taylor
#
diff --git a/graphics/gimp-manual-ps/Makefile b/graphics/gimp-manual-ps/Makefile
index f114f10a66af..fa7b1459af40 100644
--- a/graphics/gimp-manual-ps/Makefile
+++ b/graphics/gimp-manual-ps/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: gimp-manual-1.0.0 (PS)
-# Version required: 1.0.0
# Date created: 5 June 1998
# Whom: Brett Taylor
#
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index f0dc8372d2e2..871993c0bc2c 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: The GIMP
-# Version required: 1.1.17
# Date created: Mon Nov 18 21:28:43 CST 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gimp-${VERSION}
+PORTNAME= gimp
+PORTVERSION= 1.1.18
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
- ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
- ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
+MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/ \
+ ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/old/v${PORTVERSION}/
MAINTAINER= vanilla@FreeBSD.org
@@ -29,8 +29,6 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff \
intl.1:${PORTSDIR}/devel/gettext
-VERSION= 1.1.18
-
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index b54b42eff18f..9cdea019eb48 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: giram
-# Version required: 0.1.5
# Date created: 17 June 1999
# Whom: Brandon Fosdick <bfoz@glue.umd.edu>
#
# $FreeBSD$
#
-DISTNAME= Giram-0.1.5
-PKGNAME= giram-0.1.5
+PORTNAME= giram
+PORTVERSION= 0.1.5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.giram.org/pub/
+DISTNAME= Giram-${PORTVERSION}
MAINTAINER= bfoz@glue.umd.edu
diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile
index 0048d96f0413..e0645b3f380b 100644
--- a/graphics/gltk/Makefile
+++ b/graphics/gltk/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gltk
-# Version required: 1.0
# Date created: 16 Feb 2000
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= libtk
-PKGNAME= gltk-1.0
+PORTNAME= gltk
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.sgi.com/opengl/contrib/ \
ftp://ftp.u-aizu.ac.jp/pub/os/sgi/misc/ftp.sgi.com/pub/opengl/contrib/
+DISTNAME= libtk
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/glx/Makefile b/graphics/glx/Makefile
index fd34b15fc387..e5e168c91dd9 100644
--- a/graphics/glx/Makefile
+++ b/graphics/glx/Makefile
@@ -36,7 +36,8 @@
# question bugs you
#
-DISTNAME= glx-990802
+PORTNAME= glx
+PORTVERSION= 990802
CATEGORIES= graphics
MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/XF3.3.5/
DISTFILES= ${DISTNAME}.tar.bz2 \
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index 8a6a917ab0be..72a8f8f29d23 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnofract4d
-# Version required: 1.2
# Date created: 30 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnofract4d-1.2
+PORTNAME= gnofract4d
+PORTVERSION= 1.2
CATEGORIES= graphics
MASTER_SITES= http://download.sourceforge.net/gnofract4d/
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index abc56b8cdb9a..4fd09204d731 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gnomeiconedit
-# Version required: 1.0.6
# Date created: 28th January 2000
# Whom: Ade Lovett <ade@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gnome-iconedit-1.0.6
-PKGNAME= gnomeiconedit-1.0.6
+PORTNAME= gnomeiconedit
+PORTVERSION= 1.0.6
CATEGORIES= graphics gnome
MASTER_SITES= http://www.abdn.ac.uk/~u07ih/gnome-iconedit/
+DISTNAME= gnome-iconedit-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index b98b6b414038..a76e5c13c2ed 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gphoto
-# Version required: gphoto-19990511
# Date created: 26 May 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= gphoto-0.4.0
+PORTNAME= gphoto
+PORTVERSION= 0.4.0
CATEGORIES= graphics
MASTER_SITES= http://www.mustec.eu.org/~psj/downloads/ \
http://www.freenix.no/~anders/
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index b98b6b414038..a76e5c13c2ed 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gphoto
-# Version required: gphoto-19990511
# Date created: 26 May 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= gphoto-0.4.0
+PORTNAME= gphoto
+PORTVERSION= 0.4.0
CATEGORIES= graphics
MASTER_SITES= http://www.mustec.eu.org/~psj/downloads/ \
http://www.freenix.no/~anders/
diff --git a/graphics/gplot/Makefile b/graphics/gplot/Makefile
index 3d346397518d..eacf35f69069 100644
--- a/graphics/gplot/Makefile
+++ b/graphics/gplot/Makefile
@@ -1,21 +1,19 @@
# New ports collection makefile for: Gplot
-# Version required: 4.3
# Date created: 26 Dec 97
# Whom: Pedro Giffuni <giffunip@asme.org>
#
# $FreeBSD$
#
-DISTNAME= gplot
-PKGNAME= gplot-4.3
+PORTNAME= gplot
+PORTVERSION= 4.3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.psc.edu/pub/gplot/
-EXTRACT_SUFX= .tar.Z
+DISTFILES= gplot.tar.Z
MAINTAINER= giffunip@asme.org
NO_WRKSUBDIR= yes
-
ALL_TARGET= drawcgm gtex gplot
MAN1= gplot.1
DOCS= gplot.hlp gplot.txt gtex.doc
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 43a5529ed4b4..225827d0008c 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gqview
-# Version required: 0.7.0
# Date Created: 27 Oct 1998
# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gqview-0.7.0.src
-PKGNAME= gqview-0.7.0
+PORTNAME= gqview
+PORTVERSION= 0.7.0
CATEGORIES= graphics
MASTER_SITES= http://gqview.netpedia.net/ \
http://www.geocities.com/SiliconValley/Haven/5235/
+DISTNAME= ${PKGNAME}.src
MAINTAINER= nakai@FreeBSD.org
diff --git a/graphics/gracula/Makefile b/graphics/gracula/Makefile
index a749ea920569..21ffb0f6859c 100644
--- a/graphics/gracula/Makefile
+++ b/graphics/gracula/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gracula
-# Version required: 3.0
# Date created: 30 May 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= gracula-3.0
+PORTNAME= gracula
+PORTVERSION= 3.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.whizkidtech.net/cgi/gcl/ \
http://www.whizkidtech.net/gcl/
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 4a21447451a7..d6d3df7dfce2 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: graphviz
-# Version required: 1.5.1
# Date created: 03 Feb 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gviz15
-PKGNAME= graphviz-1.5.1
+PORTNAME= graphviz
+PORTVERSION= 1.5.1
CATEGORIES= graphics tk82
MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/
+DISTNAME= gviz15
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/gridpix/Makefile b/graphics/gridpix/Makefile
index 4cb4f55b4bbe..96ddd25b35e1 100644
--- a/graphics/gridpix/Makefile
+++ b/graphics/gridpix/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gridpix
-# Version required: 2.1
# Date created: 19 July 1999
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= GridPix-2.1
-PKGNAME= gridpix-2.1
+PORTNAME= gridpix
+PORTVERSION= 2.1
CATEGORIES= graphics
MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/GridPix/
+DISTNAME= GridPix-${PORTVERSION}
MAINTAINER= asami@FreeBSD.org
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 2b610bcab3c7..4345e7b144d8 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gtkdps
-# Version required: 0.3.2
# Date created: 21 April 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gtkDPS-0.3.2
-PKGNAME= gtkdps-0.3.2
+PORTNAME= gtkdps
+PORTVERSION= 0.3.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gtkDPS/
+DISTNAME= gtkDPS-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index 09c56b2ea783..7371ca268054 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkfig
-# Version required: 0.6.0
# Date created: Tue Nov 17 13:51:11 CET 1998
# Whom: Dirk Froemberg <ibex@physik.TU-Berlin.DE>
#
# $FreeBSD$
#
-DISTNAME= gtkfig-0.6.0
+PORTNAME= gtkfig
+PORTVERSION= 0.6.0
CATEGORIES= graphics
MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 89abe6d9a33b..2972edefaad8 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkgraph
-# Version required: 0.6.1
# Date created: 12 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= gtkgraph-0.6.1
+PORTNAME= gtkgraph
+PORTVERSION= 0.6.1
CATEGORIES= math
MASTER_SITES= http://gtkgraph.linuxbox.com/
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 1078c811ebc7..b3a696962062 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtksee
-# Version required: 0.5.0
# Date created: Sun Nov 22 12:08:18 CET 1998
# Whom: Dirk Froemberg <ibex@physik.TU-Berlin.DE>
#
# $FreeBSD$
#
-DISTNAME= gtksee-0.5.0
+PORTNAME= gtksee
+PORTVERSION= 0.5.0
CATEGORIES= graphics
MASTER_SITES= http://hotaru.clinuxworld.com/gtksee/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/graphics/gview/Makefile b/graphics/gview/Makefile
index 2057d7fe1e55..08bc084fa31a 100644
--- a/graphics/gview/Makefile
+++ b/graphics/gview/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gview
-# Version required: 0.1.12
# Date created: 30 April 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= gview-0.1.12
+PORTNAME= gview
+PORTVERSION= 0.1.12
CATEGORIES= graphics
MASTER_SITES= http://gview.netpedia.net/ \
http://homepages.petech.ac.za/~bruces/ \
diff --git a/graphics/gxanim/Makefile b/graphics/gxanim/Makefile
index f2101de6c5a0..4696cf211f72 100644
--- a/graphics/gxanim/Makefile
+++ b/graphics/gxanim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xanim
-# Version required: 0.50
# Date created: Sat Nov 5 11:43:03 PST 1994
# Whom: Rod Taylor
#
# $FreeBSD$
#
-DISTNAME= gxanim-0.50
+PORTNAME= gxanim
+PORTVERSION= 0.50
CATEGORIES= graphics
MASTER_SITES= http://www.iag.net/~aleris/ \
http://www.zort.on.ca/software/
diff --git a/graphics/hdf/Makefile b/graphics/hdf/Makefile
index bd569b4a26e7..1250fb6ec168 100644
--- a/graphics/hdf/Makefile
+++ b/graphics/hdf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: HDF_lib
-# Version required: 4.1r2
# Date created: 17 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= HDF4.1r3
-PKGNAME= hdf-4.1r3
+PORTNAME= hdf
+PORTVERSION= 4.1r3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/
+DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/graphics/hdf5/Makefile b/graphics/hdf5/Makefile
index bd569b4a26e7..1250fb6ec168 100644
--- a/graphics/hdf5/Makefile
+++ b/graphics/hdf5/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: HDF_lib
-# Version required: 4.1r2
# Date created: 17 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= HDF4.1r3
-PKGNAME= hdf-4.1r3
+PORTNAME= hdf
+PORTVERSION= 4.1r3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/
+DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/graphics/hobbes-icons-xpm/Makefile b/graphics/hobbes-icons-xpm/Makefile
index f2eff4d5027e..48b480c7990f 100644
--- a/graphics/hobbes-icons-xpm/Makefile
+++ b/graphics/hobbes-icons-xpm/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: hobbes-icons-xpm3
-# Version required: 1.0
# Date created: 19 October 1996
# Whom: pgs
#
# $FreeBSD$
#
-DISTNAME= hobbes-icons-xpm3
-PKGNAME= hobbes-icons-xpm3-1.0
+PORTNAME= hobbes-icons-xpm3
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}
MAINTAINER= giffunip@asme.org
diff --git a/graphics/hppsmtools/Makefile b/graphics/hppsmtools/Makefile
index b46155a9884d..e31c5498cb62 100644
--- a/graphics/hppsmtools/Makefile
+++ b/graphics/hppsmtools/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: hppsmtools
-# Version required: 0.3
# Date created: 2 September 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= hppsmtools-1.0
+PORTNAME= hppsmtools
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= http://unimut.fsk.uni-heidelberg.de/unimut/photosmart/ \
http://www.freenix.no/~anders/ \
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index 051c69e73160..30ebd7e9aa10 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -6,11 +6,12 @@
# $FreeBSD$
#
-DISTNAME= scanner
-PKGNAME= hpscan-1.0
+PORTNAME= hpscan
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL} \
ftp://ftp.cogsci.ed.ac.uk/pub/richard/
+DISTNAME= scanner
MAINTAINER= jkh@FreeBSD.org
diff --git a/graphics/icod/Makefile b/graphics/icod/Makefile
index 1384a418218f..c23847fbabfa 100644
--- a/graphics/icod/Makefile
+++ b/graphics/icod/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: icod
-# Version required: 1.0
# Date created: 02 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= icod.1.0
-PKGNAME= icod-1.0
+PORTNAME= icod
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= http://www.linuxberg.com/files/x11/graphics/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= jedgar@fxp.org
diff --git a/graphics/imanager/Makefile b/graphics/imanager/Makefile
index fca9bbf800a7..ed583ed95eb7 100644
--- a/graphics/imanager/Makefile
+++ b/graphics/imanager/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: imanager
-# Version required: 2.0
# Date created: 18 March 2000
# Whom: Cliff Rowley <dozprompt@onsea.com>
#
# $FreeBSD$
#
-DISTNAME= imanager-2.0.final.imlib
-PKGNAME= imanager-2.0
+PORTNAME= imanager
+PORTVERSION= 2.0
CATEGORIES= graphics
MASTER_SITES= http://www.digidezign.com/~imanager/
+DISTNAME= imanager-${PORTVERSION}.final.imlib
MAINTAINER= dozprompt@onsea.com
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 43cf654facf2..f385ee0fb049 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
-# Version required: 1.9.8
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= imlib-1.9.8
+PORTNAME= imlib
+PORTVERSION= 1.9.8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 43cf654facf2..f385ee0fb049 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
-# Version required: 1.9.8
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= imlib-1.9.8
+PORTNAME= imlib
+PORTVERSION= 1.9.8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 43cf654facf2..f385ee0fb049 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: imlib
-# Version required: 1.9.8
# Date created: 10 June 1997
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= imlib-1.9.8
+PORTNAME= imlib
+PORTVERSION= 1.9.8
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index cfa97c9a0952..7546b5023669 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jbig
-# Version required: 1.1
# Date created: 19 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= jbigkit-1.1
+PORTNAME= jbigkit
+PORTVERSION= 1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/JBIG/
diff --git a/graphics/jgraph/Makefile b/graphics/jgraph/Makefile
index 09abb1aaee2d..83f3e390cb3a 100644
--- a/graphics/jgraph/Makefile
+++ b/graphics/jgraph/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: jgraph
-# Version required: 8.3
# Date created: 6 August 1999
# Whom: wolman@cs.washington.edu
#
# $FreeBSD$
#
-DISTNAME= jgraph
-PKGNAME= jgraph-8.3
+PORTNAME= jgraph
+PORTVERSION= 8.3
CATEGORIES= graphics
MASTER_SITES= ftp://cs.utk.edu/pub/plank/jgraph/ \
http://www.cs.washington.edu/homes/wolman/
-EXTRACT_SUFX= .shar.Z
+DISTFILES= ${PORTNAME}.shar.Z
MAINTAINER= wolman@cs.washington.edu
@@ -19,7 +18,7 @@ EXTRACT_CMD= uncompress
EXTRACT_BEFORE_ARGS= -c
EXTRACT_AFTER_ARGS= | sh
-WRKSRC= ${WRKDIR}
+NO_WRKSUBDIR= yes
MAN1= jgraph.1
MAKEFILE= makefile
diff --git a/graphics/jpeg-mmx/Makefile b/graphics/jpeg-mmx/Makefile
index 2dfd6e40aa23..7e83bcccb033 100644
--- a/graphics/jpeg-mmx/Makefile
+++ b/graphics/jpeg-mmx/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: jpeg
-# Version required: 6b
# Date created: 6 November 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= jpegsrc.v6b
-PKGNAME= jpeg-6b
+PORTNAME= jpeg
+PORTVERSION= 6b
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/
+DISTNAME= jpegsrc.v${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 2dfd6e40aa23..7e83bcccb033 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: jpeg
-# Version required: 6b
# Date created: 6 November 1994
# Whom: smace
#
# $FreeBSD$
#
-DISTNAME= jpegsrc.v6b
-PKGNAME= jpeg-6b
+PORTNAME= jpeg
+PORTVERSION= 6b
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/
+DISTNAME= jpegsrc.v${PORTVERSION}
MAINTAINER= jseger@FreeBSD.org
diff --git a/graphics/juno-2/Makefile b/graphics/juno-2/Makefile
index 679bd980155d..6734d6476ab2 100644
--- a/graphics/juno-2/Makefile
+++ b/graphics/juno-2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: juno-2
-# Version required: 1.23
# Date created: 11 Feb 2000
# Whom: John Polstra <jdp@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= juno-sources
-PKGNAME= juno-2-1.23
+PORTNAME= juno-2
+PORTVERSION= 1.23
CATEGORIES= graphics
MASTER_SITES= http://www.research.digital.com/SRC/juno-2/
+DISTNAME= juno-sources
MAINTAINER= jdp@FreeBSD.org
diff --git a/graphics/kdegraphics11/Makefile b/graphics/kdegraphics11/Makefile
index e21ea8b89866..19eca4718d43 100644
--- a/graphics/kdegraphics11/Makefile
+++ b/graphics/kdegraphics11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdegraphics
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdegraphics-1.1.2
+PORTNAME= kdegraphics
+PORTVERSION= 1.1.2
CATEGORIES= graphics kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index e21ea8b89866..19eca4718d43 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdegraphics
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdegraphics-1.1.2
+PORTNAME= kdegraphics
+PORTVERSION= 1.1.2
CATEGORIES= graphics kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index e21ea8b89866..19eca4718d43 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdegraphics
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdegraphics-1.1.2
+PORTNAME= kdegraphics
+PORTVERSION= 1.1.2
CATEGORIES= graphics kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index e21ea8b89866..19eca4718d43 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdegraphics
-# Version required: Beta1
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdegraphics-1.1.2
+PORTNAME= kdegraphics
+PORTVERSION= 1.1.2
CATEGORIES= graphics kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/graphics/killustrator/Makefile b/graphics/killustrator/Makefile
index a0c7f0976211..a2d0bd863152 100644
--- a/graphics/killustrator/Makefile
+++ b/graphics/killustrator/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: killustrator
-# Version required: 0.7.1
# Date created: 07 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= killustrator-0.7.1
+PORTNAME= killustrator
+PORTVERSION= 0.7.1
CATEGORIES= graphics kde
MASTER_SITES= http://wwwiti.cs.uni-magdeburg.de/~sattler/pub/killustrator/
diff --git a/graphics/kplot3d/Makefile b/graphics/kplot3d/Makefile
index 3861b2b5415e..268f147281bc 100644
--- a/graphics/kplot3d/Makefile
+++ b/graphics/kplot3d/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kplot3d
-# Version required: 0.70
# Date created: 30 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= kplot3d-0.70
+PORTNAME= kplot3d
+PORTVERSION= 0.70
CATEGORIES= graphics kde
MASTER_SITES= http://members.xoom.com/kplot3d/
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index 842cf1e21540..ce78957848cd 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -1,22 +1,20 @@
# ports collection makefile for: lfview
-# Version required: 1.1beta2
# Date created: 24 February 1999
# Whom: Yuu Yashiki
#
# $FreeBSD$
#
-DISTNAME= lfview11beta3
-PKGNAME= lfview-1.1b3
+PORTNAME= lfview
+PORTVERSION= 1.1.b3
CATEGORIES= graphics
MASTER_SITES= http://www.geocities.co.jp/Playtown/6344/
+DISTNAME= lfview11beta3
EXTRACT_SUFX= .tgz
MAINTAINER= s974123@cc.matsuyama-u.ac.jp
-WRKSRC= ${WRKDIR}/lfview11beta3
USE_IMAKE= yes
-
NO_INSTALL_MANPAGES= yes
do-install:
diff --git a/graphics/libdjvu++/Makefile b/graphics/libdjvu++/Makefile
index 4b3bcce5127f..a4fba8207e4a 100644
--- a/graphics/libdjvu++/Makefile
+++ b/graphics/libdjvu++/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libdjvu++
-# Version required: 2.1
# Date Created: 20 July 1999
# Whom: Mikhail Teterin <mi@aldan.algebra.com>
#
# $FreeBSD$
#
-DISTNAME= libdjvu++-2.1
+PORTNAME= libdjvu++
+PORTVERSION= 2.1
CATEGORIES= graphics
MASTER_SITES= http://www.djvu.com/open/
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 29eaab721a82..01e0404a91a0 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libggi
-# Version required: 2.0b2.1
# Date created: 4 January 2000
# Whom: mwest@uct.ac.za
#
# $FreeBSD$
#
-DISTNAME= libggi-2.0b2.1
+PORTNAME= libggi
+PORTVERSION= 2.0b2.1
CATEGORIES= graphics devel
MASTER_SITES= ftp://ftp.ggi-project.org/pub/ggi/ggi/2_0_beta_2.1/
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index 0592ca14fe17..3c5348f89f89 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: img
-# Version required: 1.2
# Date Created: 20 February 1999
# Whom: Glenn Johnson
#
# $FreeBSD$
#
-DISTNAME= img1.2.2
-PKGNAME= libimg-1.2.2
+PORTNAME= libimg
+PORTVERSION= 1.2.2
CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/
+DISTNAME= img${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 5bdad1781f64..16c29a08e4c1 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libungif
-# Version required: 4.1.0
# Date created: 03 May 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libungif-4.1.0
+PORTNAME= libungif
+PORTVERSION= 4.1.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://prtr-13.ucsc.edu/pub/libungif/
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 7b4c252f3443..d91efd9d92d8 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libwmf
-# Version required: 0.1.16
# Date Created: 22 May 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libwmf-0.1.16
+PORTNAME= libwmf
+PORTVERSION= 0.1.16
CATEGORIES= graphics
MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/libwmf/
diff --git a/graphics/linux_glide/Makefile b/graphics/linux_glide/Makefile
index e45ca4eb355f..87aeea32386d 100644
--- a/graphics/linux_glide/Makefile
+++ b/graphics/linux_glide/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: linux_glide
-# Version required: 2.4
# Date created: Oct, 8, 1998
# Whom: cracauer@cons.org "Martin Cracauer"
#
@@ -7,10 +6,12 @@
#
#
-DISTNAME= linux_glide_2_4
-PKGNAME= linux_glide-2.4
+PORTNAME= glide
+PORTVERSION= 2.4
CATEGORIES= graphics linux
MASTER_SITES= ftp://ftp.3dfx.com/pub/glide/
+PKGNAMEPREFIX= linux_
+DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}_2_4
MAINTAINER= cracauer@cons.org
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
index 4a541b292c12..c97c1f05f1ae 100644
--- a/graphics/linux_glx/Makefile
+++ b/graphics/linux_glx/Makefile
@@ -6,9 +6,12 @@
# $FreeBSD$
#
-DISTNAME= linux_glx-991127
+PORTNAME= glx
+PORTVERSION= 991127
CATEGORIES= graphics linux
MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/linux/
+PKGNAMEPREFIX= linux_
+DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= 3d@freebsd.org
diff --git a/graphics/linux_mesa/Makefile b/graphics/linux_mesa/Makefile
index bf38d9cb5f02..4f091038bcb4 100644
--- a/graphics/linux_mesa/Makefile
+++ b/graphics/linux_mesa/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: Mesa for Linux compat
-# Version required: 2.6
# Date created: Oct, 8 1998
# Whom: cracauer
#
# $FreeBSD$
#
-DISTNAME= MesaLib-2.6
-PKGNAME= linux_mesa-2.6
+PORTNAME= mesa
+PORTVERSION= 2.6
CATEGORIES= graphics linux
MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/old-versions/
+PKGNAMEPREFIX= linux_
+DISTNAME= MesaLib-${PORTVERSION}
MAINTAINER= cracauer@cons.org
diff --git a/graphics/linux_mesa3/Makefile b/graphics/linux_mesa3/Makefile
index bf38d9cb5f02..4f091038bcb4 100644
--- a/graphics/linux_mesa3/Makefile
+++ b/graphics/linux_mesa3/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: Mesa for Linux compat
-# Version required: 2.6
# Date created: Oct, 8 1998
# Whom: cracauer
#
# $FreeBSD$
#
-DISTNAME= MesaLib-2.6
-PKGNAME= linux_mesa-2.6
+PORTNAME= mesa
+PORTVERSION= 2.6
CATEGORIES= graphics linux
MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/old-versions/
+PKGNAMEPREFIX= linux_
+DISTNAME= MesaLib-${PORTVERSION}
MAINTAINER= cracauer@cons.org
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 0665a13ac45a..04759e12f42d 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg_lib
-# Version required: 1.3.1
# Date created: 16 November 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= mpeg_lib-1.3.1
+PORTNAME= mpeg_lib
+PORTVERSION= 1.3.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/ \
http://starship.python.net/~gward/mpeglib/
diff --git a/graphics/mpeg/Makefile b/graphics/mpeg/Makefile
index 0b55e42a7ed3..6d7bc97e500e 100644
--- a/graphics/mpeg/Makefile
+++ b/graphics/mpeg/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: mpeg
-# Version required: 1.2.2
# Date created: Sa 01 May 1999 15:00:00 MET
# Whom: Tobias Reifenberger <treif@mayn.de>
#
# $FreeBSD$
#
-DISTNAME= MPEGv1.2.2
-PKGNAME= mpeg-1.2.2
+PORTNAME= mpeg
+PORTVERSION= 1.2.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.uni-koeln.de/graph/mpeg/ \
ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/mpeg/mni.mcgill.ca/
+DISTNAME= MPEGv${PORTVERSION}
MAINTAINER= treif@mayn.de
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 30cac58df698..c2a9fc6d3a2a 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg2codec
-# Version required: 1.2
# Date created: November 25, 1996
# Whom: "Philippe Charnier" <charnier@lirmm.fr>
#
# $FreeBSD$
#
-DISTNAME= mpeg2codec-1.2
+PORTNAME= mpeg2codec
+PORTVERSION= 1.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mpeg.org/pub/mpeg/mssg/
DISTFILES= mpeg2vidcodec_v12.tar.gz
diff --git a/graphics/mpeg2play/Makefile b/graphics/mpeg2play/Makefile
index 59bffa18c677..ce6a5737aa87 100644
--- a/graphics/mpeg2play/Makefile
+++ b/graphics/mpeg2play/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg2play
-# Version required: 1.1b
# Date created: June 21, 1996
# Whom: "Philippe Charnier" <charnier@lirmm.fr>
#
# $FreeBSD$
#
-DISTNAME= mpeg2play-1.1b
+PORTNAME= mpeg2play
+PORTVERSION= 1.1b
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index 66003add3ee9..01067637a627 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpeg_encode
-# Version required: 1.5b
# Date created:
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpeg_encode-1.5b-src
-PKGNAME= mpeg_encode-1.5b
+PORTNAME= mpeg_encode
+PORTVERSION= 1.5b
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index 63f37bd33759..411ec4f6979b 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg_play
-# Version required: 2.4
# Date created: 17 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= mpeg_play-2.4
+PORTNAME= mpeg_play
+PORTVERSION= 2.4
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
EXTRACT_SUFX= -patched-src.tar.gz
diff --git a/graphics/mpeg_stat/Makefile b/graphics/mpeg_stat/Makefile
index e3fb74270e2b..62b4a0f3f721 100644
--- a/graphics/mpeg_stat/Makefile
+++ b/graphics/mpeg_stat/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpeg_stat
-# Version required: 2.2b
# Date created: Thu Aug 1 21:52:06 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpeg_stat-2.2b-src
-PKGNAME= mpeg_stat-2.2b
+PORTNAME= mpeg_stat
+PORTVERSION= 2.2b
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/mpegedit/Makefile b/graphics/mpegedit/Makefile
index 12110ff6aad0..5f8ca530ae25 100644
--- a/graphics/mpegedit/Makefile
+++ b/graphics/mpegedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpegedit
-# Version required: 2.2
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpegedit_v2.2
-PKGNAME= mpegedit-2.2
+PORTNAME= mpegedit
+PORTVERSION= 2.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/tools/
+DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index 3326c4e2accd..5afa486c0462 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: mplex
-# Version required: 1.1
# Date created: Wed Jul 31 20:54:54 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mplex-1.1
-
+PORTNAME= mplex
+PORTVERSION= 1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index 65c4f98c4673..35427df9879e 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mtv
-# Version required: 1.1.0.20
# Date created: 30 Jan 2000
# Whom: kris
#
# $FreeBSD$
#
-DISTNAME= mtv-1.1.0.20
+PORTNAME= mtv
+PORTVERSION= 1.1.0.20
CATEGORIES= graphics linux
MASTER_SITES= ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/
DISTFILES= mtv-1.1.0.20.tar.gz libSDLx11.so.tar.gz
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index d1b5953f3420..4f6ab862ecd0 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netpbm
-# Version required: 8.4
# Date created: ?
# Whom: jmz (original)
#
# $FreeBSD$
#
-DISTNAME= netpbm-8.4
+PORTNAME= netpbm
+PORTVERSION= 8.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/convert
diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile
index b1f5c4a6b59b..a24ae779b818 100644
--- a/graphics/netshow/Makefile
+++ b/graphics/netshow/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: netshow
-# Version required: 2.00.251
# Date created: Thu Jun 11 22:38:52 PDT 1998
# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= netshow_linux
-PKGNAME= netshow-2.00.251
+PORTNAME= netshow
+PORTVERSION= 2.00.251
CATEGORIES= graphics net linux
MASTER_SITES= http://microsoft.com/netshow/download/en/beta/
+DISTNAME= netshow_linux
EXTRACT_SUFX= .gz
MAINTAINER= dburr@FreeBSD.org
diff --git a/graphics/opendx-samples/Makefile b/graphics/opendx-samples/Makefile
index b956aa406d08..39c03f34d35b 100644
--- a/graphics/opendx-samples/Makefile
+++ b/graphics/opendx-samples/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: opendx-samples
-# Version required: 4.0.7
# Date created: 06 Oct 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dxsamples-4.0.7
-PKGNAME= opendx-samples-4.0.7
+PORTNAME= opendx-samples
+PORTVERSION= 4.0.7
CATEGORIES= graphics math
MASTER_SITES= http://opendx.npaci.edu/source/
+DISTNAME= dxsamples-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 5962438abfea..74689302d8af 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: opendx
-# Version required: 4.0.10
# Date created: 27 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= dx-4.0.10
-PKGNAME= opendx-4.0.10
+PORTNAME= opendx
+PORTVERSION= 4.0.10
CATEGORIES= graphics math
MASTER_SITES= http://opendx.npaci.edu/source/
+DISTNAME= dx-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index 3d7f8b3af9e0..dd87273e1989 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: opengl-manpage
-# Version required: 657
# Date created: 19990120
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= opengl-man-657
+PORTNAME= opengl-man
+PORTVERSION= 657
CATEGORIES= graphics
MASTER_SITES= http://people.FreeBSD.org/~cracauer/freebsd-distfiles/ \
http://www2.cons.org:8000/freebsd-distfiles/
diff --git a/graphics/p5-Chart-PNGgraph/Makefile b/graphics/p5-Chart-PNGgraph/Makefile
index aabac03b8306..9bea89400931 100644
--- a/graphics/p5-Chart-PNGgraph/Makefile
+++ b/graphics/p5-Chart-PNGgraph/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: p5-Chart-PNGgraph
-# Version required: 1.13
# Date Created: 15 December 1999
# Whom: Garrett Wollman <wollman@lcs.mit.edu>
#
# $FreeBSD$
#
-DISTNAME= Chart-PNGgraph-1.13
+PORTNAME= Chart-PNGgraph
+PORTVERSION= 1.13
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Chart
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index 1c66325d2eca..48252f3556bb 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-chart
-# Version required: 0.99b
# Date Created: 8 April 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Chart-0.99b
-PKGNAME= p5-chart-0.99b
+PORTNAME= chart
+PORTVERSION= 0.99b
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Chart
+PKGNAMEPREFIX= p5-
+DISTNAME= Chart-${PORTVERSION}
MAINTAINER= dan@trinsec.com
diff --git a/graphics/p5-GD-Graph/Makefile b/graphics/p5-GD-Graph/Makefile
index e68210b42fe2..ceab314fa0b4 100644
--- a/graphics/p5-GD-Graph/Makefile
+++ b/graphics/p5-GD-Graph/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-GD-Graph
-# Version required: 1.24
# Date created: 21 February 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= GDGraph-1.24
-PKGNAME= p5-GD-Graph-1.24
+PORTNAME= GD-Graph
+PORTVERSION= 1.24
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
+PKGNAMEPREFIX= p5-
+DISTNAME= GDGraph-${PORTVERSION}
MAINTAINER= dima@Chg.RU
diff --git a/graphics/p5-GD-TextUtil/Makefile b/graphics/p5-GD-TextUtil/Makefile
index f9262eb8189f..4c99119d8b9d 100644
--- a/graphics/p5-GD-TextUtil/Makefile
+++ b/graphics/p5-GD-TextUtil/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-GD-TextUtil
-# Version required: 0.70
# Date created: 21 February 2000
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= GDTextUtil-0.70
-PKGNAME= p5-GD-TextUtil-0.70
+PORTNAME= GD-TextUtil
+PORTVERSION= 0.70
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
+PKGNAMEPREFIX= p5-
+DISTNAME= GDTextUtil-${PORTVERSION}
MAINTAINER= dima@Chg.RU
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 3e3907d735af..314bd10a1079 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-GD
-# Version required: 1.25
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= GD-1.25
-PKGNAME= p5-GD-1.25
+PORTNAME= GD
+PORTVERSION= 1.25
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index 3e3907d735af..314bd10a1079 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-GD
-# Version required: 1.25
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= GD-1.25
-PKGNAME= p5-GD-1.25
+PORTNAME= GD
+PORTVERSION= 1.25
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index 3e3907d735af..314bd10a1079 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-GD
-# Version required: 1.25
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= GD-1.25
-PKGNAME= p5-GD-1.25
+PORTNAME= GD
+PORTVERSION= 1.25
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index de4ad1816cca..a65a408df9d6 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Image-Size
-# Version required: 2.9
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Image-Size-2.9
-PKGNAME= p5-Image-Size-2.9
+PORTNAME= Image-Size
+PORTVERSION= 2.9
CATEGORIES= graphics www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Image
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index c17916e4972e..eeb95aeb088d 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pgperl
-# Version required: 2.16
# Date created: 22 December 1996
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= PGPLOT-2.16
-PKGNAME= pgperl-2.16
+PORTNAME= pgperl
+PORTVERSION= 2.16
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PGPLOT
+DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index 1c66325d2eca..48252f3556bb 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-chart
-# Version required: 0.99b
# Date Created: 8 April 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Chart-0.99b
-PKGNAME= p5-chart-0.99b
+PORTNAME= chart
+PORTVERSION= 0.99b
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Chart
+PKGNAMEPREFIX= p5-
+DISTNAME= Chart-${PORTVERSION}
MAINTAINER= dan@trinsec.com
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index c17916e4972e..eeb95aeb088d 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pgperl
-# Version required: 2.16
# Date created: 22 December 1996
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= PGPLOT-2.16
-PKGNAME= pgperl-2.16
+PORTNAME= pgperl
+PORTVERSION= 2.16
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PGPLOT
+DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index e11208c9b855..be26d74586df 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pgplot
-# Version required: 5.2
# Date created: 21 December 1996
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= pgplot5.2
-PKGNAME= pgplot-5.2
+PORTNAME= pgplot
+PORTVERSION= 5.2
CATEGORIES= graphics
MASTER_SITES= ftp://astro.caltech.edu/pub/pgplot/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/graphics/photopc/Makefile b/graphics/photopc/Makefile
index 812b9b405656..dd453782a1b2 100644
--- a/graphics/photopc/Makefile
+++ b/graphics/photopc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: photopc-1.6
-# Version required: 1.6
# Date created: 11 October 1997
# Whom: Douglas Carmichael <dcarmich@mcs.com>
#
# $FreeBSD$
#
-DISTNAME= photopc-1.6
+PORTNAME= photopc
+PORTVERSION= 1.6
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.average.org/pub/photopc/
diff --git a/graphics/piddle/Makefile b/graphics/piddle/Makefile
index 886960d86d7b..ef85ec560968 100644
--- a/graphics/piddle/Makefile
+++ b/graphics/piddle/Makefile
@@ -1,16 +1,15 @@
# Ports collection makefile for: piddle
-# Version required: 1.0b1
# Date created: 29 Feb 2000
# Whom: dom@myrddin.demon.co.uk
#
# $FreeBSD$
#
-DISTNAME= piddle-1.0b1-5
-PKGNAME= piddle-1.0b1
+PORTNAME= piddle
+PORTVERSION= 1.0b1
CATEGORIES= graphics python
MASTER_SITES= http://download.sourceforge.net/piddle/
-EXTRACT_SUFX= .tgz
+DISTFILES= piddle-1.0b1-5.tgz
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 6ba6dd8ba667..0a4b7117a525 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: pixmap
-# Version required: 2.6
# Date created: 19 February 1995
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= pixmap2.6
-PKGNAME= pixmap-2.6
+PORTNAME= pixmap
+PORTVERSION= 2.6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/pixmap
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index 8f19a614b277..3c0093dd9388 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Plotmtv
-# Version required: 1.4.0
# Date created: 19 October 1996
# Whom: pgs
#
# $FreeBSD$
#
-DISTNAME= Plotmtv1.4.1
-PKGNAME= plotmtv-1.4.1
+PORTNAME= plotmtv
+PORTVERSION= 1.4.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
+DISTNAME= Plotmtv${PORTVERSION}
MASTER_SITE_SUBDIR= applications
EXTRACT_SUFX= .tar.Z
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 0e2cdb206305..e31dd81ec96d 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: plotutils
-# Version required: 2.2
# Date created: 19 June 1998
# Whom: Chuck Robey (chuckr)
#
# $FreeBSD$
#
-DISTNAME= plotutils-2.3
+PORTNAME= plotutils
+PORTVERSION= 2.3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= plotutils
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 6bebc08db471..d6fcd2399c23 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: PNG images library
-# Version required: 1*
# Date created: 5 Dec 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= libpng-1.0.5
-PKGNAME= png-1.0.5
+PORTNAME= png
+PORTVERSION= 1.0.5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.uu.net/graphics/png/src/
+DISTNAME= lib${PKGNAME}
MAINTAINER= ache@FreeBSD.org
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index bab0df1155a5..6de2a3532782 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: png2html
-# Version required: 1.1
# Date created: 11 November 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= png2html-1.1
+PORTNAME= png2html
+PORTVERSION= 1.1
CATEGORIES= graphics
MASTER_SITES= http://www.engr.mun.ca/~holden/
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index d8e82c056399..29bab20bd103 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pngcrush
-# Version required: 1.4.0
# Date created: 07 December 1999
# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pngcrush-1.4.0
+PORTNAME= pngcrush
+PORTVERSION= 1.4.0
CATEGORIES= graphics
MASTER_SITES= http://download.sourceforge.net/pmt/
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 78e93ccc0324..cc7e89616d50 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: POV-Ray
-# Version required: 3.0.1
# Date created: 3 Dec 1996
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= povray3
-PKGNAME= povray-3.0.1
+PORTNAME= povray
+PORTVERSION= 3.0.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://www.hensa.ac.uk/mirrors/povray/Old-Versions/Official-3.0/Unix/\
ftp://ftp.fh-aachen.de/pub/Graphics/mirror/ftp.povray.org/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
+DISTNAME= povray3
DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index 23b94748f9d7..e3572e21fa60 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: POV-Ray
-# Version required: 3.1e
# Date created: 3 Dec 1996
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= povray31
-PKGNAME= povray-3.1g
+PORTNAME= povray
+PORTVERSION= 3.1g
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/Official/Unix/ \
ftp://www.hensa.ac.uk/mirrors/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.fh-aachen.de/pub/mirror/ftp.povray.org/povray/Old-Versions/Official-3.0/Unix/
+DISTNAME= povray31
DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= olli@fromme.com
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 78e93ccc0324..cc7e89616d50 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: POV-Ray
-# Version required: 3.0.1
# Date created: 3 Dec 1996
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= povray3
-PKGNAME= povray-3.0.1
+PORTNAME= povray
+PORTVERSION= 3.0.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://www.hensa.ac.uk/mirrors/povray/Old-Versions/Official-3.0/Unix/\
ftp://ftp.fh-aachen.de/pub/Graphics/mirror/ftp.povray.org/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
+DISTNAME= povray3
DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 78e93ccc0324..cc7e89616d50 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: POV-Ray
-# Version required: 3.0.1
# Date created: 3 Dec 1996
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
-DISTNAME= povray3
-PKGNAME= povray-3.0.1
+PORTNAME= povray
+PORTVERSION= 3.0.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://www.hensa.ac.uk/mirrors/povray/Old-Versions/Official-3.0/Unix/\
ftp://ftp.fh-aachen.de/pub/Graphics/mirror/ftp.povray.org/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
+DISTNAME= povray3
DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
diff --git a/graphics/ppm2fli/Makefile b/graphics/ppm2fli/Makefile
index 0fb11192fb65..8d68a272f4e8 100644
--- a/graphics/ppm2fli/Makefile
+++ b/graphics/ppm2fli/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ppm2fli
-# Version required: b1.92
# Date created: 7 Jan 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= ppm2fli_b1.92
-PKGNAME= ppm2fli-b1
+PORTNAME= ppm2fli
+PORTVERSION= b1
CATEGORIES= graphics
MASTER_SITES= ftp://crusty.er.usgs.gov/pub/animation/fli/
+DISTNAME= ppm2fli_b1.92
EXTRACT_SUFX= .tar.Z
MAINTAINER= giffunip@asme.org
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index b8b7bb953e7b..012ab899d2ee 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pstodit
-# Version required: 3.17
# Date created: 03 July 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pstoedit_3_17
-PKGNAME= pstoedit-3.17
+PORTNAME= pstoedit
+PORTVERSION= 3.17
CATEGORIES= graphics print
MASTER_SITES= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
+DISTNAME= ${PORTNAME}_3_17
MAINTAINER= jseger@FreeBSD.org
diff --git a/graphics/py-imaging-handbook/Makefile b/graphics/py-imaging-handbook/Makefile
index d2801b1ef73e..8022e5c0e69e 100644
--- a/graphics/py-imaging-handbook/Makefile
+++ b/graphics/py-imaging-handbook/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: PIL handbook
-# Version required: 1.0
# Date created: 18th October 1999
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= py-imaging-handbook-1.0
+PORTNAME= imaging-handbook
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= http://www.pythonware.com/library/pil/handbook/
+PKGNAMEPREFIX= py-
DISTFILES= labdoc.css index.htm overview.htm concepts.htm \
intro01.htm support.htm license.htm image.htm \
imagechops.htm imagedraw.htm imageenhance.htm \
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index e3a19da10002..3519b011ef1b 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,17 +1,18 @@
# New ports collection makefile for: PIL
-# Version required: 1.0
# Date created: 02 November 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Imaging-1.0
-PKGNAME= py-imaging-1.0
+PORTNAME= imaging
+PORTVERSION= 1.0
CATEGORIES= graphics python
MASTER_SITES= http://www.pythonware.com/downloads/ \
ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
+PKGNAMEPREFIX= py-
+DISTNAME= Imaging-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 0472aed955ae..da18dcbdfd14 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: PyOpenGL
-# Version required: 1.5.5
# Date created: Wed Aug 18 18:49:17 EDT 1999
# Whom: Randall Hopper <aa8vb@ipass.net>
#
# $FreeBSD$
#
-DISTNAME= PyOpenGL-1.5.5
-PKGNAME= py-opengl-1.5.5
+PORTNAME= opengl
+PORTVERSION= 1.5.5
CATEGORIES= graphics python
MASTER_SITES= http://starship.python.net/crew/da/
+PKGNAMEPREFIX= py-
+DISTNAME= PyOpenGL-${PORTVERSION}
MAINTAINER= aa8vb@ipass.net
diff --git a/graphics/qcread/Makefile b/graphics/qcread/Makefile
index a02b833d2515..69f337befd23 100644
--- a/graphics/qcread/Makefile
+++ b/graphics/qcread/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qcread
-# Version required: 0.3
# Date created: 23 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= qcread-0.3
+PORTNAME= qcread
+PORTVERSION= 0.3
CATEGORIES= graphics
MASTER_SITES= ftp://mars.illtel.denver.co.us/pub/qcread/ \
http://mars.illtel.denver.co.us/pub/qcread/
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index fe31ccf1a2db..70854edaf07e 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qiv
-# Version required: 1.2
# Date created: 25 December 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= qiv-1.2
+PORTNAME= qiv
+PORTVERSION= 1.2
CATEGORIES= graphics
MASTER_SITES= http://www.klografx.de/software/files/ \
ftp://ftp.klografx.de/pub/
diff --git a/graphics/qvplay/Makefile b/graphics/qvplay/Makefile
index 7648791f57ec..46ea6cb1d25c 100644
--- a/graphics/qvplay/Makefile
+++ b/graphics/qvplay/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qvplay
-# Version required: 0.94
# Date created: 2 May 1997
# Whom: Jun-ichiro itojun Itoh <itojun@itojun.org>
#
# $FreeBSD$
#
-DISTNAME= qvplay-0.94
+PORTNAME= qvplay
+PORTVERSION= 0.94
CATEGORIES= graphics
MASTER_SITES= http://www.asahi-net.or.jp/~xg2k-hys/
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index f4af7f30d747..3a838ab2c00b 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: rayshade
-# Version required: 4.0
# Date created: 21 January 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= rayshade.4.0
-PKGNAME= rayshade-4.0
+PORTNAME= rayshade
+PORTVERSION= 4.0
CATEGORIES= graphics
MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/ \
ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 53b3b6b19c48..1d39d4f57d78 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sane
-# Version required: 1.0.1
# Date created: Sat Jul 19 16:23:10 MET DST 1997
# Whom: gary@hotlava.com
#
# $FreeBSD$
#
-DISTNAME= sane-1.0.1
+PORTNAME= sane
+PORTVERSION= 1.0.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.mostang.com/pub/sane/
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 53b3b6b19c48..1d39d4f57d78 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sane
-# Version required: 1.0.1
# Date created: Sat Jul 19 16:23:10 MET DST 1997
# Whom: gary@hotlava.com
#
# $FreeBSD$
#
-DISTNAME= sane-1.0.1
+PORTNAME= sane
+PORTVERSION= 1.0.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.mostang.com/pub/sane/
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 53b3b6b19c48..1d39d4f57d78 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sane
-# Version required: 1.0.1
# Date created: Sat Jul 19 16:23:10 MET DST 1997
# Whom: gary@hotlava.com
#
# $FreeBSD$
#
-DISTNAME= sane-1.0.1
+PORTNAME= sane
+PORTVERSION= 1.0.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
ftp://ftp.mostang.com/pub/sane/
diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile
index 01ccf93e0a2c..9078d3f2cab4 100644
--- a/graphics/sced/Makefile
+++ b/graphics/sced/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sced
-# Version required: 0.94
# Date created: 27 Dec 1996
# Whom: proff@iq.org
#
# $FreeBSD$
#
-DISTNAME= sced-1.02
+PORTNAME= sced
+PORTVERSION= 1.02
CATEGORIES= graphics
MASTER_SITES= http://www.cs.berkeley.edu/~schenney/sced/src/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile
index 5d426787dae7..52006effdc79 100644
--- a/graphics/scwm-icons/Makefile
+++ b/graphics/scwm-icons/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scwm-icons
-# Version required: 0.99.2
# Date created: 07 April 1998
# Whom: Yukihiro Nakai <nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= scwm-icons-0.99.2
+PORTNAME= scwm-icons
+PORTVERSION= 0.99.2
CATEGORIES= graphics
MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 33e6fc326d96..2d35c62d0fab 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sketch
-# Version required: 0.6.5
# Date created: 04 November 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sketch-0.6.5
+PORTNAME= sketch
+PORTVERSION= 0.6.5
CATEGORIES= graphics
MASTER_SITES= http://download.sourceforge.net/sketch/
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 33e6fc326d96..2d35c62d0fab 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sketch
-# Version required: 0.6.5
# Date created: 04 November 1998
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sketch-0.6.5
+PORTNAME= sketch
+PORTVERSION= 0.6.5
CATEGORIES= graphics
MASTER_SITES= http://download.sourceforge.net/sketch/
diff --git a/graphics/smpeg/Makefile b/graphics/smpeg/Makefile
index 8dd4b7066f40..0b6241c21d15 100644
--- a/graphics/smpeg/Makefile
+++ b/graphics/smpeg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: smpeg
-# Version required: 0.3.3
# Date created: 2 Feb 2000
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= smpeg-0.3.3
+PORTNAME= smpeg
+PORTVERSION= 0.3.3
CATEGORIES= graphics
MASTER_SITES= http://www.lokigames.com/development/download/smpeg/
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index cbb8d61cb6a3..2cc888c5a3b3 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sodipodi
-# Version required: 0.17
# Date created: 28 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sodipodi-0.17
+PORTNAME= sodipodi
+PORTVERSION= 0.17
CATEGORIES= graphics
MASTER_SITES= http://www.ariman.ee/linux/sodipodi/
diff --git a/graphics/spigot/Makefile b/graphics/spigot/Makefile
index 9e249672afc2..e8afe253a6b8 100644
--- a/graphics/spigot/Makefile
+++ b/graphics/spigot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libspigot.a
-# Version required: 1.7
# Date Created: Fri Sep 15 10:04:46 CDT 1995
# Whom: james@cs.uwm.edu
#
# $FreeBSD$
#
-DISTNAME= spigot-1.7
+PORTNAME= spigot
+PORTVERSION= 1.7
CATEGORIES= graphics
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
DISTFILES= spigot.1.7.tar.gz
diff --git a/graphics/splitmpg/Makefile b/graphics/splitmpg/Makefile
index b0e6d531f94c..a3fdcd2e142f 100644
--- a/graphics/splitmpg/Makefile
+++ b/graphics/splitmpg/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: splitmpg
-# Version required:
# Date created: Wed Jul 31 21:59:42 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= splitmpg
-PKGNAME= splitmpg-1.0
+PORTNAME= splitmpg
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ecel.uwa.edu.au/users/michael/
-EXTRACT_SUFX= .tgz
+DISTFILES= ${PORTNAME}.tgz
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index e0f6b65ec177..2fb08aca52f9 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: stamp
-# Version required: 2.0.8
# Date created: 11 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= stamp-2.0.8
+PORTNAME= stamp
+PORTVERSION= 2.0.8
CATEGORIES= graphics
MASTER_SITES= http://stamp.netpedia.net/
diff --git a/graphics/tgd/Makefile b/graphics/tgd/Makefile
index 1948b729137c..8ce707191cee 100644
--- a/graphics/tgd/Makefile
+++ b/graphics/tgd/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: tgd
-# Version required: 1.2c
# Date created: 22 February 1999
# Whom: mharo@area51.fremont.ca.us
#
# $FreeBSD$
#
-DISTNAME= tgd1.2c
-PKGNAME= tgd-1.2c
+PORTNAME= tgd
+PORTVERSION= 1.2c
CATEGORIES= graphics
MASTER_SITES= ftp://probe.nalusda.gov/pub/treegenes/ \
ftp://dendrome.ucdavis.edu/pub/tgd/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= mharo@FreeBSD.org
diff --git a/graphics/tgif-nls/Makefile b/graphics/tgif-nls/Makefile
index e167109b4caa..f8ebd6961ede 100644
--- a/graphics/tgif-nls/Makefile
+++ b/graphics/tgif-nls/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: tgif-nls
-# Version required: 4.1.26
# Date created: 3 May 1999
# Whom: one@netlab.is.tsukuba.ac.jp
#
# $FreeBSD$
#
-DISTNAME= tgif-4.1.26
-PKGNAME= tgif-nls-4.1.26
+PORTNAME= tgif
+PORTVERSION= 4.1.26
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \
ftp://ftp.cs.ucla.edu/pub/tgif/
+PKGNAMESUFFIX= -nls
MAINTAINER= one@netlab.is.tsukuba.ac.jp
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 6b7a19115757..4cbe593bdead 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tgif
-# Version required: 4.1.27
# Date created: 30 Jan 1999
# Whom: bmc@WillsCreek.COM
#
# $FreeBSD$
#
-DISTNAME= tgif-4.1.27
+PORTNAME= tgif
+PORTVERSION= 4.1.27
CATEGORIES= graphics
MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \
ftp://ftp.cs.ucla.edu/pub/tgif/
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index 3f63c271fb6c..196885c21e6d 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: tiff
-# Version required: 3.5.5
# Date created: 8 October 1996
# Whom: Richard Hwang <rhwang@bigpanda.com>
# Mikhail Teterin <mi@aldan.algebra.com>
@@ -8,11 +7,12 @@
# $FreeBSD$
#
-DISTNAME= tiff-v3.5.5
-PKGNAME= tiff-3.5.5
+PORTNAME= tiff
+PORTVERSION= 3.5.5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.onshore.com/pub/libtiff/ \
http://www.libtiff.org/
+DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index 427403cd4bcb..dccfb4d8d256 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tifmerge
-# Version required: 1.0
# Date created: 29 April 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= tiff
-PKGNAME= tifmerge-1.0
+PORTNAME= tifmerge
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= http://www.whizkidtech.net/fports/
+DISTNAME= tiff
MAINTAINER= adam@whizkidtech.net
diff --git a/graphics/tkxanim/Makefile b/graphics/tkxanim/Makefile
index a23e3668aa0b..bdfe98c8d848 100644
--- a/graphics/tkxanim/Makefile
+++ b/graphics/tkxanim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkxanim
-# Version required: 0.43
# Date created: 24 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= tkxanim-0.43
+PORTNAME= tkxanim
+PORTVERSION= 0.43
CATEGORIES= graphics tk82
MASTER_SITES= http://members.yourlink.net/aaron/
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile
index df3367c2d208..1b50ee488894 100644
--- a/graphics/togl/Makefile
+++ b/graphics/togl/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: Togl
-# Version required: 1.5
# Date created: Wed Aug 18 18:49:17 EDT 1999
# Whom: Randall Hopper <aa8vb@ipass.net>
#
# $FreeBSD$
#
-DISTNAME= Togl-1.5
-PKGNAME= togl-1.5
+PORTNAME= togl
+PORTVERSION= 1.5
CATEGORIES= graphics tk82
MASTER_SITES= ftp://ftp.mesa3d.org/mesa/misc/ \
ftp://ftp.cs.umd.edu/pub/faculty/bederson/
+DISTNAME= Togl-${PORTVERSION}
MAINTAINER= aa8vb@ipass.net
diff --git a/graphics/twinlib/Makefile b/graphics/twinlib/Makefile
index e46eed6b1d25..156068a205cc 100644
--- a/graphics/twinlib/Makefile
+++ b/graphics/twinlib/Makefile
@@ -1,22 +1,21 @@
# New ports collection makefile for: twinlib
-# Version required: ${VER}
# Date created: 04 Jan 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= twinlib.${VER}
-PKGNAME= twinlib-${VER}
+PORTNAME= twinlib
+PORTVERSION= 0.2.3
CATEGORIES= graphics devel
MASTER_SITES= http://rio.xdev.org/twinlib/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= will@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/bin/tmake:${PORTSDIR}/devel/tmake
-VER= 0.2.3
USE_QT= yes
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/twinlib
@@ -28,7 +27,7 @@ MAKE_ENV+= TMAKEPATH="${LOCALBASE}/share/tmake/freebsd-g++" \
do-install:
@${INSTALL_DATA} ${WRKSRC}/TwinLib.h ${PREFIX}/include
- @${INSTALL_DATA} ${WRKSRC}/libTwinlib.so.${VER} ${PREFIX}/lib/libTwinlib.so.${VERSION}
+ @${INSTALL_DATA} ${WRKSRC}/libTwinlib.so.${PORTVERSION} ${PREFIX}/lib/libTwinlib.so.${VERSION}
@${LN} -sf ${PREFIX}/libTwinlib.so.${VERSION} ${PREFIX}/lib/libTwinlib.so
.include <bsd.port.mk>
diff --git a/graphics/txtmerge/Makefile b/graphics/txtmerge/Makefile
index cf53f150416f..1e20ee1e9818 100644
--- a/graphics/txtmerge/Makefile
+++ b/graphics/txtmerge/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: txtmerge
-# Version required: 1.01
# Date created: 20 Oct 1996
# Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= txtmerge101
-PKGNAME= txtmerge-1.01
+PORTNAME= txtmerge
+PORTVERSION= 1.01
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cdrom.com/pub/unixfreeware/graphics/ \
ftp://ftp.math.bme.hu/pub/utils/xanim/ \
ftp://ftp.kddlabs.co.jp/pub/graphics/gifanim/
+DISTNAME= txtmerge101
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 438194034dea..65cf300e9842 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: urt
-# Version required: 3.1b
# Date created: Jan 5 1997
# Whom: cfs@ing.puc.cl (original)
#
# $FreeBSD$
#
-DISTNAME= urt
-PKGNAME= urt-3.1b1
+PORTNAME= urt
+PORTVERSION= 3.1b1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cs.utah.edu/pub/
+DISTNAME= urt
DISTFILES= urt-3.1b.tar.Z urt-doc.tar urt-img.tar
PATCH_SITES= ftp://ptolemy.berkeley.edu/pub/misc/urt/
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index fd34b15fc387..e5e168c91dd9 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -36,7 +36,8 @@
# question bugs you
#
-DISTNAME= glx-990802
+PORTNAME= glx
+PORTVERSION= 990802
CATEGORIES= graphics
MASTER_SITES= http://people.FreeBSD.org/~3d/distfiles/glx/XF3.3.5/
DISTFILES= ${DISTNAME}.tar.bz2 \
diff --git a/graphics/vcdgear/Makefile b/graphics/vcdgear/Makefile
index 8ed983145573..e451ccf5cbf3 100644
--- a/graphics/vcdgear/Makefile
+++ b/graphics/vcdgear/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: vcdgear
-# Version required: 1.4
# Date created: 06 January 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vcdgear_FreeBSD
-PKGNAME= vcdgear-1.4
+PORTNAME= vcdgear
+PORTVERSION= 1.4
CATEGORIES= graphics
MASTER_SITES= http://www.vcdgear.org/files/
-EXTRACT_SUFX= .gz
+DISTFILES= vcdgear_FreeBSD.gz
MAINTAINER= cpiazza@FreeBSD.org
@@ -21,7 +20,7 @@ BROKEN= 'Only an ELF binary is distributed'
ONLY_FOR_ARCHS= i386
NO_BUILD= true
-WRKSRC= ${WRKDIR}
+NO_WRKSUBDIR= true
EXTRACT_AFTER_ARGS= > ${WRKSRC}/vcdgear
do-install:
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 2021a2c54824..04304c5d32af 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: vcg
-# Version required: 1.30.r3.17
# Date created: 19 February 1995
# Whom: hsu
#
# $FreeBSD$
#
-DISTNAME= vcg.1.30
-PKGNAME= vcg-1.30
+PORTNAME= vcg
+PORTVERSION= 1.30
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
+DISTNAME= vcg.1.30
DISTFILES= vcg.1.30.r3.17.tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/whirlgif/Makefile b/graphics/whirlgif/Makefile
index 4acdf1c50b7c..f57b4b0978b0 100644
--- a/graphics/whirlgif/Makefile
+++ b/graphics/whirlgif/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: whirlgif
-# Version required: 3.04
# Date created: 20 Oct 1996
# Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= whirlgif304
-PKGNAME= whirlgif-3.04
+PORTNAME= whirlgif
+PORTVERSION= 3.04
CATEGORIES= graphics
MASTER_SITES= http://www.danbbs.dk/~dino/whirlgif/
+DISTNAME= whirlgif304
MAINTAINER= nakai@FreeBSD.org
diff --git a/graphics/wmgrabimage/Makefile b/graphics/wmgrabimage/Makefile
index 1a3f419518ca..4a9ff575e7e9 100644
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmGrabImage
-# Version required: 0.70
# Date created: 4th November 1999
# Whom: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
#
# $FreeBSD$
#
-DISTNAME= wmGrabImage-0.70
+PORTNAME= wmGrabImage
+PORTVERSION= 0.70
CATEGORIES= graphics windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index c029834a8fd5..8adc589acd21 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: icons for WindowMaker
-# Version required: 1.0
# Date created: 26 Japnuary 1999
# Whom: KIRIYAMA Kazuhiko
#
# $FreeBSD$
#
-DISTNAME= wmicons-1.0
+PORTNAME= wmicons
+PORTVERSION= 1.0
CATEGORIES= graphics windowmaker
MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \
${MASTER_SITE_PORTS_JP} \
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index cc5b539d81ef..ec6d02947b3a 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xanim
-# Version required: 2.80.1
# Date created: Sat Nov 5 11:43:03 PST 1994
# Whom: piero
#
# $FreeBSD$
#
-DISTNAME= xanim2801
-PKGNAME= xanim-2.80.1
+PORTNAME= xanim
+PORTVERSION= 2.80.1
CATEGORIES= graphics
MASTER_SITES= ftp://xanim.va.pubnix.com/ \
ftp://xanim.va.pubnix.com/dlls/
+DISTNAME= xanim2801
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index b2bf74d0d37a..ddadd076af10 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: XaoS
-# Version required: 2.2
# Date created: 24 February 1996
# Whom: Joseph Koshy <koshy@india.hp.com>
#
# $FreeBSD$
#
-DISTNAME= XaoS-3.0
-PKGNAME= xaos-3.0
+PORTNAME= xaos
+PORTVERSION= 3.0
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://ftp.ta.jcu.cz/pub/linux/hubicka/XaoS/3.0/ \
http://www.paru.cas.cz/~hubicka/XaoS/dist/
MASTER_SITE_SUBDIR= graphics
+DISTNAME= XaoS-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 5eed89d534c8..59c846671259 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xbmbrowser
-# Version required: xbmbrowser5.1
# Date created: 06 September 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xbmbrowser5.1
-PKGNAME= xbmbrowser-5.1
+PORTNAME= xbmbrowser
+PORTVERSION= 5.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/graphics/xdgagrab/Makefile b/graphics/xdgagrab/Makefile
index a0f9ee563ac9..e847e043a48a 100644
--- a/graphics/xdgagrab/Makefile
+++ b/graphics/xdgagrab/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdgagrab
-# Version required: 0.3
# Date created: 99/01/18
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xdgagrab-0.3
+PORTNAME= xdgagrab
+PORTVERSION= 0.3
CATEGORIES= graphics
MASTER_SITES= http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index 2180c349df5d..4302fcbf89d9 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdl
-# Version required: 2.1
# Date created: 17 July 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xdl-2.1
+PORTNAME= xdl
+PORTVERSION= 2.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index ba4a2bc21ea7..2972f40d023f 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xfig
-# Version required: 3.2.3a
# Date created: 4 January 1995
# Whom: roberto
#
# $FreeBSD$
#
-DISTNAME= xfig.3.2.3a
-PKGNAME= xfig-3.2.3a
+PORTNAME= xfig
+PORTVERSION= 3.2.3a
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://www-epb.lbl.gov/xfig/
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index ba4a2bc21ea7..2972f40d023f 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xfig
-# Version required: 3.2.3a
# Date created: 4 January 1995
# Whom: roberto
#
# $FreeBSD$
#
-DISTNAME= xfig.3.2.3a
-PKGNAME= xfig-3.2.3a
+PORTNAME= xfig
+PORTVERSION= 3.2.3a
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://www-epb.lbl.gov/xfig/
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index b69627361f85..5a6b4205f0d2 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfpovray
-# Version required: 1.3.1
# Date created: 20 Sep 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xfpovray-1.3.1
+PORTNAME= xfpovray
+PORTVERSION= 1.3.1
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
${MASTER_SITE_SUNSITE}
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index cae5de670d44..d0b64e1ba5d4 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xfractint
-# Version required: 3.10
# Date created: 7 Sept 1995
# Whom: cacho@mexicano.gdl.iteso.mx
#
# $FreeBSD$
#
-DISTNAME= xfrac310
-PKGNAME= xfractint-3.10
+PORTNAME= xfractint
+PORTVERSION= 3.10
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.phoenix.net/pub/USERS/twegner/ \
http://spanky.triumf.ca/pub/fractals/programs/unix/
+DISTNAME= xfrac310
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 42de9ccb6f2d..0ac6e2c1aa5f 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xgrasp
-# Version required: 1.7d
# Date created: 23 July 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xgrasp.1.7d
-PKGNAME= xgrasp-1.7d
+PORTNAME= xgrasp
+PORTVERSION= 1.7d
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index c0fdccaeffeb..d2e5cc3d8070 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xli
-# Version required: 1.16
# Date created: 24 November 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xli-1.17.0
+PORTNAME= xli
+PORTVERSION= 1.17.0
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
http://pantransit.reptiles.org/prog/
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index 885f9ec409f4..f2d54a6adcab 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -1,20 +1,19 @@
# ports collection makefile for: xmagv
-# Version required: 1.11
# Date created: 25 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= xmagv111
-PKGNAME= xmagv-1.11
+PORTNAME= xmagv
+PORTVERSION= 1.11
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.vector.co.jp/pack/unix/art/graphics/loader/mag/
-EXTRACT_SUFX= .tgz
+DISTFILES= xmagv111.tgz
MAINTAINER= flathill@FreeBSD.org
-WRKSRC= ${WRKDIR}/xmagv
+WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
USE_IMAKE= yes
XMKMF= xmkmf
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index efe4783ece37..e4cb17348fb7 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: xmandel
-# Version required: 1.00
# Date created: 18 October 1996
# Whom: andreas@marvin.robin.de
#
# $FreeBSD$
#
-DISTNAME= xmandel
-PKGNAME= xmandel-1.0
+PORTNAME= xmandel
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cray.com/src/graphics/xmandel/
EXTRACT_SUFX= .shar
# The README says the location is ftp.cray.com:/usr/ftp/src/graphics/xmandel,
# but this has changed apparently.
+DISTNAME= ${PORTNAME}
EXTRACT_CMD= sh
EXTRACT_BEFORE_ARGS= # empty
diff --git a/graphics/xmfract/Makefile b/graphics/xmfract/Makefile
index 29925898f28c..c5d56c208b23 100644
--- a/graphics/xmfract/Makefile
+++ b/graphics/xmfract/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xmfract
-# Version required: 1.4
# Date created: Thu Aug 1 09:10:22 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xmfract_1.4
-PKGNAME= xmfract-1.4
+PORTNAME= xmfract
+PORTVERSION= 1.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= graphics
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile
index d3fd4823f694..6560d6acc21a 100644
--- a/graphics/xmorph/Makefile
+++ b/graphics/xmorph/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xmorph
-# Version required: 11sep97
# Date created: Thu Aug 1 09:10:22 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= xmorph-11sep97
-PKGNAME= xmorph-97.09.11
+PORTNAME= xmorph
+PORTVERSION= 97.09.11
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= graphics
+DISTNAME= xmorph-11sep97
MAINTAINER= erich@FreeBSD.org
diff --git a/graphics/xmountains/Makefile b/graphics/xmountains/Makefile
index b1d8cc667265..f9af85bfa4e3 100644
--- a/graphics/xmountains/Makefile
+++ b/graphics/xmountains/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmountains
-# Version required: 2.4
# Date created: 16 November 1996
# Whom: proff
#
# $FreeBSD$
#
-DISTNAME= xmountains-2.4
+PORTNAME= xmountains
+PORTVERSION= 2.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/math/fractals
diff --git a/graphics/xmovie/Makefile b/graphics/xmovie/Makefile
index b8ee701bb80c..0d5f5ec26c22 100644
--- a/graphics/xmovie/Makefile
+++ b/graphics/xmovie/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xmovie
-# Version required: 1.3
# Date created: 20 December 1998
# Whom: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
#
# $FreeBSD$
#
-DISTNAME= xmovie-i586-1.3.1
-PKGNAME= xmovie-1.3.1
+PORTNAME= xmovie
+PORTVERSION= 1.3.1
CATEGORIES= graphics linux
MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
+DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
PATCH_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PATCHFILES= ${RPM_LIBJPEG} ${RPM_LIBPNG}
diff --git a/graphics/xmrm/Makefile b/graphics/xmrm/Makefile
index 19fa2e8bf714..9a05e587c545 100644
--- a/graphics/xmrm/Makefile
+++ b/graphics/xmrm/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: xmrm
-# Version required: 2.0
# Date created: Sa 01 May 1999 15:00:00 MET
# Whom: Tobias Reifenberger <treif@mayn.de>
#
# $FreeBSD$
#
-DISTNAME= xmrm20_sources
-PKGNAME= xmrm-2.0
+PORTNAME= xmrm
+PORTVERSION= 2.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.cg.tuwien.ac.at/pub/linux/xmrm/ \
ftp://ftp.uni-passau.de/mount/common.lib.archive.unix/Graphic/xmrm/
-EXTRACT_SUFX= .tgz
+DISTFILES= xmrm20_sources.tgz
MAINTAINER= treif@mayn.de
@@ -20,7 +19,7 @@ LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
Xpm.4:${PORTSDIR}/graphics/xpm \
tiff.4:${PORTSDIR}/graphics/tiff
-WRKSRC= ${WRKDIR}
+NO_WRKSUBDIR= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xmrm ${PREFIX}/bin
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index ea370be16daf..e842cef35a88 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xpaint
-# Version required: 2.5.7
# Date created: 2 Jan 1995
# Whom: swallace
#
# $FreeBSD$
#
-DISTNAME= xpaint-2.5.7
+PORTNAME= xpaint
+PORTVERSION= 2.5.7
CATEGORIES= graphics
MASTER_SITES= http://home.worldonline.dk/~torsten/xpaint/ \
ftp://ftp.win.ne.jp/pub/graphics/
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index b5c6e2ceb428..5bacd877e766 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xpdf
-# Version required: 0.90
# Date created: 02 Feb 1996
# Whom: chuckr@glue.umd.edu
#
# $FreeBSD$
#
-DISTNAME= xpdf-0.90
+PORTNAME= xpdf
+PORTVERSION= 0.90
CATEGORIES= graphics print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN} ftp://ftp.foolabs.com/pub/xpdf/ \
ftp://ftp.duke.edu/pub/X11/contrib/applications/
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index 654e19c2bb01..e2092dfcde4d 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xpm
-# Version required: 3.4k
# Date created: 14 September 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= xpm-3.4k
+PORTNAME= xpm
+PORTVERSION= 3.4k
CATEGORIES= graphics x11
MASTER_SITES= ftp://avahi.inria.fr/pub/xpm/
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index ac1b8193f453..af0560736e90 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -1,15 +1,15 @@
# ports collection makefile for: xpx
-# Version required: 1.41
# Date created: 25 Oct 1998
# Whom: Seiichirou Hiraoka
#
# $FreeBSD$
#
-DISTNAME= xpx141
-PKGNAME= xpx-1.41
+PORTNAME= xpx
+PORTVERSION= 1.41
CATEGORIES= graphics
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/xpx/
+DISTNAME= xpx141
MAINTAINER= flathill@FreeBSD.org
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 68af33f155d9..55c39d498bef 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xsane
-# Version required: 0.56
# Date created: Fri Apr 8 00:18:29 MET DST 1999
# Whom: Dominik Brettnacher <domi@saargate.de>
#
# $FreeBSD$
#
-DISTNAME= xsane-0.56
+PORTNAME= xsane
+PORTVERSION= 0.56
CATEGORIES= graphics
MASTER_SITES= http://www.wolfsburg.de/~rauch/sane/ \
http://gd.tuwien.ac.at/hci/sane/xsane/ \
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 7f943b41642e..2f599705cab6 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwpick
-# Version required: 2.20
# Date created: 24 June 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= xwpick-2.20
+PORTNAME= xwpick
+PORTVERSION= 2.20
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/graphics/zimg/Makefile b/graphics/zimg/Makefile
index 2a1cd92ff307..fb0b6aacb5ad 100644
--- a/graphics/zimg/Makefile
+++ b/graphics/zimg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zimg
-# Version required: 2.4.0
# Date created: 20 Feb 2000
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= zimg-2.4.0
+PORTNAME= zimg
+PORTVERSION= 2.4.0
CATEGORIES= graphics
MASTER_SITES= http://www.zellner.org/zimg/download/
diff --git a/multimedia/gxanim/Makefile b/multimedia/gxanim/Makefile
index f2101de6c5a0..4696cf211f72 100644
--- a/multimedia/gxanim/Makefile
+++ b/multimedia/gxanim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xanim
-# Version required: 0.50
# Date created: Sat Nov 5 11:43:03 PST 1994
# Whom: Rod Taylor
#
# $FreeBSD$
#
-DISTNAME= gxanim-0.50
+PORTNAME= gxanim
+PORTVERSION= 0.50
CATEGORIES= graphics
MASTER_SITES= http://www.iag.net/~aleris/ \
http://www.zort.on.ca/software/
diff --git a/multimedia/linux-xmovie/Makefile b/multimedia/linux-xmovie/Makefile
index b8ee701bb80c..0d5f5ec26c22 100644
--- a/multimedia/linux-xmovie/Makefile
+++ b/multimedia/linux-xmovie/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xmovie
-# Version required: 1.3
# Date created: 20 December 1998
# Whom: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
#
# $FreeBSD$
#
-DISTNAME= xmovie-i586-1.3.1
-PKGNAME= xmovie-1.3.1
+PORTNAME= xmovie
+PORTVERSION= 1.3.1
CATEGORIES= graphics linux
MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
+DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
PATCH_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PATCHFILES= ${RPM_LIBJPEG} ${RPM_LIBPNG}
diff --git a/multimedia/mpeg/Makefile b/multimedia/mpeg/Makefile
index 0b55e42a7ed3..6d7bc97e500e 100644
--- a/multimedia/mpeg/Makefile
+++ b/multimedia/mpeg/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: mpeg
-# Version required: 1.2.2
# Date created: Sa 01 May 1999 15:00:00 MET
# Whom: Tobias Reifenberger <treif@mayn.de>
#
# $FreeBSD$
#
-DISTNAME= MPEGv1.2.2
-PKGNAME= mpeg-1.2.2
+PORTNAME= mpeg
+PORTVERSION= 1.2.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.uni-koeln.de/graph/mpeg/ \
ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
ftp://ftp.u-aizu.ac.jp/pub/graphics/image/mpeg/mni.mcgill.ca/
+DISTNAME= MPEGv${PORTVERSION}
MAINTAINER= treif@mayn.de
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index 30cac58df698..c2a9fc6d3a2a 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg2codec
-# Version required: 1.2
# Date created: November 25, 1996
# Whom: "Philippe Charnier" <charnier@lirmm.fr>
#
# $FreeBSD$
#
-DISTNAME= mpeg2codec-1.2
+PORTNAME= mpeg2codec
+PORTVERSION= 1.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mpeg.org/pub/mpeg/mssg/
DISTFILES= mpeg2vidcodec_v12.tar.gz
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index 59bffa18c677..ce6a5737aa87 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg2play
-# Version required: 1.1b
# Date created: June 21, 1996
# Whom: "Philippe Charnier" <charnier@lirmm.fr>
#
# $FreeBSD$
#
-DISTNAME= mpeg2play-1.1b
+PORTNAME= mpeg2play
+PORTVERSION= 1.1b
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index 66003add3ee9..01067637a627 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpeg_encode
-# Version required: 1.5b
# Date created:
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpeg_encode-1.5b-src
-PKGNAME= mpeg_encode-1.5b
+PORTNAME= mpeg_encode
+PORTVERSION= 1.5b
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= erich@FreeBSD.org
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 63f37bd33759..411ec4f6979b 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mpeg_play
-# Version required: 2.4
# Date created: 17 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= mpeg_play-2.4
+PORTNAME= mpeg_play
+PORTVERSION= 2.4
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
EXTRACT_SUFX= -patched-src.tar.gz
diff --git a/multimedia/mpeg_stat/Makefile b/multimedia/mpeg_stat/Makefile
index e3fb74270e2b..62b4a0f3f721 100644
--- a/multimedia/mpeg_stat/Makefile
+++ b/multimedia/mpeg_stat/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpeg_stat
-# Version required: 2.2b
# Date created: Thu Aug 1 21:52:06 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpeg_stat-2.2b-src
-PKGNAME= mpeg_stat-2.2b
+PORTNAME= mpeg_stat
+PORTVERSION= 2.2b
CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= erich@FreeBSD.org
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index 12110ff6aad0..5f8ca530ae25 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mpegedit
-# Version required: 2.2
# Date created: Thu Aug 1 10:50:57 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mpegedit_v2.2
-PKGNAME= mpegedit-2.2
+PORTNAME= mpegedit
+PORTVERSION= 2.2
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/tools/
+DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= erich@FreeBSD.org
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 3326c4e2accd..5afa486c0462 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: mplex
-# Version required: 1.1
# Date created: Wed Jul 31 20:54:54 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mplex-1.1
-
+PORTNAME= mplex
+PORTVERSION= 1.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/
diff --git a/multimedia/mtv/Makefile b/multimedia/mtv/Makefile
index 65c4f98c4673..35427df9879e 100644
--- a/multimedia/mtv/Makefile
+++ b/multimedia/mtv/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mtv
-# Version required: 1.1.0.20
# Date created: 30 Jan 2000
# Whom: kris
#
# $FreeBSD$
#
-DISTNAME= mtv-1.1.0.20
+PORTNAME= mtv
+PORTVERSION= 1.1.0.20
CATEGORIES= graphics linux
MASTER_SITES= ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glibc/packages/TGZ/
DISTFILES= mtv-1.1.0.20.tar.gz libSDLx11.so.tar.gz
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index b1f5c4a6b59b..a24ae779b818 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: netshow
-# Version required: 2.00.251
# Date created: Thu Jun 11 22:38:52 PDT 1998
# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= netshow_linux
-PKGNAME= netshow-2.00.251
+PORTNAME= netshow
+PORTVERSION= 2.00.251
CATEGORIES= graphics net linux
MASTER_SITES= http://microsoft.com/netshow/download/en/beta/
+DISTNAME= netshow_linux
EXTRACT_SUFX= .gz
MAINTAINER= dburr@FreeBSD.org
diff --git a/multimedia/ppm2fli/Makefile b/multimedia/ppm2fli/Makefile
index 0fb11192fb65..8d68a272f4e8 100644
--- a/multimedia/ppm2fli/Makefile
+++ b/multimedia/ppm2fli/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ppm2fli
-# Version required: b1.92
# Date created: 7 Jan 1998
# Whom: giffunip@asme.org
#
# $FreeBSD$
#
-DISTNAME= ppm2fli_b1.92
-PKGNAME= ppm2fli-b1
+PORTNAME= ppm2fli
+PORTVERSION= b1
CATEGORIES= graphics
MASTER_SITES= ftp://crusty.er.usgs.gov/pub/animation/fli/
+DISTNAME= ppm2fli_b1.92
EXTRACT_SUFX= .tar.Z
MAINTAINER= giffunip@asme.org
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 8dd4b7066f40..0b6241c21d15 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: smpeg
-# Version required: 0.3.3
# Date created: 2 Feb 2000
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= smpeg-0.3.3
+PORTNAME= smpeg
+PORTVERSION= 0.3.3
CATEGORIES= graphics
MASTER_SITES= http://www.lokigames.com/development/download/smpeg/
diff --git a/multimedia/spigot/Makefile b/multimedia/spigot/Makefile
index 9e249672afc2..e8afe253a6b8 100644
--- a/multimedia/spigot/Makefile
+++ b/multimedia/spigot/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libspigot.a
-# Version required: 1.7
# Date Created: Fri Sep 15 10:04:46 CDT 1995
# Whom: james@cs.uwm.edu
#
# $FreeBSD$
#
-DISTNAME= spigot-1.7
+PORTNAME= spigot
+PORTVERSION= 1.7
CATEGORIES= graphics
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
DISTFILES= spigot.1.7.tar.gz
diff --git a/multimedia/splitmpg/Makefile b/multimedia/splitmpg/Makefile
index b0e6d531f94c..a3fdcd2e142f 100644
--- a/multimedia/splitmpg/Makefile
+++ b/multimedia/splitmpg/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: splitmpg
-# Version required:
# Date created: Wed Jul 31 21:59:42 CDT 1996
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= splitmpg
-PKGNAME= splitmpg-1.0
+PORTNAME= splitmpg
+PORTVERSION= 1.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ecel.uwa.edu.au/users/michael/
-EXTRACT_SUFX= .tgz
+DISTFILES= ${PORTNAME}.tgz
MAINTAINER= erich@FreeBSD.org
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index a23e3668aa0b..bdfe98c8d848 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkxanim
-# Version required: 0.43
# Date created: 24 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= tkxanim-0.43
+PORTNAME= tkxanim
+PORTVERSION= 0.43
CATEGORIES= graphics tk82
MASTER_SITES= http://members.yourlink.net/aaron/
diff --git a/multimedia/vcdgear/Makefile b/multimedia/vcdgear/Makefile
index 8ed983145573..e451ccf5cbf3 100644
--- a/multimedia/vcdgear/Makefile
+++ b/multimedia/vcdgear/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: vcdgear
-# Version required: 1.4
# Date created: 06 January 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= vcdgear_FreeBSD
-PKGNAME= vcdgear-1.4
+PORTNAME= vcdgear
+PORTVERSION= 1.4
CATEGORIES= graphics
MASTER_SITES= http://www.vcdgear.org/files/
-EXTRACT_SUFX= .gz
+DISTFILES= vcdgear_FreeBSD.gz
MAINTAINER= cpiazza@FreeBSD.org
@@ -21,7 +20,7 @@ BROKEN= 'Only an ELF binary is distributed'
ONLY_FOR_ARCHS= i386
NO_BUILD= true
-WRKSRC= ${WRKDIR}
+NO_WRKSUBDIR= true
EXTRACT_AFTER_ARGS= > ${WRKSRC}/vcdgear
do-install:
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index cc5b539d81ef..ec6d02947b3a 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xanim
-# Version required: 2.80.1
# Date created: Sat Nov 5 11:43:03 PST 1994
# Whom: piero
#
# $FreeBSD$
#
-DISTNAME= xanim2801
-PKGNAME= xanim-2.80.1
+PORTNAME= xanim
+PORTVERSION= 2.80.1
CATEGORIES= graphics
MASTER_SITES= ftp://xanim.va.pubnix.com/ \
ftp://xanim.va.pubnix.com/dlls/
+DISTNAME= xanim2801
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
MAINTAINER= ports@FreeBSD.org
diff --git a/multimedia/xmovie/Makefile b/multimedia/xmovie/Makefile
index b8ee701bb80c..0d5f5ec26c22 100644
--- a/multimedia/xmovie/Makefile
+++ b/multimedia/xmovie/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: xmovie
-# Version required: 1.3
# Date created: 20 December 1998
# Whom: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
#
# $FreeBSD$
#
-DISTNAME= xmovie-i586-1.3.1
-PKGNAME= xmovie-1.3.1
+PORTNAME= xmovie
+PORTVERSION= 1.3.1
CATEGORIES= graphics linux
MASTER_SITES= http://people.FreeBSD.org/~imura/distfiles/
# Distfile has no version info. The original site is below.
# MASTER_SITES= http://heroine.linuxbox.com/
+DISTNAME= ${PORTNAME}-i586-${PORTVERSION}
PATCH_SITES= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PATCHFILES= ${RPM_LIBJPEG} ${RPM_LIBPNG}
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index bd569b4a26e7..1250fb6ec168 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: HDF_lib
-# Version required: 4.1r2
# Date created: 17 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= HDF4.1r3
-PKGNAME= hdf-4.1r3
+PORTNAME= hdf
+PORTVERSION= 4.1r3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/
+DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/science/hdf5-18/Makefile b/science/hdf5-18/Makefile
index bd569b4a26e7..1250fb6ec168 100644
--- a/science/hdf5-18/Makefile
+++ b/science/hdf5-18/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: HDF_lib
-# Version required: 4.1r2
# Date created: 17 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= HDF4.1r3
-PKGNAME= hdf-4.1r3
+PORTNAME= hdf
+PORTVERSION= 4.1r3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/
+DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile
index bd569b4a26e7..1250fb6ec168 100644
--- a/science/hdf5/Makefile
+++ b/science/hdf5/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: HDF_lib
-# Version required: 4.1r2
# Date created: 17 November 1996
# Whom: mi
#
# $FreeBSD$
#
-DISTNAME= HDF4.1r3
-PKGNAME= hdf-4.1r3
+PORTNAME= hdf
+PORTVERSION= 4.1r3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF4.1r3/tar/
+DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com