diff options
Diffstat (limited to 'games/quake2lnx')
| -rw-r--r-- | games/quake2lnx/Makefile | 4 | ||||
| -rw-r--r-- | games/quake2lnx/files/patch-Makefile | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile index 2f3b02c..9f93516 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 86435fa..9d786bf 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) |
