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/gillo/Makefile | 11 +++++------ games/gillo/files/patch-Jamrules | 2 +- games/gillo/files/patch-src_Jamfile | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'games/gillo') 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) ; -- cgit v1.2.3