Fix build for ELF.

4 files changed, 35 insertions, 20 deletions

diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 0fa93413193d..6e7b51f15365 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.6 1998/09/17 00:32:32 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/21 01:35:30 steve Exp $
 #
 
 DISTNAME=		3Dc-0.8.1
@@ -18,17 +18,14 @@ LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm \
 			Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_X_PREFIX=		yes
-WRKSRC=			${WRKDIR}/3Dc
-
-do-build:
-	@ cd ${WRKSRC}/src; make
+WRKSRC=			${WRKDIR}/3Dc/src
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/src/3Dc ${PREFIX}/bin
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/3Dc ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${PREFIX}/share/doc/3Dc
 .for file in 3Dc-rules.html ACKNOWLEDGEMENTS GPL README TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/3Dc
+	@ ${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/3Dc
 .endfor
 .endif
 
diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-aa
index 518b8f27b67a..daef108ec90f 100644
--- a/games/3dc/files/patch-aa
+++ b/games/3dc/files/patch-aa
@@ -1,5 +1,5 @@
---- src/Makefile.orig	Thu Apr 11 10:23:53 1996
-+++ src/Makefile	Sun May  3 19:20:18 1998
+--- src/Makefile.orig	Thu Apr 11 09:23:53 1996
++++ src/Makefile	Sat Sep 26 23:22:52 1998
 @@ -13,7 +13,7 @@
  # If your system doesn't have a unique define already, define one here.
  
@@ -9,7 +9,7 @@
  # OSF/Digital Unix/HPUX
  #CONFIGS=-fPIC -DHAVE_UNISTD_H -DHAVE_ULIMIT_H
  # Sun
-@@ -27,19 +27,19 @@
+@@ -27,19 +27,22 @@
  #   can send me opinions at mailto:paulh@euristix.ie
  PREFS=-DUNDO_ANY_MOVE
  
@@ -30,6 +30,9 @@
  # Linux
 -LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
 +LDLIBS=-L${X11BASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11
++.if ${PORTOBJFORMAT} == "elf"
++LDLIBS+=-Wl,-rpath,${X11BASE}/lib
++.endif
  # Sun
  #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm
  
diff --git a/games/KnightCap/files/patch-aa b/games/KnightCap/files/patch-aa
index 0cf23bfaaa9f..b1b49b7ed3aa 100644
--- a/games/KnightCap/files/patch-aa
+++ b/games/KnightCap/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	Wed Mar 11 21:51:57 1998
-+++ /home/andy/tmp/wrk/Makefile	Sun May 10 09:54:13 1998
+--- Makefile.orig	Wed Mar 11 15:51:57 1998
++++ Makefile	Sun Sep 27 11:09:04 1998
 @@ -2,11 +2,11 @@
  
  # what C compiler? It better be Ansi-C. Use gcc if you have it.
@@ -14,7 +14,7 @@
  
  # If you don't have gcc then perhaps try this instead. You only need
  # the null definition for inline if your C compiler doesn't know about
-@@ -21,13 +21,10 @@
+@@ -21,13 +21,13 @@
  # display (or you don't have OpenGL and Glut libraries)
  # If you do have these libs then make sure the first three
  # lines point at the right places
@@ -28,6 +28,9 @@
 +GLUT_LIBS = -L$(X11BASE)/lib -lglut
 +MESA_LIBS = -L$(X11BASE)/lib -lMesaGLU -lMesaGL -lm
 +XLIBS = -L$(X11BASE)/lib -lXmu -lXt -lXext -lX11 -lXi
++.if $(PORTOBJFORMAT) == "elf"
++XLIBS+=	-Wl,-rpath,$(X11BASE)/lib
++.endif
 +DISPLAYFLAGS = -I$(X11BASE)/include -DRENDERED_DISPLAY=1
  
  # comment out the following line if you don't want KnightCap's
diff --git a/games/blackjack/files/patch-aa b/games/blackjack/files/patch-aa
index 009195505d05..17f9d6df8caa 100644
--- a/games/blackjack/files/patch-aa
+++ b/games/blackjack/files/patch-aa
@@ -1,22 +1,34 @@
---- Makefile.orig	Fri Jan 24 09:16:39 1997
-+++ Makefile	Mon Feb 23 12:35:50 1998
-@@ -2,8 +2,8 @@
+--- Makefile.orig	Wed Feb 11 21:42:00 1998
++++ Makefile	Sun Sep 27 18:38:34 1998
+@@ -2,8 +2,11 @@
  CC=gcc
  CXX=g++
  CFLAGS=
 -INCLUDES=-I$(QTDIR)/include
 -LDFLAGS=-L$(QTDIR)/lib -lqt
-+INCLUDES=-I/usr/X11R6/include/X11/qt
-+LDFLAGS=-L/usr/X11R6/lib -lqt
++INCLUDES=-I$(X11BASE)/include/X11/qt
++LDFLAGS=-L$(X11BASE)/lib -lqt
++.if $(PORTOBJFORMAT) == "elf"
++LDFLAGS+=-Wl,-rpath,$(X11BASE)/lib
++.endif
  VERSION=1.1
  
  # For systems that don't have install, use this
-@@ -24,12 +24,14 @@
+@@ -25,7 +28,7 @@
+ 	blackjack/*.cpp			\
+ 	blackjack/*.bm
+ 
+-INSTALL=install
++INSTALL=install -c
+ INSTALL_BIN_FLAGS=-s
+ 
+ INSTALL_ROOT=/usr/local
+@@ -39,12 +42,14 @@
       user_input.o dollar_scroll_bar.o bet_option.o table_option.o \
       insurance_window.o $(METAOBJS)
  
 -MOC=$(QTDIR)/bin/moc
-+MOC=/usr/X11R6/bin/moc
++MOC=$(X11BASE)/bin/moc
  
  .SUFFIXES: .cpp