diff options
author | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-01 06:42:34 +0000 |
---|---|---|
committer | Mike Heffner <mikeh@FreeBSD.org> | 2002-07-01 06:42:34 +0000 |
commit | d16efd493c784a1c42f8dd138b1791c8b15ed543 (patch) | |
tree | 186e023afcdfd9891ae594502800e6df5a9a1f4c | |
parent | Prepare for xforms update. (diff) |
Prepare for xforms update.
Notes
Notes:
svn path=/head/; revision=62253
-rw-r--r-- | games/xothello/Makefile | 2 | ||||
-rw-r--r-- | games/xothello/files/patch-aa | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/games/xothello/Makefile b/games/xothello/Makefile index 237fce3682a1..822ea62450fd 100644 --- a/games/xothello/Makefile +++ b/games/xothello/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms +LIB_DEPENDS= forms.0:${PORTSDIR}/x11-toolkits/xforms NO_CDROM= Possible trademark infringement diff --git a/games/xothello/files/patch-aa b/games/xothello/files/patch-aa index 5f9456721d8c..0c6e530ce0ec 100644 --- a/games/xothello/files/patch-aa +++ b/games/xothello/files/patch-aa @@ -1,6 +1,6 @@ --- Makefile.orig Sat Feb 15 13:00:15 1997 -+++ Makefile Thu Apr 23 22:03:27 1998 -@@ -8,14 +8,14 @@ ++++ Makefile Mon Jul 1 02:35:58 2002 +@@ -8,14 +8,17 @@ # 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 @@ -21,12 +24,15 @@ BINDIR = $(INSTDIR)/bin INSTALL = install -@@ -25,7 +25,7 @@ +@@ -23,9 +26,9 @@ + # Flags the compiler will see + #================================================================= - CFLAGS = $(CCFLAG) $(XINCLUDE) +-CFLAGS = $(CCFLAG) $(XINCLUDE) ++CFLAGS = $(CCFLAG) $(XINCLUDE) $(XFORMSINC) LDFLAGS = $(LDFLAG) -LIBS = -lforms $(SYSLIB) $(XLIB) -+LIBS = -lxforms $(SYSLIB) $(XLIB) ++LIBS = -lforms -lXpm $(SYSLIB) $(XLIB) #================================================================= |