From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav) --- games/annelid/Makefile | 4 ++-- games/annelid/files/patch-Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'games/annelid') 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) -- cgit v1.2.3