aboutsummaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
Diffstat (limited to 'games')
-rw-r--r--games/3dc/Makefile2
-rw-r--r--games/3dc/files/patch-aa4
-rw-r--r--games/3dpong/Makefile4
-rw-r--r--games/BillardGL/Makefile8
-rw-r--r--games/BillardGL/files/patch-Makefile4
-rw-r--r--games/BillardGL/files/patch-Namen.h2
-rw-r--r--games/CaribbeanStud/files/patch-Xmakefile4
-rw-r--r--games/KnightCap/files/patch-aa6
-rw-r--r--games/abuse_sdl/Makefile6
-rw-r--r--games/actx/Makefile2
-rw-r--r--games/adom/Makefile2
-rw-r--r--games/affenspiel/Makefile4
-rw-r--r--games/airrox/files/patch-Makefile4
-rw-r--r--games/alephone/Makefile7
-rw-r--r--games/amphetamine/files/patch-aa6
-rw-r--r--games/annelid/Makefile4
-rw-r--r--games/annelid/files/patch-Makefile4
-rw-r--r--games/apoolGL/Makefile2
-rw-r--r--games/aqbubble/Makefile4
-rw-r--r--games/armagetron/Makefile7
-rw-r--r--games/atitd/Makefile2
-rw-r--r--games/atomix/Makefile3
-rw-r--r--games/atr3d/Makefile6
-rw-r--r--games/barrage/Makefile5
-rw-r--r--games/battalion/files/patch-aa4
-rw-r--r--games/battleball/Makefile6
-rw-r--r--games/bfm/files/patch-Rules.make.in2
-rw-r--r--games/blobandconquer/files/patch-makefile4
-rw-r--r--games/bloboats/files/patch-Makefile4
-rw-r--r--games/blockade/files/patch-aa4
-rw-r--r--games/blokish/Makefile6
-rw-r--r--games/bloodfrontier/files/patch-src_Makefile4
-rw-r--r--games/bogged/Makefile3
-rw-r--r--games/bomb/Makefile4
-rw-r--r--games/bomberclone/Makefile5
-rw-r--r--games/bombermaze/Makefile6
-rw-r--r--games/boswars/Makefile6
-rw-r--r--games/bubbros/Makefile2
-rw-r--r--games/bumprace/Makefile4
-rw-r--r--games/burgerspace/Makefile4
-rw-r--r--games/bygfoot/Makefile5
-rw-r--r--games/cake/files/patch-Makefile4
-rw-r--r--games/ceferino/Makefile4
-rw-r--r--games/cgoban2/Makefile3
-rw-r--r--games/chanta/Makefile4
-rw-r--r--games/chromium-bsu/Makefile10
-rw-r--r--games/chromium/Makefile10
-rw-r--r--games/clanbomber/Makefile6
-rw-r--r--games/cleanq3/files/patch-code-unix-Makefile4
-rw-r--r--games/columns/Makefile3
-rw-r--r--games/connectfive/Makefile9
-rw-r--r--games/construo/Makefile6
-rw-r--r--games/crack-attack/Makefile8
-rw-r--r--games/criticalmass/Makefile9
-rw-r--r--games/crossfire-client/Makefile6
-rw-r--r--games/cube/files/patch-Makefile4
-rw-r--r--games/cultivation/files/patch-Makefile.GnuLinux4
-rw-r--r--games/d2x/Makefile4
-rw-r--r--games/daimonin-client/Makefile6
-rw-r--r--games/daimonin/Makefile6
-rw-r--r--games/dangerdeep/Makefile2
-rw-r--r--games/deng/Makefile4
-rw-r--r--games/diameter/Makefile6
-rw-r--r--games/djgame2/Makefile4
-rw-r--r--games/doom/Makefile9
-rw-r--r--games/doom/files/patch-ab4
-rw-r--r--games/doomlegacy/Makefile2
-rw-r--r--games/dopewars/Makefile3
-rw-r--r--games/dsnake/Makefile2
-rw-r--r--games/duel/Makefile8
-rw-r--r--games/eboard/Makefile4
-rw-r--r--games/eduke32/Makefile4
-rw-r--r--games/egl/files/patch-makefile8
-rw-r--r--games/el/files/patch-Makefile.bsdg4
-rw-r--r--games/ember/Makefile6
-rw-r--r--games/enigma/Makefile2
-rw-r--r--games/ensemblist/files/patch-Makefile4
-rw-r--r--games/etuxracer/Makefile9
-rw-r--r--games/evq3/Makefile6
-rw-r--r--games/excido/files/patch-Makefile4
-rw-r--r--games/exult/Makefile8
-rw-r--r--games/ezquake/files/patch-Makefile2
-rw-r--r--games/falconseye/Makefile5
-rw-r--r--games/falconseye/files/patch-sys_unix_Makefile_src4
-rw-r--r--games/falconseye/files/x-config4
-rw-r--r--games/fgfs-base/Makefile3
-rw-r--r--games/fgsd/Makefile18
-rw-r--r--games/fkiss/Makefile4
-rw-r--r--games/flightgear-aircraft/Makefile5
-rw-r--r--games/flightgear-aircrafts/Makefile5
-rw-r--r--games/flightgear-atlas/Makefile21
-rw-r--r--games/flightgear-atlas/pkg-plist1
-rw-r--r--games/flightgear-data/Makefile3
-rw-r--r--games/flightgear-mb339-pan/Makefile4
-rw-r--r--games/flightgear/Makefile18
-rw-r--r--games/foobillard/Makefile6
-rw-r--r--games/freeciv/Makefile2
-rw-r--r--games/freesci/Makefile3
-rw-r--r--games/fuhquake/Makefile6
-rw-r--r--games/fuhquake/files/Makefile8
-rw-r--r--games/fuhquake/files/patch-mp3_player.c2
-rw-r--r--games/galaxymage/Makefile2
-rw-r--r--games/galaxymage/files/patch-src_Translate.py2
-rw-r--r--games/gcompris/Makefile7
-rw-r--r--games/geki2/Makefile7
-rw-r--r--games/geki3/Makefile7
-rw-r--r--games/gemdropx/Makefile3
-rw-r--r--games/ggz-sdl-games/Makefile6
-rw-r--r--games/gillo/Makefile11
-rw-r--r--games/gillo/files/patch-Jamrules2
-rw-r--r--games/gillo/files/patch-src_Jamfile2
-rw-r--r--games/gl-117/Makefile12
-rw-r--r--games/glasteroids/Makefile7
-rw-r--r--games/glasteroids/files/Makefile.FreeBSD4
-rw-r--r--games/glaxium/Makefile2
-rw-r--r--games/glbsp/files/patch-GUI_unx.mak4
-rw-r--r--games/glife/Makefile6
-rw-r--r--games/glmaze/files/patch-Makefile4
-rw-r--r--games/glob2/Makefile6
-rw-r--r--games/glpuzzle/Makefile6
-rw-r--r--games/gltron/Makefile9
-rw-r--r--games/gnmm/Makefile6
-rw-r--r--games/gno3dtet/Makefile3
-rw-r--r--games/gnome-games-extra-data/Makefile2
-rw-r--r--games/gnome-games/Makefile2
-rw-r--r--games/gnomeattacks/Makefile6
-rw-r--r--games/gnomebreakout/Makefile3
-rw-r--r--games/gnomechess/Makefile3
-rw-r--r--games/gnomermind/Makefile6
-rw-r--r--games/gnomesudoku/Makefile12
-rw-r--r--games/gnurobots/Makefile5
-rw-r--r--games/golddig/files/patch-ad4
-rw-r--r--games/goonies/files/patch-build-linux-Makefile4
-rw-r--r--games/gracer/Makefile15
-rw-r--r--games/grande/Makefile7
-rw-r--r--games/gretools/Makefile3
-rw-r--r--games/gtetrinet/Makefile3
-rw-r--r--games/gtkabale/Makefile3
-rw-r--r--games/gtkatlantic/Makefile3
-rw-r--r--games/gtkpool/Makefile3
-rw-r--r--games/gtkradiant/files/patch-SConstruct6
-rw-r--r--games/gtktetcolor/Makefile3
-rw-r--r--games/gturing/Makefile3
-rw-r--r--games/gweled/Makefile3
-rw-r--r--games/heretic/files/patch-aa4
-rw-r--r--games/heroes/Makefile3
-rw-r--r--games/hex/Makefile3
-rw-r--r--games/hexxagon/Makefile3
-rw-r--r--games/hohlin/Makefile2
-rw-r--r--games/icbm3d/Makefile4
-rw-r--r--games/icbm3d/files/patch-aa6
-rw-r--r--games/imaze/Makefile5
-rw-r--r--games/ioquake3/files/patch-Makefile4
-rw-r--r--games/iourbanterror/files/patch-Makefile2
-rw-r--r--games/jfduke3d/Makefile5
-rw-r--r--games/jigzo/Makefile6
-rw-r--r--games/joequake/files/patch-Makefile.linux12
-rw-r--r--games/kiki/Makefile12
-rw-r--r--games/kmquake2/files/patch-Makefile4
-rw-r--r--games/libdungeonmaker/Makefile5
-rw-r--r--games/libfov/Makefile5
-rw-r--r--games/libmaitretarot/Makefile2
-rw-r--r--games/libmt_client/Makefile2
-rw-r--r--games/libshhcards/Makefile5
-rw-r--r--games/libshhcards/files/Makefile.lib2
-rw-r--r--games/lincity-ng/Makefile3
-rw-r--r--games/linux-goodway/Makefile10
-rw-r--r--games/linux-ssamtse/Makefile4
-rw-r--r--games/linux-steam/Makefile2
-rw-r--r--games/linux-ut2003-demo/Makefile2
-rw-r--r--games/linux-ut2004-demo/Makefile2
-rw-r--r--games/linux-virtual-jay-peak/Makefile2
-rw-r--r--games/linux-x-plane-net-installer/Makefile2
-rw-r--r--games/linux-x-plane/Makefile2
-rw-r--r--games/macopix/Makefile2
-rw-r--r--games/maelstrom/Makefile5
-rw-r--r--games/maelstrom/files/Makeflags4
-rw-r--r--games/mangband/files/patch-ab4
-rw-r--r--games/marsnomercy/Makefile2
-rw-r--r--games/marsnomercy/files/patch-SConstruct6
-rw-r--r--games/merlin/Makefile3
-rw-r--r--games/mindfocus/Makefile2
-rw-r--r--games/mindguard/Makefile10
-rw-r--r--games/mindguard/files/patch-aa2
-rw-r--r--games/mindguard/files/patch-ab2
-rw-r--r--games/mirrormagic/Makefile2
-rw-r--r--games/monster-masher/Makefile3
-rw-r--r--games/nehquake/files/patch-Makefile4
-rw-r--r--games/nethack32/files/patch-ab4
-rw-r--r--games/nethack33/files/patch-ad4
-rw-r--r--games/nethack34/files/patch-ad4
-rw-r--r--games/netrek-BRMH-bin/Makefile3
-rw-r--r--games/netrek-COW3-bin/Makefile3
-rw-r--r--games/newvox/Makefile3
-rw-r--r--games/nexuiz/Makefile9
-rw-r--r--games/nighthawk/Makefile4
-rw-r--r--games/noegnud-littlehack/files/noegnud-littlehack.patch4
-rw-r--r--games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch4
-rw-r--r--games/noegnud-nethack/files/noegnud-nethack.patch4
-rw-r--r--games/noegnud-slashem/files/noegnud-slashem.patch8
-rw-r--r--games/oolite/files/patch-makefile6
-rw-r--r--games/oonsoo/Makefile8
-rw-r--r--games/openarena/files/patch-Makefile4
-rw-r--r--games/openglad/Makefile5
-rw-r--r--games/palomino/Makefile6
-rw-r--r--games/pets/Makefile3
-rw-r--r--games/pinball/Makefile11
-rw-r--r--games/planeshift/Makefile4
-rw-r--r--games/pmars/Makefile11
-rw-r--r--games/pongix/Makefile4
-rw-r--r--games/pouetchess/Makefile6
-rw-r--r--games/ppracer/Makefile4
-rw-r--r--games/q2p/files/patch-Makefile2
-rw-r--r--games/q2pro/files/patch-build__pre.mk4
-rw-r--r--games/q3base/Makefile2
-rw-r--r--games/q3cellshading/files/patch-code-unix-Makefile4
-rw-r--r--games/qgo/Makefile3
-rw-r--r--games/qix/Makefile10
-rw-r--r--games/quake2forge/Makefile2
-rw-r--r--games/quake2lnx/Makefile4
-rw-r--r--games/quake2lnx/files/patch-Makefile10
-rw-r--r--games/quake3/files/patch-code-unix-Makefile4
-rw-r--r--games/quakeforge/Makefile2
-rw-r--r--games/quetoo/Makefile4
-rw-r--r--games/race/Makefile6
-rw-r--r--games/redeclipse/files/patch-src_Makefile4
-rw-r--r--games/ri-li/Makefile2
-rw-r--r--games/robocode/Makefile5
-rw-r--r--games/rocksndiamonds/Makefile7
-rw-r--r--games/rtb/Makefile7
-rw-r--r--games/rubix/Makefile6
-rw-r--r--games/sarien/Makefile7
-rw-r--r--games/sauerbraten/files/patch-src_Makefile4
-rw-r--r--games/scare/Makefile4
-rw-r--r--games/scare/files/xglk.patch4
-rw-r--r--games/scid/files/patch-Makefile4
-rw-r--r--games/scorched3d/Makefile2
-rw-r--r--games/scourge/Makefile6
-rw-r--r--games/sdb/Makefile4
-rw-r--r--games/sdlquake2/files/patch-Makefile6
-rw-r--r--games/shaaft/Makefile5
-rw-r--r--games/shootingstar/Makefile6
-rw-r--r--games/sol/Makefile4
-rw-r--r--games/sol/files/patch-aa4
-rw-r--r--games/solarconquest/files/patch-makefile4
-rw-r--r--games/spacearyarya/Makefile7
-rw-r--r--games/spellcast/Makefile4
-rw-r--r--games/spellcast/files/patch-aa4
-rw-r--r--games/speyes/Makefile2
-rw-r--r--games/ssamtse/Makefile4
-rw-r--r--games/ssc/Makefile9
-rw-r--r--games/stratagus/Makefile5
-rw-r--r--games/stvef-paks/Makefile4
-rw-r--r--games/stvef-server/Makefile2
-rw-r--r--games/sxsame/Makefile2
-rw-r--r--games/tank/Makefile2
-rw-r--r--games/tank/files/patch-Makefile.Linux.Mesa4
-rw-r--r--games/tenebrae/files/patch-linux__Makefile.i386linux4
-rw-r--r--games/thevalley/Makefile2
-rw-r--r--games/tomatoes/Makefile6
-rw-r--r--games/tome/Makefile8
-rw-r--r--games/toycars/Makefile4
-rw-r--r--games/trackballs/Makefile9
-rw-r--r--games/tremor/Makefile7
-rw-r--r--games/tremor/files/patch-Makefile21
-rw-r--r--games/tremulous/Makefile6
-rw-r--r--games/tremulous/files/patch-Makefile4
-rw-r--r--games/tux-aqfh/Makefile14
-rw-r--r--games/tuxkart/Makefile13
-rw-r--r--games/tuxracer/Makefile9
-rw-r--r--games/tvp/Makefile8
-rw-r--r--games/uqm/Makefile2
-rw-r--r--games/uqm/files/patch-build-unix-config_proginfo_host4
-rw-r--r--games/vamos/Makefile3
-rw-r--r--games/vectoroids/Makefile3
-rw-r--r--games/warsow/files/patch-Makefile10
-rw-r--r--games/wmeyes/Makefile2
-rw-r--r--games/wmfortune/Makefile5
-rw-r--r--games/wmfortune/files/patch-Makefile4
-rw-r--r--games/wmminichess/Makefile5
-rw-r--r--games/wmpuzzle/Makefile9
-rw-r--r--games/wmqstat/Makefile2
-rw-r--r--games/wmqstat/files/patch-Makefile23
-rw-r--r--games/wmshuffle/Makefile5
-rw-r--r--games/wmshuffle/files/patch-aa4
-rw-r--r--games/wmtictactoe/Makefile5
-rw-r--r--games/wmtictactoe/files/patch-aa4
-rw-r--r--games/wmtimebomb/files/patch-aa4
-rw-r--r--games/wolf3d/files/patch-Makefile4
-rw-r--r--games/worldofpadman/files/patch-Makefile4
-rw-r--r--games/xarchon/Makefile5
-rw-r--r--games/xataxx/files/patch-aa2
-rw-r--r--games/xbl/Makefile6
-rw-r--r--games/xblood/Makefile5
-rw-r--r--games/xboard/Makefile3
-rw-r--r--games/xboing/files/patch-ac4
-rw-r--r--games/xbomb/Makefile2
-rw-r--r--games/xbomb/files/patch-hiscore.c6
-rw-r--r--games/xbomber/Makefile4
-rw-r--r--games/xbomber/files/patch-aa4
-rw-r--r--games/xbubble/Makefile4
-rw-r--r--games/xcheckers/Makefile2
-rw-r--r--games/xcheckers/files/patch-xcheckers.src_xcheckers.man8
-rw-r--r--games/xcogitate/Makefile7
-rw-r--r--games/xdeblock/Makefile2
-rw-r--r--games/xdemineur/Makefile2
-rw-r--r--games/xdesktopwaves/Makefile8
-rw-r--r--games/xdesktopwaves/files/patch-makefile8
-rw-r--r--games/xevil/Makefile5
-rw-r--r--games/xevil/files/patch-aa2
-rw-r--r--games/xeyesplus/Makefile9
-rw-r--r--games/xfireworks/Makefile5
-rw-r--r--games/xfireworks/files/patch-aa19
-rw-r--r--games/xfrisk/Makefile4
-rw-r--r--games/xgalaga/Makefile11
-rw-r--r--games/xglk/files/patch-Makefile4
-rw-r--r--games/xgospel/Makefile5
-rw-r--r--games/xinvaders/Makefile4
-rw-r--r--games/xinvaders3d/Makefile7
-rw-r--r--games/xinvaders3d/files/patch-aa2
-rw-r--r--games/xjewel/Makefile7
-rw-r--r--games/xjig/Makefile4
-rw-r--r--games/xjig/files/patch-aa4
-rw-r--r--games/xjump/Makefile7
-rw-r--r--games/xjumpx/Makefile5
-rw-r--r--games/xlines/Makefile3
-rw-r--r--games/xlines/files/patch-aa8
-rw-r--r--games/xmastermind/Makefile4
-rw-r--r--games/xmastermind/files/patch-aa8
-rw-r--r--games/xmemory/Makefile6
-rw-r--r--games/xminehunter/files/patch-aa10
-rw-r--r--games/xmines/Makefile4
-rw-r--r--games/xmines/files/patch-aa4
-rw-r--r--games/xmoto/Makefile6
-rw-r--r--games/xmris/Makefile2
-rw-r--r--games/xoids/Makefile2
-rw-r--r--games/xoj/Makefile2
-rw-r--r--games/xonix/Makefile2
-rw-r--r--games/xonotic/Makefile9
-rw-r--r--games/xosmulti/Makefile5
-rw-r--r--games/xosmulti/files/patch-aa4
-rw-r--r--games/xpat2/Makefile2
-rw-r--r--games/xpilot-ng-server/Makefile11
-rw-r--r--games/xpuzzletama/Makefile2
-rw-r--r--games/xquarto/Makefile2
-rw-r--r--games/xracer/Makefile4
-rw-r--r--games/xrally/Makefile11
-rw-r--r--games/xroach/Makefile4
-rw-r--r--games/xroach/files/patch-aa10
-rw-r--r--games/xroads/files/patch-aa6
-rw-r--r--games/xrot/Makefile2
-rw-r--r--games/xsc/Makefile8
-rw-r--r--games/xscorch/Makefile5
-rw-r--r--games/xscrabble/Makefile2
-rw-r--r--games/xshisen/Makefile5
-rw-r--r--games/xshogi/Makefile4
-rw-r--r--games/xsokoban/Makefile2
-rw-r--r--games/xteddy/Makefile4
-rw-r--r--games/xtic/Makefile4
-rw-r--r--games/xtic/files/patch-aa2
-rw-r--r--games/xtrojka/Makefile4
-rw-r--r--games/xtrojka/files/patch-aa4
-rw-r--r--games/xtron/files/patch-aa4
-rw-r--r--games/xtruco/Makefile4
-rw-r--r--games/xtruco/files/patch-aa4
-rw-r--r--games/xtux/Makefile10
-rw-r--r--games/xvmahjongg/Makefile3
-rw-r--r--games/xvmahjongg/files/patch-ab4
-rw-r--r--games/xvmines/files/patch-aa2
-rw-r--r--games/xworm/Makefile8
-rw-r--r--games/xzip/files/patch-aa4
-rw-r--r--games/yadex/Makefile4
-rw-r--r--games/yadex/files/patch-GNUmakefile4
373 files changed, 861 insertions, 1002 deletions
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 0a06ec4a4e68..37b5de4073dc 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -16,7 +16,7 @@ DISTNAME= 3Dc-${PORTVERSION}
MAINTAINER= adam-ports@blacktabby.org
COMMENT= 3-Dimensional Chess for X Window System
-LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
USE_PERL5_BUILD=yes
USE_XORG= xpm
diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-aa
index 5ab8f9a01388..791668f75d3e 100644
--- a/games/3dc/files/patch-aa
+++ b/games/3dc/files/patch-aa
@@ -21,7 +21,7 @@
+COPTIONS=-DVERSION=\"${VERSION}\"
-CFLAGS=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include
-+CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${X11BASE}/include
++CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${LOCALBASE}/include
LDOPTIONS=
# LDLIBS should include the name of your X library path if not /usr/lib;
@@ -29,7 +29,7 @@
# appear much but it looks much better when it does.
# Linux
-LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
-+LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${X11BASE}/lib
++LDLIBS=-L${LOCALBASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${LOCALBASE}/lib
# Sun
#LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index e3e77b3bbee0..81d82aae48a7 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -16,8 +16,8 @@ COMMENT= X Window 3D Pong game for 1 or 2 players with a ball and paddles
USE_XORG= x11
USE_GMAKE= yes
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
- XLIB="-L${X11BASE}/lib -lX11"
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+ XLIB="-L${LOCALBASE}/lib -lX11"
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/BillardGL/Makefile b/games/BillardGL/Makefile
index 40f4c533eab4..08e6092a1b8b 100644
--- a/games/BillardGL/Makefile
+++ b/games/BillardGL/Makefile
@@ -7,7 +7,7 @@
PORTNAME= BillardGL
PORTVERSION= 1.75
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= SF
MASTER_SITE_SUBDIR= billardgl
@@ -15,16 +15,14 @@ MASTER_SITE_SUBDIR= billardgl
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL billiard simulator
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USE_GMAKE= yes
-USE_GL= gl
+USE_GL= gl glut
post-patch:
@${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \
- s|%%X11BASE%%|${X11BASE}|' ${WRKSRC}/Namen.h
+ s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Namen.h
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/games/BillardGL/files/patch-Makefile b/games/BillardGL/files/patch-Makefile
index fadeee59e3f3..0f8512727591 100644
--- a/games/BillardGL/files/patch-Makefile
+++ b/games/BillardGL/files/patch-Makefile
@@ -14,11 +14,11 @@
+CXX ?= g++
+CFLAGS += -pipe -Wall -W -DNO_DEBUG -g
+CXXFLAGS+= -pipe -Wall -W -DNO_DEBUG -g
-+INCPATH = -I${X11BASE}/include
++INCPATH = -I${LOCALBASE}/include
+LINK = ${CXX}
LFLAGS =
-LIBS = -L/usr/X11R6/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
-+LIBS = -L${X11BASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
++LIBS = -L${LOCALBASE}/lib -lGL -lGLU -lglut -lXmu -lXext -lX11 -lm -lXi
## -lqgl -lGLU
diff --git a/games/BillardGL/files/patch-Namen.h b/games/BillardGL/files/patch-Namen.h
index b42a532a6ce5..425f7f9d03ed 100644
--- a/games/BillardGL/files/patch-Namen.h
+++ b/games/BillardGL/files/patch-Namen.h
@@ -5,7 +5,7 @@
#ifndef _WIN32
-#define PFAD "/usr/share/BillardGL/"
-+#define PFAD "%%X11BASE%%/share/%%PORTNAME%%/"
++#define PFAD "%%LOCALBASE%%/share/%%PORTNAME%%/"
#endif
#ifndef PFAD
diff --git a/games/CaribbeanStud/files/patch-Xmakefile b/games/CaribbeanStud/files/patch-Xmakefile
index 617ce934fdbf..cb172009950a 100644
--- a/games/CaribbeanStud/files/patch-Xmakefile
+++ b/games/CaribbeanStud/files/patch-Xmakefile
@@ -6,11 +6,11 @@
+## FreeBSD
+##
-+XINCLUDES=-I$(X11BASE)/include
++XINCLUDES=-I$(LOCALBASE)/include
+UILFLAGS=
+CFLAGS+= -fhandle-exceptions -fno-for-scope
+CXXFLAGS+= $(XINCLUDES)
-+LDFLAGS+=-L$(X11BASE)/lib
++LDFLAGS+=-L$(LOCALBASE)/lib
+LDLIBS=
+MOTIFLIBS=-lXm -lXmu -lXt -lX11 ${MOTIFLIB}
+
diff --git a/games/KnightCap/files/patch-aa b/games/KnightCap/files/patch-aa
index 5c8749b6f61b..3a4bc2ce8162 100644
--- a/games/KnightCap/files/patch-aa
+++ b/games/KnightCap/files/patch-aa
@@ -23,9 +23,9 @@
-X11 = /usr/X11R6
-GLUT_LIBS = -L$(GLUT)/lib/glut -lglut
-MESA_LIBS = -L$(MESA)/lib -lMesaGLU -lMesaGL -lm
-+MESA = ${X11BASE}
-+GLUT = ${X11BASE}
-+X11 = ${X11BASE}
++MESA = ${LOCALBASE}
++GLUT = ${LOCALBASE}
++X11 = ${LOCALBASE}
+GLUT_LIBS = -L$(GLUT)/lib -lglut
+MESA_LIBS = -L$(MESA)/lib -lGLU -lGL -lm
XLIBS = -L$(X11)/lib -lXmu -lXt -lXext -lX11 -lXi
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index 821dd808b954..437ecc3dd0d8 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -15,12 +15,12 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An SDL port of the Abuse game engine
USE_BZIP2= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
- LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
MAN6= abuse-sdl.6
diff --git a/games/actx/Makefile b/games/actx/Makefile
index e188118c924d..5ac45b1499f7 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -17,7 +17,7 @@ COMMENT= Window sitter for X11
NO_CDROM= 'contains commercial character data'
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= actx.1
MANLANG= "" ja
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 136ae457dbf4..3ffc9f133d60 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -19,7 +19,7 @@ NO_CDROM= Copy of CD must be sent to author
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
WRKSRC= ${WRKDIR}/adom
NO_BUILD= yes
diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index 2bb1a46b1ec3..4c08c5654f05 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -18,8 +18,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_XORG= x11 xt
-MAKE_ARGS= CC="${CC}" LIBS="-L${X11BASE}/lib -lX11" \
- DEBUG="${CFLAGS} -I${X11BASE}/include" \
+MAKE_ARGS= CC="${CC}" LIBS="-L${LOCALBASE}/lib -lX11" \
+ DEBUG="${CFLAGS} -I${LOCALBASE}/include" \
FILE_CONFIG=-DSAVED_GAME_NAME='\"affenspiel.saved\"'
PORTDOCS= COPYRIGHT README
diff --git a/games/airrox/files/patch-Makefile b/games/airrox/files/patch-Makefile
index f0ffd88b169f..cd5e690b8785 100644
--- a/games/airrox/files/patch-Makefile
+++ b/games/airrox/files/patch-Makefile
@@ -9,7 +9,7 @@
+
# bibliotecas para Linux
-LIBSLINUX = -L/usr/X11R6/lib -lGL -lGLU -lglut -L/usr/lib -lSDL_mixer -lSDL -lpthread `sdl-config --cflags --libs` -lSDL_net
-+LIBSLINUX = -L$(X11BASE)/lib -lGL -lGLU -lglut `sdl-config --libs` -lSDL_mixer -lSDL_net
++LIBSLINUX = -L$(LOCALBASE)/lib -lGL -lGLU -lglut `sdl-config --libs` -lSDL_mixer -lSDL_net
# bibliotecas para Windows
LIBSWIN = -lopengl32 -lglu32 -lglut32 -lmingw32 -lSDLmain -lSDL -lSDL_mixer -mwindows -L$(DEVCPP_PATH)\lib -lSDL_net
@@ -22,7 +22,7 @@
# flags (otimizacao e nao exibir warnings)
-FLAGS = -O2 -DREENTRANT -DHAVE_OPENGL #-g
-+FLAGS = $(CFLAGS) -DREENTRANT -DHAVE_OPENGL -I$(X11BASE)/include `sdl-config --cflags`
++FLAGS = $(CFLAGS) -DREENTRANT -DHAVE_OPENGL -I$(LOCALBASE)/include `sdl-config --cflags`
+
+ifdef OPTIMIZED_CFLAGS
+FLAGS += -O2
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index c189a3d9725e..b25add8d3a3b 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -9,8 +9,7 @@ PORTNAME= alephone
PORTVERSION= 20070525
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= marathon
+MASTER_SITES= SF/marathon
DISTNAME= AlephOne-${PORTVERSION}
MAINTAINER= ray@cultofray.net
@@ -26,8 +25,8 @@ USE_LUA= 5.0
USE_SDL= image net sdl sound
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
DATADIR= ${PREFIX}/share/AlephOne
diff --git a/games/amphetamine/files/patch-aa b/games/amphetamine/files/patch-aa
index a8279ffb0d5b..82c3d68e6ec8 100644
--- a/games/amphetamine/files/patch-aa
+++ b/games/amphetamine/files/patch-aa
@@ -25,7 +25,7 @@ $FreeBSD$
# Directories to search for header files
-SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS}
-+SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS} -I ${X11BASE}/include
++SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADERS} -I ${LOCALBASE}/include
# makemake variables
@@ -56,7 +56,7 @@ $FreeBSD$
endif
-LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib
-+LDFLAGS = -L$(X11BASE)/lib
++LDFLAGS = -L$(LOCALBASE)/lib
.PHONY : default
default : amph
@@ -78,7 +78,7 @@ $FreeBSD$
./src/Surface.o: ./src/AmpHead.hpp ./src/Clut.hpp ./src/ConstVal.hpp ./src/Graphfil.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
-./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
-+./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp ${X11BASE}/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
++./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp ${LOCALBASE}/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
./src/Thing.o: ./src/AmpHead.hpp ./src/Appl.hpp ./src/Bullet.hpp ./src/ConstVal.hpp ./src/Element.hpp ./src/File.hpp ./src/Graphfil.hpp ./src/Level.hpp ./src/ObjInfo.hpp ./src/Object.hpp ./src/Pltform.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp ./src/Thing.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
diff --git a/games/annelid/Makefile b/games/annelid/Makefile
index f6627cf618f6..838e5db83c55 100644
--- a/games/annelid/Makefile
+++ b/games/annelid/Makefile
@@ -23,7 +23,7 @@ RESTRICTED= No redistribution allowed
USE_ZIP= yes
USE_GMAKE= yes
USE_SDL= sdl
-USE_GL= yes
+USE_GL= gl
NO_WRKSUBDIR= yes
OPTIONS= OPTIMIZED_CFLAGS "Enable compilation optimizations" on
@@ -40,7 +40,7 @@ DATAFILES= annelid.dat apple.tga apple.wav backd.tga backn.tga font.dat \
post-patch:
# Fix Makefile.
@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}| ; \
- s|%%X11BASE%%|${X11BASE}| ; \
+ s|%%LOCALBASE%%|${LOCALBASE}| ; \
s|sdl-config|${SDL_CONFIG}|' \
${WRKSRC}/${MAKEFILE}
diff --git a/games/annelid/files/patch-Makefile b/games/annelid/files/patch-Makefile
index 1409572e7763..6bb19c125393 100644
--- a/games/annelid/files/patch-Makefile
+++ b/games/annelid/files/patch-Makefile
@@ -16,7 +16,7 @@
-CCC=g++
-CFLAGS=-I. `sdl-config --cflags` -c -Wall -ggdb -fomit-frame-pointer -O3
+CCC=$(CXX)
-+CFLAGS=%%CFLAGS%% -I. -I%%X11BASE%%/include `sdl-config --cflags` -c -Wall $(OPT)
++CFLAGS=%%CFLAGS%% -I. -I%%LOCALBASE%%/include `sdl-config --cflags` -c -Wall $(OPT)
+OPT = -fomit-frame-pointer -O3
-LD=g++
@@ -26,7 +26,7 @@
LIBS=-lopengl32 `sdl-config --libs`
else
-LIBS=-L/usr/X11R6/lib -lGL `sdl-config --libs`
-+LIBS=-L%%X11BASE%%/lib -lGL `sdl-config --libs`
++LIBS=-L%%LOCALBASE%%/lib -lGL `sdl-config --libs`
endif
all: $(NAME)
diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile
index aaf4148ad10b..0182f573ea8b 100644
--- a/games/apoolGL/Makefile
+++ b/games/apoolGL/Makefile
@@ -27,7 +27,7 @@ post-patch:
do-build:
${CC} ${CFLAGS} -DDATADIR="\"${DATADIR}\"" \
`${SDL_CONFIG} --cflags --libs` \
- -I${X11BASE}/include -L${X11BASE}/lib -lGL -lGLU \
+ -I${LOCALBASE}/include -L${LOCALBASE}/lib -lGL -lGLU \
-o ${WRKSRC}/apool ${WRKSRC}/*.c
do-install:
diff --git a/games/aqbubble/Makefile b/games/aqbubble/Makefile
index d634b04c1e87..e945df09421d 100644
--- a/games/aqbubble/Makefile
+++ b/games/aqbubble/Makefile
@@ -17,8 +17,8 @@ COMMENT= Game similar to snow bros
USE_SDL= sdl mixer image
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index eb4d0b9dc4ec..1a44612487ae 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -10,18 +10,17 @@ PORTNAME= armagetron
PORTVERSION= 0.2.7.1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= armagetronad
+MASTER_SITES= SF/armagetronad
DISTNAME= armagetronad-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A multiplayer networked Tron clone in 3D
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl image
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${X11BASE}/include"
+CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include"
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
diff --git a/games/atitd/Makefile b/games/atitd/Makefile
index 097acdfd19e4..1a181c5f2242 100644
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
COMMENT= The Linux "A Tale in the Desert" (ATITD) client
-RUN_DEPENDS= ${X11BASE}/bin/xhost:${X_CLIENTS_PORT}
+RUN_DEPENDS= ${LOCALBASE}/bin/xhost:${PORTSDIR}/x11/xhost
.include <bsd.port.pre.mk>
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index bb0a2eba6070..023506a683e9 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -8,7 +8,7 @@
PORTNAME= atomix
PORTVERSION= 2.14.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,7 +17,6 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= A yet another little mind game
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/games/atr3d/Makefile b/games/atr3d/Makefile
index 01af905ba00a..c1641282fb3b 100644
--- a/games/atr3d/Makefile
+++ b/games/atr3d/Makefile
@@ -33,8 +33,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
USE_AUTOTOOLS= automake:19 autoconf:261
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.include <bsd.port.pre.mk>
@@ -53,7 +53,7 @@ pre-patch:
@${REINPLACE_CMD} -e 's|-lopenal|& -lalut|' ${WRKSRC}/Makefile.am
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile.am
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile.am
pre-configure:
cd ${WRKSRC}; ${SH} autogen.sh
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index 2b21d108a428..2a0c9d273b67 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -9,8 +9,7 @@ PORTNAME= barrage
PORTVERSION= 1.0.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lgames
+MASTER_SITES= SF/lgames
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= az@FreeBSD.org
@@ -21,7 +20,7 @@ USE_SDL= sdl mixer
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-profile-path=/var/games
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
post-patch:
@${REINPLACE_CMD} -e 's|applications|applnk/Applications|g' \
diff --git a/games/battalion/files/patch-aa b/games/battalion/files/patch-aa
index fe1e950ba06a..cda0266b3a50 100644
--- a/games/battalion/files/patch-aa
+++ b/games/battalion/files/patch-aa
@@ -37,7 +37,7 @@
# STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
# ------------------------------------------------------------
-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
-+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
++CFLAGS+= -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\"
# STEP 8: ADD ANY SPECIAL LIBRARY PATHS
@@ -46,7 +46,7 @@
OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
-LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
-+LIBS = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS)
++LIBS = -L./. -L${LOCALBASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS)
all: $(TARGET)
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 5dcf4b14cce9..03b55e488e94 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -19,10 +19,10 @@ USE_GL= glu gl
WRKSRC= ${WRKDIR}/battleball-2.1-src
CFLAGS+= -Wno-deprecated ${PTHREAD_CFLAGS}
MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- XLIBS="-L${X11BASE}/lib -lX11" \
+ XLIBS="-L${LOCALBASE}/lib -lX11" \
LIBS="-lm ${XLIBS} ${PTHREAD_LIBS}" \
- GLINCS="-I${X11BASE}/include" \
- GLLIBS="-lXi -lXmu -lXext -L${X11BASE}/lib -lGL"
+ GLINCS="-I${LOCALBASE}/include" \
+ GLLIBS="-lXi -lXmu -lXext -L${LOCALBASE}/lib -lGL"
PLIST_FILES= bin/battleball
.if !defined(NOPORTDOCS)
diff --git a/games/bfm/files/patch-Rules.make.in b/games/bfm/files/patch-Rules.make.in
index 4b009d578d5e..82c31f03e55e 100644
--- a/games/bfm/files/patch-Rules.make.in
+++ b/games/bfm/files/patch-Rules.make.in
@@ -42,7 +42,7 @@
@LUA_CFLAGS@ $(CCL) $(VERSION) $(COMP_CFLAGS) @SOUND_CFLAGS@ @PLATFORM@ \
- $(DATADIR) \
- -I/usr/local/include $(ARTSC)
-+ $(DATADIR) $(ARTSC) -I$(LOCALBASE)/include -I$(X11BASE)/include
++ $(DATADIR) $(ARTSC) -I$(LOCALBASE)/include
CTAGSFLAGS=-i defptvS -a -f
diff --git a/games/blobandconquer/files/patch-makefile b/games/blobandconquer/files/patch-makefile
index 251ab44dcd73..430a09fe9a95 100644
--- a/games/blobandconquer/files/patch-makefile
+++ b/games/blobandconquer/files/patch-makefile
@@ -17,12 +17,12 @@
CXXFLAGS += -Wmissing-format-attribute -Wmissing-noreturn
CXXFLAGS += -Wdisabled-optimization
-CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
-+CXXFLAGS += -I$(X11BASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
++CXXFLAGS += -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -DDEV=$(DEV)
CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DGAMEPLAYMANUAL=\"$(DOCDIR)/index.html\" -Wall -pedantic
CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
-LIBPATH = -L/usr/X11/lib -L/usr/X11R6/lib
-LIBS = -lGL -lGLU `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz
-+LIBPATH = -L$(X11BASE)/lib
++LIBPATH = -L$(LOCALBASE)/lib
+LIBS = -lGL -lGLU `$(SDL_CONFIG) --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lz -lintl
# Yes, it means compiling is a little slower... but it's less hassle
diff --git a/games/bloboats/files/patch-Makefile b/games/bloboats/files/patch-Makefile
index 22e6282cc0a0..dd7ad611d659 100644
--- a/games/bloboats/files/patch-Makefile
+++ b/games/bloboats/files/patch-Makefile
@@ -49,7 +49,7 @@
### Libs
LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
-LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L/usr/X11R6/lib -lGL -lGLU
-+LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L$(X11BASE)/lib -lGL -lGLU
++LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L$(LOCALBASE)/lib -lGL -lGLU
LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -L/usr/pkg/lib
LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -framework OpenGL
LIBS_CROSS = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lopengl32 -lglu32
@@ -67,7 +67,7 @@
BINARY_ = $(BINARY_$(TARGET)_)
CXXFLAGS_DEFAULT_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2
-CXXFLAGS_FREEBSD_ = -g `$(SDLCONFIG) --cflags` -I/usr/X11R6/include -o bin/$(BINARY_) -O2
-+CXXFLAGS_FREEBSD_ = `$(SDLCONFIG) --cflags` -I$(X11BASE)/include -o bin/$(BINARY_) -O2
++CXXFLAGS_FREEBSD_ = `$(SDLCONFIG) --cflags` -I$(LOCALBASE)/include -o bin/$(BINARY_) -O2
CXXFLAGS_NETBSD = -g `$(SDLCONFIG) --cflags` -O2 -I/usr/pkg/include
CXXFLAGS_MACOSX_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2
CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2
diff --git a/games/blockade/files/patch-aa b/games/blockade/files/patch-aa
index 5493fbd40744..7c2444b07503 100644
--- a/games/blockade/files/patch-aa
+++ b/games/blockade/files/patch-aa
@@ -15,8 +15,8 @@
# Linux
-CFLAGS = -DSYSV -I/usr/include/X11 -Wall
-LDFLAGS = -L/usr/X11R6/lib -lX11
-+CFLAGS += -I$(X11BASE)/include
-+LDFLAGS = -L$(X11BASE)/lib -lX11
++CFLAGS += -I$(LOCALBASE)/include
++LDFLAGS = -L$(LOCALBASE)/lib -lX11
SOUND = blockade-snd.o
SOUNDH = blockade-snd.h
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 6cc004d65075..b8080b830484 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -18,11 +18,11 @@ COMMENT= Clone of the strategy board game 'Blokus'
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_WX= 2.6
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include"
MAKEFILE= makefile
diff --git a/games/bloodfrontier/files/patch-src_Makefile b/games/bloodfrontier/files/patch-src_Makefile
index d7c8164634e3..bbef9010a145 100644
--- a/games/bloodfrontier/files/patch-src_Makefile
+++ b/games/bloodfrontier/files/patch-src_Makefile
@@ -4,14 +4,14 @@
-CXXOPTFLAGS= -O3 -fomit-frame-pointer
-INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags`
-CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES)
-+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags`
++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags`
+CXXFLAGS+= -Wall -fsigned-char $(INCLUDES)
-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
-CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU
-+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU
++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU
CLIENT_OBJS= \
shared/tools.o \
shared/geom.o \
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index c538be5ab323..d53711113484 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -7,7 +7,7 @@
PORTNAME= bogged
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
@@ -25,7 +25,6 @@ EXTRACT_AFTER_ARGS= ${WRKDIR}
NO_WRKSUBDIR= yes
NO_BUILD= yes
PLIST_FILES= bin/bogged
-USE_X_PREFIX= yes
post-extract:
@ ${GUNZIP_CMD} ${WRKDIR}/${DISTNAME}${EXTRACT_SUFX}
diff --git a/games/bomb/Makefile b/games/bomb/Makefile
index 3ab7a3dff3ac..b83814921c6d 100644
--- a/games/bomb/Makefile
+++ b/games/bomb/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= esd.2:${PORTSDIR}/audio/esound \
vga.1:${PORTSDIR}/graphics/svgalib \
quicktime.0:${PORTSDIR}/multimedia/libquicktime
-MAKE_ENV= SCM_CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
+MAKE_ENV= SCM_CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
ALL_TARGET= ${PORTNAME}
PORTDOCS= README bomb.lsm guile.txt manual.txt notes.txt
@@ -29,7 +29,7 @@ pre-configure:
${REINPLACE_CMD} -e 's|/usr/lib/bomb|${DATADIR}|; \
s|/home/spot/src/quicktime4linux-1.1.9/quicktime|${LOCALBASE}/lib|; \
s|..QTDIR./libquicktime.a|-lquicktime|; \
- s|/usr/X11R6/lib|${X11BASE}/lib -L${LOCALBASE}/lib|; \
+ s|/usr/X11R6/lib|${LOCALBASE}/lib -L${LOCALBASE}/lib|; \
s|-lpthread|${PTHREAD_LIBS}|; \
s|/usr/bin/bomb|${PREFIX}/bin/bomb|; \
s|/usr/share/control-center/.data|${DATADIR}/.data|; \
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index 4d68298b6081..f8888ff6fb13 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bomberclone
PORTVERSION= 0.11.8
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= edwin@mavetju.org
COMMENT= Reimplementation of Atomic Bomber Man
@@ -21,7 +20,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
CONFIGURE_ARGS= --target=""
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
+ CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
post-extract:
${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf ;
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index a5392718d29f..372eb5a52c64 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -7,15 +7,13 @@
PORTNAME= bombermaze
PORTVERSION= 0.6.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gnome@FreeBSD.org
COMMENT= A multiplayer game, strategy place bombs to kill enemies and obstacles
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
USE_GETTEXT= yes
diff --git a/games/boswars/Makefile b/games/boswars/Makefile
index a552fa3747cb..c0f3be39801e 100644
--- a/games/boswars/Makefile
+++ b/games/boswars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= boswars
PORTVERSION= 2.4.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://boswars.org:8001/bos/releases/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -34,8 +34,8 @@ OPTIONS= GL "Enable OpenGL support" on \
.if !defined(WITHOUT_GL)
USE_GL= yes
SCONS_ARGS+= opengl=1
-CPPPATH+= ${X11BASE}/include
-LIBPATH+= ${X11BASE}/lib
+CPPPATH+= ${LOCALBASE}/include
+LIBPATH+= ${LOCALBASE}/lib
.endif
.if !defined(WITH_OPTIMIZED_CFLAGS)
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index fe89fcbd804b..5d1054f9b096 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -22,7 +22,7 @@ USE_PYTHON= yes
USE_BZIP2= yes
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/display/setup.py
do-build:
diff --git a/games/bumprace/Makefile b/games/bumprace/Makefile
index 0fe330e48249..03bdc64f6387 100644
--- a/games/bumprace/Makefile
+++ b/games/bumprace/Makefile
@@ -19,8 +19,8 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer image
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PORTDOCS= FAQ README
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index dfd824a3ff80..2c2b7f9df943 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -19,10 +19,10 @@ LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng \
GNU_CONFIGURE= yes
SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config
-CPPFLAGS= -I${X11BASE}/include -I${LOCALBASE}/include
+CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
CCONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS+= --with-gengameng-prefix="${X11BASE}"
+CONFIGURE_ARGS+= --with-gengameng-prefix="${LOCALBASE}"
MAN6= burgerspace.6
PLIST_FILES= bin/burgerspace
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index 4feab033a8f2..18c90512f9b5 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -7,9 +7,9 @@
PORTNAME= bygfoot
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= pav@FreeBSD.org
@@ -18,7 +18,6 @@ COMMENT= Football (soccer) management game
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gtk20 gnometarget
-USE_XLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
.include <bsd.port.mk>
diff --git a/games/cake/files/patch-Makefile b/games/cake/files/patch-Makefile
index 020889de38f9..629772c47950 100644
--- a/games/cake/files/patch-Makefile
+++ b/games/cake/files/patch-Makefile
@@ -8,11 +8,11 @@
-LDFLAGS += -L/usr/lib -L/usr/local/lib -lglut -lGLU -lGL -L/usr/X11R6/lib -lm -ldl
-LDFLAGS += -lpthread -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE
-LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63
-+INCLUDES = -I/usr/include -I$(LOCALBASE)/include -I$(X11BASE)/include
++INCLUDES = -I/usr/include -I$(LOCALBASE)/include
+CXX ?= g++
+CXXFLAGS += -Wall $(INCLUDES)
+
-+LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lglut -lGLU -lGL
++LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lglut -lGLU -lGL
+LDFLAGS += $(PTHREAD_LIBS) -lX11 -lXext -lXmu -lXt -lXi -lSM -lICE
+#LDFLAGS += -lcurses -ljpeg -lz -lfmod-3.63
+LDFLAGS += -ljpeg
diff --git a/games/ceferino/Makefile b/games/ceferino/Makefile
index 0d7decbf0b8c..669101f4485e 100644
--- a/games/ceferino/Makefile
+++ b/games/ceferino/Makefile
@@ -17,8 +17,8 @@ COMMENT= Game similar to Super Pang
USE_SDL= sdl mixer image
GNU_CONFIGURE= yes
USE_GMAKE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/cgoban2/Makefile b/games/cgoban2/Makefile
index 3d97e32fc29f..d42325d58aad 100644
--- a/games/cgoban2/Makefile
+++ b/games/cgoban2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cgoban2
PORTVERSION= 2.6.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games java
MASTER_SITES= http://kgs.kiseido.com/
DISTNAME= cgoban-unix-${PORTVERSION}
@@ -20,7 +20,6 @@ RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper
WRKSRC= ${WRKDIR}/cgoban
-USE_X_PREFIX= yes
USE_JAVA= yes
JAVA_VERSION= 1.3+
NO_BUILD= yes
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index a81576f61696..a8103c1eec45 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -17,8 +17,8 @@ COMMENT= Free 2D jump and run game
USE_SDL= sdl image mixer
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index d67106bc9193..1b0dda417322 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -22,16 +22,16 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
openal.0:${PORTSDIR}/audio/openal \
alut.1:${PORTSDIR}/audio/freealut
-USE_GL= yes
+USE_GL= glu
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/Chromium-0.9
post-patch:
@${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \
- -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/Makefile
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src-setup/Makefile
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/support/glpng/src/Makefile
+ -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
diff --git a/games/chromium/Makefile b/games/chromium/Makefile
index d67106bc9193..1b0dda417322 100644
--- a/games/chromium/Makefile
+++ b/games/chromium/Makefile
@@ -22,16 +22,16 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
openal.0:${PORTSDIR}/audio/openal \
alut.1:${PORTSDIR}/audio/freealut
-USE_GL= yes
+USE_GL= glu
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/Chromium-0.9
post-patch:
@${REINPLACE_CMD} -e 's|-lopenal|& -lalut|g' \
- -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/Makefile
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src-setup/Makefile
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/support/glpng/src/Makefile
+ -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src-setup/Makefile
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/support/glpng/src/Makefile
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/chromium ${PREFIX}/bin
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 27df2947aa40..36e2a46dd48b 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -7,10 +7,9 @@
PORTNAME= clanbomber
PORTVERSION= 1.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A bomberman-like multiplayer game
@@ -19,7 +18,6 @@ LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib
BROKEN= Does not compile with the newer clanCore
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ENV= LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
diff --git a/games/cleanq3/files/patch-code-unix-Makefile b/games/cleanq3/files/patch-code-unix-Makefile
index 49061333809e..ac3078f440c1 100644
--- a/games/cleanq3/files/patch-code-unix-Makefile
+++ b/games/cleanq3/files/patch-code-unix-Makefile
@@ -52,7 +52,7 @@
-endif #alpha test
+BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe
-+GL_CFLAGS = -I$(X11BASE)/include
++GL_CFLAGS = -I$(LOCALBASE)/include
-BASE_CFLAGS = -pipe
+DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
@@ -94,7 +94,7 @@
#GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
#GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
-GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-ifeq ($(ARCH),axp)
-TARGETS=\
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 911778199a77..6453b47c032d 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -7,7 +7,7 @@
PORTNAME= columns
PORTVERSION= 1.2b
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
# mastersite disappeared in December 2000
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -18,7 +18,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Nice little implementation of columns game for X Window System
USE_SDL= sdl
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
DATADIR= ${PREFIX}/share/Columns
diff --git a/games/connectfive/Makefile b/games/connectfive/Makefile
index 24d6866bafa6..3660a5e7b362 100644
--- a/games/connectfive/Makefile
+++ b/games/connectfive/Makefile
@@ -9,8 +9,7 @@ PORTNAME= connectfive
PORTVERSION= 1.0.2
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= connectfive
+MASTER_SITES= SF/connectfive
DISTNAME= connectFive
MAINTAINER= amdmi3@amdmi3.ru
@@ -18,12 +17,12 @@ COMMENT= Place five pieces in a row on a 3d board
MAKEFILE= Makefile.linux
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
ALL_TARGET= default
USE_SDL= sdl
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/connectFive
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 381e98eba7ef..73ee9cb7bf28 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -20,8 +20,8 @@ USE_GMAKE= yes
USE_XORG= sm ice x11 xext xxf86vm
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS= --bindir=${PREFIX}/bin --datadir=${DATADIR}
OPTIONS= GLUT "Use glut" on
@@ -29,7 +29,7 @@ OPTIONS= GLUT "Use glut" on
.include <bsd.port.pre.mk>
.if defined(WITH_GLUT)
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
+USE_GL= glut
PLIST_SUB+= GLUTBIN:=""
.else
PLIST_SUB+= GLUTBIN:="@comment "
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index 5779046c7ac0..bc3008324029 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= crack-attack
PORTVERSION= 1.1.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,12 +14,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pav@FreeBSD.org
COMMENT= OpenGL game based on Super Nintendo classic Tetris Attack
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
-USE_X_PREFIX= yes
+USE_GL= glut
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" CXXFLAGS="${CFLAGS}"
MAN6= crack-attack.6
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index a00c58a53ee2..7ff651e01765 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -7,11 +7,10 @@
PORTNAME= criticalmass
PORTVERSION= 1.0.0
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
@@ -21,7 +20,7 @@ CONFLICTS= shaaft-[0-9]*
USE_BZIP2= yes
USE_SDL= image mixer sdl
-USE_GL= yes
+USE_GL= gl
USE_XORG= x11
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -41,7 +40,7 @@ post-patch:
's|SDL/SDL|SDL|g'
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \
s|^CXXFLAGS|#CXXFLAGS|g ; \
- s|/usr/X11R6|${X11BASE}|g ; \
+ s|/usr/X11R6|${LOCALBASE}|g ; \
s|-lSDL | |g ; \
s|-lpng12|-lpng|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|and def|\&\& def|g' ${WRKSRC}/utils/OSName.hpp
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 70c262a510a8..66781657616c 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME= crossfire-client
PORTVERSION= 1.8.0
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
ftp://ftp.ifi.uio.no/pub/crossfire/ \
ftp://ftp.real-time.com/pub/games/crossfire/
MASTER_SITE_SUBDIR= ${PORTNAME:S/-client//}
@@ -27,8 +27,8 @@ USE_GNOME= gnometarget
USE_GMAKE= yes
USE_SDL= image sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-sound-dir=${DATADIR}/sounds
MAN6= cfclient.6
diff --git a/games/cube/files/patch-Makefile b/games/cube/files/patch-Makefile
index 6bc72191d686..4717ba647d39 100644
--- a/games/cube/files/patch-Makefile
+++ b/games/cube/files/patch-Makefile
@@ -6,10 +6,10 @@
-CXXFLAGS=$(CXXOPTFLAGS) -I../enet/include `sdl-config --cflags`
+CXX?=g++
+CXXOPTFLAGS=-Wall
-+CXXFLAGS+=$(CXXOPTFLAGS) -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags` -I$(X11BASE)/include
++CXXFLAGS+=$(CXXOPTFLAGS) -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags`
-CLIENT_LIBS=-L../enet -lenet `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU
-+CLIENT_LIBS=-L$(LOCALBASE)/lib -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU
++CLIENT_LIBS=-L$(LOCALBASE)/lib -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU
CLIENT_OBJS= \
client.o \
clientextras.o \
diff --git a/games/cultivation/files/patch-Makefile.GnuLinux b/games/cultivation/files/patch-Makefile.GnuLinux
index 3afa4bf369f2..2282fe9fc6e7 100644
--- a/games/cultivation/files/patch-Makefile.GnuLinux
+++ b/games/cultivation/files/patch-Makefile.GnuLinux
@@ -5,13 +5,13 @@
-PLATFORM_COMPILE_FLAGS = -DLINUX
-+PLATFORM_COMPILE_FLAGS = ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -DLINUX
++PLATFORM_COMPILE_FLAGS = ${CXXFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include -DLINUX
# various GL and X windows librariesneeded for linux
# also need portaudio library (which in turn needs pthreads)
-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 ${PORT_AUDIO_PATH}/lib/libportaudio.a -lpthread
-+PLATFORM_LINK_FLAGS = -L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -pthread -lportaudio
++PLATFORM_LINK_FLAGS = -L${LOCALBASE}/lib -L${LOCALBASE}/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu -pthread -lportaudio
# All platforms but OSX support g++ and need no linker hacks
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index b2d15ddb63a8..df9f5aaa74d6 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -25,9 +25,9 @@ PORTDOCS= README TODO NEWS AUTHORS readme.txt installation.txt
PLIST_FILES= bin/d2x
.ifdef(WITH_OPENGL)
-USE_GL= yes
+USE_GL= glut
CONFIGURE_ARGS+=--with-opengl
-CONFIGURE_ENV=LDFLAGS=-L${X11BASE}/lib CPPFLAGS=-I${X11BASE}/include
+CONFIGURE_ENV=LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
.endif
pre-everything::
diff --git a/games/daimonin-client/Makefile b/games/daimonin-client/Makefile
index a1f315b81454..c511d9abb63a 100644
--- a/games/daimonin-client/Makefile
+++ b/games/daimonin-client/Makefile
@@ -7,10 +7,9 @@
PORTNAME= daimonin_client
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= daimonin
+MASTER_SITES= SF/daimonin
EXTRACT_SUFX= .tgz
MAINTAINER= pav@FreeBSD.org
@@ -20,7 +19,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}/share
CONFIGURE_ENV= CFLAGS="-pipe"
USE_SDL= mixer image
-USE_XLIB= yes
SUB_FILES= daimonin.sh
SUB_LIST= PORTVERSION=${PORTVERSION}
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index a1f315b81454..c511d9abb63a 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -7,10 +7,9 @@
PORTNAME= daimonin_client
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= daimonin
+MASTER_SITES= SF/daimonin
EXTRACT_SUFX= .tgz
MAINTAINER= pav@FreeBSD.org
@@ -20,7 +19,6 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}/share
CONFIGURE_ENV= CFLAGS="-pipe"
USE_SDL= mixer image
-USE_XLIB= yes
SUB_FILES= daimonin.sh
SUB_LIST= PORTVERSION=${PORTVERSION}
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/games/dangerdeep/Makefile b/games/dangerdeep/Makefile
index c6da1bb738b5..38a6ba8fa736 100644
--- a/games/dangerdeep/Makefile
+++ b/games/dangerdeep/Makefile
@@ -43,6 +43,8 @@ SCONS_ARGS+= usex86sse=-1 # disable MMX/SSE on the build cluster
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/games/dangerdeep|${DATADIR}|; \
s|Linux|"Danger from the Deep"|' ${WRKSRC}/doc/man/dangerdeep.6
+ @${REINPLACE_CMD} -e 's|/usr/X11BASE|${LOCALBASE}|g' \
+ ${WRKSRC}/SConstruct
do-build:
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS}
diff --git a/games/deng/Makefile b/games/deng/Makefile
index 87e918421c7f..b67004d5295e 100644
--- a/games/deng/Makefile
+++ b/games/deng/Makefile
@@ -19,11 +19,11 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
-USE_GL= yes
+USE_GL= gl
USE_LDCONFIG= yes
USE_SDL= sdl mixer net
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
`${SDL_CONFIG} --cflags`"
CONFIGURE_SCRIPT= ../configure
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index a5e703901b23..9e37f7f9c0cc 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -21,14 +21,14 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl mixer image
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/gamediameter
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \
+ LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
DATADIR= ${PREFIX}/share/gamediameter
diff --git a/games/djgame2/Makefile b/games/djgame2/Makefile
index 2fda9aa44912..7d4667ce61bf 100644
--- a/games/djgame2/Makefile
+++ b/games/djgame2/Makefile
@@ -45,9 +45,9 @@ post-patch:
${WRKSRC}/makelinux
@${REINPLACE_CMD} -e 's|qmake|${QMAKE}|' \
${WRKSRC}/makelinux
- @${ECHO_CMD} "INCLUDEPATH += ${X11BASE}/include" \
+ @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \
>> ${WRKSRC}/Base/Base.pro
- @${ECHO_CMD} "INCLUDEPATH += ${X11BASE}/include" \
+ @${ECHO_CMD} "INCLUDEPATH += ${LOCALBASE}/include" \
>> ${WRKSRC}/Hall/Hall.pro
@${CHMOD} a+x ${WRKSRC}/makelinux
diff --git a/games/doom/Makefile b/games/doom/Makefile
index ac5bdd274773..b5706e100ffa 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -7,10 +7,9 @@
PORTNAME= doom
PORTVERSION= 1.10
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_IDSOFTWARE}
-MASTER_SITE_SUBDIR= source
+MASTER_SITES= SF/source
DISTNAME= doomsrc
MAINTAINER= jmz@FreeBSD.org
@@ -21,8 +20,8 @@ NO_CDROM= requested by IDsoftware
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USE_XLIB= yes
USE_ZIP= yes
+USE_XORG= x11
NO_WRKSUBDIR= yes
DATADIR= ${DMDIR}
@@ -35,7 +34,7 @@ post-patch:
-E -e 's|#include +<malloc.h>|#include <stdlib.h>|g'
do-build:
- @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${X11BASE}
+ @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${LOCALBASE}
@cd ${WRKDIR}/sndserv && ${GMAKE}
do-install:
diff --git a/games/doom/files/patch-ab b/games/doom/files/patch-ab
index c5e6617c9531..65a772bbd986 100644
--- a/games/doom/files/patch-ab
+++ b/games/doom/files/patch-ab
@@ -11,8 +11,8 @@
-LDFLAGS=-L/usr/X11R6/lib
-LIBS=-lXext -lX11 -lnsl -lm
+CFLAGS?= -O
-+CFLAGS+=-g -I${X11BASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM
-+LDFLAGS=-L${X11BASE}/lib
++CFLAGS+=-g -I${LOCALBASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM
++LDFLAGS=-L${LOCALBASE}/lib
+LIBS=-lXext -lX11 -lm
# subdirectory for objects
diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 7a3eea005fea..7d07fae2d7f4 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -50,7 +50,7 @@ post-patch:
's|-I/usr/local/include/SDL11|`${SDL_CONFIG} --cflags`|; \
s|-lSDL-1\.1|`${SDL_CONFIG} --libs`|; \
s|/usr/local|${LOCALBASE}|; \
- s|/usr/X11R6|${X11BASE}|' \
+ s|/usr/X11R6|${LOCALBASE}|' \
${WRKSRC}/${MAKEFILE}
pre-build:
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 21ea97b64e32..bf4d08d55b6b 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dopewars
PORTVERSION= 1.5.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= SF
@@ -18,7 +18,6 @@ USE_GETTEXT= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk12
-USE_X_PREFIX= yes
CONFIGURE_ARGS= --enable-networking --disable-plugins --localstatedir=${DATADIR}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index 28cb870f2c50..a971c01a5fd9 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -21,7 +21,7 @@ RESTRICTED= Licence forbids any repacking and reselling
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
WRKSRC= ${WRKDIR}/DeluxeSnake
SUB_FILES= pkg-install pkg-deinstall
diff --git a/games/duel/Makefile b/games/duel/Makefile
index f91a9d34e605..19d8b09a056a 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -16,16 +16,16 @@ DISTNAME= lin${PORTNAME}
MAINTAINER= alepulver@FreeBSD.org
COMMENT= An overhead, OpenGL space shooter
-BUILD_DEPENDS= ${X11BASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
+BUILD_DEPENDS= ${LOCALBASE}/lib/libftgl.a:${PORTSDIR}/graphics/ftgl
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${X11BASE}/include -I${X11BASE}/include/FTGL" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` `freetype-config --cflags` -I${LOCALBASE}/include -I${LOCALBASE}/include/FTGL" \
+ LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}
SUB_FILES= ${PORTNAME}-sh
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 0322e4b90c7c..a07f07d198b7 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -24,8 +24,8 @@ USE_PERL5_BUILD=yes
USE_GNOME= gtk20
CONFIGURE_ARGS= --prefix=${PREFIX} \
- --extra-inc=${LOCALBASE}/include:${X11BASE}/include \
- --extra-ld=${LOCALBASE}/lib:${X11BASE}/lib \
+ --extra-inc=${LOCALBASE}/include \
+ --extra-ld=${LOCALBASE}/lib \
--disable-dgt
INSTALL_TARGET= install install-man
diff --git a/games/eduke32/Makefile b/games/eduke32/Makefile
index 7dadaa838283..bd2298cc4f89 100644
--- a/games/eduke32/Makefile
+++ b/games/eduke32/Makefile
@@ -16,7 +16,7 @@ COMMENT= Duke Nukem 3D Port based on JFDuke and EDuke
USE_ZIP= yes
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_GNOME= gtk20
USE_SDL= mixer sdl
WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}/${PORTNAME}
@@ -42,7 +42,7 @@ post-patch:
@${REINPLACE_CMD} -Ee \
's|^(CC=).*|\1${CC}|; \
s|^(CXX=).*|\1${CXX}|; \
- s|/usr/X11R6|${X11BASE}|; \
+ s|/usr/X11R6|${LOCALBASE}|; \
s|sdl-config|${SDL_CONFIG}|' \
${WRKSRC}/Makefile \
${WRKSRC}/../build/Makefile \
diff --git a/games/egl/files/patch-makefile b/games/egl/files/patch-makefile
index 50fdb2e85302..54716e5be36e 100644
--- a/games/egl/files/patch-makefile
+++ b/games/egl/files/patch-makefile
@@ -57,9 +57,9 @@
+
+ifeq ($(OSTYPE),FreeBSD)
+# These variables are defined from the port, and passed by the environment.
-+SHARED_FLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include \
++SHARED_FLAGS+= -I$(LOCALBASE)/include \
+ -DDATADIR='\"$(Q2DIR)\"' -DLIBDIR='\"$(LIBDIR)\"'
-+LDFLAGS+= -L$(LOCALBASE)/lib -L$(X11BASE)/lib
++LDFLAGS+= -L$(LOCALBASE)/lib
+X11_LDFLAGS+= $(PTHREAD_LIBS)
+endif
@@ -87,13 +87,13 @@
+SHARED_FLAGS += -DHOMEDIR
+endif
+
-+ifeq ($(wildcard $(X11BASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h)
++ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h)
SHARED_FLAGS += -DXF86VMODE
X11_LDFLAGS += -lXxf86vm
endif
-ifeq ($(wildcard /usr/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h)
-+ifeq ($(wildcard $(X11BASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h)
++ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h)
SHARED_FLAGS += -DXF86DGA
X11_LDFLAGS += -lXxf86dga
endif
diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg
index 281882f69ad1..3a5baedbdd9a 100644
--- a/games/el/files/patch-Makefile.bsdg
+++ b/games/el/files/patch-Makefile.bsdg
@@ -15,7 +15,7 @@
-PLATFORM=-march=i686
-XDIR=-L/usr/X11R6/lib
-+XDIR=-L$(X11BASE)/lib -L$(LOCALBASE)/lib
++XDIR=-L$(LOCALBASE)/lib
CWARN=
#-Wdeclaration-after-statement -Wall -Werror
CPPWARN=
@@ -28,7 +28,7 @@
-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
+CFLAGS+=$(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
+_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags)
-+CXXFLAGS+=-I$(LOCALBASE)/include -I$(X11BASE)/include $(OPTIONS)
++CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS)
+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
-LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
diff --git a/games/ember/Makefile b/games/ember/Makefile
index fe8597b46fae..8020a28f140a 100644
--- a/games/ember/Makefile
+++ b/games/ember/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ember
PORTVERSION= 0.5.1
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://amber.worldforge.org/ember/releases/stable/
MASTER_SITE_SUBDIR=worldforge
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
@@ -49,9 +49,9 @@ post-patch:
@${REINPLACE_CMD} -e '\
s|sdl-config|${SDL_CONFIG}|g; \
s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
- s|-lGL|-L${X11BASE}/lib -lGL|g' \
+ s|-lGL|-L${LOCALBASE}/lib -lGL|g' \
${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|^CFLAGS =.*|& $${SDL_CFLAGS} -I${X11BASE}/include|g' \
+ @${REINPLACE_CMD} -e 's|^CFLAGS =.*|& $${SDL_CFLAGS} -I${LOCALBASE}/include|g' \
${WRKSRC}/src/framework/Makefile.in
@${REINPLACE_CMD} -e 's|<SDL/|<|g' \
${WRKSRC}/src/components/ogre/OgreSetup.cpp \
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 3ef387520c9e..96313240e013 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS= --target="" \
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR}
-CXXFLAGS= -I${X11BASE}/include ${PTHREAD_CFLAGS}
+CXXFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR} ${PTHREAD_LIBS}
MAN6= enigma.6
diff --git a/games/ensemblist/files/patch-Makefile b/games/ensemblist/files/patch-Makefile
index 16bb158866ac..753d85fda7cb 100644
--- a/games/ensemblist/files/patch-Makefile
+++ b/games/ensemblist/files/patch-Makefile
@@ -6,8 +6,8 @@
DATADIR=$(DESTDIR)/usr/share/$(NAME)
-COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
-LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
-+COMPILE_FLAGS=$(CFLAGS) -Wall -I$(LOCALBASE)/include -I$(X11BASE)/include `$(LOCALBASE)/bin/libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR) $(PTHREAD_CFLAGS)
-+LINK_FLAGS=-lm -L$(LOCALBASE)/lib -L$(X11BASE)/lib -lXmu -lGL -lglut -lGLU -lpng `$(LOCALBASE)/bin/libmikmod-config --libs` $(PTHREAD_LIBS)
++COMPILE_FLAGS=$(CFLAGS) -Wall -I$(LOCALBASE)/include -I$(LOCALBASE)/include `$(LOCALBASE)/bin/libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR) $(PTHREAD_CFLAGS)
++LINK_FLAGS=-lm -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lXmu -lGL -lglut -lGLU -lpng `$(LOCALBASE)/bin/libmikmod-config --libs` $(PTHREAD_LIBS)
endif
APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
#uncomment the following if you want to compile on MacOS/X
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index 3f74d4243ae7..030acbd2d8ac 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tuxracer
PORTVERSION= 0.61
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tuxracer
+MASTER_SITES= SF/tuxracer
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
@@ -20,7 +19,7 @@ COMMENT= A 3d penguin racing game using OpenGL
LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
USE_AUTOTOOLS= automake:14 autoconf:261
AUTOMAKE_ARGS= -a
@@ -28,8 +27,8 @@ CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}"
MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ARGS= --with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
--with-tcl-libs="${LOCALBASE}/lib" \
- --with-gl-libs="${X11BASE}/lib" \
- --with-gl-inc="${X11BASE}/include" \
+ --with-gl-libs="${LOCALBASE}/lib" \
+ --with-gl-inc="${LOCALBASE}/include" \
--with-data-dir=${PREFIX}/share/tuxracer
WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 80ac2e5cbbe1..76fa680b1b6d 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
USE_ZIP= yes
USE_DOS2UNIX= yes
-USE_GL= yes
+USE_GL= gl
USE_XORG= xxf86dga
USE_SCONS= yes
SCONS_ARGS= warnings=0
@@ -63,8 +63,8 @@ PLIST_SUB+= GAMELIBS="@comment "
.if defined(WITH_LUA)
USE_LUA= 5.0
SCONS_ARGS+= lua=1
-CPPPATH= ${LOCALBASE}/include ${X11BASE}/include ${LUA_INCDIR}
-LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib ${LUA_LIBDIR}
+CPPPATH= ${LOCALBASE}/include ${LUA_INCDIR}
+LIBPATH= ${LOCALBASE}/lib ${LUA_LIBDIR}
.endif
.if defined(WITHOUT_OPTIMIZED_CFLAGS)
diff --git a/games/excido/files/patch-Makefile b/games/excido/files/patch-Makefile
index 51314163ec82..bfd0bbfa16ca 100644
--- a/games/excido/files/patch-Makefile
+++ b/games/excido/files/patch-Makefile
@@ -4,10 +4,10 @@
-CC=g++
-CFLAGS=`sdl-config --cflags` #-g -Wall #-O2
-#CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2
-+CXXFLAGS += -I${X11BASE}/include `${SDL_CONFIG} --cflags`
++CXXFLAGS += -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}
-LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU
-+LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU
++LIBS = -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU
#LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU
-PREFIX=/usr/local
BINDIR=$(PREFIX)/bin/
diff --git a/games/exult/Makefile b/games/exult/Makefile
index 14cbadc967e7..4f559b511a9d 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -7,10 +7,9 @@
PORTNAME= exult
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Ultima VII engine
@@ -18,7 +17,6 @@ COMMENT= Ultima VII engine
BUILD_DEPENDS= timidity:${PORTSDIR}/audio/timidity
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
-USE_XLIB= yes
USE_SDL= sdl mixer
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
@@ -33,7 +31,7 @@ SUB_FILES= pkg-message
post-patch:
@${REINPLACE_CMD} -e 's|desktop||' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
post-install:
.if !defined(NOPORTDOCS)
diff --git a/games/ezquake/files/patch-Makefile b/games/ezquake/files/patch-Makefile
index e2de78662f16..4a52f6ea8804 100644
--- a/games/ezquake/files/patch-Makefile
+++ b/games/ezquake/files/patch-Makefile
@@ -84,4 +84,4 @@
+GL_LIBS = -ljpeg
ifeq ($(OS),freebsd)
- X11BASE ?= /usr/X11R6
+ LOCALBASE ?= /usr/X11R6
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index cd02f52bddbe..a02d4c0be277 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -9,8 +9,7 @@ PORTNAME= falconseye
PORTVERSION= 1.9.3
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= falconseye
+MASTER_SITES= SF/falconseye
DISTNAME= nethack_source_331_jtp_${PORTVERSION:S/.//g}
MAINTAINER= kris@FreeBSD.org
@@ -25,7 +24,7 @@ USE_SDL= sdl
USE_PERL5_BUILD=yes
USE_ZIP= yes
USE_XORG= x11 xpm xaw
-MAKE_ENV+= CFLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L${X11BASE}/lib -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}" X11BASE="${X11BASE}"
+MAKE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11" PREFIX="${PREFIX}"
WRKSRC= ${WRKDIR}
post-patch:
diff --git a/games/falconseye/files/patch-sys_unix_Makefile_src b/games/falconseye/files/patch-sys_unix_Makefile_src
index 0a5f9aab8074..c29bd48cb73a 100644
--- a/games/falconseye/files/patch-sys_unix_Makefile_src
+++ b/games/falconseye/files/patch-sys_unix_Makefile_src
@@ -14,8 +14,8 @@
# compile normally
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include
-LFLAGS = -L/usr/X11/lib
-+CFLAGS += -I../include -I${X11BASE}/include -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H
-+LFLAGS = -L${X11BASE}/lib
++CFLAGS += -I../include -I${LOCALBASE}/include -DHACKDIR=\"${NHDIR}\" -DHAVE_SYS_PARAM_H
++LFLAGS = -L${LOCALBASE}/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
# LFLAGS = -b i486-linuxaout -L/usr/X11/lib
diff --git a/games/falconseye/files/x-config b/games/falconseye/files/x-config
index ad90b1f0b35a..acfae4384f56 100644
--- a/games/falconseye/files/x-config
+++ b/games/falconseye/files/x-config
@@ -1,6 +1,6 @@
VARDATND = x11tiles pet_mark.xbm rip.xpm
-CFLAGS+=-DX11_GRAPHICS -I${X11BASE}/include
-LFLAGS =-L${X11BASE}/lib
+CFLAGS+=-DX11_GRAPHICS -I${LOCALBASE}/include
+LFLAGS =-L${LOCALBASE}/lib
WINSRC = $(WINTTYSRC) $(WINX11SRC)
WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index 068873ed7f98..c6b1056ae0c7 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fgfs-base
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
@@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
MAINTAINER= jylefort@FreeBSD.org
COMMENT= FlightGear scenery, textures and aircraft models
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
NO_BUILD= yes
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/data
diff --git a/games/fgsd/Makefile b/games/fgsd/Makefile
index 2073e04c7c81..2252dd296b46 100644
--- a/games/fgsd/Makefile
+++ b/games/fgsd/Makefile
@@ -9,16 +9,15 @@ PORTNAME= fgsd
DISTVERSION= 0.3.1a
PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A scenery designer for the FlightGear flight simulator
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
-RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
+RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \
flu:${PORTSDIR}/x11-toolkits/flu \
ungif:${PORTSDIR}/graphics/libungif \
@@ -26,12 +25,11 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk \
CGAL:${PORTSDIR}/math/cgal \
jpeg:${PORTSDIR}/graphics/jpeg \
png:${PORTSDIR}/graphics/png \
- glut:${PORTSDIR}/graphics/libglut
-USE_GL= yes
+USE_GL= glut
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
PLIST_FILES= bin/fgsd share/pixmaps/fgsd.xpm
DESKTOP_ENTRIES="FlightGear Scenery Designer" \
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index a280db46fcc7..959a448a7045 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fkiss
PORTVERSION= 0.33a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/fkiss/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a//}
@@ -21,7 +21,7 @@ RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
NOT_FOR_ARCHS= alpha
-USE_XLIB= yes
+USE_XORG= x11 xproto
WANT_GNOME= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/flightgear-aircraft/Makefile b/games/flightgear-aircraft/Makefile
index b2d3c5d71cc5..bbd825fc25d6 100644
--- a/games/flightgear-aircraft/Makefile
+++ b/games/flightgear-aircraft/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flightgear-aircrafts
PORTVERSION= 20060812
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \
ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \
@@ -86,9 +86,8 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= jylefort@FreeBSD.org
COMMENT= Additional aircrafts for the FlightGear flight simulator
-RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
+RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/flightgear-aircrafts/Makefile b/games/flightgear-aircrafts/Makefile
index b2d3c5d71cc5..bbd825fc25d6 100644
--- a/games/flightgear-aircrafts/Makefile
+++ b/games/flightgear-aircrafts/Makefile
@@ -7,7 +7,7 @@
PORTNAME= flightgear-aircrafts
PORTVERSION= 20060812
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Aircraft/ \
ftp://ftp.de.flightgear.org/pub/fgfs/Aircraft/ \
@@ -86,9 +86,8 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= jylefort@FreeBSD.org
COMMENT= Additional aircrafts for the FlightGear flight simulator
-RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
+RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile
index f073c3400e20..efbc812d4039 100644
--- a/games/flightgear-atlas/Makefile
+++ b/games/flightgear-atlas/Makefile
@@ -9,36 +9,35 @@ PORTNAME= flightgear-atlas
PORTVERSION= 0.3.0
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= atlas
+MASTER_SITES= SF/atlas
DISTNAME= Atlas-${PORTVERSION}
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A map viewer for use with the FlightGear flight simulator
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
glut.4:${PORTSDIR}/graphics/libglut
-RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
- ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
+RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
+ ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
GNU_CONFIGURE= yes
USE_GL= yes
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -L${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-fgbase="${X11BASE}/share/FlightGear"
+CONFIGURE_ARGS= --with-fgbase="${LOCALBASE}/share/FlightGear"
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/src/Makefile.in
post-install:
- ${INSTALL_DATA} ${WRKSRC}/src/AtlasPalette ${X11BASE}/share/FlightGear
+ ${INSTALL_DATA} ${WRKSRC}/src/AtlasPalette ${LOCALBASE}/share/FlightGear
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/games/flightgear-atlas/pkg-plist b/games/flightgear-atlas/pkg-plist
index bcde4d7b3f67..d7a1656d685d 100644
--- a/games/flightgear-atlas/pkg-plist
+++ b/games/flightgear-atlas/pkg-plist
@@ -2,5 +2,4 @@ bin/Atlas
bin/Map
bin/MapPS
bin/buildmaps.sh
-@cwd %%X11BASE%%
share/FlightGear/AtlasPalette
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 068873ed7f98..c6b1056ae0c7 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fgfs-base
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
ftp://ftp.de.flightgear.org/pub/fgfs/Shared/
@@ -15,7 +15,6 @@ MASTER_SITES= ftp://ftp.flightgear.org/pub/fgfs/Shared/ \
MAINTAINER= jylefort@FreeBSD.org
COMMENT= FlightGear scenery, textures and aircraft models
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
NO_BUILD= yes
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/data
diff --git a/games/flightgear-mb339-pan/Makefile b/games/flightgear-mb339-pan/Makefile
index 459739c8918d..89ba82f75ce4 100644
--- a/games/flightgear-mb339-pan/Makefile
+++ b/games/flightgear-mb339-pan/Makefile
@@ -7,6 +7,7 @@
PORTNAME= flightgear-mb339-pan
PORTVERSION= 1.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://hcilab.uniud.it/pan/downloads/
DISTNAME= MB339-PAN
@@ -14,11 +15,10 @@ DISTNAME= MB339-PAN
MAINTAINER= jylefort@FreeBSD.org
COMMENT= A simulation of the MB-339 PAN aerobatic jet
-RUN_DEPENDS= ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
+RUN_DEPENDS= ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
BROKEN= Size mismatch
-PREFIX?= ${X11BASE} # USE_X_PREFIX would pull in USE_XLIB
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 600d7372a1ad..67b007d6699c 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -18,20 +18,20 @@ COMMENT?= The FlightGear flight simulator
LIB_DEPENDS= glut:${PORTSDIR}/graphics/libglut \
openal.0:${PORTSDIR}/audio/openal
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
-RUN_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
- ${X11BASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
- ${X11BASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear
+RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
+ ${LOCALBASE}/lib/libsgmisc.a:${PORTSDIR}/devel/simgear \
+ ${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
FGVERSION= 0.9.10
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS= --datadir=${X11BASE}/share # location of fgfs-base
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS= --datadir=${LOCALBASE}/share # location of fgfs-base
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
.if ${PORTNAME} == FlightGear
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 18614aa22b38..839558a52ed9 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -28,9 +28,9 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_XORG= xaw ice
-CPPFLAGS= -I${X11BASE}/include
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CPPFLAGS= -I${LOCALBASE}/include
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
.if defined(WITH_SDL)
USE_SDL= yes
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 9013527d9c62..94716b06e25f 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -38,7 +38,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
ggz-gtk.1:${PORTSDIR}/games/ggz-gtk-client \
ggzcore.9:${PORTSDIR}/games/ggz-client-libs \
ggzmod.5:${PORTSDIR}/games/ggz-client-libs
-USE_XPM= yes
+USE_XORG= xpm
USE_SDL= mixer
USE_GNOME= gtk20
CONFIGURE_ARGS+=--enable-client=gtk
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 5e994b10e0bc..5447a7634699 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freesci
PORTVERSION= 0.3.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games emulators
MASTER_SITES= http://www-plan.cs.colorado.edu/creichen/${PORTNAME}/ \
http://teksolv.de/~jameson/
@@ -17,7 +17,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A portable interpreter for SCI games, such as the Space Quest series
USE_BZIP2= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
WANT_SDL= yes
INSTALLS_ICONS= yes
diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile
index 461eca70da62..5e91fe38e3ca 100644
--- a/games/fuhquake/Makefile
+++ b/games/fuhquake/Makefile
@@ -7,7 +7,7 @@
PORTNAME= fuhquake
PORTVERSION= 0.31
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \
ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \
@@ -69,14 +69,14 @@ MAKE_ARGS+= -DWITHOUT_${f}
.endfor
.if defined(WITH_X11)
-USE_XLIB= yes
+USE_XORG= x11 xxf86dga
PLIST_SUB+= X11=""
CLIENTS+= x11
.else
PLIST_SUB+= X11="@comment "
.endif
-.if (defined(WITH_XMMS) || exists(${X11BASE}/lib/libxmms.so.4)) && \
+.if (defined(WITH_XMMS) || exists(${LOCALBASE}/lib/libxmms.so.4)) && \
defined(CLIENTS)
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
MAKE_ARGS+= -DWITH_XMMS \
diff --git a/games/fuhquake/files/Makefile b/games/fuhquake/files/Makefile
index e1bb027cfc97..c9d31b27d205 100644
--- a/games/fuhquake/files/Makefile
+++ b/games/fuhquake/files/Makefile
@@ -11,7 +11,7 @@
# $FreeBSD$
#
-DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${X11BASE}/include -DDATADIR='"${DATADIR}"' -DX11BASE='"${X11BASE}"'
+DO_CFLAGS = ${CFLAGS} -funsigned-char -I${LOCALBASE}/include -I${LOCALBASE}/include -DDATADIR='"${DATADIR}"' -DLOCALBASE='"${LOCALBASE}"'
.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
DO_CFLAGS += -Did386
@@ -28,7 +28,7 @@ DO_CFLAGS += -O -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpen
.if defined(WITH_XMMS)
XMMS_CFLAGS != glib-config --cflags
DO_CFLAGS += -D__XMMS__ ${XMMS_CFLAGS} ${PTHREAD_CFLAGS}
-XMMS_LIBS = -L${X11BASE}/lib -lxmms ${PTHREAD_LIBS}
+XMMS_LIBS = -L${LOCALBASE}/lib -lxmms ${PTHREAD_LIBS}
.endif
########################################################################
@@ -186,8 +186,8 @@ CL_GLX_OBJS = \
vid_glx.o
CL_COMMON_LIBS = -lm
-CL_X11_LIBS = -L${X11BASE}/lib -lX11 -lXext
-CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${X11BASE}/lib -lGL -lXxf86dga -lXxf86vm
+CL_X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext
+CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lGL -lXxf86dga -lXxf86vm
.c.o:
${CC} ${DO_CFLAGS} -c $< -o $*.o
diff --git a/games/fuhquake/files/patch-mp3_player.c b/games/fuhquake/files/patch-mp3_player.c
index 76f5918aa034..93b58cbc7a99 100644
--- a/games/fuhquake/files/patch-mp3_player.c
+++ b/games/fuhquake/files/patch-mp3_player.c
@@ -8,7 +8,7 @@
#include <sys/wait.h>
-cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};
-+cvar_t mp3_dir = {"mp3_xmms_dir", X11BASE "/bin"};
++cvar_t mp3_dir = {"mp3_xmms_dir", LOCALBASE "/bin"};
cvar_t mp3_xmms_session = {"mp3_xmms_session", "0"};
#endif
diff --git a/games/galaxymage/Makefile b/games/galaxymage/Makefile
index fdaeb97d9cea..53b55e220780 100644
--- a/games/galaxymage/Makefile
+++ b/games/galaxymage/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco
post-configure:
@${REINPLACE_CMD} -e 's@%%DATADIR%%@${DATADIR}@g' ${WRKSRC}/GalaxyMage.py ${WRKSRC}/src/Resources.py
- @${REINPLACE_CMD} -e 's@%%X11BASE%%@${X11BASE}@g' ${WRKSRC}/src/Translate.py
+ @${REINPLACE_CMD} -e 's@%%LOCALBASE%%@${LOCALBASE}@g' ${WRKSRC}/src/Translate.py
do-install:
@${INSTALL_SCRIPT} ${WRKSRC}/GalaxyMage.py ${PREFIX}/bin/GalaxyMage
diff --git a/games/galaxymage/files/patch-src_Translate.py b/games/galaxymage/files/patch-src_Translate.py
index dce3e4799e58..f6d7d0e79781 100644
--- a/games/galaxymage/files/patch-src_Translate.py
+++ b/games/galaxymage/files/patch-src_Translate.py
@@ -5,7 +5,7 @@
def getLanguageDict(self,lang):
- return gettext.translation('GalaxyMage',os.path.join(os.getcwd(),'locale'), languages=[lang])
-+ return gettext.translation('GalaxyMage',os.path.join('%%X11BASE%%/share/locale'), languages=[lang])
++ return gettext.translation('GalaxyMage',os.path.join('%%LOCALBASE%%/share/locale'), languages=[lang])
def __init__(self):
#fill our language dictionnary with each language
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index fd78e68a0de7..c14a23b9a6e8 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,3 +1,4 @@
+
# New ports collection makefile for: gcompris2
# Date created: 23 April 2003
# Whom: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
@@ -7,10 +8,9 @@
PORTNAME= gcompris
DISTVERSION= 8.3.2-2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gcompris
+MASTER_SITES= SF/gcompris
MAINTAINER= gnome@FreeBSD.org
COMMENT= Gnome2 educational games and activities for kids ages 2 to 10
@@ -26,7 +26,6 @@ RUN_DEPENDS= gnuchess:${PORTSDIR}/games/gnuchess \
${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite20
WRKSRC= ${WRKDIR}/${PORTNAME}-8.3.2
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
diff --git a/games/geki2/Makefile b/games/geki2/Makefile
index daaa55906b40..dbf67d60807f 100644
--- a/games/geki2/Makefile
+++ b/games/geki2/Makefile
@@ -16,12 +16,9 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
COMMENT= 2D length scroll shooting game
-BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl
-RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
+BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl
+RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
-
.include <bsd.port.mk>
diff --git a/games/geki3/Makefile b/games/geki3/Makefile
index 43fa1a2e3159..484d231adfa0 100644
--- a/games/geki3/Makefile
+++ b/games/geki3/Makefile
@@ -16,12 +16,9 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION}
MAINTAINER= edwin@mavetju.org
COMMENT= 2D horizontal scroll shooting game
-BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl
-RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
+BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl
+RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
-
.include <bsd.port.mk>
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index c16a0425e58c..5b0761e62b0e 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gemdropx
PORTVERSION= 0.9
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/gemdropx/src/
@@ -16,7 +16,6 @@ COMMENT= An interesting one-player puzzle game for X
USE_SDL= mixer
USE_GMAKE= yes
-USE_X_PREFIX= yes
MAKE_ENV= JOY=NO \
SDL_CONFIG="${SDL_CONFIG}"
diff --git a/games/ggz-sdl-games/Makefile b/games/ggz-sdl-games/Makefile
index 91a569bc3273..49e1d8a1733e 100644
--- a/games/ggz-sdl-games/Makefile
+++ b/games/ggz-sdl-games/Makefile
@@ -13,15 +13,15 @@ CATEGORIES= games
MAINTAINER= yinjieh@csie.nctu.edu.tw
COMMENT= The GGZ Gaming Zone - SDL-based games
-USE_GL= yes
+USE_GL= gl
USE_SDL= image mixer sdl ttf
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-debug
USE_GGZ= client
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
post-install:
${INSTALL_DATA} ${WRKSRC}/geekgame/module.dsc ${PREFIX}/share/ggz/geekgame.dsc
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index b4b0e8ef56a4..c24ef878bc68 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -9,19 +9,18 @@ PORTNAME= gillo
DISTVERSION= 1.0beta1
PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Players are cars throwing a magnetic fuzzy ball into a goal
BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \
- ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode \
- ${X11BASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib
+ ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode \
+ ${LOCALBASE}/lib/libplibsg.a:${PORTSDIR}/x11-toolkits/plib
USE_BZIP2= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -35,7 +34,7 @@ post-patch:
${WRKSRC}/src/Jamfile
do-build:
- cd ${WRKSRC} && ${SETENV} "C++=${CC}" "X11BASE=${X11BASE}" \
+ cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \
"CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
${JAM} -dx -sPREFIX=${PREFIX}
diff --git a/games/gillo/files/patch-Jamrules b/games/gillo/files/patch-Jamrules
index 195a5d6ea4a9..e7e8e2c160a7 100644
--- a/games/gillo/files/patch-Jamrules
+++ b/games/gillo/files/patch-Jamrules
@@ -8,7 +8,7 @@
-if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
-else CCFLAGS += -O3 ;
+CCFLAGS += $(CFLAGS) %%SDL_CFLAGS%% ;
-+HDRS = $(X11BASE)/include ;
++HDRS = $(LOCALBASE)/include ;
+#if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
+#else CCFLAGS += -O3 ;
C++FLAGS += $(CCFLAGS) ;
diff --git a/games/gillo/files/patch-src_Jamfile b/games/gillo/files/patch-src_Jamfile
index c81bffa2ccc6..0b9f4e2dcd44 100644
--- a/games/gillo/files/patch-src_Jamfile
+++ b/games/gillo/files/patch-src_Jamfile
@@ -5,6 +5,6 @@
Main gillo3 : camera.cpp cameraball.cpp cameratrack.cpp car.cpp context.cpp cube.cpp entity.cpp event.cpp field.cpp game.cpp goal.cpp goalkeeper.cpp img.cpp main.cpp menu.cpp omnicar.cpp overlay.cpp player.cpp pwrup.cpp rect.cpp simpleball.cpp sound.cpp video.cpp viewport.cpp prefix.c iballpicker.cpp ;
-LINKLIBS on gillo3 = -lpthread -lGL -lGLU -lSDL -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl ;
-+LINKLIBS on gillo3 = -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(X11BASE)/lib %%SDL_LDFLAGS%% ;
++LINKLIBS on gillo3 = -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% ;
InstallBin $(BINDIR) : gillo3$(SUFEXE) ;
diff --git a/games/gl-117/Makefile b/games/gl-117/Makefile
index 8ee4bf918e8f..f6159dc24b87 100644
--- a/games/gl-117/Makefile
+++ b/games/gl-117/Makefile
@@ -10,22 +10,16 @@ PORTNAME= gl-117
PORTVERSION= 1.3.2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTVERSIONSUFFIX= -src
MAINTAINER= erik@smluc.org
COMMENT= An OpenGL & SDL action flight simulator
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
-USE_SDL= mixer sdl
-USE_GL= yes
+USE_GL= glut
USE_BZIP2= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --x-include=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib \
- --with-opengl-dir=${X11BASE}
+CONFIGURE_ARGS= --with-opengl-dir=${LOCALBASE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/games/glasteroids/Makefile b/games/glasteroids/Makefile
index 5c4e326ca00e..8fa233172030 100644
--- a/games/glasteroids/Makefile
+++ b/games/glasteroids/Makefile
@@ -7,7 +7,7 @@
PORTNAME= glasteroids
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.honors.montana.edu/~jjc/Glasteroids/
DISTNAME= Glasteriods
@@ -15,12 +15,9 @@ DISTNAME= Glasteriods
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Asteroids game for X Window System
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
WRKSRC= ${WRKDIR}/Glasteroids
-USE_X_PREFIX= yes
-USE_GL= yes
+USE_GL= glut
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
MAKEFILE= ${FILESDIR}/Makefile.FreeBSD
diff --git a/games/glasteroids/files/Makefile.FreeBSD b/games/glasteroids/files/Makefile.FreeBSD
index 73f971e341a5..b023c005dafd 100644
--- a/games/glasteroids/files/Makefile.FreeBSD
+++ b/games/glasteroids/files/Makefile.FreeBSD
@@ -10,8 +10,8 @@ PROG = Glasteroids
LIBS = -lglut -lGLU -lGL -lXmu -lX11 -lXext -lm -lXi ${PTHREAD_LIBS}
-INCDIR = -I${X11BASE}/include
-LIBDIR = -L${X11BASE}/lib
+INCDIR = -I${LOCALBASE}/include
+LIBDIR = -L${LOCALBASE}/lib
PREFIX ?= /usr/X11R6
X11BASE ?= /usr/X11R6
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index ec386e4574f7..926bcc06ca6a 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -30,7 +30,7 @@ MAN6= glaxium.6
USE_DOS2UNIX=variables.cpp scene.cpp
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g; \
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \
s|/games/glaxium|/glaxium|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|gcc -g -o|$$(CC) -o|g ; \
s|/games/glaxium|/glaxium|g' ${WRKSRC}/Makefile.in
diff --git a/games/glbsp/files/patch-GUI_unx.mak b/games/glbsp/files/patch-GUI_unx.mak
index c7eb7396bd81..12d06d09d511 100644
--- a/games/glbsp/files/patch-GUI_unx.mak
+++ b/games/glbsp/files/patch-GUI_unx.mak
@@ -7,7 +7,7 @@
-FLTK_PREFIX=../fltk-1.1.6
-FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib
-FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \
-+FLTK_PREFIX=${X11BASE}
++FLTK_PREFIX=${LOCALBASE}
+FLTK_CFLAGS=-I$(FLTK_PREFIX)/include
+FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images \
-lfltk -lX11 -lXext
@@ -20,7 +20,7 @@
+CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
CXXFLAGS=$(CFLAGS)
-LDFLAGS=-L/usr/X11R6/lib
-+LDFLAGS=-L${X11BASE}/lib
++LDFLAGS=-L${LOCALBASE}/lib
LIBS=-lm $(FLTK_LIBS)
OBJS=$(SYSDIR)/main.o \
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 46f6c010d06f..5beb993ba09e 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -7,16 +7,14 @@
PORTNAME= glife
PORTVERSION= 0.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= gLife-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Conway's Game of Life for GNOME
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomeprefix gnomehack libglade
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/glmaze/files/patch-Makefile b/games/glmaze/files/patch-Makefile
index e6423f4c62ae..6d9e0abb47dd 100644
--- a/games/glmaze/files/patch-Makefile
+++ b/games/glmaze/files/patch-Makefile
@@ -28,11 +28,11 @@
.c.o:
- $(CC) -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -I${X11BASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -I${LOCALBASE}/include -DVERSION=\"$(VERSION)\" $(SDL_FLAGS) -c -o $@ $<
glmaze: $(OBJECTS)
- $(CC) $(OBJECTS) -o $@ $(SDL_LIBS) -lGL -lGLU -lm
-+ $(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${X11BASE}/lib $(SDL_LIBS) -lGL -lGLU -lm
++ $(CC) $(LDFLAGS) $(OBJECTS) -o $@ -L${LOCALBASE}/lib $(SDL_LIBS) -lGL -lGLU -lm
clean:
@echo Cleaning up...
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 9c8bee1d93f8..d1b548c35730 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -22,12 +22,12 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
freetype.9:${PORTSDIR}/print/freetype2
USE_SDL= image net sdl ttf
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
USE_SCONS= yes
SCONS_BUILDENV= ${SCONS_ENV}
-LINKFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib
-CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include
+LINKFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include
.include <bsd.port.pre.mk>
diff --git a/games/glpuzzle/Makefile b/games/glpuzzle/Makefile
index da193d0766c0..aaac10f37cb0 100644
--- a/games/glpuzzle/Makefile
+++ b/games/glpuzzle/Makefile
@@ -20,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
USE_SDL= sdl mixer
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" \
- CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"
+ CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \
+ LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
post-patch:
.for i in font image puzzles sound
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 223254204c8c..a7ba9397a336 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gltron
PORTVERSION= 0.70
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= -source.tar.gz
MAINTAINER= lx@FreeBSD.org
@@ -18,7 +17,7 @@ COMMENT= A 3D worm game for two players for X Window System
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl sound
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -26,8 +25,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS= --disable-warn
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
.if defined(WITH_SDL_NET)
USE_SDL+= net
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 775208580242..be3d075b3807 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -7,10 +7,9 @@
PORTNAME= gnmm
PORTVERSION= 0.1.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= gnome
@@ -19,7 +18,6 @@ COMMENT= A "nine mens' morris" implementation for the GNOME Desktop Environment
USE_GETTEXT= yes
USE_ICONV= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf
diff --git a/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index 6160023f4c66..6a1266e39f5a 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gno3dtet
PORTVERSION= 1.96.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= http://eseb.net/ftp/gno3dtet/
EXTRACT_SUFX= .tgz
@@ -17,7 +17,6 @@ COMMENT= GNOME version of the classic 3D-ified T*tris
EXTRACT_DEPENDS=intltoolize:${PORTSDIR}/textproc/intltool
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui librsvg2
USE_GMAKE= yes
USE_AUTOTOOLS= autoheader:261 automake:19 aclocal:19 autoconf:261
diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile
index 689969db9886..e1682a04c02f 100644
--- a/games/gnome-games-extra-data/Makefile
+++ b/games/gnome-games-extra-data/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-games-extra-data
PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +21,6 @@ RUN_DEPENDS= ${LOCALBASE}/bin/sol:${PORTSDIR}/games/gnome-games
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
USE_GNOME= gnomehack gnomeprefix gnometarget
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index a8113c9caf2c..314e9c9aa054 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gnome-games
PORTVERSION= 2.22.1.1
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +24,6 @@ USE_PYTHON= yes
USE_GETTEXT= yes
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
-USE_XLIB= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \
librsvg2 desktopfileutils pygnomedesktop gnomedocutils
diff --git a/games/gnomeattacks/Makefile b/games/gnomeattacks/Makefile
index 05856f74d44e..583f8c5c6756 100644
--- a/games/gnomeattacks/Makefile
+++ b/games/gnomeattacks/Makefile
@@ -7,15 +7,13 @@
PORTNAME= gnomeattacks
PORTVERSION= 0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME 2 game featuring a bizarre flying GNOME logo
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnomeprefix gnomevfs2 libgnomeui
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 5b94b6cac758..2c3a7c39b60f 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomebreakout
PORTVERSION= 0.5.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= http://www.users.on.net/~mipearson/
DISTNAME= gnome-breakout-${PORTVERSION}
@@ -15,7 +15,6 @@ DISTNAME= gnome-breakout-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME version of the classic breakout game
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix libgnomeui
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 87a8c7cf2ae1..554fbe85847b 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomechess
PORTVERSION= 0.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-chess/0.3
@@ -19,7 +19,6 @@ COMMENT= A GUI chess front-end to crafy, for the GNOME Desktop Environment
BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty
-USE_X_PREFIX= yes
USE_GNOME= gnomecanvas gnomehack gnomeprefix libglade
USE_GMAKE= yes
INSTALLS_OMF= yes
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 0f941b4c48e1..2d5030c5e7f4 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -7,16 +7,14 @@
PORTNAME= gnomermind
PORTVERSION= 1.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A puzzle game for Gnome, loosely based on the classic MasterMind game
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gdkpixbuf gnomehack gnomelibs gnomeprefix
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gnomesudoku/Makefile b/games/gnomesudoku/Makefile
index 049316599fa8..ade9d4902dc5 100644
--- a/games/gnomesudoku/Makefile
+++ b/games/gnomesudoku/Makefile
@@ -7,10 +7,9 @@
PORTNAME= gnomesudoku
PORTVERSION= 0.5.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnome-sudoku
+MASTER_SITES= SF/gnome-sudoku
DISTNAME= gnome-sudoku-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
@@ -21,13 +20,12 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
.if !defined(DISPLAY)
BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
- ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
+ ${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
.if !defined(PACKAGE_BUILDING)
MAKE_ENV+= DISPLAY="localhost:1001"
.endif
.endif
-USE_X_PREFIX= yes
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
USE_GNOME= gnomehack gnomeprefix pygnome2 pygnomedesktop
@@ -40,7 +38,7 @@ pre-configure:
${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
${RM} -f ${WRKDIR}/.Xvfb.pid ; \
fi
- ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
post-configure:
@@ -54,7 +52,7 @@ pre-install:
${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill || ${TRUE} ; \
${RM} -f ${WRKDIR}/.Xvfb.pid ; \
fi
- ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
+ ${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5
post-install:
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 40d3b6f1c28d..69a0b7342b43 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnurobots
PORTVERSION= 1.0D
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gnurobots
@@ -18,8 +18,7 @@ COMMENT= GNU diversion wherein Scheme-coded robots explore a world
LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile
GNU_CONFIGURE= yes
-USE_XPM= yes
-USE_XLIB= yes
+USE_XORG= x11 xpm
pre-patch:
${CP} ${WRKSRC}/getopt/getopt.h ${WRKSRC}/include
diff --git a/games/golddig/files/patch-ad b/games/golddig/files/patch-ad
index cddd0874e257..6efae3fb0ef4 100644
--- a/games/golddig/files/patch-ad
+++ b/games/golddig/files/patch-ad
@@ -29,10 +29,10 @@
#CFLAGS = -O2
#CFLAGS = -O
-CFLAGS = -O -W -Wreturn-type -Wunused -g -finline-functions
-+CFLAGS += -W -Wreturn-type -Wunused -finline-functions -I${X11BASE}/include
++CFLAGS += -W -Wreturn-type -Wunused -finline-functions -I${LOCALBASE}/include
#CFLAGS = -g
-LDFLAGS = -g
-+LDFLAGS = -L ${X11BASE}/lib
++LDFLAGS = -L ${LOCALBASE}/lib
all: ${GAME} ${EDITOR}
diff --git a/games/goonies/files/patch-build-linux-Makefile b/games/goonies/files/patch-build-linux-Makefile
index 4589a372735c..e4155ebbabe3 100644
--- a/games/goonies/files/patch-build-linux-Makefile
+++ b/games/goonies/files/patch-build-linux-Makefile
@@ -14,8 +14,8 @@
-CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` -I/usr/local/include/SDL -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU
+CC ?= c++
-+CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${X11BASE}/include
-+LDFLAGS += `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
++CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
++LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
RM = rm -f
CP = cp -r
LN = ln -s
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index 8c030e658637..c226fcaef7d9 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -9,28 +9,27 @@ PORTNAME= gracer
PORTVERSION= 0.1.5
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= nox@FreeBSD.org
COMMENT= A 3D motor sport simulator
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- tcl82.1:${PORTSDIR}/lang/tcl82 \
- glut.4:${PORTSDIR}/graphics/libglut
+ tcl82.1:${PORTSDIR}/lang/tcl82
+USE_GL= glut
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= autoconf:213
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/tcl8.2 \
- -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+ -I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/lib"
USE_GMAKE= yes
# for plib (sound):
-CONFIGURE_ARGS+= --with-plib=${X11BASE}/plib
+CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib
MAN6= gracer.6
diff --git a/games/grande/Makefile b/games/grande/Makefile
index ac521a39c7f7..c135de1f712c 100644
--- a/games/grande/Makefile
+++ b/games/grande/Makefile
@@ -7,7 +7,7 @@
PORTNAME= grande
PORTVERSION= 0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://kxl.orz.hm/download/
DISTNAME= ${PORTNAME}-KXL-${PORTVERSION}
@@ -15,12 +15,11 @@ DISTNAME= ${PORTNAME}-KXL-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Zanac type game
-BUILD_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
-RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
+BUILD_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
+RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
NO_CDROM= Possible copyright infringement
-USE_X_PREFIX= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/games/gretools/Makefile b/games/gretools/Makefile
index 9fa431ab5bcf..4567777ca2da 100644
--- a/games/gretools/Makefile
+++ b/games/gretools/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gretools
PORTVERSION= 1.2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= http://www.cs.utexas.edu/~arvindn/gretools/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION:R}
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR= ${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME vocabulary builder
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix gnometarget pygnome2
USE_PYTHON= yes
USE_GMAKE= yes
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 9525f08f4227..43cb6967570b 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gtetrinet
PORTVERSION= 0.7.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games gnome ipv6
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
@@ -17,7 +17,6 @@ COMMENT= A version of the popular TetriNET multiplayer tetris clone
USE_GETTEXT= yes
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= esound gnomehack gnomeprefix gnometarget libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index ac8454850937..8509302dad48 100644
--- a/games/gtkabale/Makefile
+++ b/games/gtkabale/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gtkabale
PORTVERSION= 0.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://freebsd.unixfreunde.de/sources/
MAINTAINER= ports@FreeBSD.org
COMMENT= A lazy version of solitaire game
-USE_X_PREFIX= yes
USE_GNOME= imlib
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index a0d5c368e54f..511828ed630a 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkatlantic
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://gtkatlantic.gradator.net/downloads/v0.4/
@@ -18,7 +18,6 @@ USE_BZIP2= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_X_PREFIX= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index 32012f34f7f1..369d65b1267e 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkpool
PORTVERSION= 0.5.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://gtkpool.seul.org/
@@ -16,7 +16,6 @@ COMMENT= A 2D pool game using the GTK+ toolkit
GNU_CONFIGURE= yes
USE_GNOME= gtk12
-USE_X_PREFIX= yes
post-patch:
@${REINPLACE_CMD} -e 's,-O2 -O0 -Wall `gtk-config --cflags` -lgtk -lgdk -lglib -lm -lX11,${CXXFLAGS} `gtk-config --cflags` `gtk-config --libs`,' ${WRKSRC}/configure
diff --git a/games/gtkradiant/files/patch-SConstruct b/games/gtkradiant/files/patch-SConstruct
index 8e8575e0600e..fa6ddeb1ac66 100644
--- a/games/gtkradiant/files/patch-SConstruct
+++ b/games/gtkradiant/files/patch-SConstruct
@@ -13,7 +13,7 @@
# there is a default hardcoded value, you can override on command line, those are saved between runs
# we only handle strings
-serialized=['CC', 'CXX', 'JOBS', 'BUILD', 'SETUP']
-+serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'X11BASE', 'JOBS', 'BUILD', 'SETUP']
++serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'LOCALBASE', 'JOBS', 'BUILD', 'SETUP']
# help -------------------------------------------
@@ -60,8 +60,8 @@
+ CCFLAGS += '-fPIC '
+ CXXFLAGS += '-fPIC '
+ CPPPATH.append(LOCALBASE + '/include')
-+ CPPPATH.append(X11BASE + '/include')
-+ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + X11BASE + '/lib '
++ CPPPATH.append(LOCALBASE + '/include')
++ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + LOCALBASE + '/lib '
CPPPATH.append('libs')
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index e231c900129d..ef3ed12fb53c 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtktetcolor
PORTVERSION= 0.6.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.dvgu.ru/ifit/~panov/gtktetcolor/
@@ -16,7 +16,6 @@ MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
COMMENT= A game for GNOME that resembles well-known tetris and columns
-USE_X_PREFIX= yes
USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index ed65b75fd5e6..3ec905972543 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -7,14 +7,13 @@
PORTNAME= gturing
PORTVERSION= 0.1.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= games gnome
MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/gturing/0.1/
MAINTAINER= ports@FreeBSD.org
COMMENT= A simple turing machine simulator for GNOME 2
-USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgnomeui
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
diff --git a/games/gweled/Makefile b/games/gweled/Makefile
index 4eb3d7fb8846..7923084462ea 100644
--- a/games/gweled/Makefile
+++ b/games/gweled/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gweled
PORTVERSION= 0.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games gnome
MASTER_SITES= http://sebdelestaing.free.fr/gweled/Release/
@@ -16,7 +16,6 @@ COMMENT= GNOME version of the game called "Bejeweled" or "Diamond Mine"
LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod
-USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomehier libgnomeui librsvg2
GNU_CONFIGURE= yes
diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-aa
index a15e20fb9935..8792e863ff8f 100644
--- a/games/heretic/files/patch-aa
+++ b/games/heretic/files/patch-aa
@@ -53,7 +53,7 @@
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \
-+ -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl)
++ -I. -I.. -I${LOCALBASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl)
# Uncomment the line below if you want to use original "[" and "]" keys
# for inventory access, instead of "k" and "l".
@@ -68,7 +68,7 @@
endif
-X_LDFLAGS = -L/usr/X11R6/lib
-+X_LDFLAGS = -L${X11BASE}/lib
++X_LDFLAGS = -L${LOCALBASE}/lib
X11LIBS = -lXext -lX11
-GLLIBS = -lSDL -lpthread
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 6ae003970193..251a20cdc869 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -7,7 +7,7 @@
PORTNAME= heroes
PORTVERSION= 0.21
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= games
MASTER_SITES= SF
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -30,7 +30,6 @@ DATASRC= ${WRKDIR}/${DATADISTNAME}
SOUNDSRC= ${WRKDIR}/${SOUNDISTNAME}
MUSICSRC= ${WRKDIR}/${MUSICDISTNAME}
-USE_X_PREFIX= yes
USE_SDL= mixer sdl
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/games/hex/Makefile b/games/hex/Makefile
index fd6269b79f5a..e4f4d2eb6e7f 100644
--- a/games/hex/Makefile
+++ b/games/hex/Makefile
@@ -7,14 +7,13 @@
PORTNAME= hex
PORTVERSION= 0.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.earth.li/projectpurple/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of "Puzzle Bobble" for X11 that uses GTK/Imlib
-USE_X_PREFIX= yes
USE_GNOME= imlib
MAKE_ENV= GRAPHICPATH="${GRAPHICPATH}" LEVELPATH="${LEVELPATH}"
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index 8a0d67ad4664..d3a4f7265899 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= hexxagon
PORTVERSION= 1.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://www.nesqi.se/hexxagon/hexxagon/download/
@@ -18,7 +18,6 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
USE_BZIP2= yes
USE_GMAKE= yes
-USE_XLIB= yes
GNU_CONFIGURE= yes
DESKTOP_ENTRIES="Hexxagon" "Strategy Game" "" \
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index 838a8ecc7d8f..e7ead06f688c 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/hoh-install-${PORTVERSION}/
USE_BZIP2= YES
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
ONLY_FOR_ARCHS= i386
SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 82547fb08801..ee44b33a3651 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icbm3d
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/icbm3d/
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= "Inter-Continental Ballistic Missiles, 3D" - 3D game of defense
WRKSRC= ${WRKDIR}/icbm3d
-USE_X_PREFIX= yes
+USE_XORG= x11
MAKEFILE= makefile
ALL_TARGET= icbm3d
diff --git a/games/icbm3d/files/patch-aa b/games/icbm3d/files/patch-aa
index 1d20749a5459..b9f935070eca 100644
--- a/games/icbm3d/files/patch-aa
+++ b/games/icbm3d/files/patch-aa
@@ -7,7 +7,7 @@
-CC=gcc
+CC?=gcc
+PREFIX?=/usr/X11R6
-+X11BASE?=/usr/X11R6
++LOCALBASE?=/usr/X11R6
MATHLIB=-lm
INSTALLROOT=$(PREFIX)
@@ -15,8 +15,8 @@
-XLIB=-L$(PREFIX)/lib -lX11 #-lcompat
-CFLAGS=-I$(PREFIX)/include -O2
-+XLIB=-L$(X11BASE)/lib -lX11 #-lcompat
-+CFLAGS+=-I$(X11BASE)/include
++XLIB=-L$(LOCALBASE)/lib -lX11 #-lcompat
++CFLAGS+=-I$(LOCALBASE)/include
# End of makefile user-definable variables-----------------------------------
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 5bbeb5a9e666..ce62776583e8 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imaze
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://home.tu-clausthal.de/student/iMaze/files/
PKGNAMESUFFIX= -${TOOLKIT}
@@ -25,9 +25,8 @@ LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
TOOLKIT= xview
.endif
-USE_X_PREFIX= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= ${TOOLKIT} X11Dir=${X11BASE} CFlags="${CFLAGS}"
+CONFIGURE_ARGS= ${TOOLKIT} X11Dir=${LOCALBASE} CFlags="${CFLAGS}"
CONFIGURE_WRKSRC=${WRKSRC}/source
BUILD_WRKSRC= ${WRKSRC}/source
MAKE_ENV= SOUNDDIR=${SOUNDDIR}
diff --git a/games/ioquake3/files/patch-Makefile b/games/ioquake3/files/patch-Makefile
index f1123b4b68b4..30b4fbfe3dc7 100644
--- a/games/ioquake3/files/patch-Makefile
+++ b/games/ioquake3/files/patch-Makefile
@@ -107,7 +107,7 @@
+ BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -DLIBDIR='\"$(LIBDIR)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
- GL_CFLAGS = -I/usr/X11R6/include
-+ GL_CFLAGS = -I$(X11BASE)/include
++ GL_CFLAGS = -I$(LOCALBASE)/include
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
@@ -188,7 +188,7 @@
+ endif
+
+ ifneq ($(USE_SDL_VIDEO),1)
-+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(USE_OPENAL),1)
diff --git a/games/iourbanterror/files/patch-Makefile b/games/iourbanterror/files/patch-Makefile
index 1efcfda57fe6..b71f958e684d 100644
--- a/games/iourbanterror/files/patch-Makefile
+++ b/games/iourbanterror/files/patch-Makefile
@@ -213,7 +213,7 @@
+ endif
+
+ ifneq ($(USE_SDL_VIDEO),1)
-+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(USE_OPENAL),1)
diff --git a/games/jfduke3d/Makefile b/games/jfduke3d/Makefile
index f4a1705cc648..8d0e2caed584 100644
--- a/games/jfduke3d/Makefile
+++ b/games/jfduke3d/Makefile
@@ -24,9 +24,8 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
ONLY_FOR_ARCHS= i386
ONLY_FOR_ARCHS_REASON= uses x86 assembly code
USE_ZIP= yes
-USE_GCC= 3.2+
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_GNOME= gtk20
USE_SDL= mixer sdl
WRKSRC= ${WRKDIR}/${PORTNAME}_src_${PORTVERSION}
@@ -38,7 +37,7 @@ post-patch:
s|^(CC=).*|\1${CC}|; \
s|^(CFLAGS=).*|\1${CFLAGS}|; \
s|^(NASMFLAGS=).*|\1 -s -f elf|; \
- s|/usr/X11R6|${X11BASE}|; \
+ s|/usr/X11R6|${LOCALBASE}|; \
s|sdl-config|${SDL_CONFIG}|' \
${WRKSRC}/Makefile \
${WRKDIR}/jfbuild_src_${PORTVERSION}/Makefile \
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index da193d0766c0..aaac10f37cb0 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -20,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
USE_SDL= sdl mixer
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
MAKE_ENV= CXX="${CXX}" \
- CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
- LDFLAGS="`${SDL_CONFIG} --libs` -L${X11BASE}/lib"
+ CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include" \
+ LDFLAGS="`${SDL_CONFIG} --libs` -L${LOCALBASE}/lib"
post-patch:
.for i in font image puzzles sound
diff --git a/games/joequake/files/patch-Makefile.linux b/games/joequake/files/patch-Makefile.linux
index be4c3e029c94..199e15712d15 100644
--- a/games/joequake/files/patch-Makefile.linux
+++ b/games/joequake/files/patch-Makefile.linux
@@ -14,7 +14,7 @@
+CC ?= gcc
+#_E := @
+LOCALBASE ?= /usr/local
-+X11BASE ?= /usr/X11R6
++LOCALBASE ?= /usr/X11R6
+USE_OPTIMIZED_CFLAGS ?= YES
-default_target: glx
@@ -63,7 +63,7 @@
GLX_CFLAGS := $(CFLAGS) \
- -DGLQUAKE -I/usr/X11R6/include
-+ -DGLQUAKE -I$(X11BASE)/include
++ -DGLQUAKE -I$(LOCALBASE)/include
+
+ifeq ($(strip $(USE_X86_ASM)),YES)
+GLX_CFLAGS += -Did386
@@ -73,7 +73,7 @@
- -lGL -L/usr/X11R6/lib -lX11 \
- -lXext -lXxf86dga -lXxf86vm \
- -lpng -ljpeg
-+ -L$(X11BASE)/lib -lGL -lX11 \
++ -L$(LOCALBASE)/lib -lGL -lX11 \
+ -lXext -lXxf86dga -lXxf86vm \
+ -L$(LOCALBASE)/lib -lpng -ljpeg
@@ -96,7 +96,7 @@
X11_S_OBJS := $(addprefix $(X11_DIR)/, $(addsuffix .o, $(X11_S_FILES)))
-X11_CFLAGS := $(CFLAGS)
-+X11_CFLAGS := $(CFLAGS) -I$(X11BASE)/include
++X11_CFLAGS := $(CFLAGS) -I$(LOCALBASE)/include
+
+ifeq ($(strip $(USE_X86_ASM)),YES)
+X11_CFLAGS += -Did386
@@ -105,7 +105,7 @@
X11_LDFLAGS := $(LDFLAGS) \
- -L/usr/X11R6/lib -lX11 -lXext \
- -lpng
-+ -L$(X11BASE)/lib -lX11 -lXext \
++ -L$(LOCALBASE)/lib -lX11 -lXext \
+ -L$(LOCALBASE)/lib -lpng
x11: _DIR := $(X11_DIR)
@@ -120,7 +120,7 @@
SVGA_LDFLAGS := $(LDFLAGS) \
- -L/usr/X11R6/lib -lX11 -lpthread \
- -lvga -lpng
-+ -L$(X11BASE)/lib -lX11 -lpthread \
++ -L$(LOCALBASE)/lib -lX11 -lpthread \
+ -L$(LOCALBASE)/lib -lvga -lpng
+ifeq ($(OSTYPE),Linux)
diff --git a/games/kiki/Makefile b/games/kiki/Makefile
index e21fd3c3c9be..72876062471c 100644
--- a/games/kiki/Makefile
+++ b/games/kiki/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kiki
PORTVERSION= 1.0.2
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
@@ -21,23 +20,22 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
USE_PYTHON= 2.3
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl mixer image
USE_DOS2UNIX= kodilib/linux/Makefile src/main/KikiController.cpp linux/Makefile kodilib/src/types/KVector.h src/main/KikiPythonWidget.h
-USE_GCC= 3.4+
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
WRKSRC= ${WRKDIR}/kiki
post-patch:
- @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${X11BASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile
- @${REINPLACE_CMD} -e '/^X11_INCLUDES/ s|/.*/|${X11BASE}/include|' ${WRKSRC}/linux/Makefile
+ @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|.*|CXXFLAGS+=$$(KODI_INCLUDES) -I${LOCALBASE}/include `${SDL_CONFIG} --cflags`|' ${WRKSRC}/kodilib/linux/Makefile
+ @${REINPLACE_CMD} -e '/^X11_INCLUDES/ s|/.*/|${LOCALBASE}/include|' ${WRKSRC}/linux/Makefile
@${REINPLACE_CMD} -e '/PYTHON/ s|/usr|${LOCALBASE}|' ${WRKSRC}/linux/Makefile
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/linux/Makefile
@${REINPLACE_CMD} -e 's|CXXFLAGS =|CXXFLAGS +=|' ${WRKSRC}/linux/Makefile
@${REINPLACE_CMD} -e 's|PYTHON_VERSION|PYTHON_VER|' ${WRKSRC}/linux/Makefile
- @${REINPLACE_CMD} -e '/^GLLIBS/ s|$$| -L${X11BASE}/lib|' ${WRKSRC}/linux/Makefile
+ @${REINPLACE_CMD} -e '/^GLLIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/linux/Makefile
@${REINPLACE_CMD} -e 's|getenv("KIKI_HOME")|"${DATADIR}"|' ${WRKSRC}/src/main/KikiController.cpp
do-build:
diff --git a/games/kmquake2/files/patch-Makefile b/games/kmquake2/files/patch-Makefile
index fa5149d83782..25d27cab782f 100644
--- a/games/kmquake2/files/patch-Makefile
+++ b/games/kmquake2/files/patch-Makefile
@@ -56,7 +56,7 @@
+Q2DIR?=$(LOCALBASE)/share/quake2
LIBDIR?=$(LOCALBASE)/lib/kmquake2
- XCFLAGS=-I$(X11BASE)/include
+ XCFLAGS=-I$(LOCALBASE)/include
@@ -91,7 +95,7 @@
endif
@@ -150,7 +150,7 @@
-$(BINDIR)/baseq2/kmq2game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
- $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -lGL
+$(BINDIR)/baseq2/kmq2game.$(SHLIBEXT) : $(GAME_OBJS)
-+ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -L$(X11BASE)/lib -lGL
++ $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS) -L$(LOCALBASE)/lib -lGL
$(BUILDDIR)/game/acebot_ai.o : $(GAME_DIR)/acesrc/acebot_ai.c
$(DO_SHLIB_CC)
diff --git a/games/libdungeonmaker/Makefile b/games/libdungeonmaker/Makefile
index 3e14d55cb2d8..748a1484e273 100644
--- a/games/libdungeonmaker/Makefile
+++ b/games/libdungeonmaker/Makefile
@@ -8,15 +8,14 @@
PORTNAME= libdungeonmaker
PORTVERSION= 2.05
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= dungeonmaker
DISTNAME= dungeonmaker-${PORTVERSION}
MAINTAINER= aaron@FreeBSD.org
COMMENT= A program/library that "grows" dungeons for use in isometric games
-INSTALLS_SHLIB= yes
-USE_GCC= 3.2+
+USE_LDCONFIG= yes
SUB_FILES= pkg-message
PLIST_SUB+= HAS_DOCS=${HAS_DOCS}
diff --git a/games/libfov/Makefile b/games/libfov/Makefile
index a9737778152f..b532a52ed5f4 100644
--- a/games/libfov/Makefile
+++ b/games/libfov/Makefile
@@ -8,14 +8,13 @@
PORTNAME= libfov
PORTVERSION= 1.0.2
CATEGORIES= games devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= libfov
+MASTER_SITES= SFE/libfov
MAINTAINER= aaron@FreeBSD.org
COMMENT= C library for calculating fields of view on low resolution rasters
WRKSRC= ${WRKDIR}/${DISTNAME}/fov
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
post-extract:
@${CP} ${PATCHDIR}/Makefile.bsd ${WRKSRC}/Makefile
diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile
index 156accb3ce0c..d53923e744a2 100644
--- a/games/libmaitretarot/Makefile
+++ b/games/libmaitretarot/Makefile
@@ -19,6 +19,6 @@ USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20 libxml2 lthack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile
index 2c78e6159b69..018f8d074ef3 100644
--- a/games/libmt_client/Makefile
+++ b/games/libmt_client/Makefile
@@ -21,6 +21,6 @@ USE_AUTOTOOLS= libtool:15
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GNOME= glib20 libxml2 lthack
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index dfefeb988265..0bf9b0111e92 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libshhcards
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://shh.thathost.com/pub-unix/files/
DISTNAME= shhcards-${PORTVERSION}
@@ -15,8 +15,7 @@ DISTNAME= shhcards-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for displaying game cards on X Window System
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKEFILE= ${FILESDIR}/Makefile.lib
USE_LDCONFIG= yes
diff --git a/games/libshhcards/files/Makefile.lib b/games/libshhcards/files/Makefile.lib
index 05e563d82944..f5488978f8fe 100644
--- a/games/libshhcards/files/Makefile.lib
+++ b/games/libshhcards/files/Makefile.lib
@@ -12,7 +12,7 @@ INCS= shhcards.h
INCSDIR=${PREFIX}/include
INCDIR= ${INCSDIR} # for pre-bsd.incs.mk API
-CFLAGS+= -I${X11BASE}/include
+CFLAGS+= -I${LOCALBASE}/include
SRCS= shhcards.c
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index c6d4a8a95457..a2351231a3ca 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -19,14 +19,13 @@ BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
LIB_DEPENDS= physfs-1.0.1:${PORTSDIR}/devel/physfs
USE_BZIP2= yes
-USE_GCC= 3.2+
USE_SDL= sdl mixer image ttf gfx
USE_GL= yes
USE_GNOME= libxml2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-libphysfs=${PREFIX} \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+ --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/games/linux-goodway/Makefile b/games/linux-goodway/Makefile
index 03f7a64b2d25..d61bacbc32c4 100644
--- a/games/linux-goodway/Makefile
+++ b/games/linux-goodway/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= icoconvert:${PORTSDIR}/graphics/icoconvert
RUN_DEPENDS= X-Plane:${PORTSDIR}/games/linux-x-plane
WRKSRC= ${WRKDIR}/GoodWay${GWVERSION}F
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_ZIP= yes
USE_LINUX= yes
RESTRICTED= "Redistribution prohibited"
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS= i386 amd64
GWVERSION= ${PORTVERSION:S|.||g}
-XDIR= ${X11BASE}/lib/x-plane
+XDIR= ${LOCALBASE}/lib/x-plane
GWDIR= ${PREFIX}/lib/goodway
GWDIR_REL= ${GWDIR:S,^${PREFIX}/,,}
@@ -59,11 +59,11 @@ post-patch:
do-build:
.for t in athlon-xp i586 pentium-3
- @if [ -e ${X11BASE}/lib/x-plane/X-Plane-${t} ]; then \
- ${ECHO_CMD} 'GNL_XPlaneEXE=${X11BASE}/lib/x-plane/X-Plane-${t}' > ${WRKSRC}/Properties3.prf; \
+ @if [ -e ${LOCALBASE}/lib/x-plane/X-Plane-${t} ]; then \
+ ${ECHO_CMD} 'GNL_XPlaneEXE=${LOCALBASE}/lib/x-plane/X-Plane-${t}' > ${WRKSRC}/Properties3.prf; \
fi
.endfor
- @${ECHO_CMD} 'GNL_XPlaneDir=${X11BASE}/lib/x-plane' >> ${WRKSRC}/Properties3.prf
+ @${ECHO_CMD} 'GNL_XPlaneDir=${LOCALBASE}/lib/x-plane' >> ${WRKSRC}/Properties3.prf
@icoconvert ${WRKSRC}/ICON1.ICO
@${MKDIR} ${WRKSRC}/.icons
@${MV} ${WRKSRC}/ICON1_*.png ${WRKSRC}/.icons
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index 1bb4ccf7d69d..16d632e0ac6b 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -19,9 +19,9 @@ COMMENT= Serious Sam - The Second Encounter
NO_BUILD= yes
USE_BZIP2= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GL= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
NO_PACKAGE= yes # distfiles must be downloaded manually, wierd legal issues etc etc etc.
SSAMDIR= ${PREFIX}/ssam
diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile
index 8036ac104bc7..225546718c3f 100644
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LINUX_BASE_PORT}
IS_INTERACTIVE= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
PKGMESSAGE= ${WRKDIR}/pkg-message
INSTALLDIR?= steam
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index cbe1b464e358..a56f85c91237 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX= .sh.bin
MAINTAINER= alepulver@FreeBSD.org
COMMENT= Unreal Tournament 2003 demo
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LINUX= yes
NO_PACKAGE= Distfile is 130MB, set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
diff --git a/games/linux-ut2004-demo/Makefile b/games/linux-ut2004-demo/Makefile
index 92450a292870..fdbcba03e07c 100644
--- a/games/linux-ut2004-demo/Makefile
+++ b/games/linux-ut2004-demo/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= jylefort@FreeBSD.org
COMMENT= Unreal Tournament 2004 demo
ONLY_FOR_ARCHS= i386 amd64
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LINUX= yes
NO_PACKAGE= Distfile size is 275MB, set FORCE_PACKAGE if you really want to build this package
RESTRICTED= Redistribution is limited, see license
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index 3a00767e8aa4..f0b26d9f9d4c 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -17,7 +17,7 @@ COMMENT= A simulation of snowboarding at the Jay Peak resort in Vermont
WRKSRC= ${WRKDIR}/soulride
ONLY_FOR_ARCHS= i386
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LINUX= yes
NO_BUILD= yes
SUB_FILES= virtual-jay-peak
diff --git a/games/linux-x-plane-net-installer/Makefile b/games/linux-x-plane-net-installer/Makefile
index 4995f43f9a17..f57fa2fe0249 100644
--- a/games/linux-x-plane-net-installer/Makefile
+++ b/games/linux-x-plane-net-installer/Makefile
@@ -22,7 +22,7 @@ BROKEN= Unfetchable
DEPRECATED= ${BROKEN}
EXPIRATION_DATE=2007-04-10
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_LINUX= yes
NO_BUILD= yes
RESTRICTED= "Redistribution prohibited"
diff --git a/games/linux-x-plane/Makefile b/games/linux-x-plane/Makefile
index c56492f4db52..0bd9b0763157 100644
--- a/games/linux-x-plane/Makefile
+++ b/games/linux-x-plane/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/libopenal.so.1:${PORTSDIR}/audio/linux-openal
IGNOREFILES= ${DISTFILES} # user-created distribution
NO_WRKSUBDIR= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_BZIP2= yes
USE_LINUX= yes
NO_BUILD= yes
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index d508dfeb171d..46d06cff3e36 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= macopix
PORTVERSION= 1.6.4
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/
.if defined(WITH_GTK1)
@@ -36,7 +37,6 @@ RESTRICTED_FILES= \
macopix-mascot-HxB-euc-ja-0.30.tar.gz
USE_GETTEXT= yes
-USE_X_PREFIX= yes
.if defined(WITH_GTK1)
USE_GNOME= gtk12 gdkpixbuf
.else
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 362bf8d4fb3b..43201cb6cb2c 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -7,7 +7,7 @@
PORTNAME= maelstrom
PORTVERSION= 3.0.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.devolution.com/~slouken/projects/Maelstrom/src/
DISTNAME= Maelstrom-${PORTVERSION}
@@ -15,9 +15,8 @@ DISTNAME= Maelstrom-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Asteroids-style game for X Window System
-USE_X_PREFIX= yes
USE_SDL= sdl net
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/maelstrom/files/Makeflags b/games/maelstrom/files/Makeflags
index de83567d2f66..f2721ebf85f1 100644
--- a/games/maelstrom/files/Makeflags
+++ b/games/maelstrom/files/Makeflags
@@ -20,12 +20,12 @@ OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \
Utils.o shared.o myerror.o
SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o
-X11INCLUDE = -I${X11BASE}/include
+X11INCLUDE = -I${LOCALBASE}/include
INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
CFLAGS += $(INCLUDES) $(FEATURES) \
-pedantic -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
EXTRALIBS =
-X11LINKDIR = -L${X11BASE}/lib
+X11LINKDIR = -L${LOCALBASE}/lib
X11LIBS = -lXpm $(XPMLINKDIR) -lX11 -lXext $(X11LINKDIR)
CSUMLIB =
LIBS = $(EXTRALIBS) $(X11LIBS) $(CSUMLIB)
diff --git a/games/mangband/files/patch-ab b/games/mangband/files/patch-ab
index 9b94e2b07849..cda4eb16a658 100644
--- a/games/mangband/files/patch-ab
+++ b/games/mangband/files/patch-ab
@@ -15,8 +15,8 @@
#
-CFLAGS = -Wall -g -pipe -D"USE_X11" -D"USE_GCU" -I/usr/include/ncurses
-LIBS = -L/usr/X11R6/lib -lX11 -lncurses
-+CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${X11BASE}/include
-+LIBS = -L${X11BASE}/lib -lX11 -lncurses
++CFLAGS += -D"USE_X11" -D"USE_GCU" -DDEFAULT_PATH="\"${PREFIX}/lib/mangband\"" -I${LOCALBASE}/include
++LIBS = -L${LOCALBASE}/lib -lX11 -lncurses
##
diff --git a/games/marsnomercy/Makefile b/games/marsnomercy/Makefile
index 472879ec4718..d2161b90cf59 100644
--- a/games/marsnomercy/Makefile
+++ b/games/marsnomercy/Makefile
@@ -18,7 +18,7 @@ COMMENT= A turn-based strategy game setting on Mars
BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl image ttf
MAKE_ENV= CC="${CC}" CXX="${CXX}"
SCONS_ARGS= prefix=${PREFIX}
diff --git a/games/marsnomercy/files/patch-SConstruct b/games/marsnomercy/files/patch-SConstruct
index 5def5523e273..1ab7e68b7420 100644
--- a/games/marsnomercy/files/patch-SConstruct
+++ b/games/marsnomercy/files/patch-SConstruct
@@ -6,7 +6,7 @@
else:
+ # Section used for FreeBSD port
+ LOCALBASE = os.environ['LOCALBASE']
-+ X11BASE = os.environ['X11BASE']
++ LOCALBASE = os.environ['LOCALBASE']
# determine compiler and linker flags for SDL
- env.ParseConfig('sdl-config --cflags')
- env.ParseConfig('sdl-config --libs')
@@ -19,8 +19,8 @@
-
+ env.Replace(CC = os.environ['CC'])
+ env.Replace(CXX = os.environ['CXX'])
-+ env.Replace(CPPPATH = [X11BASE + '/include',LOCALBASE+ '/include'])
-+ env.Replace(LIBPATH = [X11BASE + '/lib',LOCALBASE+ '/lib'])
++ env.Replace(CPPPATH = [LOCALBASE + '/include',LOCALBASE+ '/include'])
++ env.Replace(LIBPATH = [LOCALBASE + '/lib',LOCALBASE+ '/lib'])
+ env.Append(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`')
# generate help for options
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index c4ea71fd7be8..0e4328307304 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= merlin
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.doc.ic.ac.uk/~np2/software/download/
DISTNAME= ${PORTNAME}
@@ -19,7 +19,6 @@ RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_X_PREFIX= yes
post-patch:
@${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" \
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index 37c450b0315f..1803b7a5bcfb 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ixtl@utmc.or.jp
COMMENT= Lovely characters stay on top of active window
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
RESTRICTED= 'contains commercial character data'
post-install:
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 8e977b785044..2fbd583689af 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -40,15 +40,15 @@ DOCS= algorithms.html antarctic.html author.html \
versions.html
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mindguard ${X11BASE}/bin/mindguard
- ${MKDIR} ${X11BASE}/share/mindguard
+ ${INSTALL_PROGRAM} ${WRKSRC}/mindguard ${PREFIX}/bin/mindguard
+ ${MKDIR} ${PREFIX}/share/mindguard
.for i in ${CARRIERS}
- ${INSTALL_DATA} ${WRKSRC}/carriers/$i ${X11BASE}/share/mindguard
+ ${INSTALL_DATA} ${WRKSRC}/carriers/$i ${PREFIX}/share/mindguard
.endfor
.if !defined(NOPORTDOCS)
- ${MKDIR} ${X11BASE}/share/doc/mindguard
+ ${MKDIR} ${PREFIX}/share/doc/mindguard
.for i in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/docs/$i ${X11BASE}/share/doc/mindguard
+ ${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/mindguard
.endfor
.endif
diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-aa
index ea0f1258c4f4..a1d794d57804 100644
--- a/games/mindguard/files/patch-aa
+++ b/games/mindguard/files/patch-aa
@@ -10,7 +10,7 @@
mindguard: mindguard.c mindguard.h
- $(CC) `gtk-config --cflags` mindguard.c -o mindguard `gtk-config --libs`
-+ $(CC) -DX11BASE=\"${X11BASE}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs`
++ $(CC) -DLOCALBASE=\"${PREFIX}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs`
install: mindguard install-bin install-carriers install-docs
diff --git a/games/mindguard/files/patch-ab b/games/mindguard/files/patch-ab
index cb83fcf5aff0..94079c995e76 100644
--- a/games/mindguard/files/patch-ab
+++ b/games/mindguard/files/patch-ab
@@ -5,7 +5,7 @@
break;
case 2:
- strcpy(car_path, "/usr/local/share/MindGuard/carriers/");
-+ strcpy(car_path, X11BASE "/share/mindguard/");
++ strcpy(car_path, LOCALBASE "/share/mindguard/");
break;
default:
break;
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 5978097b17e9..a22ea993ec86 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -18,7 +18,7 @@ COMMENT= An arcade style game with stereo sound for X Window System
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \
RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \
- X11_PATH="${X11BASE}"
+ X11_PATH="${LOCALBASE}"
WANT_SDL= yes
OPTIONS= SDL "SDL support" on
diff --git a/games/monster-masher/Makefile b/games/monster-masher/Makefile
index 2b3206ff99a1..f852a101b381 100644
--- a/games/monster-masher/Makefile
+++ b/games/monster-masher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= monster
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games gnome
MASTER_SITES= http://www.cs.aau.dk/~olau/monster-masher/source/
PKGNAMESUFFIX= -masher
@@ -18,7 +18,6 @@ COMMENT= Gnomemm puzzle game where you have to clean the caves of monsters
LIB_DEPENDS= gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
-USE_X_PREFIX= yes
USE_BZIP2= yes
USE_GNOME= gnomeprefix gnomehack gnometarget intlhack
USE_GMAKE= yes
diff --git a/games/nehquake/files/patch-Makefile b/games/nehquake/files/patch-Makefile
index 1d40a6b42932..a83f9531ab5e 100644
--- a/games/nehquake/files/patch-Makefile
+++ b/games/nehquake/files/patch-Makefile
@@ -67,8 +67,8 @@
-GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm
-GLCFLAGS=-DGLQUAKE -I/usr/include -I/usr/X11R6/include
-+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-+GLCFLAGS=-DGLQUAKE -I$(X11BASE)/include
++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++GLCFLAGS=-DGLQUAKE -I$(LOCALBASE)/include
DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
diff --git a/games/nethack32/files/patch-ab b/games/nethack32/files/patch-ab
index a22424c84079..9f6970d871ed 100644
--- a/games/nethack32/files/patch-ab
+++ b/games/nethack32/files/patch-ab
@@ -6,8 +6,8 @@
-CFLAGS = -O -I../include
-LFLAGS =
-+CFLAGS += -O -I../include -I${X11BASE}/include
-+LFLAGS = -L${X11BASE}/lib
++CFLAGS += -O -I../include -I${LOCALBASE}/include
++LFLAGS = -L${LOCALBASE}/lib
# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
diff --git a/games/nethack33/files/patch-ad b/games/nethack33/files/patch-ad
index 2053453e3489..f0f1ab1843ba 100644
--- a/games/nethack33/files/patch-ad
+++ b/games/nethack33/files/patch-ad
@@ -11,7 +11,7 @@
# CFLAGS = -g -I../include
+CFLAGS += -I../include
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
+endif
+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
+CFLAGS += -DQT_GRAPHICS
@@ -65,7 +65,7 @@
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
# WINX11LIB = -lXaw -lXmu -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
diff --git a/games/nethack34/files/patch-ad b/games/nethack34/files/patch-ad
index 86219e9fefaf..b66b31524228 100644
--- a/games/nethack34/files/patch-ad
+++ b/games/nethack34/files/patch-ad
@@ -14,7 +14,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
-CFLAGS = -O -I../include
+CFLAGS += -I../include
+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS -I${X11BASE}/include
++CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
+endif
+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
+CFLAGS += -DQT_GRAPHICS
@@ -71,7 +71,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${X11BASE}/lib
++WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
# WINX11LIB = -lXaw -lXmu -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index 37c103a59445..1561df2934d4 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netrek-BRMH
PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://ftp.netrek.org/pub/netrek/mirrors/ftp.csua.berkeley.edu.old/netrek/ \
@@ -17,7 +17,6 @@ EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
COMMENT= A 16-player network space battle/conquest game with a Star Trek theme
-USE_X_PREFIX= YES
NO_BUILD= YES
NO_WRKSUBDIR= YES
PLIST_FILES= bin/netrek
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index c7951fd4cb68..50bc0220a70d 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netrek-COW
PORTVERSION= 3.00.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://ftp.netrek.org/pub/netrek/clients/cow/COW-bin/old/
DISTFILES= COW.3.00pl0.FreeBSD.gz
@@ -15,7 +15,6 @@ DISTFILES= COW.3.00pl0.FreeBSD.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= A 16-player network space battle/conquest game with a Star Trek theme
-USE_X_PREFIX= YES
NO_BUILD= YES
NO_WRKSUBDIR= YES
PLIST_FILES= bin/netrek
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index f6d78d173dd4..f387f2ed9150 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -7,7 +7,7 @@
PORTNAME= newvox
PORTVERSION= 1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://www.libsdl.org/projects/newvox/src/
@@ -15,7 +15,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Voxel-style landscape rendering fly-by
USE_SDL= sdl
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
do-install:
diff --git a/games/nexuiz/Makefile b/games/nexuiz/Makefile
index c206cd78824d..1404c8664d66 100644
--- a/games/nexuiz/Makefile
+++ b/games/nexuiz/Makefile
@@ -7,9 +7,9 @@
PORTNAME= nexuiz
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -49,7 +49,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis \
.endif
.if !defined(WITHOUT_CLIENT)
-USE_GL= yes
+USE_GL= glut
+USE_XORG= x11 xpm xxf86vm xxf86dga xext
ALL_TARGET+= cl-release
PLIST_SUB+= CLIENT=""
.else
@@ -74,7 +75,7 @@ PLIST_SUB+= SERVER="@comment "
post-extract:
@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \
-d ${WRKDIR}/Nexuiz/sources
- @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' ${WRKSRC}/${MAKEFILE}
+ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE}
@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
do-build:
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index bafb98cd391f..d615d09c046b 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -26,8 +26,8 @@ MAN6= nighthawk.6
CFLAGS+= -DINSTALL_DIR=\\\"\${DATADIR}\\\" \
-DSCORES_FILE=\\\"/var/games/nighthawk.scores\\\" \
- -I${X11BASE}/include
-LDFLAGS= -lm -L${X11BASE}/lib -lX11 -lGL -lGLU -lglut
+ -I${LOCALBASE}/include
+LDFLAGS= -lm -L${LOCALBASE}/lib -lX11 -lGL -lGLU -lglut
post-patch:
${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/noegnud-littlehack/files/noegnud-littlehack.patch b/games/noegnud-littlehack/files/noegnud-littlehack.patch
index 7cc51e5b48fe..67ba867c6ad8 100644
--- a/games/noegnud-littlehack/files/noegnud-littlehack.patch
+++ b/games/noegnud-littlehack/files/noegnud-littlehack.patch
@@ -64,7 +64,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
# compile normally
-COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
++COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${X11BASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
index 6b9ea1c2a789..e6d94e177cdd 100644
--- a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
+++ b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
++COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${X11BASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack/files/noegnud-nethack.patch b/games/noegnud-nethack/files/noegnud-nethack.patch
index 94d7198efb1f..f9ae4b49ed26 100644
--- a/games/noegnud-nethack/files/noegnud-nethack.patch
+++ b/games/noegnud-nethack/files/noegnud-nethack.patch
@@ -64,7 +64,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
++COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${X11BASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-slashem/files/noegnud-slashem.patch b/games/noegnud-slashem/files/noegnud-slashem.patch
index 1afe73864a6a..0b61d3dd3c32 100644
--- a/games/noegnud-slashem/files/noegnud-slashem.patch
+++ b/games/noegnud-slashem/files/noegnud-slashem.patch
@@ -24,7 +24,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
# compile normally
-COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
++COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -33,7 +33,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${X11BASE}/lib
++LFLAGS = -L${LOCALBASE}/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
# LFLAGS = -b i486-linuxaout -L/usr/X11/lib
@@ -100,8 +100,8 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem
# compile normally
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
-LFLAGS = -L/usr/X11R6/lib
-+CFLAGS += -O2 -fomit-frame-pointer -I../include -I${X11BASE}/include
-+LFLAGS = -L${X11BASE}/lib
++CFLAGS += -O2 -fomit-frame-pointer -I../include -I${LOCALBASE}/include
++LFLAGS = -L${LOCALBASE}/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
# LFLAGS = -b i486-linuxaout -L/usr/X11/lib
diff --git a/games/oolite/files/patch-makefile b/games/oolite/files/patch-makefile
index 2c0d06d39473..93cd7f9f31cd 100644
--- a/games/oolite/files/patch-makefile
+++ b/games/oolite/files/patch-makefile
@@ -18,8 +18,8 @@
- ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
- oolite_LIB_DIRS += -L/usr/X11R6/lib/
+ ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs`
-+ ADDITIONAL_CFLAGS = -I${X11BASE}/include -DLINUX `sdl-config --cflags`
-+ ADDITIONAL_OBJCFLAGS = -I${X11BASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
-+ oolite_LIB_DIRS += -L${X11BASE}/lib/
++ ADDITIONAL_CFLAGS = -I${LOCALBASE}/include -DLINUX `sdl-config --cflags`
++ ADDITIONAL_OBJCFLAGS = -I${LOCALBASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
++ oolite_LIB_DIRS += -L${LOCALBASE}/lib/
endif
OBJC_PROGRAM_NAME = oolite
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index feb8f7bfd567..6a4b3f4a3c7a 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oonsoo
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www4.ncsu.edu/~bwmott/www/oonsoo/distributions/
@@ -17,12 +17,12 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= A solitaire card game for X
+USE_XORG= x11
PLIST_FILES= bin/oonsoo
-USE_XLIB= yes
MAKEFILE= Makefile.Linux
MAKE_ARGS= CC="${CXX}" CPPFLAGS="${CXXFLAGS} -ansi" \
- SYS_INCLUDE="-I${X11BASE}/include" \
- SYS_LIBS="-L${X11BASE}/lib -lX11"
+ SYS_INCLUDE="-I${LOCALBASE}/include" \
+ SYS_LIBS="-L${LOCALBASE}/lib -lX11"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/oonsoo ${PREFIX}/bin
diff --git a/games/openarena/files/patch-Makefile b/games/openarena/files/patch-Makefile
index ac77e4c5f58b..ca726586ad3d 100644
--- a/games/openarena/files/patch-Makefile
+++ b/games/openarena/files/patch-Makefile
@@ -79,7 +79,7 @@
- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
-
- GL_CFLAGS = -I/usr/X11R6/include
-+ GL_CFLAGS = -I$(X11BASE)/include
++ GL_CFLAGS = -I$(LOCALBASE)/include
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
@@ -160,7 +160,7 @@
+ endif
+
+ ifneq ($(USE_SDL_VIDEO),1)
-+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(USE_OPENAL),1)
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index d599b6828aa8..e809a969751f 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openglad
PORTVERSION= 0.98
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= snowstorm
+MASTER_SITES= SF/snowstorm
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL port of an old DOS game called Gladiator
@@ -19,7 +18,7 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_SDL= sdl mixer
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
PLIST_SUB= DOCDIR=share/doc/${PORTNAME}
NOT_FOR_ARCHS= sparc64
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 305a3beaa527..f30fa2fc0c74 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -15,11 +15,9 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= infofarmer@FreeBSD.org
COMMENT= Action flight simulator with its own 3D engine
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
-
USE_ZIP= yes
USE_PYTHON= yes
-USE_GL= yes
+USE_GL= glut
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
@@ -36,7 +34,7 @@ post-patch:
@${REINPLACE_CMD} -Ee 's!(-O[0-9s]?|-funroll-loops|-fno-inline)!!g'\
${WRKSRC}/gfx/tools/cc-config.sh
@${REINPLACE_CMD} -e 's|-march=$$ARCH||' ${WRKSRC}/gfx/tools/cc-config.sh
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g'\
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g'\
${WRKSRC}/gfx/tools/cc-config.sh ${WRKSRC}/gfx/tools/ld-config.sh
do-install:
diff --git a/games/pets/Makefile b/games/pets/Makefile
index 2875cf531241..1e0ca583051b 100644
--- a/games/pets/Makefile
+++ b/games/pets/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pets
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.loria.fr/~rougier/pub/Software/
@@ -17,7 +17,6 @@ COMMENT= Funny pets to follow your mouse pointer
WRKSRC= ${WRKDIR}/pet-${PORTVERSION}
-USE_X_PREFIX= yes
USE_GNOME= gtk20 pkgconfig
SUB_FILES= pkg-message
diff --git a/games/pinball/Makefile b/games/pinball/Makefile
index e13b1b7e04d9..327cb1384fad 100644
--- a/games/pinball/Makefile
+++ b/games/pinball/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pinball
PORTVERSION= 0.3.1
PORTREVISION= 8
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= thierry@FreeBSD.org
COMMENT= Emilia Pinball is a free pinball game
@@ -25,9 +24,9 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro
USE_SDL= image mixer sdl
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug
@@ -35,8 +34,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug
CONFIGURE_ARGS+= --with-allegro
EXTRA_LIBS= -lGL -lGLU
.endif
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -DRZR_LIBSTATIC" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${EXTRA_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -DRZR_LIBSTATIC" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${EXTRA_LIBS}"
ALLEGRO_CONFIG= ${LOCALBASE}/bin/allegro-config
DOCS= README
diff --git a/games/planeshift/Makefile b/games/planeshift/Makefile
index f5a0ff66b0ea..15f9103eddc1 100644
--- a/games/planeshift/Makefile
+++ b/games/planeshift/Makefile
@@ -25,8 +25,8 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= automake:15:env autoconf:261:env
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS}
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
+LDFLAGS+= -L${LOCALBASE}/lib
CRYSTAL= ${LOCALBASE}
CEL= ${LOCALBASE}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 3d2c064aa915..1ab72d959556 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -7,10 +7,9 @@
PORTNAME= pmars
PORTVERSION= 0.9.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= corewar
+MASTER_SITES= SF/corewar
MAINTAINER= alepulver@FreeBSD.org
COMMENT= A portable corewar system with ICWS'94 extensions
@@ -70,11 +69,11 @@ MAKE_ARGS+= CFLAGS+="-DSMALLMEM"
.endif
.if !defined(WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
TARGETS+= x11
X11_ARGS+= CFLAGS+="-DXWINGRAPHX" \
- CFLAGS+="-I${X11BASE}/include" \
- LIB+="-L${X11BASE}/lib -lX11"
+ CFLAGS+="-I${LOCALBASE}/include" \
+ LIB+="-L${LOCALBASE}/lib -lX11"
PLIST_SUB+= X11=""
.else
PLIST_SUB+= X11="@comment "
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index 9f95058b003a..f10c53c8c753 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -17,8 +17,8 @@ COMMENT= Free pong-like game
USE_SDL= sdl image net
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD}
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD}
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/pouetchess/Makefile b/games/pouetchess/Makefile
index 20a757b7cc71..84d963f8a501 100644
--- a/games/pouetchess/Makefile
+++ b/games/pouetchess/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= amdmi3@amdmi3.ru
COMMENT= An open-source 3D chess game
USE_SDL= sdl image
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/pouetChess_0.11
@@ -36,11 +36,11 @@ post-patch:
"s|$$(${PRINTF} '\r')$$||" {} \;
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${X11BASE}/lib|' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/^LIBS/ s|$$| -L${LOCALBASE}/lib|' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/CXX / d' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/CXXFLAGS.*+=/ d' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/^CXXFLAGS/ s|:=|+=|' ${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|$$| -I${X11BASE}/include|' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/^CXXFLAGS/ s|$$| -I${LOCALBASE}/include|' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|config\.ini|${PREFIX}/etc/pouetChess.conf|' ${WRKSRC}/src/globalInfos.cpp
@${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/src/globalInfos.h
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index 0a69bedea569..0f6a23e14a89 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_BZIP2= yes
USE_SDL= mixer sdl
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd${OSREL}
@@ -28,7 +28,7 @@ USE_DOS2UNIX= yes
DOS2UNIX_REGEX= .*\.(c|cpp|h)
post-patch:
- @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,RacingMode::,,' ${WRKSRC}/src/racingmode.h
.include <bsd.port.mk>
diff --git a/games/q2p/files/patch-Makefile b/games/q2p/files/patch-Makefile
index 337e42f12766..0539957c3fcb 100644
--- a/games/q2p/files/patch-Makefile
+++ b/games/q2p/files/patch-Makefile
@@ -161,7 +161,7 @@
+GAME_NAME=game.$(SHLIB_EXT)
BASE_CFLAGS+=-I$(LOCALBASE)/include \
- -I$(X11BASE)/include \
+ -I$(LOCALBASE)/include \
@@ -168,15 +165,14 @@
ifeq ($(strip $(OPTIMIZE)),YES)
diff --git a/games/q2pro/files/patch-build__pre.mk b/games/q2pro/files/patch-build__pre.mk
index 3ea555471f6c..087a65b53d49 100644
--- a/games/q2pro/files/patch-build__pre.mk
+++ b/games/q2pro/files/patch-build__pre.mk
@@ -10,8 +10,8 @@
-LDFLAGS_LINUX=#blank
+DATADIR?=$(Q2DIR)
+LIBDIR?=$(PREFIX)/lib/q2pro
-+CFLAGS_LINUX=-I$(LOCALBASE)/include -I$(X11BASE)/include -DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"'
-+LDFLAGS_LINUX=-L$(LOCALBASE)/lib -L$(X11BASE)/lib
++CFLAGS_LINUX=-I$(LOCALBASE)/include -DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"'
++LDFLAGS_LINUX=-L$(LOCALBASE)/lib
SRCFILES_LINUX=#blank
ASMFILES_LINUX=#blank
diff --git a/games/q3base/Makefile b/games/q3base/Makefile
index 5e9452aa1365..f32f8546f7f2 100644
--- a/games/q3base/Makefile
+++ b/games/q3base/Makefile
@@ -36,7 +36,7 @@ USE_SDL+= image
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|' \
+ @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's/echo aout/echo elf/' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|\($${exec_prefix}/lib\)/quake3|\1/q3base|' \
${WRKSRC}/src/Makefile.in
diff --git a/games/q3cellshading/files/patch-code-unix-Makefile b/games/q3cellshading/files/patch-code-unix-Makefile
index f7132cdb406e..c3ab9b0fa886 100644
--- a/games/q3cellshading/files/patch-code-unix-Makefile
+++ b/games/q3cellshading/files/patch-code-unix-Makefile
@@ -89,7 +89,7 @@
-endif #alpha test
+BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe
-+GL_CFLAGS = -I$(X11BASE)/include
++GL_CFLAGS = -I$(LOCALBASE)/include
-BASE_CFLAGS = -pipe
+DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
@@ -131,7 +131,7 @@
#GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
#GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
-GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-ifeq ($(ARCH),axp)
-TARGETS=\
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 2dd93e204117..8e0f1ffebbe5 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qgo
PORTVERSION= 1.5.4.2
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}
@@ -17,11 +18,11 @@ COMMENT= A Go board and SGF editor written with the Qt library
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+USE_XORG= x11 ice xext
USE_QT_VER= 3
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/qix/Makefile b/games/qix/Makefile
index 73983e38174d..203e76e53ae5 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= qix
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
@@ -15,15 +15,17 @@ MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
COMMENT= The classic arcade game
-BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+ xset:${PORTSDIR}/x11/xset
USE_DISPLAY= yes
.if defined(WITHOUT_X11)
MAKE_ARGS= NO_X11=yes
.else
-USE_X_PREFIX= yes
+USE_XORG= x11
PLIST= pkg-plist.x11
.endif
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 14db55b89f82..6447c8cf9bba 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+= GAME="@comment "
.if defined(WITH_GL)
USE_GL= yes
-CONFIGURE_ARGS+=--with-opengl=${X11BASE}
+CONFIGURE_ARGS+=--with-opengl=${LOCALBASE}
PLIST_SUB+= GL=""
.else
CONFIGURE_ARGS+=--with-opengl=no
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 2f3b02c226b7..9f9351681910 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -7,7 +7,7 @@
PORTNAME= quake2lnx
PORTVERSION= 0.16.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= games ipv6
MASTER_SITES= http://offload1.icculus.org/quake2/files/
DISTNAME= quake2-r${PORTVERSION}
@@ -55,7 +55,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
# ###
.if defined(WITH_X11)
-USE_XLIB= yes
+USE_XORG= x11 xxf86dga
MAKE_ARGS+= BUILD_X11=YES
REF_TARGETS+= softx
PLIST_SUB+= X11=""
diff --git a/games/quake2lnx/files/patch-Makefile b/games/quake2lnx/files/patch-Makefile
index 86435fa071eb..9d786bfc81cf 100644
--- a/games/quake2lnx/files/patch-Makefile
+++ b/games/quake2lnx/files/patch-Makefile
@@ -152,8 +152,8 @@
-XCFLAGS=-I/usr/X11R6/include
-XLDFLAGS=-L/usr/X11R6/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
-AALDFLAGS=-lm -laa
-+XCFLAGS=-I${X11BASE}/include
-+XLDFLAGS=-L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm
++XCFLAGS=-I${LOCALBASE}/include
++XLDFLAGS=-L${LOCALBASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm
+AACFLAGS=-I${PREFIX}/include
+AALDFLAGS=-L${PREFIX}/lib -laa
@@ -161,7 +161,7 @@
+SDLCFLAGS=$(shell ${SDL_CONFIG} --cflags)
ifeq ($(strip $(STATICSDL)),YES)
- SDLLDFLAGS += -L/usr/X11R6/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a
-+ SDLLDFLAGS += -L${X11BASE}/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a
++ SDLLDFLAGS += -L${LOCALBASE}/lib$(_LIB) -Wl,-Bstatic $(SDLDIR)/libSDL.a
SDLLDFLAGS += $(SDLDIR)/libesd.a $(SDLDIR)/libartsc.a -Wl,-Bdynamic
SDLLDFLAGS += -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm -lXv \
-lXinerama
@@ -177,8 +177,8 @@
-GLXCFLAGS=-I/usr/X11R6/include -DOPENGL
-GLXLDFLAGS=-L/usr/X11R6/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
-+GLXCFLAGS=-I${X11BASE}/include -DOPENGL
-+GLXLDFLAGS=-L${X11BASE}/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
++GLXCFLAGS=-I${LOCALBASE}/include -DOPENGL
++GLXLDFLAGS=-L${LOCALBASE}/lib$(_LIB) -lX11 -lXext -lXxf86dga -lXxf86vm
SDLGLCFLAGS=$(SDLCFLAGS) -DOPENGL
SDLGLLDFLAGS=$(SDLLDFLAGS)
diff --git a/games/quake3/files/patch-code-unix-Makefile b/games/quake3/files/patch-code-unix-Makefile
index e9c97bb1023c..56eb13a14c4f 100644
--- a/games/quake3/files/patch-code-unix-Makefile
+++ b/games/quake3/files/patch-code-unix-Makefile
@@ -80,7 +80,7 @@
-endif #alpha test
+BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe
-+GL_CFLAGS = -I$(X11BASE)/include
++GL_CFLAGS = -I$(LOCALBASE)/include
-BASE_CFLAGS = -pipe
+DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror
@@ -122,7 +122,7 @@
#GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
#GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
-GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-+GLLDFLAGS=-L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-ifeq ($(ARCH),axp)
-TARGETS=\
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 803942dda835..e53b89f4d3ae 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -74,7 +74,7 @@ PLIST_SUB+= VORBIS="@comment "
.if defined(WITH_XMMS)
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
-CONFIGURE_ARGS+=--with-xmms-prefix=${X11BASE}
+CONFIGURE_ARGS+=--with-xmms-prefix=${LOCALBASE}
PLIST_SUB+= XMMS=""
.else
CONFIGURE_ARGS+=--disable-xmms
diff --git a/games/quetoo/Makefile b/games/quetoo/Makefile
index 25e64f314238..817329f6d68f 100644
--- a/games/quetoo/Makefile
+++ b/games/quetoo/Makefile
@@ -19,12 +19,12 @@ COMMENT= Fast, stable, compatible, and secure Quake II client
USE_BZIP2= yes
USE_SDL= sdl
-USE_GL= yes
+USE_GL= glut
USE_DOS2UNIX= src/vanctf/g_local.h
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
- OPENGL_CFLAGS="-I${X11BASE}/include" OPENGL_LIBS="-L${X11BASE}/lib"
+ OPENGL_CFLAGS="-I${LOCALBASE}/include" OPENGL_LIBS="-L${LOCALBASE}/lib"
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
LIBDIR= ${PREFIX}/lib/${PORTNAME}
diff --git a/games/race/Makefile b/games/race/Makefile
index add2d7f4794f..045019b5dfd9 100644
--- a/games/race/Makefile
+++ b/games/race/Makefile
@@ -17,9 +17,9 @@ COMMENT= OpenGL Racing Game
USE_SDL= mixer image sdl
USE_BZIP2= yes
-USE_GL= yes
-CFLAGS+= "-I${X11BASE}/include"
-MAKE_ENV= CC="${CC} ${CFLAGS}" LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
+USE_GL= glut
+CFLAGS+= "-I${LOCALBASE}/include"
+MAKE_ENV= CC="${CC} ${CFLAGS}" LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
post-patch:
@${REINPLACE_CMD} -e "s|^CC|#CC|g" \
diff --git a/games/redeclipse/files/patch-src_Makefile b/games/redeclipse/files/patch-src_Makefile
index d7c8164634e3..bbef9010a145 100644
--- a/games/redeclipse/files/patch-src_Makefile
+++ b/games/redeclipse/files/patch-src_Makefile
@@ -4,14 +4,14 @@
-CXXOPTFLAGS= -O3 -fomit-frame-pointer
-INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags`
-CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES)
-+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags`
++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags`
+CXXFLAGS+= -Wall -fsigned-char $(INCLUDES)
-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
-CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU
-+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU
++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU
CLIENT_OBJS= \
shared/tools.o \
shared/geom.o \
diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile
index b0d1997ec7ad..b2e7819fcbbe 100644
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_SDL= sdl mixer
-CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include"
+CONFIGURE_ENV= CPPFLAGS="`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include"
post-patch:
@${REINPLACE_CMD} -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index ddc8881768d0..96a836f9858c 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -7,9 +7,9 @@
PORTNAME= robocode
PORTVERSION= 1.5.1
+PORTREVISION= 1
CATEGORIES= games java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=robocode
+MASTER_SITES= SF/robocode
DISTNAME= ${PORTNAME}-setup-${PORTVERSION}
EXTRACT_SUFX= .jar
@@ -24,7 +24,6 @@ JAVA_RUN= yes
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
USE_ZIP= yes
-USE_XLIB= yes
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 18b081a2c2d6..8b6c0993d092 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rocksndiamonds
PORTVERSION= 3.2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
http://homepages.compuserve.de/rocksndiamonds/
@@ -18,7 +18,7 @@ COMMENT= Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \
RO_GAME_DIR="${DATADIR}" RW_GAME_DIR="${DATADIR}/scores" \
- X11_PATH="${X11BASE}"
+ X11_PATH="${LOCALBASE}"
MAN1= rocksndiamonds.1
@@ -27,8 +27,7 @@ LIB_DEPENDS+= smpeg:${PORTSDIR}/multimedia/smpeg
USE_SDL= image mixer net sdl
ALL_TARGET= sdl
.else
-USE_XLIB= yes
-USE_XORG= x11
+USE_XORG= x11 xpm xt
ALL_TARGET= x11
.endif
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 474f91b031b1..9769d8d5f9d4 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -7,10 +7,9 @@
PORTNAME= RealTimeBattle
PORTVERSION= 1.0.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF${PORTNAME:}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Ext
MAINTAINER= ports@FreeBSD.org
@@ -19,9 +18,7 @@ COMMENT= Robot programming game for UNIX
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GNOME= gnometarget gtk20
-USE_GCC= 3.4+
USE_PERL5= yes
USE_PYTHON= yes
USE_GMAKE= yes
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index bad00d944178..66808f2ab64e 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -7,7 +7,7 @@
PORTNAME= rubix
PORTVERSION= 1.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://sed.free.fr/rubix/
@@ -15,10 +15,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Another Rubik's cube game with a rather interesting interface
USE_BZIP2= yes
-USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_XORG= x11
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DENGLISH" \
- XINC="-I${X11BASE}/include" XLIB="-L${X11BASE}/lib -lX11"
+ XINC="-I${LOCALBASE}/include" XLIB="-L${LOCALBASE}/lib -lX11"
ALL_TARGET= ${PORTNAME}
PORTDOCS= ${DOCFILES}
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index 846b58937ca4..4a58c44d6038 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -7,17 +7,16 @@
PORTNAME= sarien
PORTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Sierra AGI games interpreter
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_XLIB= yes
+USE_XORG= x11
CFLAGS+= -I${LOCALBASE}/include
diff --git a/games/sauerbraten/files/patch-src_Makefile b/games/sauerbraten/files/patch-src_Makefile
index d7c8164634e3..bbef9010a145 100644
--- a/games/sauerbraten/files/patch-src_Makefile
+++ b/games/sauerbraten/files/patch-src_Makefile
@@ -4,14 +4,14 @@
-CXXOPTFLAGS= -O3 -fomit-frame-pointer
-INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I/usr/X11R6/include `sdl-config --cflags`
-CXXFLAGS= -w -fsigned-char $(CXXOPTFLAGS) $(INCLUDES)
-+INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(X11BASE)/include `$(SDL_CONFIG) --cflags`
++INCLUDES= -Ishared -Iengine -Ifpsgame -Irpggame -Ienet/include -I$(LOCALBASE)/include `$(SDL_CONFIG) --cflags`
+CXXFLAGS+= -Wall -fsigned-char $(INCLUDES)
-PLATFORM_PREFIX=native
+PLATFORM_PREFIX=FreeBSD
-CLIENT_LIBS=-Lenet -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lGLU
-+CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(X11BASE)/lib -lGL -lGLU
++CLIENT_LIBS=-Lenet -lenet `$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer -lz -L$(LOCALBASE)/lib -lGL -lGLU
CLIENT_OBJS= \
shared/tools.o \
shared/geom.o \
diff --git a/games/scare/Makefile b/games/scare/Makefile
index 330e26579142..3c2adfaf6ddc 100644
--- a/games/scare/Makefile
+++ b/games/scare/Makefile
@@ -27,8 +27,8 @@ BINFILES= scare
.if defined(WITH_XGLK)
PKGNAMESUFFIX= -glk
-BUILD_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
-RUN_DEPENDS+= ${X11BASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
+RUN_DEPENDS+= ${LOCALBASE}/lib/libxglk.a:${PORTSDIR}/games/xglk
ALL_TARGET= all glkscare
diff --git a/games/scare/files/xglk.patch b/games/scare/files/xglk.patch
index ef555fe6d738..519ee481a5ff 100644
--- a/games/scare/files/xglk.patch
+++ b/games/scare/files/xglk.patch
@@ -5,7 +5,7 @@
# for Glk, comment out the include line.
GLKPATH = $(GLKDIR)/$(GLK)
-sinclude $(GLKPATH)/Make.$(GLK)
-+.include "$(X11BASE)/share/xglk/Make.$(GLK)"
++.include "$(LOCALBASE)/share/xglk/Make.$(GLK)"
GLKLIBS = -L$(GLKPATH) $(GLKLIB) $(LINKLIBS)
# Always use the Bourne shell.
@@ -14,7 +14,7 @@
os_glk.o: os_glk.c $(HEADERS)
$(CC) $(GLKARCH) $(CFLAGS) -Wno-write-strings \
- -I $(GLKDIR)/$(GLK) -c -o $@ $<
-+ -DLINUX_GRAPHICS -I${X11BASE}/include/xglk -c -o $@ $<
++ -DLINUX_GRAPHICS -I${LOCALBASE}/include/xglk -c -o $@ $<
# Option to build an IFP plugin version of SCARE.
scare_plugin.c: scare.hdr
diff --git a/games/scid/files/patch-Makefile b/games/scid/files/patch-Makefile
index e689cd32c9ef..03872e3cc917 100644
--- a/games/scid/files/patch-Makefile
+++ b/games/scid/files/patch-Makefile
@@ -34,9 +34,9 @@
-# TCL_INCLUDE = -I /usr/local/include/tcl8.0 -I /usr/local/include/tk8.0
-# TCL_LIBRARY = -L /usr/local/lib -ltcl80 -ldl
-# TK_LIBRARY = $(TCL_LIBRARY) -ltk80 -L /usr/X11/lib -lX11
-+TCL_INCLUDE = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${X11BASE}/include
++TCL_INCLUDE = -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include
+TCL_LIBRARY = -L${LOCALBASE}/lib -ltcl84
-+TK_LIBRARY = $(TCL_LIBRARY) -ltk84 -L${X11BASE}/lib -lX11
++TK_LIBRARY = $(TCL_LIBRARY) -ltk84 -L${LOCALBASE}/lib -lX11
########################################
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 64b1815320cd..e4a853a57fbc 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -53,7 +53,7 @@ post-patch:
${WRKSRC}/src/3dsparse/aseFile.tab.cpp \
${WRKSRC}/src/ode/config.h \
${WRKSRC}/src/zlib/zutil.h
- @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \
+ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \
${WRKSRC}/configure.ac
pre-configure:
diff --git a/games/scourge/Makefile b/games/scourge/Makefile
index 0b929c084ede..ba15a9612e54 100644
--- a/games/scourge/Makefile
+++ b/games/scourge/Makefile
@@ -20,12 +20,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS= ${DATADIR}/config/scourge.cfg:${PORTSDIR}/games/scourge-data
USE_AUTOTOOLS= autoconf:261:env automake:19:env
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl mixer net ttf
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_LIBS}
-LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
+LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/games/sdb/Makefile b/games/sdb/Makefile
index 9503d2447092..595d0575e857 100644
--- a/games/sdb/Makefile
+++ b/games/sdb/Makefile
@@ -21,8 +21,8 @@ USE_GMAKE= yes
BUILD_WRKSRC= ${WRKSRC}/src
-CPPFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include
-LDFLAGS= `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
+CPPFLAGS= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
MAKE_ARGS= CPP="${CXX}" CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LIBS="${LDFLAGS}"
PLIST_FILES= bin/sdb
diff --git a/games/sdlquake2/files/patch-Makefile b/games/sdlquake2/files/patch-Makefile
index 5b764d456808..202e3e56667d 100644
--- a/games/sdlquake2/files/patch-Makefile
+++ b/games/sdlquake2/files/patch-Makefile
@@ -6,8 +6,8 @@
+CC?=gcc
+SDL_CONFIG?=sdl-config
+LOCALBASE?=/usr/local
-+X11BASE?=/usr/X11R6
-+CFLAGS+=-O3 -ffast-math -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' $(shell $(SDL_CONFIG) --cflags) -I$(X11BASE)/include
++LOCALBASE?=/usr/X11R6
++CFLAGS+=-O3 -ffast-math -DDATADIR='"$(Q2DIR)"' -DLIBDIR='"$(LIBDIR)"' $(shell $(SDL_CONFIG) --cflags) -I$(LOCALBASE)/include
+
+LIBS=-lm -lz
+
@@ -53,7 +53,7 @@
ref_sdlgl.so: $(sdlgl_OBJ)
- $(CC) -shared -g -o $@ $(shell sdl-config --libs) -lGL -ljpeg -lpng12 $^
-+ $(CC) -shared -g -o $@ $(shell $(SDL_CONFIG) --libs) -L$(X11BASE)/lib -lGL -ljpeg -lpng $^
++ $(CC) -shared -g -o $@ $(shell $(SDL_CONFIG) --libs) -L$(LOCALBASE)/lib -lGL -ljpeg -lpng $^
ALLOBJ:=$(quake2_OBJ) $(sdlgl_OBJ)
diff --git a/games/shaaft/Makefile b/games/shaaft/Makefile
index 3168a3d34344..e4c19e1c6e16 100644
--- a/games/shaaft/Makefile
+++ b/games/shaaft/Makefile
@@ -9,8 +9,7 @@ PORTNAME= shaaft
PORTVERSION= 0.5.0
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= criticalmass
+MASTER_SITES= SF/criticalmass
DISTNAME= Shaaft-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
@@ -41,7 +40,7 @@ BROKEN= Does not compile on sparc64
post-patch:
@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \
s|^CXXFLAGS|#CXXFLAGS|g ; \
- s|/usr/X11R6|${X11BASE}|g ; \
+ s|/usr/X11R6|${LOCALBASE}|g ; \
s|-lSDL | |g ; \
s|-lpng12|-lpng|g' ${WRKSRC}/configure
@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/games/shootingstar/Makefile b/games/shootingstar/Makefile
index 9547544aa201..d38b6c4411e7 100644
--- a/games/shootingstar/Makefile
+++ b/games/shootingstar/Makefile
@@ -17,11 +17,11 @@ COMMENT= SDL/OpenGL top-down shooter
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= sdl mixer image
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
SDL_CONFIG="${SDL_CONFIG}"
.include <bsd.port.mk>
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 10b35b678be5..940d9290d86f 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sol
PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://shh.thathost.com/pub-unix/files/
@@ -22,7 +22,7 @@ LIB_DEPENDS= shhopt.1:${PORTSDIR}/devel/libshhopt \
CONFLICTS= gnome-games-*
USE_GMAKE= yes
-USE_XORG= xpm
+USE_XORG= xpm x11 xaw
MAN6= sol.6
diff --git a/games/sol/files/patch-aa b/games/sol/files/patch-aa
index 4d8940ad7c3d..f94aa9ff516a 100644
--- a/games/sol/files/patch-aa
+++ b/games/sol/files/patch-aa
@@ -7,8 +7,8 @@
-INCDIR = -I/usr/local/include -I/usr/X11R6/include \
- -I/usr/local/include/X11
-LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11
-+INCDIR = -I${LOCALBASE}/include -I${X11BASE}/include
-+LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
EXTRA_LIBS = -lSM -lICE
# Irix at Ifi
diff --git a/games/solarconquest/files/patch-makefile b/games/solarconquest/files/patch-makefile
index 349e95e25db3..16aa0fd0bb99 100644
--- a/games/solarconquest/files/patch-makefile
+++ b/games/solarconquest/files/patch-makefile
@@ -3,8 +3,8 @@
@@ -1,5 +1,5 @@
-LIBRARIES = `sdl-config --libs` -L/usr/X11R6/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg
-CFLAGS = -w -O3 -I/usr/include/GL `sdl-config --cflags`
-+LIBRARIES = `${SDL_CONFIG} --libs` -L${X11BASE}/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg
-+CXXFLAGS += `${SDL_CONFIG} --cflags` -I${X11BASE}/include
++LIBRARIES = `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_mixer -lSDL_image -lGL -lGLU -lpng -ljpeg
++CXXFLAGS += `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
all:
- g++ $(CFLAGS) -o solar ./source/main.cpp $(LIBRARIES)
diff --git a/games/spacearyarya/Makefile b/games/spacearyarya/Makefile
index afa0448a4d88..cb8b1072d44f 100644
--- a/games/spacearyarya/Makefile
+++ b/games/spacearyarya/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spacearyarya
PORTVERSION= 1.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= ftp://ftp.dvo.ru/pub/Gentoo/distfiles/ \
ftp://ftp.uni-erlangen.de/.mirrors/ftpbsd/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
@@ -18,12 +18,11 @@ DISTNAME= SpaceAryarya-KXL-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Space Harrier, the ancient video game like game
-BUILD_DEPENDS= ${X11BASE}/include/KXL.h:${PORTSDIR}/devel/kxl
-RUN_DEPENDS= ${X11BASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
+BUILD_DEPENDS= ${LOCALBASE}/include/KXL.h:${PORTSDIR}/devel/kxl
+RUN_DEPENDS= ${LOCALBASE}/lib/libKXL-1.1.7.so:${PORTSDIR}/devel/kxl
NO_CDROM= Possible copyright infringement
-USE_X_PREFIX= yes
GNU_CONFIGURE= yes
.include <bsd.port.mk>
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 0eb047209a74..47f8db521cdd 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= spellcast
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.eblong.com/zarf/ftp/
DISTNAME= ${PORTNAME}
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiplayer fight with spells turn based game for X Window System
-USE_X_PREFIX= yes
+USE_XORG= x11
MAN6= spellcast.6
do-install:
diff --git a/games/spellcast/files/patch-aa b/games/spellcast/files/patch-aa
index dedeb30d889e..ef61d96ac23c 100644
--- a/games/spellcast/files/patch-aa
+++ b/games/spellcast/files/patch-aa
@@ -5,13 +5,13 @@
#OTHERLIBS = -lbsdmalloc
-CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \
-+CFLAGS += -I${X11BASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \
++CFLAGS += -I${LOCALBASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \
-DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR)
-LFLAGS = -g
+LFLAGS =
-XLIB = -L/usr/local/lib -lX11
-+XLIB = -L${X11BASE}/lib -lX11
++XLIB = -L${LOCALBASE}/lib -lX11
OBJS = engine.o espells.o execute.o execute2.o emonster.o etran.o
XOBJS = main.o xtext.o xquery.o xloop.o xgest.o xbutton.o xtalk.o
diff --git a/games/speyes/Makefile b/games/speyes/Makefile
index d39d0c51ba9d..13ca504a68b8 100644
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@@ -16,6 +16,6 @@ COMMENT= WindowMaker dockapp/xeyes clone using SouthPark characters
PLIST_FILES= bin/speyes
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
.include <bsd.port.mk>
diff --git a/games/ssamtse/Makefile b/games/ssamtse/Makefile
index 1bb4ccf7d69d..16d632e0ac6b 100644
--- a/games/ssamtse/Makefile
+++ b/games/ssamtse/Makefile
@@ -19,9 +19,9 @@ COMMENT= Serious Sam - The Second Encounter
NO_BUILD= yes
USE_BZIP2= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
USE_GL= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
NO_PACKAGE= yes # distfiles must be downloaded manually, wierd legal issues etc etc etc.
SSAMDIR= ${PREFIX}/ssam
diff --git a/games/ssc/Makefile b/games/ssc/Makefile
index c9ef114cbf2a..8b615847c11a 100644
--- a/games/ssc/Makefile
+++ b/games/ssc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ssc
PORTVERSION= 0.8
PORTREVISION= 5
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}x
+MASTER_SITES= SF/${PORTNAME}x
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL arcade space shoot-em-up with interesting physics
@@ -21,12 +20,12 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
USE_BZIP2= yes
USE_GCC= 3.2
USE_GMAKE= yes
-USE_GL= yes
+USE_GL= gl
USE_SDL= mixer sdl
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${X11BASE}/include" \
- LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS=-L${LOCALBASE}/lib
ONLY_FOR_ARCHS= i386
.include <bsd.port.pre.mk>
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index d3a952423578..1a33fd396faa 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stratagus
PORTVERSION= 2.2.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= SF
EXTRACT_SUFX= -src.tar.gz
@@ -20,8 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_GMAKE= yes
USE_LUA= 5.0
USE_SDL= sdl
-USE_XLIB= yes
-USE_GL= yes
+USE_GL= gl
GNU_CONFIGURE= yes
CFLAGS+= -I${LUA_INCDIR}
CONFIGURE_ENV= LDFLAGS="-L${LUA_LIBDIR} -lm"
diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile
index 8e79468948ca..29cbc7c535e5 100644
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -19,12 +19,12 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux .pk3 files
# Make this a BUILD_DEPENDS too, so that it can create the
# directory hierarchy for us.
-BUILD_DEPENDS= ${X11BASE}/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/games/stvef-server
+BUILD_DEPENDS= ${LOCALBASE}/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/games/stvef-server
RUN_DEPENDS= ${BUILD_DEPENDS}
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
EXTRACT_ONLY= # Don't extract anything
GAMEDIR= ${PREFIX}/games/stvef/
diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile
index 03e0a5489540..5ec35c1db14f 100644
--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -17,7 +17,7 @@ COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux
ONLY_FOR_ARCHS= i386
USE_ZIP= yes
USE_LINUX= yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
WRKSRC= ${WRKDIR}/Linux
INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index 7456dfd380d4..4ccdb87c39f5 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A tile-removing puzzle game for the X Window system
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
INSTALL_TARGET= install install.dir
BINOWN= root
BINGRP= games
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 1ec3d66ccca7..e26d25a61e33 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= erik@smluc.org
COMMENT= A 3-D network tank game that uses OpenGL/Mesa
-BUILD_DEPENDS= ${X11BASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
+BUILD_DEPENDS= ${LOCALBASE}/lib/libaux.a:${PORTSDIR}/graphics/libaux
USE_GMAKE= yes
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/games/tank/files/patch-Makefile.Linux.Mesa b/games/tank/files/patch-Makefile.Linux.Mesa
index 92cd5a521a83..2f4debbfbd6a 100644
--- a/games/tank/files/patch-Makefile.Linux.Mesa
+++ b/games/tank/files/patch-Makefile.Linux.Mesa
@@ -10,7 +10,7 @@
MESA = Mesa
-INCLUDE = -I/usr/include -I$(MESA)/include -I$(MESA)/include/GL
-+INCLUDE = -I$(X11BASE)/include -I$(X11BASE)/include/GL
++INCLUDE = -I$(LOCALBASE)/include -I$(LOCALBASE)/include/GL
-CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \
- -pedantic -funroll-loops -mieee-fp
@@ -18,7 +18,7 @@
+ -pedantic -funroll-loops
-LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib
-+LDFLAGS = -L$(X11BASE)/lib
++LDFLAGS = -L$(LOCALBASE)/lib
TAR = tar
COMPRESS = compress -v
diff --git a/games/tenebrae/files/patch-linux__Makefile.i386linux b/games/tenebrae/files/patch-linux__Makefile.i386linux
index 73e7e693508a..9e038de53580 100644
--- a/games/tenebrae/files/patch-linux__Makefile.i386linux
+++ b/games/tenebrae/files/patch-linux__Makefile.i386linux
@@ -17,11 +17,11 @@
+#CC = /usr/bin/gcc
-X11_LIBS = -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXxf86dga -lXxf86vm
-+X11_LIBS = -L${X11BASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm
++X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext -lXxf86dga -lXxf86vm
# to enable OpenGL code in source
-OPENGL_CFLAGS = -D__glx__ -DGLQUAKE
-+OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${X11BASE}/include
++OPENGL_CFLAGS = -D__glx__ -DGLQUAKE -I${LOCALBASE}/include
OPENGL_LIBS = -lGL -lGLU
-PNG_LIBS = -lpng -lz
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index d7e1e10d228d..203174e94162 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_SDL= sdl
USE_PERL5_BUILD=yes
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CXXFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
+ CXXFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include"
PLIST_FILES= bin/valley
diff --git a/games/tomatoes/Makefile b/games/tomatoes/Makefile
index abe0c964102c..0fff30317c90 100644
--- a/games/tomatoes/Makefile
+++ b/games/tomatoes/Makefile
@@ -21,7 +21,7 @@ TDATA= ${WRKDIR}/tomatoes-${PORTVERSION}
USE_BZIP2= yes
USE_SDL= mixer image
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
MAKEFILE= makefile
MAKE_ARGS= CC="${CXX}" \
@@ -39,9 +39,9 @@ PLIST_FILES= bin/tomatoes \
PLIST_DIRS= %%DATADIR%%/music \
%%DATADIR%%
-SDL_CFLAGS= `${SDL_CONFIG} --cflags` -I${X11BASE}/include
+SDL_CFLAGS= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
SDL_LDFLAGS= `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer \
- -L${X11BASE}/lib -lGL -lGLU
+ -L${LOCALBASE}/lib -lGL -lGLU
.include <bsd.port.pre.mk>
diff --git a/games/tome/Makefile b/games/tome/Makefile
index ad599392a2f8..9ee6adc8e470 100644
--- a/games/tome/Makefile
+++ b/games/tome/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tome
PORTVERSION= 2.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://t-o-m-e.net/dl/src/
DISTNAME= tome-234-src
@@ -30,15 +30,15 @@ DESKTOP_ENTRIES= "ToME" "Roguelike game based on JRR Tolkien's work" \
.include <bsd.port.pre.mk>
.ifndef (WITHOUT_X11)
-USE_XLIB= yes
+USE_XORG= x11
.endif
post-patch:
.ifdef (WITHOUT_X11)
${REINPLACE_CMD} -e 's/-DUSE_X11//g' ${WRKSRC}/${MAKEFILE}
${REINPLACE_CMD} -e 's/-lX11//g' ${WRKSRC}/${MAKEFILE}
- ${REINPLACE_CMD} -e 's@-L$$(X11BASE)/lib@@g' ${WRKSRC}/${MAKEFILE}
- ${REINPLACE_CMD} -e 's@-I$$(X11BASE)/include@@g' ${WRKSRC}/${MAKEFILE}
+ ${REINPLACE_CMD} -e 's@-L$$(LOCALBASE)/lib@@g' ${WRKSRC}/${MAKEFILE}
+ ${REINPLACE_CMD} -e 's@-I$$(LOCALBASE)/include@@g' ${WRKSRC}/${MAKEFILE}
.endif
.include <bsd.port.post.mk>
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index 822d288c0d82..7d2d4d0f51ae 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -22,8 +22,8 @@ USE_GL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LDFLAGS="-L${LOCALBASE}lib -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}lib"
PORTDOCS= README
diff --git a/games/trackballs/Makefile b/games/trackballs/Makefile
index 875c852bc1a6..cff386388d3f 100644
--- a/games/trackballs/Makefile
+++ b/games/trackballs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= trackballs
PORTVERSION= 1.1.4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ganael.laplanche@martymac.com
COMMENT= SDL-based Marble Madness clone
@@ -17,7 +16,7 @@ COMMENT= SDL-based Marble Madness clone
LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-USE_GL= yes
+USE_GL= gl
USE_SDL= image mixer sdl ttf
USE_GETTEXT= yes
USE_GMAKE= yes
@@ -30,8 +29,8 @@ MAKE_ARGS= mkinstalldirs="${MKDIR}"
MAN6= ${PORTNAME}.6
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lintl
+CPPFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib -lintl
post-patch:
@${REINPLACE_CMD} -e 's|install -D|$$(INSTALL)|' \
diff --git a/games/tremor/Makefile b/games/tremor/Makefile
index 5e9dad92aca9..8bd425d70f11 100644
--- a/games/tremor/Makefile
+++ b/games/tremor/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tremor
PORTVERSION= 3.2.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \
http://tremor.quakedev.com/:data
@@ -25,9 +25,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
USE_BZIP2= yes
-USE_GCC= 3.4+
-USE_GL= gl
-USE_XORG= xxf86dga
+USE_GL= gl glu
+USE_XORG= x11 xxf86dga
USE_GMAKE= yes
ALL_TARGET= release
diff --git a/games/tremor/files/patch-Makefile b/games/tremor/files/patch-Makefile
index 64c76ac1849d..033c8838a70d 100644
--- a/games/tremor/files/patch-Makefile
+++ b/games/tremor/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Jan 17 06:19:35 2007
-+++ Makefile Wed Feb 14 15:40:17 2007
-@@ -21,51 +21,44 @@
+--- ./Makefile.orig 2007-01-17 10:19:35.000000000 +0100
++++ ./Makefile 2008-04-13 17:38:19.000000000 +0200
+@@ -21,51 +21,42 @@
BUILD_DEBUG_DIR=debug_build
BUILD_RELEASE_DIR=release_build
@@ -40,7 +40,6 @@
-X11BASE=/usr/X11R6
+LOCALBASE?=/usr/local
+GAMEBASE=$(LOCALBASE)
-+X11BASE?=/usr/X11R6
SYSBINDIR=$(LOCALBASE)/bin
-DATADIR= $(GAMEBASE)/games/quake
-
@@ -54,7 +53,7 @@
-BASE_CFLAGS+= \
+BASE_CFLAGS+= $(CFLAGS) \
-I$(LOCALBASE)/include \
- -I$(X11BASE)/include \
+- -I$(X11BASE)/include \
-Dstricmp=strcasecmp \
-DGLQUAKE
-ifeq ($(ARCH),i386)
@@ -65,7 +64,7 @@
DEBUG_CFLAGS=$(BASE_CFLAGS) -g -ggdb -Wall
RELEASE_CFLAGS+=$(BASE_CFLAGS) \
-fno-strict-aliasing \
-@@ -76,9 +69,6 @@
+@@ -76,9 +67,6 @@
-falign-loops=2 \
-falign-jumps=2 \
-falign-functions=2
@@ -75,7 +74,13 @@
endif
ifeq ($(strip $(STRIP)),YES)
-@@ -107,7 +97,7 @@
+@@ -102,12 +90,11 @@
+
+ X_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \
+ -lX11 -lXext -lXxf86vm -lXxf86dga
+-GLX_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \
+- -L$(LOCALBASE)/lib$(ARCH_LIBDIR) \
++GLX_LDFLAGS=-L$(LOCALBASE)/lib$(ARCH_LIBDIR) \
-lGL -lGLU -ljpeg `libpng-config --libs`
@@ -84,7 +89,7 @@
SDL_CFLAGS=$(shell $(SDL_CONFIG) --cflags)
SDL_LDFLAGS=$(shell $(SDL_CONFIG) --libs)
-@@ -405,4 +395,4 @@
+@@ -405,4 +392,4 @@
@echo
@printf "Type tremor as user to start playing.\n"
@echo .....
diff --git a/games/tremulous/Makefile b/games/tremulous/Makefile
index 1eefd8182dad..3cb730e704d4 100644
--- a/games/tremulous/Makefile
+++ b/games/tremulous/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tremulous
PORTVERSION= 1.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S|$|${PORTNAME}/|} \
http://0day.icculus.org/mirrors/tremulous/ \
@@ -74,8 +74,8 @@ MAKE_ENV+= USE_SDL_AUDIO=1
USE_SDL= sdl
MAKE_ENV+= USE_SDL_VIDEO=1
. else
-USE_GL= yes
-USE_XLIB= yes
+USE_GL= gl
+USE_XORG= x11 xxf86dga
. endif
# Vorbis
. if defined(WITH_VORBIS)
diff --git a/games/tremulous/files/patch-Makefile b/games/tremulous/files/patch-Makefile
index 270ac4aa5ab7..705c84b3e52a 100644
--- a/games/tremulous/files/patch-Makefile
+++ b/games/tremulous/files/patch-Makefile
@@ -77,7 +77,7 @@
+ BASE_CFLAGS = -I$(LOCALBASE)/include -DARCH='\"$(ARCH)\"' -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
- GL_CFLAGS = -I/usr/X11R6/include
-+ GL_CFLAGS = -I$(X11BASE)/include
++ GL_CFLAGS = -I$(LOCALBASE)/include
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
@@ -159,7 +159,7 @@
+ endif
+
+ ifneq ($(USE_SDL_VIDEO),1)
-+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(USE_OPENAL),1)
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index d5c9c3b9dfd9..6d56190e345c 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -7,25 +7,23 @@
PORTNAME= tux_aqfh
PORTVERSION= 1.0.14
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= http://tuxaqfh.sourceforge.net/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL adventure game
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-USE_X_PREFIX= yes
-USE_GL= yes
+USE_GL= glut
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS= --with-plib=${X11BASE}
+CONFIGURE_ARGS= --with-plib=${LOCALBASE}
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lusbhid ${PTHREAD_LIBS}
+CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -lusbhid ${PTHREAD_LIBS}
post-patch:
@${REINPLACE_CMD} -e \
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index b3c03d339692..e107661c0bce 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -7,22 +7,21 @@
PORTNAME= tuxkart
PORTVERSION= 0.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://tuxkart.sourceforge.net/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= An OpenGL action kart racing game
-BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
+BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
-USE_X_PREFIX= yes
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lusbhid"
-CONFIGURE_ARGS= --with-plib=${X11BASE}
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib -lusbhid"
+CONFIGURE_ARGS= --with-plib=${LOCALBASE}
post-patch:
@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 3f74d4243ae7..030acbd2d8ac 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tuxracer
PORTVERSION= 0.61
PORTREVISION= 6
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tuxracer
+MASTER_SITES= SF/tuxracer
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
@@ -20,7 +19,7 @@ COMMENT= A 3d penguin racing game using OpenGL
LIB_DEPENDS= tcl83.1:${PORTSDIR}/lang/tcl83
USE_SDL= mixer sdl
-USE_GL= yes
+USE_GL= gl
USE_GMAKE= yes
USE_AUTOTOOLS= automake:14 autoconf:261
AUTOMAKE_ARGS= -a
@@ -28,8 +27,8 @@ CONFIGURE_ENV= THREAD_LIB="${PTHREAD_LIBS}"
MAKE_ENV= ${CONFIGURE_ENV}
CONFIGURE_ARGS= --with-tcl-inc="${LOCALBASE}/include/tcl8.3" \
--with-tcl-libs="${LOCALBASE}/lib" \
- --with-gl-libs="${X11BASE}/lib" \
- --with-gl-inc="${X11BASE}/include" \
+ --with-gl-libs="${LOCALBASE}/lib" \
+ --with-gl-inc="${LOCALBASE}/include" \
--with-data-dir=${PREFIX}/share/tuxracer
WORKDATA= ${WRKDIR}/${PORTNAME}-data-${PORTVERSION}
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index cfc627744dc9..c9c32d7ea6be 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -14,17 +14,15 @@ MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
MAINTAINER= ports@FreeBSD.org
COMMENT= Play the cardgame President (or Ass) against 3 AIs
-
USE_TK= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp \
- --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS= --enable-carddir=${PREFIX}/share/games/tvp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/tcl8.4 \
-I${LOCALBASE}/include/tk8.4" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib \
+ LIBS="-L${LOCALBASE}/lib \
-ltcl84 -ltk84 -lX11 -lm"
#CFLAGS+= -lX11 -lm -ltcl84 -ltk84 \
-# -L${LOCALBASE}/lib -L${X11BASE}/lib
+# -L${LOCALBASE}/lib
USE_PERL5_BUILD=yes
MAN6= tvp.6
diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index 63addabbefd2..ab47a0659b79 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -92,7 +92,7 @@ do-configure:
@${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/sc2/config.state
@${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/sc2/config.state
@${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/sc2/config.state
- cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} PREFIX=${PREFIX} ./build.sh uqm config
+ cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config
do-build:
cd ${WRKSRC}/sc2 && ./build.sh uqm
diff --git a/games/uqm/files/patch-build-unix-config_proginfo_host b/games/uqm/files/patch-build-unix-config_proginfo_host
index c25505c7b934..fe744a212478 100644
--- a/games/uqm/files/patch-build-unix-config_proginfo_host
+++ b/games/uqm/files/patch-build-unix-config_proginfo_host
@@ -28,8 +28,8 @@
FreeBSD|OpenBSD)
- LIB_opengl_CFLAGS="-I/usr/X11R6/include -D_THREAD_SAFE"
- LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lX11 -lXext -pthread -lGL"
-+ LIB_opengl_CFLAGS="-I${X11BASE}/include -D_THREAD_SAFE"
-+ LIB_opengl_LDFLAGS="-L${X11BASE}/lib -lX11 -lXext -pthread -lGL"
++ LIB_opengl_CFLAGS="-I${LOCALBASE}/include -D_THREAD_SAFE"
++ LIB_opengl_LDFLAGS="-L${LOCALBASE}/lib -lX11 -lXext -pthread -lGL"
;;
MINGW32*|CYGWIN*)
LIB_opengl_CFLAGS=""
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index 1135639d2dfd..4c100205d849 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -24,8 +24,7 @@ USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
MAKEINFO="makeinfo --no-split"
-CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
- ac_cv_header_boost_test_unit_test_hpp=no
+CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no
USE_LDCONFIG= yes
INFO= vamos
diff --git a/games/vectoroids/Makefile b/games/vectoroids/Makefile
index 46d18a89ca20..df0eb316e5dd 100644
--- a/games/vectoroids/Makefile
+++ b/games/vectoroids/Makefile
@@ -7,14 +7,13 @@
PORTNAME= vectoroids
PORTVERSION= 1.1.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/vectoroids/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= A vector-based, pretty, Asteroids clone
-USE_X_PREFIX= yes
USE_SDL= image mixer sdl
USE_GMAKE= yes
diff --git a/games/warsow/files/patch-Makefile b/games/warsow/files/patch-Makefile
index 44da79ad3c5c..54892efa2968 100644
--- a/games/warsow/files/patch-Makefile
+++ b/games/warsow/files/patch-Makefile
@@ -1,10 +1,12 @@
---- Makefile Thu Jun 8 22:44:02 2006
-+++ Makefile Sat Aug 19 20:50:05 2006
-@@ -19,14 +19,14 @@
+--- Makefile.orig 2006-06-08 22:44:02.000000000 +0200
++++ Makefile 2008-04-11 13:18:40.000000000 +0200
+@@ -18,15 +18,15 @@
+
CC?=gcc
- CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D__linux__ -Wall
+-CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D__linux__ -Wall
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops
++CFLAGS_COMMON=$(CFLAGS) -I. -I$(LOCALBASE)/include -D__linux__ -Wall
+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops
CFLAGS_DEBUG=-O0 -ggdb -DDEBUG
CFLAGS_COMMON+=$(CFLAGS_RELEASE)
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index c5b951eaa9a1..f5d6779f287e 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= The world's most useless WindowMaker dock app
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
PORTDOCS= README
diff --git a/games/wmfortune/Makefile b/games/wmfortune/Makefile
index f2da82ee2b52..6d186bebe125 100644
--- a/games/wmfortune/Makefile
+++ b/games/wmfortune/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmfortune
PORTVERSION= 0.241
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://dockapps.org/files/90/128/
@@ -16,8 +16,7 @@ COMMENT= A dockapp that outputs fortune messages
PLIST_FILES= bin/wmfortune
USE_GMAKE= yes
-USE_XPM= yes
-USE_X_PREFIX= yes
+USE_XORG= xpm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmfortune ${PREFIX}/bin
diff --git a/games/wmfortune/files/patch-Makefile b/games/wmfortune/files/patch-Makefile
index b90d32a36b73..45e2de14aaae 100644
--- a/games/wmfortune/files/patch-Makefile
+++ b/games/wmfortune/files/patch-Makefile
@@ -8,8 +8,8 @@ $FreeBSD$
-############################
+CC ?= gcc
+CFLAGS += -c -Wall
-+INCDIR = -I${X11BASE}/include -I/usr/local/include
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include -I/usr/local/include
++LIBDIR = -L${LOCALBASE}/lib
+LIBS = -lXpm -lXext -lX11
+OBJS = wmfortune.o dockapp.o
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 8e6566bc7409..8379208a296e 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmminichess
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://www.insanum.com/miniCHESS/
DISTNAME= miniCHESS-${PORTVERSION}
@@ -18,8 +18,7 @@ COMMENT= Window Maker chess dockapp game
RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
USE_GMAKE= YES
-USE_X_PREFIX= YES
-USE_XPM= YES
+USE_XORG= xpm
MAKE_ENV= PREFIX="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \
INSTALL_DATA="${INSTALL_DATA}"
diff --git a/games/wmpuzzle/Makefile b/games/wmpuzzle/Makefile
index 6aeac4b9f526..ff93d2361d14 100644
--- a/games/wmpuzzle/Makefile
+++ b/games/wmpuzzle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmpuzzle
PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://www.godisch.de/debian/wmpuzzle/
@@ -16,8 +16,7 @@ COMMENT= A dockable puzzle game for WindowMaker and AfterStep
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -26,8 +25,8 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
MAN6= wmpuzzle.6
PLIST_FILES= bin/wmpuzzle
-CPPFLAGS= -I${X11BASE}/include -DBSD
-LDFLAGS= -L${X11BASE}/lib
+CPPFLAGS= -I${LOCALBASE}/include -DBSD
+LDFLAGS= -L${LOCALBASE}/lib
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmpuzzle ${PREFIX}/bin
diff --git a/games/wmqstat/Makefile b/games/wmqstat/Makefile
index b0085c058aaa..43f6673f0801 100644
--- a/games/wmqstat/Makefile
+++ b/games/wmqstat/Makefile
@@ -16,7 +16,7 @@ COMMENT= A dockapp for monitoring of various Internet game servers
RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
-USE_XORG= xpm
+USE_XORG= xpm x11 xext
PLIST_FILES= bin/${PORTNAME}
PORTDOCS= README
diff --git a/games/wmqstat/files/patch-Makefile b/games/wmqstat/files/patch-Makefile
index 6968db36c79d..28882d2830c9 100644
--- a/games/wmqstat/files/patch-Makefile
+++ b/games/wmqstat/files/patch-Makefile
@@ -1,15 +1,17 @@
---- Makefile.orig Fri Apr 25 05:00:09 2003
-+++ Makefile Fri Apr 25 05:00:40 2003
+--- ./Makefile.orig 2003-04-24 21:31:39.000000000 +0200
++++ ./Makefile 2008-04-13 13:00:54.000000000 +0200
@@ -1,14 +1,11 @@
-CC = cc
-+CC ?= cc
-
+-
-X11BASE = /usr/X11R6
- LDIR = -L${X11BASE}/lib
- IDIR = -I${X11BASE}/include
+-LDIR = -L${X11BASE}/lib
+-IDIR = -I${X11BASE}/include
++CC ?= cc
-INSTALL = install
--
++LDIR = -L${LOCALBASE}/lib
++IDIR = -I${LOCALBASE}/include
+
LIBS = -lX11 -lXpm -lXext
-CFLAGS = -O -pipe -s -Wall
@@ -17,13 +19,12 @@
OBJS = appcore/wmqstat.o\
appcore/srv_proc.o\
-@@ -22,9 +19,6 @@
-
+@@ -23,8 +20,5 @@
all: ${OBJS}
${CC} ${CFLAGS} -o wmqstat ${OBJS} ${LDIR} ${LIBS}
--
+
-install:
- ${INSTALL} -o root -g wheel -m 755 wmqstat ${X11BASE}/bin
-
+-
clean:
rm -f wmqstat appcore/*.o wmgeneral/*.o core
diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile
index 09955aa1d2d2..4b1b93fba18b 100644
--- a/games/wmshuffle/Makefile
+++ b/games/wmshuffle/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmshuffle
PORTVERSION= 0.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games windowmaker afterstep
MASTER_SITES= http://www.linuks.mine.nu/dockapp/ \
http://freebsd.nsu.ru/distfiles/
@@ -16,8 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A dockable Shuffle game for WindowMaker and AfterStep
USE_GMAKE= yes
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
post-install:
@${MKDIR} ${DATADIR}
diff --git a/games/wmshuffle/files/patch-aa b/games/wmshuffle/files/patch-aa
index d8a549160d6d..a717532f6e74 100644
--- a/games/wmshuffle/files/patch-aa
+++ b/games/wmshuffle/files/patch-aa
@@ -4,8 +4,8 @@
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS += -c -Wall
-+INCDIR = -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
LIBS = -lXpm -lXext -lX11
OBJS = wmshuffle.o ./wmgeneral/wmgeneral.o
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 0156be20c240..efc22bed7664 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmtictactoe
PORTVERSION= 1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games windowmaker afterstep
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jim
@@ -19,8 +19,7 @@ COMMENT= A dockable TicTacToe game for WindowMaker and AfterStep
PLIST_FILES= bin/wmtictactoe
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/wmtictactoe.app/wmtictactoe
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
post-install:
@${ECHO} "===> Run 'wmtictactoe --help' for the available options"
diff --git a/games/wmtictactoe/files/patch-aa b/games/wmtictactoe/files/patch-aa
index 634a6e7d67b4..9a25147bab6f 100644
--- a/games/wmtictactoe/files/patch-aa
+++ b/games/wmtictactoe/files/patch-aa
@@ -4,8 +4,8 @@
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+CFLAGS += -c -Wall
-+INCLUDES = -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
++INCLUDES = -I${LOCALBASE}/include
++LIBDIR = -L${LOCALBASE}/lib
LIBS = -lXpm -lXext -lX11
OBJS = wmtictactoe.o ../wmgeneral/wmgeneral.o
diff --git a/games/wmtimebomb/files/patch-aa b/games/wmtimebomb/files/patch-aa
index 37475fcb9dbd..e512956d94e5 100644
--- a/games/wmtimebomb/files/patch-aa
+++ b/games/wmtimebomb/files/patch-aa
@@ -4,11 +4,11 @@
-XPMLIB = -L/usr/X11R6/lib -lXpm -lm -ljpeg -lpng -lz -ltiff -lgif
-WMAKER = -L/usr/local/lib -lWMaker -lWINGs -lwraster -lPropList
+XPMLIB = `pkg-config --libs WINGs wmlib wrlib`
-+WMAKER = -L${X11BASE}/lib -lWMaker
++WMAKER = -L${LOCALBASE}/lib -lWMaker
LOCAL_LIBRARIES = $(WMAKER) $(XPMLIB) $(XLIB)
-+EXTRA_INCLUDES= `pkg-config --cflags WINGs wmlib wrlib` -I${X11BASE}/include
++EXTRA_INCLUDES= `pkg-config --cflags WINGs wmlib wrlib` -I${LOCALBASE}/include
+
SRCS = timebomb.c
OBJS = timebomb.o
diff --git a/games/wolf3d/files/patch-Makefile b/games/wolf3d/files/patch-Makefile
index ad46434f13a9..db0d3b605711 100644
--- a/games/wolf3d/files/patch-Makefile
+++ b/games/wolf3d/files/patch-Makefile
@@ -31,8 +31,8 @@
SLFLAGS = $(LFLAGS) -lvga
-XLFLAGS = $(LFLAGS) -L/usr/X11R6/lib -lX11 -lXext
-DLFLAGS = $(LFLAGS) `sdl-config --libs` -L/usr/X11R6/lib -lX11 -lXext
-+XLFLAGS = $(LFLAGS) -L$(X11BASE)/lib -lX11 -lXext
-+DLFLAGS = $(LFLAGS) `$(SDL_CONFIG) --libs` -L$(X11BASE)/lib -lX11 -lXext
++XLFLAGS = $(LFLAGS) -L$(LOCALBASE)/lib -lX11 -lXext
++DLFLAGS = $(LFLAGS) `$(SDL_CONFIG) --libs` -L$(LOCALBASE)/lib -lX11 -lXext
NASM = nasm
diff --git a/games/worldofpadman/files/patch-Makefile b/games/worldofpadman/files/patch-Makefile
index 13759574ae15..bbaf2397236c 100644
--- a/games/worldofpadman/files/patch-Makefile
+++ b/games/worldofpadman/files/patch-Makefile
@@ -131,7 +131,7 @@
+ BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
- GL_CFLAGS = -I/usr/X11R6/include
-+ GL_CFLAGS = -I$(X11BASE)/include
++ GL_CFLAGS = -I$(LOCALBASE)/include
DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -pipe
@@ -228,7 +228,7 @@
+ endif
+
+ ifneq ($(USE_SDL_VIDEO),1)
-+ CLIENT_LDFLAGS += -L$(X11BASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
++ CLIENT_LDFLAGS += -L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
endif
ifeq ($(USE_OPENAL),1)
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index a07f5826b88e..61d791f3bd37 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xarchon
PORTVERSION= 0.50
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= ftp://ftp.seul.org/pub/xarchon/ \
http://xarchon.seul.org/
@@ -16,10 +16,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A chess-like strategy game with battle options
-USE_XLIB= yes
USE_GNOME= esound gtk12
USE_GMAKE= yes
-USE_XPM= yes
+USE_XORG= x11 xpm ice
GNU_CONFIGURE= yes
MAN6= xarchon.6
diff --git a/games/xataxx/files/patch-aa b/games/xataxx/files/patch-aa
index a889bc3797a0..ca0d01aea6c9 100644
--- a/games/xataxx/files/patch-aa
+++ b/games/xataxx/files/patch-aa
@@ -11,7 +11,7 @@
/* DATADIR is where the boards and bitmaps will be installed */
-DATADIR = /afs/andrew.cmu.edu/usr0/games/lib/xataxx
-+DATADIR = $(X11BASE)/share/xataxx
++DATADIR = $(LOCALBASE)/share/xataxx
LOCAL_LIBRARIES = $(XLIB)
SRCS = bits.c board.c colbits.c demo.c display.c main.c nubot.c parse.c zot.c
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 667e916ed3b3..e3ad50e56e2b 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -7,16 +7,16 @@
PORTNAME= xbl
PORTVERSION= 1.1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www710.univ-lyon1.fr/~exco/XBL/ GENTOO/distfiles
MAINTAINER= ports@FreeBSD.org
COMMENT= A 3D block-dropping game
-BUILD_DEPENDS= imake:${X_IMAKE_PORT}
+BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake
-USE_X_PREFIX= yes
+USE_XORG= x11 xext
GNU_CONFIGURE= yes
MAN1= xbl.1
diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index 8f6c70839ee3..8511fb912a16 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -7,15 +7,14 @@
PORTNAME= xblood
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes the root window bloody
-USE_X_PREFIX= yes
-
+USE_XORG= x11
MAN1= xblood.1
MANCOMPRESSED= yes
PLIST_FILES= bin/xblood
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 47e3283e80a3..5b3b5678c57a 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -24,9 +24,6 @@ STRIP=
MAN6= xboard.6 zic2xpm.6
INFO= xboard
-CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib \
- --x-includes=${X11BASE}/include
-
.if defined(WITH_XAW3D)
CONFIGURE_ARGS+= "--with-Xaw3d"
LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/games/xboing/files/patch-ac b/games/xboing/files/patch-ac
index 0d9f5240991a..c93c8dda9f52 100644
--- a/games/xboing/files/patch-ac
+++ b/games/xboing/files/patch-ac
@@ -5,7 +5,7 @@
XCOMM placed. Default will be the current directory.
- XBOING_DIR = .
-+ XBOING_DIR = ${X11BASE}/lib/X11/xboing
++ XBOING_DIR = ${LOCALBASE}/lib/X11/xboing
XCOMM These are some defines that must be set. Some may be overwritten in the
XCOMM machine arch section.
@@ -13,7 +13,7 @@
- XPMLIB = -L/usr/X11/lib -lXpm
- XPMINCLUDE = -I/usr/X11/include/X11
+ XPMLIB = -lXpm
-+ XPMINCLUDE = -I${X11BASE}/include/X11
++ XPMINCLUDE = -I${LOCALBASE}/include/X11
XBOINGINCLUDE = -I./include
LEVEL_INSTALL_DIR = $(XBOING_DIR)/levels
SOUNDS_DIR = $(XBOING_DIR)/sounds
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 6cf711205e44..0d6259197100 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -25,7 +25,7 @@ PLIST_FILES= bin/xbomb \
PLIST_DIRS= lib/X11/xbomb
do-build:
- cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DX11BASE=\"${X11BASE}\" \
+ cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DLOCALBASE=\"${LOCALBASE}\" \
`pkg-config --cflags xaw8` *.c -o xbomb \
`pkg-config --libs xaw8`
diff --git a/games/xbomb/files/patch-hiscore.c b/games/xbomb/files/patch-hiscore.c
index 5ea85294a405..6d7a940dde31 100644
--- a/games/xbomb/files/patch-hiscore.c
+++ b/games/xbomb/files/patch-hiscore.c
@@ -5,9 +5,9 @@
/*+ The names of the high score tables. +*/
-static char *filenames[NTYPES]={"/var/tmp/xbomb6.hi","/var/tmp/xbomb4.hi","/var/tmp/xbomb3.hi"};
-+static char *filenames[NTYPES]={X11BASE"/lib/X11/xbomb/xbomb6.hi",
-+ X11BASE"/lib/X11/xbomb/xbomb4.hi",
-+ X11BASE"/lib/X11/xbomb/xbomb3.hi"};
++static char *filenames[NTYPES]={LOCALBASE"/lib/X11/xbomb/xbomb6.hi",
++ LOCALBASE"/lib/X11/xbomb/xbomb4.hi",
++ LOCALBASE"/lib/X11/xbomb/xbomb3.hi"};
/*+ The names of the positions in the high score tables. +*/
static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"};
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index a57b38e4f956..8518138aed45 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xbomber
PORTVERSION= 0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.billsgames.com/unix/x/xbomber/
DISTNAME= ${PORTNAME}.${PORTVERSION}
@@ -16,8 +16,8 @@ MAINTAINER= marcus@FreeBSD.org
COMMENT= A game based on "Super Bomberman" for the Super Nintendo
WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_XORG= x11
-USE_X_PREFIX= yes
MAKEFILE= makefile
do-install:
diff --git a/games/xbomber/files/patch-aa b/games/xbomber/files/patch-aa
index f2dcd11cb46d..d4e650e209ae 100644
--- a/games/xbomber/files/patch-aa
+++ b/games/xbomber/files/patch-aa
@@ -8,7 +8,7 @@
+CC?=gcc
MATHLIB=-lm
-CFLAGS=-I/usr/X11/include
-+CFLAGS+=-I${X11BASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\"
++CFLAGS+=-I${LOCALBASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\"
# Change this to "touch" if your system doesn't have the "strip" command:
POSTPROCESS=strip
@@ -22,7 +22,7 @@
# uncomment for FreeBSD
-#XLIB=-L /usr/X11R6/lib -lX11 -lcompat
-+XLIB=-L${X11BASE}/lib -lX11 -lcompat
++XLIB=-L${LOCALBASE}/lib -lX11 -lcompat
# End of makefile user-definable variables-----------------------------------
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index 8fe9be1aa67f..4b2e7e88ddef 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xbubble
PORTVERSION= 0.5.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
@@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
MAN6= xbubble.6
-USE_X_PREFIX= yes
+USE_XORG= x11 xmu
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/games/xcheckers/Makefile b/games/xcheckers/Makefile
index 949408377582..f2d19b28cbfc 100644
--- a/games/xcheckers/Makefile
+++ b/games/xcheckers/Makefile
@@ -23,7 +23,7 @@ post-patch:
@${REINPLACE_CMD} '/^#/d' ${WRKSRC}/Local.config
pre-install:
- @${REINPLACE_CMD} 's:@X11BASE@:${X11BASE}:g' \
+ @${REINPLACE_CMD} 's:@LOCALBASE@:${LOCALBASE}:g' \
${WRKSRC}/xcheckers.src/xcheckers.man
.include <bsd.port.mk>
diff --git a/games/xcheckers/files/patch-xcheckers.src_xcheckers.man b/games/xcheckers/files/patch-xcheckers.src_xcheckers.man
index a5cd6401376c..5d4a4da5471f 100644
--- a/games/xcheckers/files/patch-xcheckers.src_xcheckers.man
+++ b/games/xcheckers/files/patch-xcheckers.src_xcheckers.man
@@ -8,7 +8,7 @@ $FreeBSD$
.I ~/.xcheckersrc
and in
-.I /usr/lib/X11/app-defaults/XCheckers.
-+.I @X11BASE@/lib/X11/app-defaults/XCheckers.
++.I @LOCALBASE@/lib/X11/app-defaults/XCheckers.
(First mentioned places overriding)
.TP
@@ -17,13 +17,13 @@ $FreeBSD$
.SH FILES
-.I /usr/lib/X11/app-defaults/XCheckers,
-+.I @X11BASE@/lib/X11/app-defaults/XCheckers,
++.I @LOCALBASE@/lib/X11/app-defaults/XCheckers,
.br
-.I /usr/lib/X11/xcheckers/scene.xpm,
-+.I @X11BASE@/share/xcheckers/scene.xpm,
++.I @LOCALBASE@/share/xcheckers/scene.xpm,
.br
-.I /usr/lib/X11/xcheckers/stars.xpm
-+.I @X11BASE@/share/xcheckers/stars.xpm
++.I @LOCALBASE@/share/xcheckers/stars.xpm
.SH SEE ALSO
.BR simplech (6),
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 86141b6c511d..25d24f6c4fcf 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcogitate
PORTVERSION= 1.02
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mph
@@ -16,12 +16,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A logic game with board and stones
PLIST_FILES= bin/xcogitate
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
WRKSRC= ${WRKDIR}/XCOGITATE_SOURCE
do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include -o xcogitate xcogitate.c -L${X11BASE}/lib -lX11 -lXpm
+ cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -o xcogitate xcogitate.c -L${LOCALBASE}/lib -lX11 -lXpm
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/xcogitate ${PREFIX}/bin
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index 81ef27423e33..6e2592ddd1d7 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -18,7 +18,7 @@ COMMENT= Block action game
WRKSRC= ${WRKDIR}/xdeblo_v1.0
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
post-patch:
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index f92fefff11c3..e5de4bd3db52 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Another minesweeper game for the X Window System
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= xdemineur.1
PLIST_FILES= bin/xdemineur
diff --git a/games/xdesktopwaves/Makefile b/games/xdesktopwaves/Makefile
index dc24ca25963a..f1976b757040 100644
--- a/games/xdesktopwaves/Makefile
+++ b/games/xdesktopwaves/Makefile
@@ -7,17 +7,15 @@
PORTNAME= xdesktopwaves
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Simulation of water waves on the desktop
-USE_X_PREFIX= yes
-
MAN1= xdesktopwaves.1
+USE_XORG= x11 xext
PLIST_FILES= bin/xdesktopwaves
diff --git a/games/xdesktopwaves/files/patch-makefile b/games/xdesktopwaves/files/patch-makefile
index ab57a74ad54d..a4eacbc64b0f 100644
--- a/games/xdesktopwaves/files/patch-makefile
+++ b/games/xdesktopwaves/files/patch-makefile
@@ -7,22 +7,22 @@
-CC = gcc
-CFLAGS = -I/usr/X11R6/include -O2
+#CC = gcc
-+CFLAGS += -I$(X11BASE)/include
++CFLAGS += -I$(LOCALBASE)/include
#============================= Linker configuration ============================
-LINK = gcc
-LFLAGS = -L/usr/X11R6/lib
+LINK = $(CC)
-+LFLAGS = -L$(X11BASE)/lib
++LFLAGS = -L$(LOCALBASE)/lib
LIBS = -lm -lX11 -lXext
#============================ Installer configuration ==========================
-BINDIR = /usr/X11R6/bin
-MAN1DIR = /usr/X11R6/man/man1
-+BINDIR = $(X11BASE)/bin
-+MAN1DIR = $(X11BASE)/man/man1
++BINDIR = $(LOCALBASE)/bin
++MAN1DIR = $(LOCALBASE)/man/man1
INSTALL = install
RM = rm -f -v
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 27662addcfad..ba410fb42ef5 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xevil
PORTVERSION= 2.02.r2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.xevil.com/download/stable/
DISTNAME= xevilsrc${PORTVERSION:S/.r/r/}
@@ -15,9 +15,8 @@ DISTNAME= xevilsrc${PORTVERSION:S/.r/r/}
MAINTAINER= ports@FreeBSD.org
COMMENT= A fast-action, networked, anti-social, kill-everything game
-USE_X_PREFIX= yes
USE_ZIP= yes
-USE_XPM= yes
+USE_XORG= xpm
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
MAKEFILE= makefile
ALL_TARGET= freebsd
diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-aa
index 5ef4b4fb11b8..a786c4ed1900 100644
--- a/games/xevil/files/patch-aa
+++ b/games/xevil/files/patch-aa
@@ -29,7 +29,7 @@
-INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \
+ @$(MAKE) CC="${CXX}" \
+CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \
-+INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \
++INCL_DIRS="-I$(LOCALBASE)/include" LIBS_DIRS="-L$(LOCALBASE)/lib" \
OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \
LIBS="-lXpm -lX11 -lm" $(TARGETS)
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index 830ba9c6b8c6..4f740d15b2db 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xeyes+
PORTVERSION= 2.02
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.asahi-net.or.jp/~fj9y-ynym/
DISTNAME= ${PORTNAME}${PORTVERSION}
@@ -15,14 +15,13 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Horrible eyes looking at your mouse cursor
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
PLIST_FILES= bin/xeyes+
do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include -DXPM -DUSLEEP \
- -o xeyes+ xeyes+.c -L${X11BASE}/lib -lX11 -lXpm -lm
+ cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -DXPM -DUSLEEP \
+ -o xeyes+ xeyes+.c -L${LOCALBASE}/lib -lX11 -lXpm -lm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xeyes+ ${PREFIX}/bin
diff --git a/games/xfireworks/Makefile b/games/xfireworks/Makefile
index 2fa8b4861c0c..92265d1d2602 100644
--- a/games/xfireworks/Makefile
+++ b/games/xfireworks/Makefile
@@ -7,15 +7,14 @@
PORTNAME= xfireworks
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://hp.vector.co.jp/authors/VA014157/myfreesoft/
MAINTAINER= ports@FreeBSD.org
COMMENT= Fireworks on X
-USE_X_PREFIX= yes
-
+USE_XORG= x11
MAN1= xfireworks.1
do-install:
diff --git a/games/xfireworks/files/patch-aa b/games/xfireworks/files/patch-aa
index 508d6c94afdb..dd7d742c5e7d 100644
--- a/games/xfireworks/files/patch-aa
+++ b/games/xfireworks/files/patch-aa
@@ -1,8 +1,8 @@
---- Makefile~ Fri Nov 3 05:36:55 2000
-+++ Makefile Fri Nov 3 05:38:11 2000
-@@ -1,7 +1,7 @@
- VERSION = XFireworks-1.3
- PKGNAME = xfireworks-1.3
+--- ./Makefile.orig 2000-08-06 04:00:44.000000000 +0200
++++ ./Makefile 2008-04-13 01:15:22.000000000 +0200
+@@ -1,18 +1,18 @@
+ VERSION = XFireworks-1.4
+ PKGNAME = xfireworks-1.4
-PREFIX = /usr/X11R6
-X11BASE = /usr/X11R6
+#PREFIX = /usr/X11R6
@@ -10,9 +10,12 @@
BINDIR = $(PREFIX)/bin
LIBDIR = $(PREFIX)/etc
-@@ -10,9 +10,9 @@
- XINCLUDEDIR = $(X11BASE)/include
- XLIBDIR = $(X11BASE)/lib
+ MANDIR = $(PREFIX)/man/man1
+
+-XINCLUDEDIR = $(X11BASE)/include
+-XLIBDIR = $(X11BASE)/lib
++XINCLUDEDIR = $(LOCALBASE)/include
++XLIBDIR = $(LOCALBASE)/lib
-CFLAGS = -O
+#CFLAGS = -O
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 58c11a662fbc..4ba26c425d42 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfrisk
PORTVERSION= 1.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://tuxick.net/xfrisk/files/
DISTNAME= XFrisk-${PORTVERSION}
@@ -19,10 +19,8 @@ LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
NO_CDROM= Possible trademark infringement
-USE_X_PREFIX= yes
NO_INSTALL_MANPAGES= yes
WRKSRC= ${WRKDIR}/XFrisk
USE_GMAKE= yes
-MAKE_ENV+= XDIR=${X11BASE}
.include <bsd.port.mk>
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 0412ba56f23c..862b30fd7cdc 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -7,21 +7,18 @@
PORTNAME= xgalaga
PORTVERSION= 2.0.34
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://people.FreeBSD.org/~linimon/public_distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= Galaga resurrected on X
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm xmu
HAS_CONFIGURE= yes
# xgalaga has a very strange usage of these variables...
-CONFIGURE_ARGS= --prefix=${X11BASE}/lib/X11/xgalaga \
- --exec_prefix=${X11BASE}/bin \
- --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS= --prefix=${LOCALBASE}/lib/X11/xgalaga \
+ --exec_prefix=${LOCALBASE}/bin
.if defined(NOSOUND)
CONFIGURE_ARGS+= --without-sound
diff --git a/games/xglk/files/patch-Makefile b/games/xglk/files/patch-Makefile
index 7afde854068c..f5ef629585d7 100644
--- a/games/xglk/files/patch-Makefile
+++ b/games/xglk/files/patch-Makefile
@@ -6,8 +6,8 @@
# for Red Hat Linux
-XINCLUDE = -I/usr/X11R6/include/X11
-XLIB = -L/usr/X11R6/lib -lX11
-+XINCLUDE = -I${X11BASE}/include
-+XLIB = -L${X11BASE}/lib -lX11
++XINCLUDE = -I${LOCALBASE}/include
++XLIB = -L${LOCALBASE}/lib -lX11
# for SparcStation / Solaris
#XINCLUDE = -I/usr/openwin/include
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index f955c94f263b..f186f3ebec0d 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xgospel
PORTVERSION= 1.12d
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.teaser.fr/~jlgailly/
@@ -15,8 +15,7 @@ COMMENT= An X11 Go (weiqi, baduk) client for the Internet Go Server
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-USE_XLIB= yes
-USE_XPM= yes
+USE_XORG= xpm x11 ice
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-x --with-xpm --with-xaw3d
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 9bfb0ff6ac1f..08ff361436fe 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xinvaders
PORTVERSION= 2.1.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/arcade/invaders
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS= i386
NO_CDROM= "don't sell for profit"
USE_GETTEXT= yes
-USE_X_PREFIX= yes
+USE_XORG= x11 xmu xaw xt
USE_AUTOTOOLS= automake:14 autoconf:213
AUTOMAKE_ARGS= --include-deps
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index 18ae5c1913ef..28d688b78427 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -7,17 +7,16 @@
PORTNAME= xinvaders3d
PORTVERSION= 1.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Vector-graphics Space Invaders clone for X
+USE_XORG= x11
PLIST_FILES= bin/xinv3d
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
do-install:
diff --git a/games/xinvaders3d/files/patch-aa b/games/xinvaders3d/files/patch-aa
index 659bb4a4d1d8..a09d750624cb 100644
--- a/games/xinvaders3d/files/patch-aa
+++ b/games/xinvaders3d/files/patch-aa
@@ -6,7 +6,7 @@
-CC = gcc
-XLIB = -L/usr/X11R6/lib -I/usr/X11R6/include
+CC?= gcc
-+XLIB = -L$(X11BASE)/lib -I$(X11BASE)/include
++XLIB = -L$(LOCALBASE)/lib -I$(LOCALBASE)/include
LIBS = -lm -lX11
OBJS = game.o aliens.o player.o effects.o \
object.o camera.o main-x11.o vec4x1.o mat4x4.o
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 244ddfc3ba3f..3bb147906a8d 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xjewel
PORTVERSION= 1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.warwick.ac.uk/pub/x11/ \
ftp://ftp.x.org/R5contrib/
@@ -16,8 +16,9 @@ EXTRACT_SUFX= .tar.z
MAINTAINER= jmz@FreeBSD.org
COMMENT= X11 dropping jewels game
-BUILD_DEPENDS= bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
USE_IMAKE= yes
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 4e7f69d3ae95..233680488b9c 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xjig
PORTVERSION= 2.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Jigsaw puzzle game for X11
-USE_XLIB= yes
+USE_XORG= x11 xproto xext
MAKEFILE= Makefile.Linux
MAN1= xjig.1
PLIST_FILES= bin/xjig
diff --git a/games/xjig/files/patch-aa b/games/xjig/files/patch-aa
index ca2c92322c6b..8f8f62c14458 100644
--- a/games/xjig/files/patch-aa
+++ b/games/xjig/files/patch-aa
@@ -15,10 +15,10 @@
### Directories for include files of X11 and libraries
-X_INCLUDE = /usr/X11R6/include
-+X_INCLUDE = $(X11BASE)/include
++X_INCLUDE = $(LOCALBASE)/include
-XLIB_DIR = /usr/X11R6/lib
-+XLIB_DIR = $(X11BASE)/lib
++XLIB_DIR = $(LOCALBASE)/lib
###################################################################
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 41435017a35c..60364e1b68e7 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xjump
PORTVERSION= 2.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -18,10 +18,9 @@ COMMENT= A simple X game where one tries to jump up as many levels as possible
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/g}
PLIST_FILES= bin/xjump
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm xaw
MAKE_ARGS= CC="${CC} ${CFLAGS}" RECORD_FILE="/var/games/xjump.record" \
- IDIR="-I${X11BASE}/include" LDIR="-L${X11BASE}/lib"
+ IDIR="-I${LOCALBASE}/include" LDIR="-L${LOCALBASE}/lib"
ALL_TARGET= xjump
do-install:
diff --git a/games/xjumpx/Makefile b/games/xjumpx/Makefile
index b4c05ddeb282..d6a4b03ce235 100644
--- a/games/xjumpx/Makefile
+++ b/games/xjumpx/Makefile
@@ -7,15 +7,14 @@
PORTNAME= xjumpx
PORTVERSION= 1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://fenix.ne.jp/~cdrtk/soft/dl/
MAINTAINER= ports@FreeBSD.org
COMMENT= Improved version of xjump
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm xaw
MAN1= xjumpx.1
MANCOMPRESSED= yes
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 411818ba3d41..3f7899365bf5 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xlines
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.trolltech.com/contrib/
DISTNAME= ${PORTNAME}
@@ -16,7 +16,6 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Remove as many balls from board as you can
USE_QT_VER= 3
-USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/games/xlines/files/patch-aa b/games/xlines/files/patch-aa
index 9b5e76c27bf7..3d0c53c6af8d 100644
--- a/games/xlines/files/patch-aa
+++ b/games/xlines/files/patch-aa
@@ -6,11 +6,11 @@
-LFLAGS=-L/usr/local/qt/lib -lqt -L/usr/X11/lib -lX11
-CC=gcc
-MOC=/usr/local/qt/bin/moc
-+INCDIR=${X11BASE}/include/
-+CXXFLAGS+=-I${X11BASE}/include -DSHOW_NEXT_COLORS ${PTHREAD_CFLAGS}
-+LFLAGS=-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
++INCDIR=${LOCALBASE}/include/
++CXXFLAGS+=-I${LOCALBASE}/include -DSHOW_NEXT_COLORS ${PTHREAD_CFLAGS}
++LFLAGS=-L${LOCALBASE}/lib -lqt-mt ${PTHREAD_LIBS}
+CC?=gcc
-+MOC=${X11BASE}/bin/moc
++MOC=${LOCALBASE}/bin/moc
SRC=lines.cpp lines.moc
OBJECTS=lines.o
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 60c8be6c9a53..279eb04b6048 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmastermind
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
@@ -17,7 +17,7 @@ COMMENT= Mastermind game for X Window System
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
-USE_X_PREFIX= yes
+USE_XORG= x11 xpm
pre-patch:
@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
diff --git a/games/xmastermind/files/patch-aa b/games/xmastermind/files/patch-aa
index ee322a413bff..afb6f3547394 100644
--- a/games/xmastermind/files/patch-aa
+++ b/games/xmastermind/files/patch-aa
@@ -5,14 +5,14 @@
CC = gcc
-CFLAGS = -O2 -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi
-+.if exists(${X11BASE}/include/X11/forms.h)
-+XFORMSINC=-I${X11BASE}/include/X11
++.if exists(${LOCALBASE}/include/X11/forms.h)
++XFORMSINC=-I${LOCALBASE}/include/X11
+.endif
-+CFLAGS+= -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi -I${X11BASE}/include ${XFORMSINC}
++CFLAGS+= -Wall -Wpointer-arith -Wstrict-prototypes -pedantic -ansi -I${LOCALBASE}/include ${XFORMSINC}
CLIBS = -lm
#GRAPHLIBS = -lforms -L/usr/X11R6/lib/ -lX11 -static
-GRAPHLIBS = -lforms -L/usr/X11R6/lib/ -lX11
-+GRAPHLIBS = -lforms -L${X11BASE}/lib -lX11 -lXpm
++GRAPHLIBS = -lforms -L${LOCALBASE}/lib -lX11 -lXpm
MF = Makefile
ALLLIBS = $(GRAPHLIBS) $(CLIBS)
diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile
index 5276e7386b2f..c5cb48dff26e 100644
--- a/games/xmemory/Makefile
+++ b/games/xmemory/Makefile
@@ -20,9 +20,9 @@ USE_IMAKE= yes
MAN1= xmemory.1
post-install:
- @${MKDIR} ${X11BASE}/lib/X11/xmemory
+ @${MKDIR} ${LOCALBASE}/lib/X11/xmemory
${INSTALL_DATA} ${WRKSRC}/home.mem ${WRKSRC}/sports.mem \
- ${X11BASE}/lib/X11/xmemory
- ${LN} -sf home.mem ${X11BASE}/lib/X11/xmemory/default.mem
+ ${LOCALBASE}/lib/X11/xmemory
+ ${LN} -sf home.mem ${LOCALBASE}/lib/X11/xmemory/default.mem
.include <bsd.port.mk>
diff --git a/games/xminehunter/files/patch-aa b/games/xminehunter/files/patch-aa
index 19500eb99265..13e1d26baaac 100644
--- a/games/xminehunter/files/patch-aa
+++ b/games/xminehunter/files/patch-aa
@@ -6,12 +6,12 @@
-
-INCLUDES = -I/usr/local/X11R5/include
-LIBS = -L/usr/local/X11R5/lib -lXm -lXt -lXpm -lXext -lX11
-+INSTALL_BIN_PATH = ${X11BASE}/bin
-+INSTALL_SCORE_PATH = ${X11BASE}/lib/X11/xminehunter
++INSTALL_BIN_PATH = ${LOCALBASE}/bin
++INSTALL_SCORE_PATH = ${LOCALBASE}/lib/X11/xminehunter
-+INCLUDES = -I${X11BASE}/include
-+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXpm -lXext -lX11
-+LIBS+= -Wl,-rpath,${X11BASE}/lib
++INCLUDES = -I${LOCALBASE}/include
++LIBS = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXpm -lXext -lX11
++LIBS+= -Wl,-rpath,${LOCALBASE}/lib
CC = g++
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index d9c7b9229221..20fa6b200587 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmines
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Minesweeper game for the X Window System
-USE_X_PREFIX= yes
+USE_XORG= x11 xt
post-install:
.if !defined(NOPORTDOCS)
diff --git a/games/xmines/files/patch-aa b/games/xmines/files/patch-aa
index b31bdc3f5e28..d1543859aee3 100644
--- a/games/xmines/files/patch-aa
+++ b/games/xmines/files/patch-aa
@@ -12,8 +12,8 @@
-SCOREFILES = /usr/X386/lib/X11/games
+CFLAGS += -DSCOREfILE=\"$(SCOREFILES)/scores\"
+CC ?= gcc
-+INCLUDE = ${X11BASE}/include
-+LIBRARY = ${X11BASE}/lib
++INCLUDE = ${LOCALBASE}/include
++LIBRARY = ${LOCALBASE}/lib
+BIN = ${PREFIX}/bin
+SCOREFILES = ${PREFIX}/share/xmines
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 25fc5b47ed7a..bf04c7d58c98 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -18,7 +18,7 @@ COMMENT= Challenging 2D motocross platform game
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
curl.4:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS= ${X11BASE}/lib/libode.a:${PORTSDIR}/devel/ode
+BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -30,8 +30,8 @@ USE_DOS2UNIX= src/*.cpp src/*.h
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include -I${LUA_INCDIR}
-LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -L${LUA_LIBDIR}
+CPPFLAGS= -I${LOCALBASE}/include -I${LUA_INCDIR}
+LDFLAGS= -L${LOCALBASE}/lib -L${LUA_LIBDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 5defc8219890..ee56d4508ccf 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -27,6 +27,6 @@ post-configure:
-e 's/^INSTMRISFLAGS.*/INSTMRISFLAGS = \$(OWNER) -m 2555/' Makefile
post-install:
- @${CHMOD} g+w ${X11BASE}/lib/X11/xmris
+ @${CHMOD} g+w ${LOCALBASE}/lib/X11/xmris
.include <bsd.port.mk>
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 2c138ba5fe59..e4ae70222067 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X Window Asteroids style game with full color pixmaps
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN6= xoids.6
post-extract:
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index fb5f845b2ca4..d1ee62f744cc 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= O. J. Simpson Simulator root window demo
-USE_XPM= yes
+USE_XORG= xpm
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
PLIST_FILES= bin/xoj
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 76f5f7a63069..f3c44ef82991 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= joerg@FreeBSD.org
COMMENT= Try to win land without colliding with `flyers' and `eaters'
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= xonix.1
.include <bsd.port.mk>
diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile
index c206cd78824d..1404c8664d66 100644
--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@@ -7,9 +7,9 @@
PORTNAME= nexuiz
PORTVERSION= 2.4
+PORTREVISION= 1
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//g}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -49,7 +49,8 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis \
.endif
.if !defined(WITHOUT_CLIENT)
-USE_GL= yes
+USE_GL= glut
+USE_XORG= x11 xpm xxf86vm xxf86dga xext
ALL_TARGET+= cl-release
PLIST_SUB+= CLIENT=""
.else
@@ -74,7 +75,7 @@ PLIST_SUB+= SERVER="@comment "
post-extract:
@${EXTRACT_CMD} ${WRKDIR}/Nexuiz/sources/enginesource20080229.zip \
-d ${WRKDIR}/Nexuiz/sources
- @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},' ${WRKSRC}/${MAKEFILE}
+ @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' ${WRKSRC}/${MAKEFILE}
@${REINPLACE_CMD} -E 's,(fs_basedir\, )"",\1"${DATADIR}",' ${WRKSRC}/fs.c
do-build:
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index cc304de57fa5..ccf4af9e6e5e 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xosmulti
PORTVERSION= 1.00
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= flathill
@@ -18,8 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A little girl cartoon on the top of the active window
WRKSRC= ${WRKDIR}/xosmulti
-USE_X_PREFIX= yes
-USE_XORG= xbitmaps
+USE_XORG= xbitmaps x11 xt xi
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xosmulti ${PREFIX}/bin
diff --git a/games/xosmulti/files/patch-aa b/games/xosmulti/files/patch-aa
index 3f3eadd42ebe..e7190fbead33 100644
--- a/games/xosmulti/files/patch-aa
+++ b/games/xosmulti/files/patch-aa
@@ -29,7 +29,7 @@
-# INC_DIR = -I/usr/X11R6/include
-# LIB_DIR = -L/usr/X11R6/lib
-+INC_DIR = -I${X11BASE}/include
-+LIB_DIR = -L${X11BASE}/lib
++INC_DIR = -I${LOCALBASE}/include
++LIB_DIR = -L${LOCALBASE}/lib
all: $(TARGET)
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index d3f4f2a0799e..7791706c8b7a 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An X11 solitaire game with 14 variations
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN6= xpat2.6
MANCOMPRESSED= no
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index 0cbd0f5fd8bc..0e4f38fe8b49 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -7,10 +7,9 @@
PORTNAME= xpilot-ng
PORTVERSION= 4.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xpilot
+MASTER_SITES= SF/xpilot
PKGNAMESUFFIX?= -server
MAINTAINER= ports@FreeBSD.org
@@ -44,10 +43,8 @@ MAN6= xpilot-ng-replay.6 \
xpilot-ng-x11.6 \
xpilot-ng-xp-mapedit.6
-USE_X_PREFIX= yes
-
-CPPFLAGS+= -I${X11BASE}/include
-LDFLAGS+= -I${X11BASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -I${LOCALBASE}/include
OPTIONS= SDL "SDL/OpenGL client" on \
SOUND "Sound" off
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index a0d0fbc23b85..14991d7aa7d3 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -18,7 +18,7 @@ COMMENT= Puzzle tama, a tetris like game
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
PLIST_FILES= bin/xpuzzletama lib/X11/xpuzzletama/tama_score
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 0ba738db6793..bc9bc4e968eb 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= X version of simple but tricky board game
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN6= xquarto.6
PLIST_FILES= bin/xquarto
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index e196240c5e92..18d8f52ab921 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
USE_GMAKE= yes
USE_AUTOTOOLS= automake:14 autoconf:213
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
- LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_ARGS= --disable-esd
PORTDOCS= AUTHORS README README.html
diff --git a/games/xrally/Makefile b/games/xrally/Makefile
index 090d198453f0..a134a18353b6 100644
--- a/games/xrally/Makefile
+++ b/games/xrally/Makefile
@@ -10,8 +10,7 @@ PORTNAME= xrally
PORTVERSION= 1.1.1
PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xrally
+MASTER_SITES= SF/xrally
DISTNAME= ${PORTNAME}-1.1
MAINTAINER= edwin@mavetju.org
@@ -24,11 +23,11 @@ HAS_CONFIGURE= yes
USE_XORG= x11 xi xpm
USE_BZIP2= yes
USE_GMAKE= yes
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
- CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include"
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+ CFLAGS="${PTHREAD_CFLAGS}"
MAKE_ENV= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
- CFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
- INCLUDES="-I${X11BASE}/include"
+ CFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+ INCLUDES="-I${LOCALBASE}/include"
.include <bsd.port.pre.mk>
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 5e69dfc98664..1fb742a7e6e6 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xroach
PORTVERSION= 4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_BACKUP}
DISTNAME= ${PORTNAME}
@@ -15,11 +15,11 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cockroaches hide under your windows
+USE_XORG= x11
MAN6= xroach.6
MANCOMPRESSED= maybe
PLIST_FILES= bin/xroach
-USE_X_PREFIX= yes
IGNOREFILES= ${DISTFILES}
WRKSRC= ${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xroach
diff --git a/games/xroach/files/patch-aa b/games/xroach/files/patch-aa
index 928b1414c46d..a5c1aea51fff 100644
--- a/games/xroach/files/patch-aa
+++ b/games/xroach/files/patch-aa
@@ -11,14 +11,14 @@
-LDADD= -lX11/X11 -lm
+MAN6= xroach.6
+
-+DPADD+= ${X11BASE}/lib/libX11.a ${LIBM}
-+CFLAGS+= -I${X11BASE}/include -I${.CURDIR}/bitmaps
-+LDADD+= -L${X11BASE}/lib -lX11 -lm
++DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM}
++CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps
++LDADD+= -L${LOCALBASE}/lib -lX11 -lm
+
-+MANDIR= ${X11BASE}/man/man
++MANDIR= ${LOCALBASE}/man/man
+
+BINOWN= bin
-+BINDIR= ${X11BASE}/bin
++BINDIR= ${LOCALBASE}/bin
+BINMODE= 755
.include <bsd.prog.mk>
diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa
index 7f0e9be73571..0d0c35316136 100644
--- a/games/xroads/files/patch-aa
+++ b/games/xroads/files/patch-aa
@@ -7,7 +7,7 @@
-DATAPATH = /usr/games/xroads/
-BINPATH = /usr/X11R6/bin/
+PREFIX ?= /usr/X11R6
-+X11BASE ?= /usr/X11R6
++LOCALBASE ?= /usr/X11R6
+DATAPATH = ${PREFIX}/share/xroads
+BINPATH = ${PREFIX}/bin
# I imagine you would use this BINPATH for Solaris:
@@ -18,7 +18,7 @@
#CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\"
-CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\"
-+CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${X11BASE}/include
++CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${LOCALBASE}/include
###########################################################################
# Links necessary for X11
@@ -27,7 +27,7 @@
### Linux machines use this line:
-LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm
-+LINK = -L${X11BASE}/lib -lX11 -lm
++LINK = -L${LOCALBASE}/lib -lX11 -lm
### This line should work on Sun machines:
#LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm
diff --git a/games/xrot/Makefile b/games/xrot/Makefile
index 961d6516f02d..9f537f706b53 100644
--- a/games/xrot/Makefile
+++ b/games/xrot/Makefile
@@ -20,7 +20,7 @@ ALL_TARGET= xrot
PLIST_FILES= bin/xrot
WRKSRC= ${WRKDIR}/xrot
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xrot ${PREFIX}/bin
diff --git a/games/xsc/Makefile b/games/xsc/Makefile
index 9fd02e115ea1..4c269aad595e 100644
--- a/games/xsc/Makefile
+++ b/games/xsc/Makefile
@@ -7,17 +7,17 @@
PORTNAME= xsc
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.panix.com/~mbh/xsc/
MAINTAINER= ports@FreeBSD.org
COMMENT= A vector graphics space shoot'em up game
-USE_X_PREFIX= yes
+USE_XORG= x11
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" \
- LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
PLIST_FILES= bin/xsc
.include <bsd.port.mk>
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index fe94fbf8012f..54897100e2f3 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xscorch
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
MASTER_SITES= http://chaos2.org/xscorch/ \
http://mirror.dok.org/xscorch/
@@ -17,8 +17,7 @@ COMMENT= Multiplayer tank shoot-em-up
LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index acde1cdeb632..9c7c4ebcc3d2 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -16,7 +16,7 @@ COMMENT= X version of the popular board game
USE_BZIP2= yes
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
XSCRABBLEDIR= ${PREFIX}/lib/X11/xscrabble
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 8ad6cea6be5d..e385bd993a50 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -7,15 +7,14 @@
PORTNAME= xshisen
PORTVERSION= 1.51
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.techfirm.co.jp/~masaoki/
MAINTAINER= ports@FreeBSD.org
COMMENT= Shisen-sho puzzle game for X11
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sharedstatedir="${DATADIR}"
INSTALL_TARGET= install-prog
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index dd2e60d9bcca..a4a0233d64a4 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xshogi
PORTVERSION= ${GNUSHOGI_PORTVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${GNUSHOGI_MASTER_SITES}
MASTER_SITE_SUBDIR= ${GNUSHOGI_MASTER_SITE_SUBDIR}
@@ -20,7 +20,7 @@ RUN_DEPENDS= gnushogi:${PORTSDIR}/games/gnushogi
BUILD_WRKSRC= ${WRKSRC}/xshogi
-USE_X_PREFIX= yes
+USE_XORG= xt xaw x11
GNU_CONFIGURE= yes
MAN6= xshogi.6
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index c4c674c0bd1e..71f9b77b21e5 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -17,7 +17,7 @@ COMMENT= A puzzle of pushing objects to the goals
USE_IMAKE= yes
USE_PERL5_BUILD=yes
-USE_XPM= yes
+USE_XORG= xpm
WRKSRC= ${WRKDIR}/xsokoban
ALL_TARGET= xsokoban
MAN1= xsokoban.1
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 32b8eb119682..7dd8b42c1171 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -17,8 +17,8 @@ COMMENT= A cuddlesome teddy for the X desktop
NO_CDROM= Can only be distributed for free
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
USE_GNOME= imlib
MAN6= xteddy.6
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 7021e14c4159..16a9a4c6d26f 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -17,11 +17,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= An X version of a simple but tricky board game
USE_IMAKE= yes
-USE_XPM= yes
+USE_XORG= xpm
MAN1= xtic.1
PLIST_FILES= bin/xtic
post-patch:
- @${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h
+ @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure.h
.include <bsd.port.mk>
diff --git a/games/xtic/files/patch-aa b/games/xtic/files/patch-aa
index 193a8f1570f2..386c6c767553 100644
--- a/games/xtic/files/patch-aa
+++ b/games/xtic/files/patch-aa
@@ -5,4 +5,4 @@
* Change this to the correct place, if needed */
-#define XPMLIBRARY -L/usr/local/lib -lXpm
-+#define XPMLIBRARY -L%%X11BASE%%/lib -lXpm
++#define XPMLIBRARY -L%%LOCALBASE%%/lib -lXpm
diff --git a/games/xtrojka/Makefile b/games/xtrojka/Makefile
index d7b21ee4d0e2..7fbc6c07ae8d 100644
--- a/games/xtrojka/Makefile
+++ b/games/xtrojka/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtrojka
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.funet.fi/pub/unix/games/
DISTNAME= ${PORTNAME}
@@ -15,10 +15,10 @@ DISTNAME= ${PORTNAME}
MAINTAINER= e@ik.nu
COMMENT= Game of skill similar to T*tris
+USE_XORG= x11 xt xproto xaw
WRKSRC= ${WRKDIR}
MAN6= xtrojka.6
MANCOMPRESSED= yes
-USE_XLIB= yes
pre-install:
${MKDIR} ${PREFIX}/share/xtrojka
diff --git a/games/xtrojka/files/patch-aa b/games/xtrojka/files/patch-aa
index c84978d819c1..fc405e53b436 100644
--- a/games/xtrojka/files/patch-aa
+++ b/games/xtrojka/files/patch-aa
@@ -21,7 +21,7 @@
# add library search path
#
-CFLAGS+=-L/usr/X11/lib
-+CFLAGS+=-L${X11BASE}/lib
++CFLAGS+=-L${LOCALBASE}/lib
# on some systems you might add this line, because gcc starts wining
# about 'sizeof(Display)', since Display might be an empty struct;
@@ -52,7 +52,7 @@
#LIBS=-lnsl
+# FreeBSD
-+XDIR=${X11BASE}/include
++XDIR=${LOCALBASE}/include
+LIBS=-lm
+
#
diff --git a/games/xtron/files/patch-aa b/games/xtron/files/patch-aa
index d86897fc09cd..4324ff061fd1 100644
--- a/games/xtron/files/patch-aa
+++ b/games/xtron/files/patch-aa
@@ -11,8 +11,8 @@
+CC?= gcc
+CFLAGS?= -O4 -Wall
+DEFINES= -DPREFIX=\"${PREFIX}\"
-+INCLUDES= -I${X11BASE}/include -I${X11BASE}/include/X11
-+LIBS= -L${X11BASE}/lib
++INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/X11
++LIBS= -L${LOCALBASE}/lib
LDLIBS= -lXpm -lX11
DEPEND= makedepend
OBJS= wintype.o xtron.o main.o xpm2pixmap.o resource.o
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index f5f35dccaebd..5b6d02643f61 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xtruco
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
@@ -16,8 +16,8 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple version for X Window of the famous card game Super Truco
+USE_XORG= x11
PLIST_FILES= bin/xtruco
-USE_X_PREFIX= yes
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-aa
index fad5bbb28e4d..dc7a6b43b017 100644
--- a/games/xtruco/files/patch-aa
+++ b/games/xtruco/files/patch-aa
@@ -5,13 +5,13 @@
################################
-INCLUDES = -I/usr/X11/include
-+INCLUDES = -I${X11BASE}/include
++INCLUDES = -I${LOCALBASE}/include
# Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines)
OPC = -DIPC_OK
-LIBRARIES = -lX11 -L/usr/X11/lib
-+LIBRARIES = -lX11 -L${X11BASE}/lib
++LIBRARIES = -lX11 -L${LOCALBASE}/lib
CFILES = xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\
topwind.c window.c color.c button.c font.c read.c
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 3ed2ac81af9c..6585c84a57bd 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -7,10 +7,9 @@
PORTNAME= xtux
PORTVERSION= 2003.03.06
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
@@ -18,8 +17,7 @@ COMMENT= Humorous Arcade game for X
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
USE_GMAKE= yes
MAKE_ENV= CPP="${CC} -E" CC="${CC}"
@@ -31,7 +29,7 @@ post-patch:
s|^CFLAGS|#CFLAGS|g ; \
s|^CPP|#CPP|g ; \
s|^MAKE|#MAKE|g ; \
- s|/usr/X11R6|$${X11BASE}|g'
+ s|/usr/X11R6|$${LOCALBASE}|g'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xtux ${PREFIX}/bin
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index 9bca551703ce..f0b4e64fb81e 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xvmahjongg
PORTVERSION= 2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTFILES= ${PORTNAME}${PORTVERSION}.tar.Z
@@ -18,7 +18,6 @@ COMMENT= Mahjongg for XView with multicolored tiles
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
ALL_TARGET= mahjongg.swap
-USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/mahjongg2.1
MAN6= xvmahjongg.6
diff --git a/games/xvmahjongg/files/patch-ab b/games/xvmahjongg/files/patch-ab
index 38eddecb20ac..5a103463a10d 100644
--- a/games/xvmahjongg/files/patch-ab
+++ b/games/xvmahjongg/files/patch-ab
@@ -5,13 +5,13 @@
# Root directory of XView developers package
# For OpenWindows users, this is the same as $OPENWINHOME.
-XVIEWROOT = ${OPENWINHOME}
-+XVIEWROOT = ${X11BASE}
++XVIEWROOT = ${LOCALBASE}
# If not in OpenWindows, need to specify directory where libxview
# and libolgx are.
# For OpenWindows users, this is taken care of via $LD_LIBRARY_PATH.
-XVIEWLIBDIR =
-+XVIEWLIBDIR = -L${X11BASE}/lib
++XVIEWLIBDIR = -L${LOCALBASE}/lib
# e.g., XVIEWLIBDIR = -L/usr/openwin/lib
# This -L... stuff may only be appropriate in a SunOS environment,
# so do what's appropriate in your environment. The -L<pathname>
diff --git a/games/xvmines/files/patch-aa b/games/xvmines/files/patch-aa
index 0e79ce313c41..f2e3dcb50c2d 100644
--- a/games/xvmines/files/patch-aa
+++ b/games/xvmines/files/patch-aa
@@ -3,7 +3,7 @@
@@ -1,7 +1,8 @@
-WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp})
+#WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp})
-+WHERE=${X11BASE}
++WHERE=${LOCALBASE}
#CC = gcc
-CC = cc
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index 305206b9377a..e133062804dd 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xworm
PORTVERSION= 1.02
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.ekran.no/archive/x/
DISTNAME= ${PORTNAME}102
@@ -15,12 +15,12 @@ DISTNAME= ${PORTNAME}102
MAINTAINER= ports@FreeBSD.org
COMMENT= Classic game with apples and hungry worm
+USE_XORG= x11 xt
WRKSRC= ${WRKDIR}/XWorm
-USE_X_PREFIX= yes
ALL_TARGET= linux
-MAKE_ARGS= CC="${CC}" INCDIR="-I${X11BASE}/include" \
+MAKE_ARGS= CC="${CC}" INCDIR="-I${LOCALBASE}/include" \
LINUXFLAGS='${CFLAGS} -DXWORMDIR=\"${DATADIR}\"' \
- LINUXLINK="-L${X11BASE}/lib -lXt -lX11 -lm"
+ LINUXLINK="-L${LOCALBASE}/lib -lXt -lX11 -lm"
DATA= font grid raw
PLIST_FILES= bin/xworm ${DATA:S/^/%%DATADIR%%\/xworm./}
diff --git a/games/xzip/files/patch-aa b/games/xzip/files/patch-aa
index cf0d776536ec..f4473206f185 100644
--- a/games/xzip/files/patch-aa
+++ b/games/xzip/files/patch-aa
@@ -6,8 +6,8 @@
-XINCLUDE = /usr/include/X11
-XLIB = /usr/lib/X11
-+XINCLUDE = $(X11BASE)/include
-+XLIB = $(X11BASE)/lib
++XINCLUDE = $(LOCALBASE)/include
++XLIB = $(LOCALBASE)/lib
+
+SYSTEMFLAGS = -DAUTO_END_MODE
diff --git a/games/yadex/Makefile b/games/yadex/Makefile
index dbebe04c1af6..f54a836ad096 100644
--- a/games/yadex/Makefile
+++ b/games/yadex/Makefile
@@ -7,7 +7,7 @@
PORTNAME= yadex
PORTVERSION= 1.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://www.teaser.fr/~amajorel/yadex/ \
http://hjem.get2net.dk/RasII/amajorel/yadex/
@@ -16,9 +16,9 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= danfe@FreeBSD.org
COMMENT= A WAD-file editor, for games like Doom and Hexen
-USE_XLIB= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
+USE_XORG= x11
MAKEFILE= GNUmakefile
HAS_CONFIGURE= yes
CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" PREFIX="${PREFIX}"
diff --git a/games/yadex/files/patch-GNUmakefile b/games/yadex/files/patch-GNUmakefile
index 394ea892ccbc..5e816a60eb1b 100644
--- a/games/yadex/files/patch-GNUmakefile
+++ b/games/yadex/files/patch-GNUmakefile
@@ -6,8 +6,8 @@
else
- X11LIBDIR = /usr/X11R6/lib
- X11INCLUDEDIR = /usr/X11R6/include
-+ X11LIBDIR = $(X11BASE)/lib
-+ X11INCLUDEDIR = $(X11BASE)/include
++ X11LIBDIR = $(LOCALBASE)/lib
++ X11INCLUDEDIR = $(LOCALBASE)/include
endif
endif