aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/abuse_sdl/Makefile2
-rw-r--r--games/an/Makefile2
-rw-r--r--games/bugsx/Makefile3
-rw-r--r--games/cardpics/Makefile3
-rw-r--r--games/crafty-open-enormous/Makefile3
-rw-r--r--games/crafty-open-large/Makefile3
-rw-r--r--games/crafty-open-medium/Makefile3
-rw-r--r--games/dmjava/Makefile3
-rw-r--r--games/doom-freedoom/Makefile3
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/ensemblist/Makefile3
-rw-r--r--games/evq3/Makefile2
-rw-r--r--games/flying/Makefile3
-rw-r--r--games/fortunate/Makefile2
-rw-r--r--games/freeciv-sounds/Makefile2
-rw-r--r--games/freedink-data/Makefile3
-rw-r--r--games/freedink-dfarc/Makefile3
-rw-r--r--games/gnugo/Makefile3
-rw-r--r--games/gnushogi/Makefile.common3
-rw-r--r--games/gtypist/Makefile3
-rw-r--r--games/ifm/Makefile3
-rw-r--r--games/ishido/Makefile3
-rw-r--r--games/katawa-shoujo/Makefile2
-rw-r--r--games/libggz/bsd.ggz.mk5
-rw-r--r--games/libmaitretarot/Makefile3
-rw-r--r--games/libmt_client/Makefile3
-rw-r--r--games/linux-doom3/Makefile5
-rw-r--r--games/linux-enemyterritory-shrub/Makefile3
-rw-r--r--games/linux-enemyterritory/Makefile4
-rw-r--r--games/linux-etqw-demo-server/Makefile2
-rw-r--r--games/linux-etqw-server/Makefile2
-rw-r--r--games/linux-quake3-demo/Makefile2
-rw-r--r--games/linux-quake3/Makefile4
-rw-r--r--games/linux-quake4-demo/Makefile2
-rw-r--r--games/linux-quake4/Makefile4
-rw-r--r--games/linux-rtcw/Makefile3
-rw-r--r--games/linux-ut2003-demo/Makefile2
-rw-r--r--games/liquidwar/Makefile3
-rw-r--r--games/maitretarot/Makefile3
-rw-r--r--games/mt_dolphin_ia/Makefile3
-rw-r--r--games/mt_gtk_client/Makefile3
-rw-r--r--games/nehquake/Makefile3
-rw-r--r--games/nethack32/Makefile2
-rw-r--r--games/nethack34/Makefile4
-rw-r--r--games/oldrunner/Makefile3
-rw-r--r--games/oonsoo/Makefile3
-rw-r--r--games/p5-Acme-GuessNumber/Makefile3
-rw-r--r--games/pycadia/Makefile2
-rw-r--r--games/quake-data/Makefile4
-rw-r--r--games/quake-source/Makefile2
-rw-r--r--games/quake2-source/Makefile2
-rw-r--r--games/quake3/Makefile2
-rw-r--r--games/scummvm/Makefile1
-rw-r--r--games/senken/Makefile2
-rw-r--r--games/sokoban/Makefile3
-rw-r--r--games/supertux-devel/Makefile2
-rw-r--r--games/supertux/Makefile2
-rw-r--r--games/timeseal/Makefile3
-rw-r--r--games/tractorgen/Makefile1
-rw-r--r--games/tycho/Makefile3
-rw-r--r--games/wmquake/Makefile3
-rw-r--r--games/wolfpack/Makefile3
-rw-r--r--games/worldofpadman/Makefile2
-rw-r--r--games/xbat/Makefile3
-rw-r--r--games/xbattle/Makefile2
-rw-r--r--games/xblackjack/Makefile3
-rw-r--r--games/xboing/Makefile3
-rw-r--r--games/xbubble/Makefile2
-rw-r--r--games/xcubes/Makefile3
-rw-r--r--games/xdemineur/Makefile3
-rw-r--r--games/xdino/Makefile3
-rw-r--r--games/xhexagons/Makefile3
-rw-r--r--games/xisola/Makefile3
-rw-r--r--games/xjig/Makefile3
-rw-r--r--games/xjump/Makefile2
-rw-r--r--games/xkoules/Makefile2
-rw-r--r--games/xlaby/Makefile3
-rw-r--r--games/xmball/Makefile3
-rw-r--r--games/xmille/Makefile3
-rw-r--r--games/xmines/Makefile3
-rw-r--r--games/xmlink/Makefile3
-rw-r--r--games/xneko/Makefile3
-rw-r--r--games/xoct/Makefile3
-rw-r--r--games/xoids/Makefile3
-rw-r--r--games/xoj/Makefile3
-rw-r--r--games/xosmulti/Makefile3
-rw-r--r--games/xpanex/Makefile3
-rw-r--r--games/xpipeman/Makefile3
-rw-r--r--games/xpyraminx/Makefile3
-rw-r--r--games/xrubik/Makefile3
-rw-r--r--games/xshisen/Makefile3
-rw-r--r--games/xshogi/Makefile3
-rw-r--r--games/xskewb/Makefile3
-rw-r--r--games/xtic/Makefile3
-rw-r--r--games/xtriangles/Makefile3
-rw-r--r--games/xtruco/Makefile3
96 files changed, 101 insertions, 167 deletions
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index ec4f973340cc..7c124221071a 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -5,7 +5,7 @@ PORTNAME= abuse_sdl
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
http://abuse.zoy.org/raw-attachment/wiki/download/
DISTNAME= abuse-${DISTVERSION}
diff --git a/games/an/Makefile b/games/an/Makefile
index f4ac104fcb90..06cb8fca8a7d 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -5,7 +5,7 @@ PORTNAME= an
PORTVERSION= 0.95
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 0e0afc04dcfe..c92a2214a37c 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bugsx
PORTVERSION= 1.08
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= bugsx108
MAINTAINER= ports@FreeBSD.org
diff --git a/games/cardpics/Makefile b/games/cardpics/Makefile
index 8c8bb7507130..8fc6d1f4e1d1 100644
--- a/games/cardpics/Makefile
+++ b/games/cardpics/Makefile
@@ -4,8 +4,7 @@
PORTNAME= cardpics
PORTVERSION= 0.4
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Free cards for your free card games!
diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile
index 03bd914ce9de..4a9845f51542 100644
--- a/games/crafty-open-enormous/Makefile
+++ b/games/crafty-open-enormous/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-enormous
PORTVERSION= 20070924
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://www.cis.uab.edu/hyatt/crafty/pgn/
DISTFILES= enormous.zip
EXTRACT_ONLY= ${DISTFILES}
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 63b708251077..cf661416b863 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-large
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTFILES= large1.zip large2.zip large3.zip large4.zip
MAINTAINER= ports@FreeBSD.org
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index c450acacdfe7..bc4b61a81253 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -5,8 +5,7 @@ PORTNAME= crafty-open-medium
PORTVERSION= 20070909
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dd/crafty
+MASTER_SITES= LOCAL/dd/crafty
DISTNAME= medium
MAINTAINER= ports@FreeBSD.org
diff --git a/games/dmjava/Makefile b/games/dmjava/Makefile
index 7f2ebd4566f2..3d39c1933580 100644
--- a/games/dmjava/Makefile
+++ b/games/dmjava/Makefile
@@ -5,9 +5,8 @@ PORTNAME= dmjava
PORTVERSION= 1.05
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/oliver \
http://chaos.zpc.cz/files/
-MASTER_SITE_SUBDIR= oliver
DISTNAME= dmj${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
diff --git a/games/doom-freedoom/Makefile b/games/doom-freedoom/Makefile
index e3eed18479f7..b2b205406587 100644
--- a/games/doom-freedoom/Makefile
+++ b/games/doom-freedoom/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedoom
PORTVERSION= 0.7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-iwad
+MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTNAME}-iwad
PKGNAMEPREFIX= ${DMPKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-iwad-${PORTVERSION}
diff --git a/games/doom/Makefile b/games/doom/Makefile
index b6df2413fc97..6dccf7eec358 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -5,7 +5,7 @@ PORTNAME= doom
PORTVERSION= 1.10
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+MASTER_SITES= IDSOFTWARE/source
DISTNAME= doomsrc
MAINTAINER= ports@FreeBSD.org
diff --git a/games/ensemblist/Makefile b/games/ensemblist/Makefile
index d84b56ed9ba7..6b86d4f3a50b 100644
--- a/games/ensemblist/Makefile
+++ b/games/ensemblist/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ensemblist
PORTVERSION= 040126
PORTREVISION= 10
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Assemble given shapes from primitives
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 58ed7c4c5dda..7e218d7c3e4f 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -5,7 +5,7 @@ PORTNAME= evq3
PORTVERSION= 1.3.20080810
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|}
+MASTER_SITES= LOCAL/alepulver
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
pak-evq3.pk3 \
pak-5evq3.pk3
diff --git a/games/flying/Makefile b/games/flying/Makefile
index bd455b06f369..2a0d2dbd5e2c 100644
--- a/games/flying/Makefile
+++ b/games/flying/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flying
PORTVERSION= 6.20
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/arcade
+MASTER_SITES= SUNSITE/games/arcade
MAINTAINER= ports@FreeBSD.org
COMMENT= Pool/snooker/billiards/carrom/etc game
diff --git a/games/fortunate/Makefile b/games/fortunate/Makefile
index 15162ea800f8..8de6344043a3 100644
--- a/games/fortunate/Makefile
+++ b/games/fortunate/Makefile
@@ -4,7 +4,7 @@ PORTNAME= fortunate
PORTVERSION= 3.1
PORTREVISION= 4
CATEGORIES= games gnustep
-MASTER_SITES= ${MASTER_SITE_GNUSTEP_CH}
+MASTER_SITES= GNUSTEP_CH
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical front-end to the command-line BSD fortune
diff --git a/games/freeciv-sounds/Makefile b/games/freeciv-sounds/Makefile
index c2e399e4e43f..d94a8ec8956b 100644
--- a/games/freeciv-sounds/Makefile
+++ b/games/freeciv-sounds/Makefile
@@ -4,7 +4,7 @@
PORTNAME= freeciv
PORTVERSION= 3
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/
PKGNAMESUFFIX= -sounds
DISTNAME= stdsounds${DISTVERSION}
diff --git a/games/freedink-data/Makefile b/games/freedink-data/Makefile
index 71e21a452ef0..fb04355679d5 100644
--- a/games/freedink-data/Makefile
+++ b/games/freedink-data/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-data
PORTVERSION= 1.08.${PORTVER}
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
MAINTAINER= shurd@FreeBSD.org
COMMENT= Game data for games/freedink (Dink Smallwood)
diff --git a/games/freedink-dfarc/Makefile b/games/freedink-dfarc/Makefile
index dbae53253d4a..b06d1e96f5bb 100644
--- a/games/freedink-dfarc/Makefile
+++ b/games/freedink-dfarc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= freedink-dfarc
PORTVERSION= 3.12
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= freedink
+MASTER_SITES= GNU/freedink
DISTNAME= dfarc-${PORTVERSION}
MAINTAINER= shurd@FreeBSD.org
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 8fc242ed236e..53ab9b3523bf 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gnugo
PORTVERSION= 3.8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= gnugo
+MASTER_SITES= GNU
MAINTAINER= spcoltri@omcl.org
COMMENT= The game of Go
diff --git a/games/gnushogi/Makefile.common b/games/gnushogi/Makefile.common
index 13278ffb7b90..c1cde15337f2 100644
--- a/games/gnushogi/Makefile.common
+++ b/games/gnushogi/Makefile.common
@@ -4,9 +4,8 @@
GNUSHOGI_PORTNAME= gnushogi
GNUSHOGI_PORTVERSION= 1.4.0
-GNUSHOGI_MASTER_SITES= ${MASTER_SITE_GNU}
+GNUSHOGI_MASTER_SITES= GNU/${GNUSHOGI_PORTNAME}
GNUSHOGI_DISTNAME= ${GNUSHOGI_PORTNAME}-${GNUSHOGI_PORTVERSION}
-GNUSHOGI_MASTER_SITE_SUBDIR= ${GNUSHOGI_PORTNAME}
USES= tar:bzip2
DISTINFO_FILE= ${.CURDIR}/../../games/gnushogi/distinfo
diff --git a/games/gtypist/Makefile b/games/gtypist/Makefile
index 3261e2b57b84..248003dd38ca 100644
--- a/games/gtypist/Makefile
+++ b/games/gtypist/Makefile
@@ -3,8 +3,7 @@
PORTNAME= gtypist
PORTVERSION= 2.9.5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNU
MAINTAINER= naddy@FreeBSD.org
COMMENT= Interactive typing tutor
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 61450df6bc92..e54e53384f07 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ifm
PORTVERSION= 5.4
CATEGORIES= games tk
-MASTER_SITES= http://www.ifarchive.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= if-archive/mapping-tools
+MASTER_SITES= http://www.ifarchive.org/if-archive/mapping-tools/
MAINTAINER= akosela@andykosela.com
COMMENT= Interactive Fiction mapper and walkthrough generator
diff --git a/games/ishido/Makefile b/games/ishido/Makefile
index ee446d26a99c..3094283c7350 100644
--- a/games/ishido/Makefile
+++ b/games/ishido/Makefile
@@ -5,8 +5,7 @@ PORTNAME= ishido
PORTVERSION= 1.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= obrien
+MASTER_SITES= LOCAL/obrien
MAINTAINER= ports@FreeBSD.org
COMMENT= Tile placement game
diff --git a/games/katawa-shoujo/Makefile b/games/katawa-shoujo/Makefile
index 4a267f136a60..acb89c3d15a6 100644
--- a/games/katawa-shoujo/Makefile
+++ b/games/katawa-shoujo/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 1.3
DISTVERSIONSUFFIX=-[linux-x86][FCF758CC]
CATEGORIES= games
MASTER_SITES= http://dl.katawa-shoujo.com/gold_${PORTVERSION}/:game \
- GENTOO/distfiles:icon
+ GENTOO:icon
DISTFILES= [4ls]_${PORTNAME:S|-|_|}_${PORTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:game \
${PORTNAME}-48.png:icon \
${PORTNAME}-256.png:icon
diff --git a/games/libggz/bsd.ggz.mk b/games/libggz/bsd.ggz.mk
index d4d94d584480..3ef94ffc6cb0 100644
--- a/games/libggz/bsd.ggz.mk
+++ b/games/libggz/bsd.ggz.mk
@@ -5,9 +5,8 @@
GGZ_VERSION= 0.0.14.1
MASTER_SITES= \
- http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \
- http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
+ http://mirrors.dotsrc.org/ggzgamingzone/ggz/${PORTVERSION}/ \
+ http://ftp.ggzgamingzone.org/pub/ggz/${PORTVERSION}/
DIST_SUBDIR= ggz
# components section
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 33fbe6d16fed..a9d7327e3761 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmaitretarot
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Core library of MaitreTarot, a Tarot card game
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index 89b3d901fa9b..d945aa5c8090 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= libmt_client
PORTVERSION= 0.1.98
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Client-side library of MaitreTarot, a Tarot card game
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index 51de889a017a..4f538f87c4c2 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -5,8 +5,7 @@ PORTNAME= doom3
PORTVERSION= 1.3.1.1304
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= doom3/linux
+MASTER_SITES= IDSOFTWARE/doom3/linux
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-linux-${PORTVERSION}.x86
EXTRACT_SUFX= .run
@@ -29,7 +28,7 @@ SUB_FILES= doom3 doom3-ded pkg-message pkg-deinstall
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNO_CDKEY}
-MASTER_SITE_SUBDIR= doom3/linux/old
+MASTER_SITES= IDSOFTWARE/doom3/linux/old
PORTVERSION= 1.1.1286
PORTEPOCH= 0
PLIST_SUB+= NEW="@comment "
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 48e2231b3de6..8a4acb7ed8ce 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -5,8 +5,7 @@ PORTNAME= shrub
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
PKGNAMEPREFIX= linux-enemyterritory-
DISTNAME= 1.2-test13-l
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index a5a0f5c5835e..6425073ff0ef 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -5,8 +5,8 @@ PORTNAME= enemyterritory
PORTVERSION= 2.60b
PORTREVISION= 3
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|et/:patch|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|et/linux/:full|}
+MASTER_SITES= IDSOFTWARE/et/:patch \
+ IDSOFTWARE/et/linux/:full
PKGNAMEPREFIX= linux-
DISTNAME= et-linux-2.60b.x86
DISTFILES= et-linux-2.60.x86.run:full ET-2.60b.zip:patch
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index 1f3d1c7e1ed9..b9c8da4893e1 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -4,7 +4,7 @@
PORTNAME= etqw
PORTVERSION= 2.0.r1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+MASTER_SITES= IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo-server
DISTNAME= ETQW-demo2-server-full.r1.x86
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index fe8fe499bff6..ebd2eb7b6b50 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= games linux
MASTER_SITES= http://ftp.4players.de/pub/hosted/wolfenstein/users/etqw/server/ \
ftp://ftp0.uk.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
ftp://ftp0.nl.multiplay.co.uk/pub/games/fps/enemyterritory_quakewars/server/linux/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|etqw/|}
+ IDSOFTWARE/etqw
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -server
DISTNAME= ETQW${PKGNAMESUFFIX}-1.5-full.x86
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index ca75854b6cb2..64091054c5bc 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake3
DISTVERSION= 1.11-6
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= linuxq3ademo-${DISTVERSION}.x86
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index d5b2867b9b17..5563c6bdd9aa 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -4,8 +4,8 @@
PORTNAME= quake3
PORTVERSION= 1.32c
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake3/linux/:data|} \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake3/:patch|}
+MASTER_SITES= IDSOFTWARE/quake3/linux/:data \
+ IDSOFTWARE/quake3/:patch
PKGNAMEPREFIX= linux-
DISTFILES= ${Q3DATAFILE}:data \
${Q3PATCHFILE}:patch
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index c32c76bda4d3..78185c8b537a 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -5,7 +5,7 @@ PORTNAME= quake4
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= games linux
-MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO/distfiles
+MASTER_SITES= IDSOFTWARE/${PORTNAME}/demo GENTOO
PKGNAMEPREFIX= linux-
PKGNAMESUFFIX= -demo
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}${PKGNAMESUFFIX}.x86
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 8229e700d1c4..c9fd30632e08 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -6,8 +6,8 @@ PORTVERSION= 1.4.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/|} \
- ${MASTER_SITE_GENTOO:S|$|distfiles/|}
+MASTER_SITES= IDSOFTWARE/quake4/linux/ \
+ GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 55fe0a05fc4b..ffcfd24e36fb 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -5,8 +5,7 @@ PORTNAME= rtcw
DISTVERSION= 1.41b
PORTREVISION= 2
CATEGORIES= games linux
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= wolf/linux
+MASTER_SITES= IDSOFTWARE/wolf/linux
PKGNAMEPREFIX= linux-
DISTNAME= wolf-linux-${DISTVERSION}.x86
EXTRACT_SUFX= .run
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index 6b15126b0207..a0ef2d21a5ad 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= ut2003-demo
PORTVERSION= 2206
CATEGORIES= games linux
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
PKGNAMEPREFIX= linux-
DISTNAME= ut2003demo-lnx-${PORTVERSION}
EXTRACT_SUFX= .sh.bin
diff --git a/games/liquidwar/Makefile b/games/liquidwar/Makefile
index ae2387660389..5b7830373d53 100644
--- a/games/liquidwar/Makefile
+++ b/games/liquidwar/Makefile
@@ -6,9 +6,8 @@ PORTVERSION= 5.6.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://liquidwar.sunsite.dk/archive/ \
- ${MASTER_SITE_SAVANNAH} \
+ SAVANNAH \
http://ufoot.hd.free.fr/pub/archive/
-MASTER_SITE_SUBDIR= liquidwar
MAINTAINER= edwin@mavetju.org
COMMENT= You control an army of liquid and have to try and eat your opponents
diff --git a/games/maitretarot/Makefile b/games/maitretarot/Makefile
index 00258e6420d3..acefe998fdd9 100644
--- a/games/maitretarot/Makefile
+++ b/games/maitretarot/Makefile
@@ -5,8 +5,7 @@ PORTNAME= maitretarot
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= thierry@FreeBSD.org
COMMENT= Server side of MaitreTarot, a Tarot card game
diff --git a/games/mt_dolphin_ia/Makefile b/games/mt_dolphin_ia/Makefile
index a7f2784543fe..b91c192640ea 100644
--- a/games/mt_dolphin_ia/Makefile
+++ b/games/mt_dolphin_ia/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_dolphin_ia
PORTVERSION= 0.1.98
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= Basic AI for MaitreTarot, a Tarot card game
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index dbed834954d8..50df3fc4b9f4 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mt_gtk_client
PORTVERSION= 0.1.98
PORTREVISION= 11
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= maitretarot
+MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
COMMENT= GTK+ client for MaitreTarot, a Tarot card game
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index 79e1e32e94b8..fc7829888ffc 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -5,8 +5,7 @@ PORTNAME= nehquake
PORTVERSION= 1.0
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= NehQuake-bjp-bin-src.linux
MAINTAINER= ports@FreeBSD.org
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index eb69d33ac504..3c817b29e8f9 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= SF/${TRUEPORTNAME}/${TRUEPORTNAME}/3.2.2
DISTNAME= nethack-322
-PATCH_SITES= ${MASTER_SITE_SOURCEFORGE:C/%SUBDIR%/${TRUEPORTNAME}\/${TRUEPORTNAME}\/${PORTVERSION}/}
+PATCH_SITES= SOURCEFORGE/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
PATCHFILES= nh-3.2.2-3.2.3.diff
MAINTAINER= glewis@FreeBSD.org
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 4b8121fe5a98..e5f25f2901b8 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -53,13 +53,13 @@ CFLAGS+= -DMENU_COLOR_REGEX_POSIX
.if defined(WITH_STATUSCOLORS)
PATCHFILES+= nh343-statuscolors.fixed.patch
PATCH_SITES+= http://jdc.koitsu.org/nethack/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
.endif
.if defined(WITH_HPMON)
PATCHFILES+= hpmon.diff
PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \
- ${MASTER_SITE_LOCAL:S|%SUBDIR%|wxs|}
+ LOCAL/wxs
PATCH_DIST_STRIP= -p1
CFLAGS+= -DHPMON
.endif
diff --git a/games/oldrunner/Makefile b/games/oldrunner/Makefile
index 897294c153a5..9849dc1565c4 100644
--- a/games/oldrunner/Makefile
+++ b/games/oldrunner/Makefile
@@ -4,8 +4,7 @@
PORTNAME= oldrunner
PORTVERSION= 20120131
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= culot
+MASTER_SITES= LOCAL/culot
MAINTAINER= culot@FreeBSD.org
COMMENT= Textmode remake of Broderbund's LodeRunner
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index 662a5224b12a..6811c1a71819 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -5,9 +5,8 @@ PORTNAME= oonsoo
PORTVERSION= 1.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/solitaires \
http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/
-MASTER_SITE_SUBDIR= games/solitaires
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/games/p5-Acme-GuessNumber/Makefile b/games/p5-Acme-GuessNumber/Makefile
index f34ab8016302..0e6539843b87 100644
--- a/games/p5-Acme-GuessNumber/Makefile
+++ b/games/p5-Acme-GuessNumber/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Acme-GuessNumber
PORTVERSION= 0.04
PORTREVISION= 1
CATEGORIES= games perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Locale/IMACAT
+MASTER_SITES= CPAN/Locale/IMACAT
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/games/pycadia/Makefile b/games/pycadia/Makefile
index ca247f966dc4..d006c3c939f2 100644
--- a/games/pycadia/Makefile
+++ b/games/pycadia/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pycadia
PORTVERSION= 0.5.1
PORTREVISION= 6
CATEGORIES= games python
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/games/
DIST_SUBDIR= python
diff --git a/games/quake-data/Makefile b/games/quake-data/Makefile
index 31f1c08083b8..7867d8f93190 100644
--- a/games/quake-data/Makefile
+++ b/games/quake-data/Makefile
@@ -38,7 +38,7 @@ PLIST_FILES+= %%DATADIR%%/id1/pak1.pak
.endif
.if ${PORT_OPTIONS:MQW_DATA} || ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= ${PROGFILE}:qw
EXTRACT_ONLY+= ${PROGFILE}
COMMENT:= ${COMMENT:S,Quake,& and &World,}
@@ -48,7 +48,7 @@ PLIST_SUB+= QUAKEWORLD="@comment "
.endif
.if ${PORT_OPTIONS:MQW_SKINS}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/skins/:skins|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/skins/:skins
DISTFILES+= ${SKINFILES:S/$/:skins/}
PLIST_SUB+= QUAKEWORLD_SKINS=""
COMMENT+= and skins
diff --git a/games/quake-source/Makefile b/games/quake-source/Makefile
index ce553a881142..fa5c9d98ace6 100644
--- a/games/quake-source/Makefile
+++ b/games/quake-source/Makefile
@@ -26,7 +26,7 @@ QUAKEWORLD_DESC= Install QuakeWorld game source
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MQUAKEWORLD}
-MASTER_SITES+= ${MASTER_SITE_IDSOFTWARE:S|$|quakeworld/unix/:qw|}
+MASTER_SITES+= IDSOFTWARE/quakeworld/unix/:qw
DISTFILES+= qwsv-2.30-glibc-i386-unknown-linux2.0${EXTRACT_SUFX}:qw
COMMENT:= ${COMMENT:S/Quake/& and QuakeWorld/}
PLIST_SUB+= QUAKEWORLD=""
diff --git a/games/quake2-source/Makefile b/games/quake2-source/Makefile
index ec91bc9fc443..037fb918de68 100644
--- a/games/quake2-source/Makefile
+++ b/games/quake2-source/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 3.21
PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://offload1.icculus.org/quake2/files/:icc \
- ${MASTER_SITE_IDSOFTWARE:S|$|quake2/source/:id|}
+ IDSOFTWARE/quake2/source/:id
PKGNAMEPREFIX= quake2-
DISTNAME= quake2-r0.16.2
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:icc
diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index c2169387c04f..cc95ade64234 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= ftp://mancubus.net/pub/idgames/idstuff/source/ \
http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
http://www.gamers.org/pub/idgames/idstuff/source/ \
- ${MASTER_SITE_IDSOFTWARE:S|$|source/|}
+ IDSOFTWARE/source/
DISTNAME= ${PORTNAME}-${REALVERSION}-source
MAINTAINER= shirshegsm@gmail.com
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 2eb63bf7af2b..1cf8464b85fa 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -6,7 +6,6 @@ DISTVERSION= 1.7.0
PORTREVISION= 3
CATEGORIES= games emulators
MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= Interpreter for several adventure games
diff --git a/games/senken/Makefile b/games/senken/Makefile
index ccaf3f6133e3..8f18cc0b2347 100644
--- a/games/senken/Makefile
+++ b/games/senken/Makefile
@@ -5,7 +5,7 @@ PORTNAME= senken
PORTVERSION= 0.3.0
PORTREVISION= 15
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= City simulation game
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index 7df317bac0bd..d6974081aa50 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sokoban
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}-src
MAINTAINER= lifanov@mail.lifanov.com
diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile
index 4f2ffda505e7..f912f366504d 100644
--- a/games/supertux-devel/Makefile
+++ b/games/supertux-devel/Makefile
@@ -4,7 +4,7 @@ PORTNAME= supertux
PORTVERSION= 0.3.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
PKGNAMESUFFIX= -devel
MAINTAINER= makc@FreeBSD.org
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 06f023331ade..84d04cbaf8d7 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -5,7 +5,7 @@ PORTNAME= supertux
PORTVERSION= 0.1.3
PORTREVISION= 12
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= makc@FreeBSD.org
COMMENT= Side-scroller game similar to Super Mario Brothers
diff --git a/games/timeseal/Makefile b/games/timeseal/Makefile
index 441b9247f4d6..02509db6bf78 100644
--- a/games/timeseal/Makefile
+++ b/games/timeseal/Makefile
@@ -4,8 +4,7 @@
PORTNAME= timeseal
PORTVERSION= 1.0
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jylefort
+MASTER_SITES= LOCAL/jylefort
DISTFILES= timeseal.BSD386-1.0-i386
EXTRACT_ONLY=
diff --git a/games/tractorgen/Makefile b/games/tractorgen/Makefile
index 2750b06db145..8e76501d38d2 100644
--- a/games/tractorgen/Makefile
+++ b/games/tractorgen/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.31.7
PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.vergenet.net/~conrad/software/tractorgen/dl/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= robin@15augustus.nl
COMMENT= Generates ASCII tractors
diff --git a/games/tycho/Makefile b/games/tycho/Makefile
index 7b41357ec687..fe2ea4a5799a 100644
--- a/games/tycho/Makefile
+++ b/games/tycho/Makefile
@@ -4,8 +4,7 @@
PORTNAME= tycho
PORTVERSION= 0.1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alepulver
+MASTER_SITES= LOCAL/alepulver
DISTNAME= redcoder
MAINTAINER= ports@FreeBSD.org
diff --git a/games/wmquake/Makefile b/games/wmquake/Makefile
index da44fd88b8c2..ba304ca7f62c 100644
--- a/games/wmquake/Makefile
+++ b/games/wmquake/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= uqs
+ LOCAL/uqs
MAINTAINER= ports@FreeBSD.org
COMMENT= Id Software's Quake I in a 64x64 WM dockapp window
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index 002b7fa13a49..a6d7ec5e5f07 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= wolfpack
PORTVERSION= 4.3.32
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= empserver/${DISTNAME}
+MASTER_SITES= SF/empserver/${DISTNAME}
DISTNAME= empire-${PORTVERSION}
MAINTAINER= johans@FreeBSD.org
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index 3c108f852f7e..89b954a1d941 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.2.20080621
PORTREVISION= 12
CATEGORIES= games
MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \
- ${MASTER_SITE_LOCAL:S|$|alepulver/:source|}
+ LOCAL/alepulver/:source
DISTFILES= worldofpadman.run:full \
wop_patch_1_2.run:update \
${SRC_FILE}.tar.bz2:source
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index a43e0da5639e..f26ce82ded4a 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xbat
PORTVERSION= 1.11
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
DISTNAME= xev111
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index ce7df87cf5c4..591982d98ef7 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbattle
PORTVERSION= 5.4.1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles \
+MASTER_SITES= GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
${PORTNAME}_icons${EXTRACT_SUFX}:icons
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 3339d921168e..e9ef53ff0253 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xblackjack
PORTVERSION= 2.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X11/Motif blackjack game
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index cbdb4ebe98b0..9b32ff53af81 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xboing
PORTVERSION= 2.4
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 8f9bdeb2c11a..ae79f2b5ba7e 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xbubble
PORTVERSION= 0.5.8
PORTREVISION= 7
CATEGORIES= games
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle Bobble clone for Unix/X11 platforms
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index e4678a28f3ae..e6ac777bb6d5 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xcubes
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Cube puzzle for X11
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index adb7339f0f72..23ab69964003 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xdemineur
PORTVERSION= 2.1.1
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
+MASTER_SITES= XCONTRIB/games \
http://www.babafou.eu.org/xdemineur/
-MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
COMMENT= Another minesweeper game for the X Window System
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 64c313b0c954..3ff551ed9856 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xdino
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Dino puzzle game for X11
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 7fbe7c56e116..ec5b88706b71 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xhexagons
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index c6285cf85396..d159ecc97edb 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xisola
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple board game for X Window System
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 739f8f853cd8..dac0ec69ad63 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xjig
PORTVERSION= 2.4
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= Jigsaw puzzle game for X11
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index b0dca2dba32e..d37b41f5dc34 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xjump
PORTVERSION= 2.7.5
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 34ec6ee4e1c5..8877079d680c 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.4
PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.ucw.cz/~hubicka/koules/packages/ \
- GENTOO/distfiles \
+ GENTOO \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/:icons
DISTFILES= ${PORTNAME:S/x//}${PORTVERSION}-src${EXTRACT_SUFX} \
${PORTNAME:S/x//}.png:icons
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index 3ede391545c3..343b2ca844e7 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -5,9 +5,8 @@ PORTNAME= xlaby
PORTVERSION= 2.0.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+MASTER_SITES= SUNSITE/games/strategy \
ftp://quatramaran.ens.fr/pub/madore/xlaby/
-MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= ports@FreeBSD.org
COMMENT= Daemonic X Labyrinth played directly with the mouse pointer
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 39ff0c57c17d..4093c4ab5a51 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmball
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Masterball puzzle for X Window System
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 4cff8ab4d026..2e59e05d728c 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmille
PORTVERSION= 2.0
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= XCONTRIB
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index 0b1bcf10df75..471794d6fcbb 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmines
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 696ec9a88c44..4131d63435fb 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xmlink
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Missing Link puzzle for X Window System
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index ed3f8877f6db..04832c9d18b6 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.0
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index aa4e4c5c1842..4383136bb0a7 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoct
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Oct puzzle for X Window System
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 2c8e1dc5b66d..8fd94af7e34e 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoids
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
MAINTAINER= ports@FreeBSD.org
COMMENT= X Window Asteroids style game with full color pixmaps
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index c07502283c3c..1f466f81130a 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xoj
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/demos
+MASTER_SITES= SUNSITE/X11/demos
MAINTAINER= ports@FreeBSD.org
COMMENT= O. J. Simpson Simulator root window demo
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 428edd55685b..1edb3866e3c9 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xosmulti
PORTVERSION= 1.00
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= flathill
+MASTER_SITES= LOCAL/flathill
DISTNAME= ${PORTNAME}_${PORTVERSION}_tar
EXTRACT_SUFX= .gz
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index c553c8f55cdf..da8d5d8a0783 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpanex
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Panex puzzle for X Window System
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index a1062c97e43f..b9e6cb0e18ec 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpipeman
PORTVERSION= 1.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= SUNSITE
-MASTER_SITE_SUBDIR= games/strategy
+MASTER_SITES= SUNSITE/games/strategy
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index 7f8a3da4ca89..e41d11ed5dab 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xpyraminx
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Pyraminx puzzle for X Window System
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index d6da8b88e483..3bb5fa51ca65 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xrubik
PORTVERSION= 5.5.2
PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= X-based rubik's cube(tm)
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index d0b605321fc1..ca8aefaa2a00 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xshisen
PORTVERSION= 1.51
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= hrs
+MASTER_SITES= LOCAL/hrs
MAINTAINER= turutani@scphys.kyoto-u.ac.jp
COMMENT= Shisen-sho puzzle game for X11
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index c680a97ddc93..aa1a1d4ff7a5 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -4,8 +4,7 @@
PORTNAME= xshogi
PORTVERSION= 1.4.2
CATEGORIES= games
-MASTER_SITES= GNU
-MASTER_SITE_SUBDIR= gnushogi
+MASTER_SITES= GNU/gnushogi
MAINTAINER= johans@FreeBSD.org
COMMENT= Japanese chess-like game for X Window System
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 32c2a505c5a7..700fb7441403 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xskewb
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Skewb puzzle (similar to Rubik's Cube) for X Window
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index e9cb756a4dfa..33101d6e8e66 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtic
PORTVERSION= 1.12
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index db0ba2bbc6dc..3bd32cb6ad12 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtriangles
PORTVERSION= 5.5.2
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games/xpuzzles
+MASTER_SITES= XCONTRIB/games/xpuzzles
MAINTAINER= ports@FreeBSD.org
COMMENT= Triangles puzzle
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index aaca49e2b0ea..ce19ba4825bb 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xtruco
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= games
+MASTER_SITES= XCONTRIB/games
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org