From 44fa80481074cd35888ebc22004934733aaa2124 Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sun, 24 Jun 2012 21:53:38 +0000 Subject: s/X11BASE/LOCALBASE/, or equivalent. The X11BASE variable is long gone, however these ports were not updated. --- games/demonquake/files/patch-Makefile | 2 +- games/q2p/files/patch-Makefile | 2 +- games/qix/pkg-deinstall | 4 ++-- games/qix/pkg-install | 2 +- games/tremor/files/patch-Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'games') diff --git a/games/demonquake/files/patch-Makefile b/games/demonquake/files/patch-Makefile index c1c9498ca2f3..2aa4a85d4ed1 100644 --- a/games/demonquake/files/patch-Makefile +++ b/games/demonquake/files/patch-Makefile @@ -47,7 +47,7 @@ -GAMEBASE= /usr/local -X11BASE=/usr/X11R6 +LOCALBASE?=/usr/local -+X11BASE?=/usr/X11R6 ++X11BASE?=/usr/local SYSBINDIR=$(LOCALBASE)/bin -DATADIR= $(GAMEBASE)/games/quake - diff --git a/games/q2p/files/patch-Makefile b/games/q2p/files/patch-Makefile index 0539957c3fcb..c5a9b9d05cca 100644 --- a/games/q2p/files/patch-Makefile +++ b/games/q2p/files/patch-Makefile @@ -139,7 +139,7 @@ -LOCALBASE= /usr/local -GAMEBASE= /usr/local -SYSBINDIR=$(LOCALBASE)/bin -+X11BASE?= /usr/X11R6 ++X11BASE?= /usr/local +LOCALBASE?= /usr/local +GAMEBASE?= $(PREFIX) +SYSBINDIR?= $(PREFIX)/bin diff --git a/games/qix/pkg-deinstall b/games/qix/pkg-deinstall index aa9faf7ceff0..0f90f4ac2cea 100644 --- a/games/qix/pkg-deinstall +++ b/games/qix/pkg-deinstall @@ -3,7 +3,7 @@ if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -X11BASE=/usr/X11R6 +X11BASE=/usr/local FONTDIR=$X11BASE/lib/X11/fonts/local ALIAS=$FONTDIR/fonts.alias @@ -15,4 +15,4 @@ $X11BASE/bin/mkfontdir $FONTDIR if [ `ls -l $FONTDIR/fonts.dir|awk '{print $5}'` = 2 ]; then rm $FONTDIR/fonts.dir fi -exit 0 \ No newline at end of file +exit 0 diff --git a/games/qix/pkg-install b/games/qix/pkg-install index 0e668af85c9b..f033fc051cc1 100644 --- a/games/qix/pkg-install +++ b/games/qix/pkg-install @@ -4,7 +4,7 @@ if [ "$2" != POST-INSTALL ] ; then exit 0 fi -X11BASE=/usr/X11R6 +X11BASE=/usr/local FONTDIR=$X11BASE/lib/X11/fonts/local mkdir -p $X11BASE/share/qix diff --git a/games/tremor/files/patch-Makefile b/games/tremor/files/patch-Makefile index 033c8838a70d..278a464d9611 100644 --- a/games/tremor/files/patch-Makefile +++ b/games/tremor/files/patch-Makefile @@ -76,7 +76,7 @@ ifeq ($(strip $(STRIP)),YES) @@ -102,12 +90,11 @@ - X_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \ + X_LDFLAGS=-L$(LOCALBASE)/lib$(ARCH_LIBDIR) \ -lX11 -lXext -lXxf86vm -lXxf86dga -GLX_LDFLAGS=-L$(X11BASE)/lib$(ARCH_LIBDIR) \ - -L$(LOCALBASE)/lib$(ARCH_LIBDIR) \ -- cgit v1.2.3