kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* pass variables via MAKE_ENV instead of @REPLACEMENTS@+sed

Browse source 
* remove redundant dependency on png and remove -lpng
This commit is contained in:
zuntum 2001-03-12 22:33:47 +00:00
parent 9a1ef496dd
commit fe3dfbdc36
3 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
games/kulki/Makefile
View file

@ -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 DISTNAME= kulki-1.01
@ -11,7 +11,6 @@ HOMEPAGE= http://www.cs.put.poznan.pl/adanilecki/
COMMENT= Simple logic game - "balls" COMMENT= Simple logic game - "balls"
DEPENDS+= qt2>=2.2.3:../../x11/qt2 DEPENDS+= qt2>=2.2.3:../../x11/qt2
DEPENDS+= png-*:../../graphics/png
WRKSRC= ${WRKDIR}/kulki WRKSRC= ${WRKDIR}/kulki
@ -21,14 +20,10 @@ MAKE_ENV= "MOC=${X11BASE}/qt2/bin/moc" \
"CXX=${CXX}" \ "CXX=${CXX}" \
"CP=${CP}" \ "CP=${CP}" \
"QTDIR=${X11BASE}/qt2" \ "QTDIR=${X11BASE}/qt2" \
"CXXFLAGS=${CXXFLAGS}" "CXXFLAGS=${CXXFLAGS}" \
"X11BASE=${X11BASE}" \
post-patch: "PREFIX=${PREFIX}" \
${SED} -e "s,@X11BASE@,${X11BASE},g" \ "LOCALBASE=${LOCALBASE}"
-e "s,@PREFIX@,${PREFIX},g" \
-e "s,@LOCALBASE@,${LOCALBASE},g" \
${WRKSRC}/Makefile > ${WRKSRC}/Makefile.done
${MV} ${WRKSRC}/Makefile.done ${WRKSRC}/Makefile
do-install: do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/kulki ${INSTALL_DATA_DIR} ${PREFIX}/share/kulki

4
games/kulki/files/patch-sum
View file

@ -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

12
games/kulki/patches/patch-aa
View file

@ -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.orig Thu Feb 8 19:27:43 2001
+++ Makefile +++ 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\ - -I$(QTDIR)/include -L$(QTDIR)/lib\
- -lqt -lX11 -lXext - -lqt -lX11 -lXext
-INSTALL = /usr/games/ -INSTALL = /usr/games/
+LIBS = -L@X11BASE@/lib -Wl,-R@X11BASE@/lib -L@X11BASE@/qt2/lib -Wl,-R@X11BASE@/qt2/lib \ +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 \ + -I$(X11BASE)/qt2/include -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -I$(LOCALBASE)/include \
+ -lqt -lX11 -lXext -lpng + -lqt -lX11 -lXext
# obrazki w $(INSTALL)/images # obrazki w $(INSTALL)/images
# #
#GLIBS= -L/mnt/sys2/xlib -lm -lX11 -lXext /usr/X11R6/lib/libqt.a \ #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 %.o: %.cc
- g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $< - g++ $(CFLAGS) $(DEBUG) $(GINCLUDE) -c $<
+ $(CXX) $(CXXFLAGS) -DINSTALL=\"@PREFIX@/share/kulki\" -L@X11BASE@/lib -L@X11BASE@/qt2/lib -I@X11BASE@/include \ + $(CXX) $(CXXFLAGS) -DINSTALL=\"$(PREFIX)/share/kulki\" -L$(X11BASE)/lib -L$(X11BASE)/qt2/lib -I$(X11BASE)/include \
+ -I@X11BASE@/qt2/include -c $< + -I$(X11BASE)/qt2/include -c $<
GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o GOB = main.o main_window.o szcanvas.o szsprite.o hscor.o