Fix up conversion to use buildlink.mk files slightly by not putting a

buildlink directory into the rpath.  Also substitute for basename in the
Makefile, and modify patch to be less intrusive about its changes.

3 files changed, 32 insertions, 23 deletions

diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index de415022d84..ffb524c4815 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/06/24 02:11:53 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/25 04:29:26 jlam Exp $
 #
 
 DISTNAME=	kulki-1.01
@@ -12,13 +12,21 @@ COMMENT=	Simple logic game - "balls"
 
 WRKSRC=		${WRKDIR}/kulki
 
-USE_X11=	YES
-USE_GMAKE=	YES
-
 USE_BUILDLINK_ONLY=	YES
+USE_X11=		YES
+USE_GMAKE=		YES
+
+BUILDLINK_QTDIR=	${BUILDLINK_DIR}/qt2
+QTDIR=			${X11PREFIX}/qt2
+
+LDFLAGS+=	-Wl,-R${QTDIR}/lib
 
-MAKE_ENV=	QTDIR="${BUILDLINK_DIR}/qt2" MOC="${QTDIR}/bin/moc" CXX="${CXX}" CP="${CP}" \
-		CXXFLAGS="-I${QTDIR}/include"
+MAKE_ENV+=	QTDIR="${BUILDLINK_QTDIR}"
+MAKE_ENV+=	MOC="${BUILDLINK_QTDIR}/bin/moc"
+MAKE_ENV+=	CXX="${CXX}"
+MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=	BASENAME="${BASENAME}"
+MAKE_ENV+=	CP="${CP}"
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kulki
diff --git a/games/kulki/distinfo b/games/kulki/distinfo
index c1c806c5849..1f8dd60f35b 100644
--- a/games/kulki/distinfo
+++ b/games/kulki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/06/24 02:11:53 zuntum Exp $
+$NetBSD: distinfo,v 1.5 2001/06/25 04:29:26 jlam Exp $
 
 SHA1 (kulki-1.01.tgz) = 20f14bdbde44dc56d914e4451ae33824f30abaf1
 Size (kulki-1.01.tgz) = 1190074 bytes
-SHA1 (patch-aa) = 2d606898902986136bffba59669a89968c924e33
+SHA1 (patch-aa) = 27a971b6be1059d258c49663c123e46c748cbc38
diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa
index d9836da7450..3c059b049f0 100644
--- a/games/kulki/patches/patch-aa
+++ b/games/kulki/patches/patch-aa
@@ -1,45 +1,46 @@
-$NetBSD: patch-aa,v 1.4 2001/06/24 02:11:54 zuntum Exp $
+$NetBSD: patch-aa,v 1.5 2001/06/25 04:29:26 jlam Exp $
 
---- Makefile.orig	Thu Feb  8 19:27:43 2001
+--- Makefile.orig	Thu Feb  8 13:27:43 2001
 +++ Makefile
-@@ -1,8 +1,4 @@
--DEBUG = #-g
+@@ -1,8 +1,8 @@
+ DEBUG = #-g
 -GLIBS = -L/usr/X11/lib \
--	-I$(QTDIR)/include -L$(QTDIR)/lib\
--	-lqt -lX11 -lXext 
++GLIBS = -L${X11BASE}/lib \
+ 	-I$(QTDIR)/include -L$(QTDIR)/lib\
+ 	-lqt -lX11 -lXext 
 -INSTALL = /usr/games/
-+LDFLAGS+=	-L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt -lX11 -lXext
++INSTALL = ${PREFIX}/share
  # obrazki w $(INSTALL)/images
  #
  #GLIBS= -L/mnt/sys2/xlib -lm -lX11 -lXext /usr/X11R6/lib/libqt.a \
-@@ -10,18 +6,16 @@
- #	 /usr/X11R6/lib/libkfm.la /usr/X11R6/lib/libkfile.la \
+@@ -11,17 +11,17 @@
  #	  /usr/X11R6/lib/libkfm.la /usr/lib/libpng.a \
  #	  /usr/lib/libjpeg.a 
--GINCLUDE = -I$(QTDIR)/include
+ GINCLUDE = -I$(QTDIR)/include
 -CFLAGS =  -Wall -pipe -O2 -DINSTALL=\"$(INSTALL)/kulki_dir\"
++CFLAGS =  -Wall -pipe -O2 -DINSTALL=\"$(INSTALL)/kulki\"
  
  .SUFFIXES:
  %moc.moc: %.h
 -	moc $< -o `basename $< .h`moc.moc
-+	$(MOC) $< -o `basename $< .h`moc.moc
++	${MOC} $< -o `basename $< .h`moc.moc
  
  %.cc: %.moc
 -	cp `basename $< .moc`.moc  `basename $< .moc`.cc
-+	$(CP) `basename $< .moc`.moc  `basename $< .moc`.cc
++	${CP} `${BASENAME} $< .moc`.moc  `${BASENAME} $< .moc`.cc
  
  %.o: %.cc
 -	g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
-+	$(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -c $<
++	${CXX} ${CXXFLAGS} $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
  
  	
  GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o 
-@@ -30,7 +24,7 @@
+@@ -30,7 +30,7 @@
  all: gui kulki
  
  kulki: gui
 -	g++ $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki && strip kulki
-+	$(CXX) $(MOB) $(LOB) $(LDFLAGS) $(GOB) -o kulki
++	${CXX} ${LDFLAGS} $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki
  	
  gui: $(MOB) $(GOB)