diff options
author | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2008-04-20 01:56:05 +0800 |
commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /games/tremulous | |
parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
download | freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip |
- 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)
Diffstat (limited to 'games/tremulous')
-rw-r--r-- | games/tremulous/Makefile | 6 | ||||
-rw-r--r-- | games/tremulous/files/patch-Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
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) |