aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/4va/Makefile5
-rw-r--r--graphics/GraphicsMagick/Makefile1
-rw-r--r--graphics/Hermes/Makefile2
-rw-r--r--graphics/SciPlot/Makefile3
-rw-r--r--graphics/acidwarp/Makefile3
-rw-r--r--graphics/barcode/Makefile3
-rw-r--r--graphics/cal3d-devel/Makefile3
-rw-r--r--graphics/cegui/Makefile3
-rw-r--r--graphics/dc20pack/Makefile3
-rw-r--r--graphics/dmtx-utils/Makefile3
-rw-r--r--graphics/driconf/Makefile3
-rw-r--r--graphics/flasm/Makefile3
-rw-r--r--graphics/g2/Makefile3
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/gimp-app/Makefile3
-rw-r--r--graphics/gpaint/Makefile3
-rw-r--r--graphics/graphos/Makefile3
-rw-r--r--graphics/gtk-update-icon-cache/Makefile3
-rw-r--r--graphics/imlib2/Makefile3
-rw-r--r--graphics/imlib2_loaders/Makefile3
-rw-r--r--graphics/jasper/Makefile6
-rw-r--r--graphics/jpgtn/Makefile3
-rw-r--r--graphics/liblug/Makefile3
-rw-r--r--graphics/linplasma/Makefile3
-rw-r--r--graphics/netpbm/Makefile3
-rw-r--r--graphics/ocrad/Makefile1
-rw-r--r--graphics/ocropus/Makefile2
-rw-r--r--graphics/opengl-man/Makefile3
-rw-r--r--graphics/opennurbs/Makefile1
-rw-r--r--graphics/p5-Color-Calc/Makefile1
-rw-r--r--graphics/p5-Color-Palette/Makefile1
-rw-r--r--graphics/p5-Color-Scheme/Makefile1
-rw-r--r--graphics/p5-Image-PBMlib/Makefile1
-rw-r--r--graphics/p5-SpringGraph/Makefile3
-rw-r--r--graphics/p5-URI-GoogleChart/Makefile1
-rw-r--r--graphics/pear-IO_SWF/Makefile3
-rw-r--r--graphics/pecl-qrencode/Makefile3
-rw-r--r--graphics/pfscalibration/Makefile3
-rw-r--r--graphics/pfstmo/Makefile3
-rw-r--r--graphics/php5-swfed/Makefile3
-rw-r--r--graphics/pixelize/Makefile1
-rw-r--r--graphics/prison/Makefile3
-rw-r--r--graphics/py-gchartwrapper/Makefile2
-rw-r--r--graphics/py-glewpy/Makefile2
-rw-r--r--graphics/py-openexr/Makefile1
-rw-r--r--graphics/scr2png/Makefile3
-rw-r--r--graphics/sdl2_gfx/Makefile3
-rw-r--r--graphics/sdl_gfx/Makefile3
-rw-r--r--graphics/seam-carving-gui/Makefile2
-rw-r--r--graphics/seejpeg/Makefile3
-rw-r--r--graphics/separate/Makefile3
-rw-r--r--graphics/svgfig/Makefile5
-rw-r--r--graphics/tesseract-data/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--graphics/timeless/Makefile3
-rw-r--r--graphics/wmicons/Makefile7
-rw-r--r--graphics/xbmbrowser/Makefile3
-rw-r--r--graphics/xfpovray/Makefile3
-rw-r--r--graphics/xli/Makefile1
-rw-r--r--graphics/xpdf/Makefile3
-rw-r--r--graphics/xwpick/Makefile3
-rw-r--r--graphics/zphoto/Makefile1
62 files changed, 54 insertions, 111 deletions
diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile
index bb6e9e5fe8e6..53a5608ad704 100644
--- a/graphics/4va/Makefile
+++ b/graphics/4va/Makefile
@@ -5,14 +5,13 @@ PORTNAME= 4va
PORTVERSION= 1.21
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/X
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SUNSITE/apps/graphics/hacks/X
MAINTAINER= ports@FreeBSD.org
COMMENT= Four-Dimensional graphics tumbler for X11
USE_XORG= x11
+USES= tar:tgz
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
CLIBS="-lm -lX11 -L${LOCALBASE}/lib"
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index f02434f29192..ccea1e3c8089 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -8,7 +8,6 @@ PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast image processing tools based on ImageMagick
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index 2cd24bd640d2..490ade65554d 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.3.3
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.su.se/pub/lunar/source-archive/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast pixel formats conversion library
diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index aa3769232df5..4c1f6fd49b53 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SciPlot
PORTVERSION= 1.36
PORTREVISION= 4
CATEGORIES= graphics math
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= widgets
+MASTER_SITES= XCONTRIB/widgets
MAINTAINER= thierry@FreeBSD.org
COMMENT= Full-featured Xt widget to display 2D data in a graph
diff --git a/graphics/acidwarp/Makefile b/graphics/acidwarp/Makefile
index 26a3085835c7..0c8dec9b2faf 100644
--- a/graphics/acidwarp/Makefile
+++ b/graphics/acidwarp/Makefile
@@ -4,8 +4,7 @@
PORTNAME= acidwarp
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= swills@FreeBSD.org
COMMENT= SVGAlib demo which displays trippy mathematical images in cycling colors
diff --git a/graphics/barcode/Makefile b/graphics/barcode/Makefile
index e0d58486e407..a1f86cd604a6 100644
--- a/graphics/barcode/Makefile
+++ b/graphics/barcode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= barcode
PORTVERSION= 0.98
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= barcode
+MASTER_SITES= GNU
MAINTAINER= jev@ecad.org
COMMENT= A barcode generation library along with a command line frontend
diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile
index 4439b13eebb9..e5829ebcc76f 100644
--- a/graphics/cal3d-devel/Makefile
+++ b/graphics/cal3d-devel/Makefile
@@ -5,8 +5,7 @@ PORTNAME= cal3d
PORTVERSION= 20060720
PORTREVISION= 4
CATEGORIES= graphics devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= acm/${PORTNAME}
+MASTER_SITES= LOCAL/acm/${PORTNAME}
PKGNAMESUFFIX= -devel
DIST_SUBDIR= ${PORTNAME}
diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile
index e20713f14ef6..6b14e5849f85 100644
--- a/graphics/cegui/Makefile
+++ b/graphics/cegui/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cegui
PORTVERSION= 0.8.4
CATEGORIES= graphics devel
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= crayzedsgui/CEGUI%20Mk-2/0.8
+MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8
MAINTAINER= oliver@FreeBSD.org
COMMENT= Library providing windowing and widgets for graphics APIs
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index fe04ea9b8740..018f0d4fc624 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dc20pack
PORTVERSION= 1.0
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/capture
+MASTER_SITES= SUNSITE/apps/graphics/capture
MAINTAINER= maurice@castro.aus.net
COMMENT= Digital camera control and download tool for Kodak DC20/25 camera
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index 9f32d0f5df0f..d4b2b922bc46 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dmtx-utils
PORTVERSION= 0.7.4
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=libdmtx/libdmtx/${PORTVERSION}
+MASTER_SITES= SF/libdmtx/libdmtx/${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
COMMENT= Software for reading and writing Data Matrix barcodes
diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile
index d1ec3dcef057..537aac1d3363 100644
--- a/graphics/driconf/Makefile
+++ b/graphics/driconf/Makefile
@@ -5,8 +5,7 @@ PORTNAME= driconf
PORTVERSION= 0.9.1
PORTREVISION= 10
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME}
+MASTER_SITES= DEBIAN
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig.tar.gz
MAINTAINER= lichray@gmail.com
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 9f98c85a601b..de3299d1256f 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -3,9 +3,8 @@
PORTNAME= flasm
PORTVERSION= 1.62
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/kuriyama \
http://www.nowrap.de/download/
-MASTER_SITE_SUBDIR= kuriyama
DISTNAME= flasm16src
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index de9e7bcb1b0f..9c2e30b1e635 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -5,8 +5,7 @@ PORTNAME= g2
PORTVERSION= 0.40
PORTREVISION= 9
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use, portable, and powerful 2D graphics library
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 4a538f0b09cd..5cbb27286042 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -6,7 +6,7 @@ PORTNAME= gdk-pixbuf
PORTVERSION= 0.22.0
PORTREVISION= 17
CATEGORIES= graphics
-MASTER_SITES= GNOME/sources/gdk-pixbuf/0.22
+MASTER_SITES= GNOME
DISTNAME= gdk-pixbuf-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index d7ab985eb8df..f3c98d2f3870 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.8.14
PORTREVISION?= 2
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
-MASTER_SITES= GIMP
-MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}
+MASTER_SITES= GIMP/gimp/v${PORTVERSION:R}
DISTNAME= gimp-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 795603589490..17ea6ae68ccc 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.3.3
DISTVERSIONPREFIX= 2-
PORTREVISION= 5
CATEGORIES= graphics gnome
-MASTER_SITES= ${MASTER_SITE_GNU_ALPHA}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU_ALPHA
MAINTAINER= ports@FreeBSD.org
COMMENT= Small-scale painting program for GNOME
diff --git a/graphics/graphos/Makefile b/graphics/graphos/Makefile
index be41bc0c3eba..a7b305f903fc 100644
--- a/graphics/graphos/Makefile
+++ b/graphics/graphos/Makefile
@@ -4,8 +4,7 @@ PORTNAME= graphos
PORTVERSION= 0.5
PORTREVISION= 2
CATEGORIES= graphics gnustep
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= gap
+MASTER_SITES= SAVANNAH/gap
DISTNAME= Graphos-${PORTVERSION}
MAINTAINER= theraven@FreeBSD.org
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index eaaa5dd0c28e..298735731d8f 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gtk-update-icon-cache
PORTVERSION= 2.24.27
CATEGORIES= graphics
-MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 53415040d0b2..d20ba1c6b00b 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 6
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= The next generation graphics library for Enlightenment
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index f997af077e84..8ba327f10f31 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.4.6
PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= enlightenment/imlib2-src/${PORTVERSION}
+MASTER_SITES= SF/enlightenment/imlib2-src/${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= Extra image loader plugins for Imlib 2
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 8a783c8d8483..d49b586415c5 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.900.1
PORTREVISION= 14
CATEGORIES= graphics
MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
- ${MASTER_SITE_IMAGEMAGICK}
-MASTER_SITE_SUBDIR= ImageMagick/delegates
+ ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Implementation of the codec specified in the JPEG-2000 standard
@@ -23,9 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --enable-shared --enable-static
USE_LDCONFIG= yes
-MASTER_SITE_IMAGEMAGICK= \
- ftp://ftp.imagemagick.org/pub/%SUBDIR%/
-
OPTIONS_DEFINE= OPENGL UUID DOCS
UUID_DESC= UUID support (required by GDAL)
diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile
index 491f640a3414..c6af00e63482 100644
--- a/graphics/jpgtn/Makefile
+++ b/graphics/jpgtn/Makefile
@@ -5,8 +5,7 @@ PORTNAME= jpgtn
PORTVERSION= 2.06
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/misc
+MASTER_SITES= SUNSITE/apps/graphics/misc
MAINTAINER= ports@FreeBSD.org
COMMENT= Creates thumbnails of JPEG images
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index 99285acb1f76..3378cf2ba601 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -5,8 +5,7 @@ PORTNAME= liblug
PORTVERSION= 1.0.6
PORTREVISION= 5
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= libs/graphics
+MASTER_SITES= SUNSITE/libs/graphics
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-format graphics manipulation library
diff --git a/graphics/linplasma/Makefile b/graphics/linplasma/Makefile
index cd0766023c83..eb87ea3b3d42 100644
--- a/graphics/linplasma/Makefile
+++ b/graphics/linplasma/Makefile
@@ -5,8 +5,7 @@ PORTNAME= linplasma
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/hacks/svgalib
+MASTER_SITES= SUNSITE/apps/graphics/hacks/svgalib
MAINTAINER= ports@FreeBSD.org
COMMENT= Sinus plasma, an SVGAlib demo
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4572d7a1e119..4f2d3d1413c6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 10.35.94
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \
- ${MASTER_SITE_LOCAL:S/$/:man/}
-MASTER_SITE_SUBDIR= dinoex/:man
+ LOCAL/dinoex/:man
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Toolkit for conversion of images between different formats
diff --git a/graphics/ocrad/Makefile b/graphics/ocrad/Makefile
index c7d0c4354bc0..29af8ff47602 100644
--- a/graphics/ocrad/Makefile
+++ b/graphics/ocrad/Makefile
@@ -5,7 +5,6 @@ PORTNAME= ocrad
PORTVERSION= 0.22
CATEGORIES= graphics
MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tar.lz
MAINTAINER= lippe@FreeBSD.org
diff --git a/graphics/ocropus/Makefile b/graphics/ocropus/Makefile
index 5726eb75d070..e51e4c99d177 100644
--- a/graphics/ocropus/Makefile
+++ b/graphics/ocropus/Makefile
@@ -5,7 +5,7 @@ PORTNAME= ocropus
PORTVERSION= 0.4
PORTREVISION= 14
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= hiroto.kagotani@gmail.com
COMMENT= The OCRopus(tm) open source document analysis and OCR system
diff --git a/graphics/opengl-man/Makefile b/graphics/opengl-man/Makefile
index 5193fa4e1c7d..99b21c8f3196 100644
--- a/graphics/opengl-man/Makefile
+++ b/graphics/opengl-man/Makefile
@@ -5,8 +5,7 @@ PORTNAME= opengl-man
PORTVERSION= 657.2
CATEGORIES= graphics
MASTER_SITES= http://www2.cons.org/freebsd-distfiles/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= cracauer
+ LOCAL/cracauer
DISTNAME= opengl-man-657-plusmissing
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 98865526a026..c43d2828c424 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 20121024
PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/
-MASTER_SITE_SUBDIR= ${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= fernando.apesteguia@gmail.com
diff --git a/graphics/p5-Color-Calc/Makefile b/graphics/p5-Color-Calc/Makefile
index 929cb5083ef7..f1fa2668aa32 100644
--- a/graphics/p5-Color-Calc/Makefile
+++ b/graphics/p5-Color-Calc/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.074
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
diff --git a/graphics/p5-Color-Palette/Makefile b/graphics/p5-Color-Palette/Makefile
index 8c7c2b99066f..c66b348c9fed 100644
--- a/graphics/p5-Color-Palette/Makefile
+++ b/graphics/p5-Color-Palette/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.100002
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Color-Scheme/Makefile b/graphics/p5-Color-Scheme/Makefile
index 23ee20ab091c..5419205b4555 100644
--- a/graphics/p5-Color-Scheme/Makefile
+++ b/graphics/p5-Color-Scheme/Makefile
@@ -5,7 +5,6 @@ PORTVERSION= 1.05
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Color
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/p5-Image-PBMlib/Makefile b/graphics/p5-Image-PBMlib/Makefile
index 874482d1ecef..cbaf46843f77 100644
--- a/graphics/p5-Image-PBMlib/Makefile
+++ b/graphics/p5-Image-PBMlib/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.00
PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Image
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/graphics/p5-SpringGraph/Makefile b/graphics/p5-SpringGraph/Makefile
index 8dbbf0c0086e..b0acb87cd9c7 100644
--- a/graphics/p5-SpringGraph/Makefile
+++ b/graphics/p5-SpringGraph/Makefile
@@ -5,8 +5,7 @@ PORTNAME= SpringGraph
PORTVERSION= 0.05
PORTREVISION= 8
CATEGORIES= graphics perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= GraphViz/TEEJAY
+MASTER_SITES= CPAN/GraphViz/TEEJAY
PKGNAMEPREFIX= p5-
MAINTAINER= bofh@FreeBSD.org
diff --git a/graphics/p5-URI-GoogleChart/Makefile b/graphics/p5-URI-GoogleChart/Makefile
index 8f0024ee297c..63a20fef409b 100644
--- a/graphics/p5-URI-GoogleChart/Makefile
+++ b/graphics/p5-URI-GoogleChart/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.02
PORTREVISION= 1
CATEGORIES= graphics www perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= URI
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
diff --git a/graphics/pear-IO_SWF/Makefile b/graphics/pear-IO_SWF/Makefile
index 4c7622374bd7..a8a476fe2618 100644
--- a/graphics/pear-IO_SWF/Makefile
+++ b/graphics/pear-IO_SWF/Makefile
@@ -5,8 +5,7 @@ PORTNAME= IO_SWF
PORTVERSION= 2.2.6
CATEGORIES= graphics www pear
MASTER_SITES= http://openpear.org/get/ \
- LOCAL
-MASTER_SITE_SUBDIR= tota/${PKGNAMEPREFIX}${PORTNAME}
+ LOCAL/tota/${PKGNAMEPREFIX}${PORTNAME}
PKGNAMEPREFIX= pear-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pecl-qrencode/Makefile b/graphics/pecl-qrencode/Makefile
index c49f467208e1..f480c0553461 100644
--- a/graphics/pecl-qrencode/Makefile
+++ b/graphics/pecl-qrencode/Makefile
@@ -4,8 +4,7 @@
PORTNAME= qrencode
PORTVERSION= 0.4
CATEGORIES= graphics pear
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= vanilla
+MASTER_SITES= LOCAL/vanilla
PKGNAMEPREFIX= pecl-
DIST_SUBDIR= PECL
diff --git a/graphics/pfscalibration/Makefile b/graphics/pfscalibration/Makefile
index 51b775f359aa..35e0e9ec73ee 100644
--- a/graphics/pfscalibration/Makefile
+++ b/graphics/pfscalibration/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pfscalibration
PORTVERSION= 1.4
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Photometric calibration of cameras and recovery HDR images from the set of LDR exposures
diff --git a/graphics/pfstmo/Makefile b/graphics/pfstmo/Makefile
index 4ec317283556..a867c4e73dbd 100644
--- a/graphics/pfstmo/Makefile
+++ b/graphics/pfstmo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pfstmo
PORTVERSION= 1.5
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pfstools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES= SF/pfstools/${PORTNAME}/${PORTVERSION}
MAINTAINER= ii@any.com.ru
COMMENT= Tone mapping operators
diff --git a/graphics/php5-swfed/Makefile b/graphics/php5-swfed/Makefile
index feacc1956df8..09c19e25542c 100644
--- a/graphics/php5-swfed/Makefile
+++ b/graphics/php5-swfed/Makefile
@@ -5,8 +5,7 @@ PORTNAME= swfed
PORTVERSION= 0.62
PORTREVISION= 3
CATEGORIES= graphics www
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= ${PORTNAME}/60548
+MASTER_SITES= SFJP/${PORTNAME}/60548
PKGNAMEPREFIX= php5-
MAINTAINER= yoya@awm.jp
diff --git a/graphics/pixelize/Makefile b/graphics/pixelize/Makefile
index 8ff1d6002e3e..10b5c5e04937 100644
--- a/graphics/pixelize/Makefile
+++ b/graphics/pixelize/Makefile
@@ -8,7 +8,6 @@ CATEGORIES= graphics
MASTER_SITES= ftp://lashwhip.com/pub/ \
http://www.c-s.li/ports/ \
http://lashwhip.com/pixelize/
-MASTER_SITE_SUBDIR= apps/graphics/misc
MAINTAINER= cs@FreeBSD.org
COMMENT= Use many scaled down images to try to duplicate another image
diff --git a/graphics/prison/Makefile b/graphics/prison/Makefile
index 7cd1b11702ce..c1da7e9d824d 100644
--- a/graphics/prison/Makefile
+++ b/graphics/prison/Makefile
@@ -5,8 +5,7 @@ PORTNAME= prison
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/src
+MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src
MAINTAINER= fluffy@FreeBSD.org
COMMENT= Barcode library for KDE
diff --git a/graphics/py-gchartwrapper/Makefile b/graphics/py-gchartwrapper/Makefile
index c0048fef075d..8f180afb4d81 100644
--- a/graphics/py-gchartwrapper/Makefile
+++ b/graphics/py-gchartwrapper/Makefile
@@ -5,7 +5,7 @@ PORTNAME= GChartWrapper
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile
index 112f218f3deb..3fc4f4a3c816 100644
--- a/graphics/py-glewpy/Makefile
+++ b/graphics/py-glewpy/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DIST_SUBDIR= python
PATCH_SITES= http://mirror.amdmi3.ru/distfiles/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|}
+ LOCAL/amdmi3
PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2
MAINTAINER= acm@FreeBSD.org
diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile
index f34852f8d00e..e627432da050 100644
--- a/graphics/py-openexr/Makefile
+++ b/graphics/py-openexr/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
USES= python
USE_PYTHON= distutils autoplist
-MASTER_SITE_SUBDIR=source/O/OpenEXR
post-extract:
${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/setup.py
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index a015790f804e..418a338f2776 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -5,8 +5,7 @@ PORTNAME= scr2png
PORTVERSION= 1.2
PORTREVISION= 6
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= nik
+MASTER_SITES= LOCAL/nik
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts the output of "vidcontrol -p" to PNG
diff --git a/graphics/sdl2_gfx/Makefile b/graphics/sdl2_gfx/Makefile
index e27e968cf51b..9be086d65b3c 100644
--- a/graphics/sdl2_gfx/Makefile
+++ b/graphics/sdl2_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl2_gfx
PORTVERSION= 1.0.1
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL2_gfx
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL2_gfx/
DISTNAME= SDL2_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile
index b360c6970234..0278d65b06d3 100644
--- a/graphics/sdl_gfx/Makefile
+++ b/graphics/sdl_gfx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sdl_gfx
PORTVERSION= 2.0.25
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= http://www.ferzkopp.net/Software/%SUBDIR%/
-MASTER_SITE_SUBDIR= SDL_gfx-${PORTVERSION:R}
+MASTER_SITES= http://www.ferzkopp.net/Software/SDL_gfx-${PORTVERSION:R}/
DISTNAME= SDL_gfx-${PORTVERSION}
MAINTAINER= mva@FreeBSD.org
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index e55096b62c92..cf6eec847f83 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -5,7 +5,7 @@ PORTNAME= seam-carving-gui
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
MAINTAINER= buganini@gmail.com
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index eb0efd0d4ea9..54af290b56bd 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= seejpeg
PORTVERSION= 1.10
PORTREVISION= 4
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/viewers/svga
+MASTER_SITES= SUNSITE/apps/graphics/viewers/svga
MAINTAINER= ports@FreeBSD.org
COMMENT= Console graphics viewer using the svga console graphics library
diff --git a/graphics/separate/Makefile b/graphics/separate/Makefile
index d28f124214b7..f300aa32a494 100644
--- a/graphics/separate/Makefile
+++ b/graphics/separate/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 0.5.8
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics
-MASTER_SITES= SFJP
-MASTER_SITE_SUBDIR= separate-plus/47873
+MASTER_SITES= SFJP/separate-plus/47873
DISTNAME= ${PORTNAME}+-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/svgfig/Makefile b/graphics/svgfig/Makefile
index 09961d5b9ca8..8f1f86127983 100644
--- a/graphics/svgfig/Makefile
+++ b/graphics/svgfig/Makefile
@@ -4,17 +4,16 @@ PORTNAME= SVGFig
PORTVERSION= 1.1.6
PORTREVISION= 1
CATEGORIES= graphics python
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:tl}-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Draw mathematical figures in SVG using Python
WRKSRC= ${WRKDIR}/${PORTNAME:tl}
-USES= python
+USES= python tar:tgz
USE_PYTHON= distutils autoplist
post-patch:
diff --git a/graphics/tesseract-data/Makefile b/graphics/tesseract-data/Makefile
index 8d1646f44d8d..dd10a1c68b33 100644
--- a/graphics/tesseract-data/Makefile
+++ b/graphics/tesseract-data/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract-data
PORTVERSION= 3.02
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= ${TESSERACT_LANGS_300:O:u:S|$|.traineddata.gz|} \
${TESSERACT_LANGS_301:O:u:S|^|tesseract-ocr-3.01.|:S|$|.tar.gz|} \
${TESSERACT_LANGS_302:O:u:S|^|tesseract-ocr-3.02.|:S|$|.tar.gz|}
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index 900781e82b6d..159f95b26356 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tesseract
PORTVERSION= 3.02.02
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
DISTFILES= tesseract-ocr-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= bf@FreeBSD.org
diff --git a/graphics/timeless/Makefile b/graphics/timeless/Makefile
index 26a60588250d..95e06eab5f3c 100644
--- a/graphics/timeless/Makefile
+++ b/graphics/timeless/Makefile
@@ -5,8 +5,7 @@ PORTNAME= timeless
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= shaun
+MASTER_SITES= LOCAL/shaun
MAINTAINER= ports@FreeBSD.org
COMMENT= FreeBSD/SDL port of Tran's Timeless Demo with Sound
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index e0d2da437114..a38326a35a0c 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -5,11 +5,10 @@ PORTNAME= wmicons
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= graphics windowmaker
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
- ${MASTER_SITE_WINDOWMAKER} \
- ${MASTER_SITE_PORTS_JP} \
+MASTER_SITES= LOCAL/kiri/wmicons \
+ WINDOWMAKER/contrib/old/icons \
+ PORTS_JP \
http://www.itlb.te.noda.tus.ac.jp/~manome/wmaker/archive/
-MASTER_SITE_SUBDIR= . contrib/old/icons
DISTFILES= ${EXTRACT_ONLY} isiconpack4.tgz
EXTRACT_ONLY= DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz \
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index f0800aeb0103..21964a94f04e 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbmbrowser
PORTVERSION= 5.1
PORTREVISION= 3
CATEGORIES= graphics
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= utilities
+MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 35487175033d..4384e8aff1b9 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.3.1
PORTREVISION= 13
CATEGORIES= graphics
MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
- ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= apps/graphics/rays/pov
+ SUNSITE/apps/graphics/rays/pov
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface to POV-Ray
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index be623eb4dbd6..bf3026c9e395 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.17.0
PORTREVISION= 16
CATEGORIES= graphics
MASTER_SITES= DEBIAN
-MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
MAINTAINER= lichray@gmail.com
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index f49fc5924713..7593460185ad 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -6,9 +6,8 @@ PORTREVISION= 4
CATEGORIES= graphics print
MASTER_SITES= http://mirrors.rit.edu/zi/ \
ftp://ftp.foolabs.com/pub/xpdf/ \
- ${MASTER_SITE_TEX_CTAN} \
+ TEX_CTAN/support/xpdf \
http://komquats.com/distfiles/
-MASTER_SITE_SUBDIR= support/xpdf
MAINTAINER= cy@FreeBSD.org
COMMENT= Display PDF files and convert them to other formats
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 778f68969ab9..c2b368790bdb 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xwpick
PORTVERSION= 2.20
PORTREVISION= 2
CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=applications
+MASTER_SITES= XCONTRIB/applications
MAINTAINER= ports@FreeBSD.org
COMMENT= Image pick up utility for X Window System
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index cdb8b2f9e7f9..c5e55a70ab7b 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.2
PORTREVISION= 14
CATEGORIES= graphics www
MASTER_SITES= http://namazu.org/~satoru/zphoto/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Zooming photo album generator