aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--games/xjumpjump/Makefile3
-rw-r--r--games/xjumpjump/files/patch-aa16
2 files changed, 12 insertions, 7 deletions
diff --git a/games/xjumpjump/Makefile b/games/xjumpjump/Makefile
index cf465572f77c..5ec9b7fb20c4 100644
--- a/games/xjumpjump/Makefile
+++ b/games/xjumpjump/Makefile
@@ -14,8 +14,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \
- Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms
USE_X_PREFIX= yes
diff --git a/games/xjumpjump/files/patch-aa b/games/xjumpjump/files/patch-aa
index ab561b1a2eea..5a1c28f3892a 100644
--- a/games/xjumpjump/files/patch-aa
+++ b/games/xjumpjump/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig Wed Feb 26 21:21:57 1997
-+++ Makefile Thu Mar 15 23:12:59 2001
-@@ -8,16 +8,16 @@
+--- Makefile.orig Wed Feb 26 15:21:57 1997
++++ Makefile Mon Jul 1 02:13:27 2002
+@@ -8,16 +8,19 @@
# Flags that might be overriden by top makefile
#=================================================================
@@ -14,6 +14,9 @@
-XINCLUDE= -I/usr/X11R6/include
-XLIB = -L/usr/X11R6/lib
+XINCLUDE= -I$(X11BASE)/include
++.if exists(${X11BASE}/include/X11/forms.h)
++XFORMSINC= -I${X11BASE}/include/X11
++.endif
+XLIB = -L$(X11BASE)/lib
-INSTDIR = /usr/local
@@ -24,9 +27,12 @@
INSTALL = install
INFODIR_DEFINE = -DINFO_TXT_FILE=\"$(INFODIR)/\"
-@@ -28,7 +28,7 @@
+@@ -26,9 +29,9 @@
+ # Flags the compiler will see
+ #=================================================================
- CFLAGS = $(CCFLAG) $(XINCLUDE)
+-CFLAGS = $(CCFLAG) $(XINCLUDE)
++CFLAGS = $(CCFLAG) $(XINCLUDE) $(XFORMSINC)
LDFLAGS = $(LDFLAG)
-LIBS = -lforms $(SYSLIB) $(XLIB)
+LIBS = -lforms $(SYSLIB) $(XLIB) -lXpm