diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-04-17 14:59:55 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-04-17 14:59:55 +0000 |
| commit | 364c17b7cfe72af3bd219b53556267f8cda67f3c (patch) | |
| tree | d9312a6521ccc2d8d17da696788aefe5c4e8db97 | |
| parent | 08dadb6e992debec707d4c0e6642dd86f1defee0 (diff) | |
| download | FreeBSD-ports-364c17b7cfe72af3bd219b53556267f8cda67f3c.zip FreeBSD-ports-364c17b7cfe72af3bd219b53556267f8cda67f3c.tar.gz | |
- Fix the build broken by the last autoconf/automake overhaul;
- use devel/sdl12 instead of devel/sdl10 because the latter is doomed for
death.
| -rw-r--r-- | games/quakeforge/Makefile | 6 | ||||
| -rw-r--r-- | games/quakeforge/files/patch-ab | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 01d2469..81b39d2 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -18,16 +18,16 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${WADFILE} MAINTAINER= darius@dons.net.au -LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl10 \ +BUILD_DEPENDS= ${ACLOCAL}:${PORTSDIR}/devel/automake14 +LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \ ${GL_DEPENDS} -SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config +SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config WADFILE= quakesw-1.0.6.tar.gz USE_BZIP2= yes USE_GMAKE= yes USE_AUTOCONF_VER=213 -USE_AUTOMAKE= yes USE_XLIB= yes PLIST= ${WRKDIR}/PLIST diff --git a/games/quakeforge/files/patch-ab b/games/quakeforge/files/patch-ab index 3a94eff..00d831f 100644 --- a/games/quakeforge/files/patch-ab +++ b/games/quakeforge/files/patch-ab @@ -2,7 +2,7 @@ $FreeBSD$ --- configure.in.orig Sun Feb 27 13:26:03 2000 -+++ configure.in Wed Jan 24 23:42:29 2001 ++++ configure.in Wed Apr 17 17:43:43 2002 @@ -210,7 +210,7 @@ fi save_CPPFLAGS="$CPPFLAGS" @@ -21,3 +21,12 @@ $FreeBSD$ fi if test "x$HAS_SDL" != xyes; then SDL_CFLAGS="" SDL_LIBS="" +@@ -343,7 +343,7 @@ + + dnl Make sure -lSDL works + if test "x$HAS_SDL" = xyes; then +- AC_CHECK_LIB(SDL, SDL_Init, SDL_LIBS="$SDL_LIBS -lSDL" ++ AC_CHECK_LIB(SDL-1.1, SDL_Init, SDL_LIBS="$SDL_LIBS" + HAS_SDL=yes, HAS_SDL=no, [$SDL_LIBS]) + fi + if test "x$HAS_SDL" != xyes; then |
