diff options
| author | zuntum <zuntum> | 2001-03-12 22:33:47 +0000 |
|---|---|---|
| committer | zuntum <zuntum> | 2001-03-12 22:33:47 +0000 |
| commit | 192633a586e69497ce8c56327f400eacb4d3ee32 (patch) | |
| tree | f79002811e67b4b2a84bbefe19b42bb07b12f4cd | |
| parent | cd6207d3d456bffee5b5edfa5224df8005120bd6 (diff) | |
| download | pkgsrc-192633a586e69497ce8c56327f400eacb4d3ee32.tar.gz | |
* pass variables via MAKE_ENV instead of @REPLACEMENTS@+sed
* remove redundant dependency on png and remove -lpng
| -rw-r--r-- | games/kulki/Makefile | 15 | ||||
| -rw-r--r-- | games/kulki/files/patch-sum | 4 | ||||
| -rw-r--r-- | games/kulki/patches/patch-aa | 12 |
3 files changed, 13 insertions, 18 deletions
diff --git a/games/kulki/Makefile b/games/kulki/Makefile index cf0c34e3a52..865d0d4d999 100644 --- a/games/kulki/Makefile +++ b/games/kulki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/12 08:57:37 zuntum Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/12 22:33:47 zuntum Exp $ # DISTNAME= kulki-1.01 @@ -11,7 +11,6 @@ HOMEPAGE= http://www.cs.put.poznan.pl/adanilecki/ COMMENT= Simple logic game - "balls" DEPENDS+= qt2>=2.2.3:../../x11/qt2 -DEPENDS+= png-*:../../graphics/png WRKSRC= ${WRKDIR}/kulki @@ -21,14 +20,10 @@ MAKE_ENV= "MOC=${X11BASE}/qt2/bin/moc" \ "CXX=${CXX}" \ "CP=${CP}" \ "QTDIR=${X11BASE}/qt2" \ - "CXXFLAGS=${CXXFLAGS}" - -post-patch: - ${SED} -e "s,@X11BASE@,${X11BASE},g" \ - -e "s,@PREFIX@,${PREFIX},g" \ - -e "s,@LOCALBASE@,${LOCALBASE},g" \ - ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.done - ${MV} ${WRKSRC}/Makefile.done ${WRKSRC}/Makefile + "CXXFLAGS=${CXXFLAGS}" \ + "X11BASE=${X11BASE}" \ + "PREFIX=${PREFIX}" \ + "LOCALBASE=${LOCALBASE}" do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/kulki diff --git a/games/kulki/files/patch-sum b/games/kulki/files/patch-sum index b5cb46517c6..4032bde7de5 100644 --- a/games/kulki/files/patch-sum +++ b/games/kulki/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 2001/03/12 08:57:37 zuntum Exp $ +$NetBSD: patch-sum,v 1.2 2001/03/12 22:33:48 zuntum Exp $ -SHA1 (patch-aa) = 7ea8167b65136d13fe5b0a45b322b009778aa2f9 +SHA1 (patch-aa) = 0b1398098aaf5d2f49e983c4babf731659171774 diff --git a/games/kulki/patches/patch-aa b/games/kulki/patches/patch-aa index 1bf70cae50f..009068c8b5e 100644 --- a/games/kulki/patches/patch-aa +++ b/games/kulki/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/03/12 08:57:37 zuntum Exp $ +$NetBSD: patch-aa,v 1.2 2001/03/12 22:33:48 zuntum Exp $ --- Makefile.orig Thu Feb 8 19:27:43 2001 +++ Makefile @@ -8,9 +8,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/12 08:57:37 zuntum Exp $ - -I$(QTDIR)/include -L$(QTDIR)/lib\ - -lqt -lX11 -lXext -INSTALL = /usr/games/ -+LIBS = -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -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 -lpng ++LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -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 # obrazki w $(INSTALL)/images # #GLIBS= -L/mnt/sys2/xlib -lm -lX11 -lXext /usr/X11R6/lib/libqt.a \ @@ -32,8 +32,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/12 08:57:37 zuntum Exp $ %.o: %.cc - g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $< -+ $(CXX) $(CXXFLAGS) -DINSTALL=\"@PREFIX@/share/kulki\" -L@X11BASE@/lib -L@X11BASE@/qt2/lib -I@X11BASE@/include \ -+ -I@X11BASE@/qt2/include -c $< ++ $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -L$(X11BASE)/lib -L$(X11BASE)/qt2/lib -I$(X11BASE)/include \ ++ -I$(X11BASE)/qt2/include -c $< GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o |