diff options
| author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
| commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
| tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /games/joequake/files/patch-Makefile.linux | |
| parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
| download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz | |
- 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/joequake/files/patch-Makefile.linux')
| -rw-r--r-- | games/joequake/files/patch-Makefile.linux | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/games/joequake/files/patch-Makefile.linux b/games/joequake/files/patch-Makefile.linux index be4c3e0..199e157 100644 --- a/games/joequake/files/patch-Makefile.linux +++ b/games/joequake/files/patch-Makefile.linux @@ -14,7 +14,7 @@ +CC ?= gcc +#_E := @ +LOCALBASE ?= /usr/local -+X11BASE ?= /usr/X11R6 ++LOCALBASE ?= /usr/X11R6 +USE_OPTIMIZED_CFLAGS ?= YES -default_target: glx @@ -63,7 +63,7 @@ GLX_CFLAGS := $(CFLAGS) \ - -DGLQUAKE -I/usr/X11R6/include -+ -DGLQUAKE -I$(X11BASE)/include ++ -DGLQUAKE -I$(LOCALBASE)/include + +ifeq ($(strip $(USE_X86_ASM)),YES) +GLX_CFLAGS += -Did386 @@ -73,7 +73,7 @@ - -lGL -L/usr/X11R6/lib -lX11 \ - -lXext -lXxf86dga -lXxf86vm \ - -lpng -ljpeg -+ -L$(X11BASE)/lib -lGL -lX11 \ ++ -L$(LOCALBASE)/lib -lGL -lX11 \ + -lXext -lXxf86dga -lXxf86vm \ + -L$(LOCALBASE)/lib -lpng -ljpeg @@ -96,7 +96,7 @@ X11_S_OBJS := $(addprefix $(X11_DIR)/, $(addsuffix .o, $(X11_S_FILES))) -X11_CFLAGS := $(CFLAGS) -+X11_CFLAGS := $(CFLAGS) -I$(X11BASE)/include ++X11_CFLAGS := $(CFLAGS) -I$(LOCALBASE)/include + +ifeq ($(strip $(USE_X86_ASM)),YES) +X11_CFLAGS += -Did386 @@ -105,7 +105,7 @@ X11_LDFLAGS := $(LDFLAGS) \ - -L/usr/X11R6/lib -lX11 -lXext \ - -lpng -+ -L$(X11BASE)/lib -lX11 -lXext \ ++ -L$(LOCALBASE)/lib -lX11 -lXext \ + -L$(LOCALBASE)/lib -lpng x11: _DIR := $(X11_DIR) @@ -120,7 +120,7 @@ SVGA_LDFLAGS := $(LDFLAGS) \ - -L/usr/X11R6/lib -lX11 -lpthread \ - -lvga -lpng -+ -L$(X11BASE)/lib -lX11 -lpthread \ ++ -L$(LOCALBASE)/lib -lX11 -lpthread \ + -L$(LOCALBASE)/lib -lvga -lpng +ifeq ($(OSTYPE),Linux) |
