summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorzuntum <zuntum@pkgsrc.org>2001-06-24 02:11:53 +0000
committerzuntum <zuntum@pkgsrc.org>2001-06-24 02:11:53 +0000
commit4cff93bf7da717bdf34aade6f4fe21b0ede54012 (patch)
treef9a2d36a2b4ccca20664c06eb5c3ba6eceb7330c /games
parent779248843dd1d0700c45115a195f607ad67a3b6c (diff)
downloadpkgsrc-4cff93bf7da717bdf34aade6f4fe21b0ede54012.tar.gz
o converted to use buildlink.mk from qt2-libs package
Diffstat (limited to 'games')
-rw-r--r--games/kulki/Makefile10
-rw-r--r--games/kulki/distinfo4
-rw-r--r--games/kulki/patches/patch-aa17
3 files changed, 15 insertions, 16 deletions
diff --git a/games/kulki/Makefile b/games/kulki/Makefile
index cd9be2212bf..de415022d84 100644
--- a/games/kulki/Makefile
+++ b/games/kulki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/06/24 01:30:39 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/06/24 02:11:53 zuntum Exp $
#
DISTNAME= kulki-1.01
@@ -10,14 +10,15 @@ MAINTAINER= zuntum@netbsd.org
HOMEPAGE= http://www.cs.put.poznan.pl/adanilecki/
COMMENT= Simple logic game - "balls"
-DEPENDS+= qt2>=2.2.3:../../x11/qt2
-
WRKSRC= ${WRKDIR}/kulki
USE_X11= YES
USE_GMAKE= YES
-MAKE_ENV= QTDIR="${X11BASE}/qt2" MOC="${QTDIR}/bin/moc" CXX="${CXX}" CP="${CP}"
+USE_BUILDLINK_ONLY= YES
+
+MAKE_ENV= QTDIR="${BUILDLINK_DIR}/qt2" MOC="${QTDIR}/bin/moc" CXX="${CXX}" CP="${CP}" \
+ CXXFLAGS="-I${QTDIR}/include"
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kulki
@@ -28,4 +29,5 @@ do-install:
cd ${PREFIX}/share/kulki && \
( ${GUNZIP_CMD} -c ${WRKSRC}/images.tgz | ${GTAR} xf - )
+.include "../../x11/qt2-libs/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/kulki/distinfo b/games/kulki/distinfo
index 499b8eed2a9..c1c806c5849 100644
--- a/games/kulki/distinfo
+++ b/games/kulki/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/06/24 01:32:08 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2001/06/24 02:11:53 zuntum Exp $
SHA1 (kulki-1.01.tgz) = 20f14bdbde44dc56d914e4451ae33824f30abaf1
Size (kulki-1.01.tgz) = 1190074 bytes
-SHA1 (patch-aa) = 8a45294fc9e2c453a2c1bbb0210c9798d1fa5f15
+SHA1 (patch-aa) = 2d606898902986136bffba59669a89968c924e33
diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa
index 76695153a8a..d9836da7450 100644
--- a/games/kulki/patches/patch-aa
+++ b/games/kulki/patches/patch-aa
@@ -1,20 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2001/06/24 01:30:39 zuntum Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/24 02:11:54 zuntum Exp $
--- Makefile.orig Thu Feb 8 19:27:43 2001
+++ Makefile
-@@ -1,8 +1,6 @@
+@@ -1,8 +1,4 @@
-DEBUG = #-g
-GLIBS = -L/usr/X11/lib \
- -I$(QTDIR)/include -L$(QTDIR)/lib\
- -lqt -lX11 -lXext
-INSTALL = /usr/games/
-+LIBS = -L$(X11BASE)/qt2/lib -Wl,-R$(X11BASE)/qt2/lib \
-+ -I$(X11BASE)/qt2/include -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -I$(LOCALBASE)/include \
-+ -lqt -lX11 -lXext
++LDFLAGS+= -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt -lX11 -lXext
# obrazki w $(INSTALL)/images
#
#GLIBS= -L/mnt/sys2/xlib -lm -lX11 -lXext /usr/X11R6/lib/libqt.a \
-@@ -10,18 +8,17 @@
+@@ -10,18 +6,16 @@
# /usr/X11R6/lib/libkfm.la /usr/X11R6/lib/libkfile.la \
# /usr/X11R6/lib/libkfm.la /usr/lib/libpng.a \
# /usr/lib/libjpeg.a
@@ -32,17 +30,16 @@ $NetBSD: patch-aa,v 1.3 2001/06/24 01:30:39 zuntum Exp $
%.o: %.cc
- g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -L$(X11BASE)/lib -L$(X11BASE)/qt2/lib \
-+ -I$(X11BASE)/qt2/include -c $<
++ $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -c $<
GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o
-@@ -30,7 +27,7 @@
+@@ -30,7 +24,7 @@
all: gui kulki
kulki: gui
- g++ $(MOB) $(LOB) $(GLIBS) $(GOB) -o kulki && strip kulki
-+ $(CXX) $(MOB) $(LOB) $(LIBS) $(LDFLAGS) $(GOB) -o kulki
++ $(CXX) $(MOB) $(LOB) $(LDFLAGS) $(GOB) -o kulki
gui: $(MOB) $(GOB)