2 files changed, 259 insertions, 20 deletions

diff --git a/games/pp/Makefile b/games/pp/Makefile
index a2088a09a6c6..a67f7dcbf18c 100644
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@@ -13,29 +13,24 @@ DISTFILES=	ppinst-0.01.tar.gz ppsrc-0.01.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/ppsrc
 USE_QT=		yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/ppsrc
-
-pre-build:
-	@ cd ${WRKSRC}; ${MAKE} ${MAKE_ENV} depend
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/pp ${PREFIX}/bin/pp.bin
-	@ ${SED} 's#%%PREFIX%%#${PREFIX}#g' ${FILESDIR}/pp.sh > ${WRKDIR}/pp.sh
-	@ ${INSTALL_SCRIPT} ${WRKDIR}/pp.sh ${PREFIX}/bin/pp
-	@ ${MKDIR} ${PREFIX}/share/pp
-	@ ${INSTALL_DATA} ${WRKDIR}/ppinst/autosave.sav ${PREFIX}/share/pp
-	@ ${MKDIR} ${PREFIX}/share/pp/pic
-	@ ${INSTALL_DATA} ${WRKDIR}/ppinst/*.gif ${PREFIX}/share/pp/pic
-	@ ${MKDIR} ${PREFIX}/share/pp/level
-	@ ${INSTALL_DATA} ${WRKDIR}/ppinst/*.map1 ${PREFIX}/share/pp/level
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pp ${PREFIX}/bin/pp.bin
+	@${SED} "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/pp.sh > ${WRKDIR}/pp.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/pp.sh ${PREFIX}/bin/pp
+	@${MKDIR} ${PREFIX}/share/pp
+	${INSTALL_DATA} ${WRKDIR}/ppinst/autosave.sav ${PREFIX}/share/pp
+	@${MKDIR} ${PREFIX}/share/pp/pic
+	${INSTALL_DATA} ${WRKDIR}/ppinst/*.gif ${PREFIX}/share/pp/pic
+	@${MKDIR} ${PREFIX}/share/pp/level
+	${INSTALL_DATA} ${WRKDIR}/ppinst/*.map1 ${PREFIX}/share/pp/level
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/pp
+	@${MKDIR} ${PREFIX}/share/doc/pp
 .for file in INSTALL LICENSE RULES WARRANTY free-license.html
-	@ ${INSTALL_DATA} ${WRKDIR}/ppinst/${file} ${PREFIX}/share/doc/pp
+	${INSTALL_DATA} ${WRKDIR}/ppinst/${file} ${PREFIX}/share/doc/pp
 .endfor
 .endif
 
diff --git a/games/pp/files/patch-aa b/games/pp/files/patch-aa
index a1e9c22d0eb1..9f56572ec905 100644
--- a/games/pp/files/patch-aa
+++ b/games/pp/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile	Sat Apr  5 21:08:26 1997
-+++ /home/andy/tmp/wrk/Makefile	Sat May  1 14:30:37 1999
+--- Makefile.orig	Sun Apr  6 02:08:26 1997
++++ Makefile	Thu Nov 23 11:28:17 2000
 @@ -1,10 +1,13 @@
  ####### This section was automatically generated from
  
@@ -21,7 +21,7 @@
  
  .cpp.o:
 -	$(CC) -c $(CFLAGS) -I$(INCDIR) $<
-+	$(CXX) -c $(CFLAGS) -I$(INCDIR) $<
++	$(CXX) -c $(CXXFLAGS) -I$(INCDIR) $<
  
  ####### Build rules
  
@@ -33,3 +33,247 @@
  
  depend:
  	@makedepend -I$(INCDIR) $(SOURCES) 2> /dev/null
+@@ -66,243 +69,3 @@
+ m_main.cpp: main.h
+ 	$(MOC) -o $@ main.h
+ 
+-# DO NOT DELETE THIS LINE -- make depend depends on it.
+-
+-pic2.o: pic2.h /usr/X11R6/lib/qt/include/qapp.h
+-pic2.o: /usr/X11R6/lib/qt/include/qwidget.h
+-pic2.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-pic2.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-pic2.o: /usr/X11R6/lib/qt/include/qglobal.h
+-pic2.o: /usr/X11R6/lib/qt/include/qobject.h
+-pic2.o: /usr/X11R6/lib/qt/include/qstring.h
+-pic2.o: /usr/X11R6/lib/qt/include/qarray.h
+-pic2.o: /usr/X11R6/lib/qt/include/qgarray.h
+-pic2.o: /usr/X11R6/lib/qt/include/qshared.h
+-pic2.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-pic2.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-pic2.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-pic2.o: /usr/X11R6/lib/qt/include/qevent.h /usr/X11R6/lib/qt/include/qrect.h
+-pic2.o: /usr/X11R6/lib/qt/include/qsize.h /usr/X11R6/lib/qt/include/qpoint.h
+-pic2.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-pic2.o: /usr/X11R6/lib/qt/include/qpalette.h
+-pic2.o: /usr/X11R6/lib/qt/include/qcolor.h
+-pic2.o: /usr/X11R6/lib/qt/include/qcursor.h /usr/X11R6/lib/qt/include/qfont.h
+-pic2.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-pic2.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-pic2.o: /usr/X11R6/lib/qt/include/qpainter.h
+-pic2.o: /usr/X11R6/lib/qt/include/qregion.h /usr/X11R6/lib/qt/include/qpen.h
+-pic2.o: /usr/X11R6/lib/qt/include/qbrush.h
+-pic2.o: /usr/X11R6/lib/qt/include/qpntarry.h
+-pic2.o: /usr/X11R6/lib/qt/include/qwmatrix.h
+-pic2.o: /usr/X11R6/lib/qt/include/qpixmap.h
+-pic2.o: /usr/X11R6/lib/qt/include/qtooltip.h
+-pic2.o: /usr/X11R6/lib/qt/include/qtimer.h stepp.h /usr/include/stdlib.h
+-pic2.o: /usr/include/errno.h /usr/include/linux/errno.h
+-pic2.o: /usr/include/asm/errno.h /usr/include/alloca.h
+-pic2.o: /usr/X11R6/lib/qt/include/qfile.h /usr/X11R6/lib/qt/include/qiodev.h
+-pic2.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
+-pic2.o: /usr/X11R6/lib/qt/include/qdstream.h
+-stepp.o: stepp.h /usr/include/string.h /usr/include/features.h
+-stepp.o: /usr/include/sys/cdefs.h
+-stepp.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-stepp.o: /usr/X11R6/lib/qt/include/qwidget.h
+-stepp.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-stepp.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-stepp.o: /usr/X11R6/lib/qt/include/qglobal.h
+-stepp.o: /usr/X11R6/lib/qt/include/qobject.h
+-stepp.o: /usr/X11R6/lib/qt/include/qstring.h
+-stepp.o: /usr/X11R6/lib/qt/include/qarray.h
+-stepp.o: /usr/X11R6/lib/qt/include/qgarray.h
+-stepp.o: /usr/X11R6/lib/qt/include/qshared.h
+-stepp.o: /usr/X11R6/lib/qt/include/qgeneric.h
+-stepp.o: /usr/X11R6/lib/qt/include/qevent.h /usr/X11R6/lib/qt/include/qrect.h
+-stepp.o: /usr/X11R6/lib/qt/include/qsize.h /usr/X11R6/lib/qt/include/qpoint.h
+-stepp.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-stepp.o: /usr/X11R6/lib/qt/include/qpalette.h
+-stepp.o: /usr/X11R6/lib/qt/include/qcolor.h
+-stepp.o: /usr/X11R6/lib/qt/include/qcursor.h
+-stepp.o: /usr/X11R6/lib/qt/include/qfont.h
+-stepp.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-stepp.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-leiste.o: leiste.h /usr/X11R6/lib/qt/include/qpushbt.h
+-leiste.o: /usr/X11R6/lib/qt/include/qbutton.h
+-leiste.o: /usr/X11R6/lib/qt/include/qwidget.h
+-leiste.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-leiste.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-leiste.o: /usr/X11R6/lib/qt/include/qglobal.h
+-leiste.o: /usr/X11R6/lib/qt/include/qobject.h
+-leiste.o: /usr/X11R6/lib/qt/include/qstring.h
+-leiste.o: /usr/X11R6/lib/qt/include/qarray.h
+-leiste.o: /usr/X11R6/lib/qt/include/qgarray.h
+-leiste.o: /usr/X11R6/lib/qt/include/qshared.h
+-leiste.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-leiste.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-leiste.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-leiste.o: /usr/X11R6/lib/qt/include/qevent.h
+-leiste.o: /usr/X11R6/lib/qt/include/qrect.h /usr/X11R6/lib/qt/include/qsize.h
+-leiste.o: /usr/X11R6/lib/qt/include/qpoint.h
+-leiste.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-leiste.o: /usr/X11R6/lib/qt/include/qpalette.h
+-leiste.o: /usr/X11R6/lib/qt/include/qcolor.h
+-leiste.o: /usr/X11R6/lib/qt/include/qcursor.h
+-leiste.o: /usr/X11R6/lib/qt/include/qfont.h
+-leiste.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-leiste.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-leiste.o: /usr/X11R6/lib/qt/include/qpixmap.h
+-leiste.o: /usr/X11R6/lib/qt/include/qlabel.h
+-leiste.o: /usr/X11R6/lib/qt/include/qframe.h
+-main.o: main.h pic2.h /usr/X11R6/lib/qt/include/qapp.h
+-main.o: /usr/X11R6/lib/qt/include/qwidget.h
+-main.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-main.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-main.o: /usr/X11R6/lib/qt/include/qglobal.h
+-main.o: /usr/X11R6/lib/qt/include/qobject.h
+-main.o: /usr/X11R6/lib/qt/include/qstring.h
+-main.o: /usr/X11R6/lib/qt/include/qarray.h
+-main.o: /usr/X11R6/lib/qt/include/qgarray.h
+-main.o: /usr/X11R6/lib/qt/include/qshared.h
+-main.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-main.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-main.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-main.o: /usr/X11R6/lib/qt/include/qevent.h /usr/X11R6/lib/qt/include/qrect.h
+-main.o: /usr/X11R6/lib/qt/include/qsize.h /usr/X11R6/lib/qt/include/qpoint.h
+-main.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-main.o: /usr/X11R6/lib/qt/include/qpalette.h
+-main.o: /usr/X11R6/lib/qt/include/qcolor.h
+-main.o: /usr/X11R6/lib/qt/include/qcursor.h /usr/X11R6/lib/qt/include/qfont.h
+-main.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-main.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-main.o: /usr/X11R6/lib/qt/include/qpainter.h
+-main.o: /usr/X11R6/lib/qt/include/qregion.h /usr/X11R6/lib/qt/include/qpen.h
+-main.o: /usr/X11R6/lib/qt/include/qbrush.h
+-main.o: /usr/X11R6/lib/qt/include/qpntarry.h
+-main.o: /usr/X11R6/lib/qt/include/qwmatrix.h
+-main.o: /usr/X11R6/lib/qt/include/qpixmap.h
+-main.o: /usr/X11R6/lib/qt/include/qtooltip.h
+-main.o: /usr/X11R6/lib/qt/include/qtimer.h stepp.h /usr/include/stdlib.h
+-main.o: /usr/include/errno.h /usr/include/linux/errno.h
+-main.o: /usr/include/asm/errno.h /usr/include/alloca.h
+-main.o: /usr/X11R6/lib/qt/include/qfile.h /usr/X11R6/lib/qt/include/qiodev.h
+-main.o: /usr/include/stdio.h /usr/include/libio.h /usr/include/_G_config.h
+-main.o: /usr/X11R6/lib/qt/include/qdstream.h leiste.h
+-main.o: /usr/X11R6/lib/qt/include/qpushbt.h
+-main.o: /usr/X11R6/lib/qt/include/qbutton.h
+-main.o: /usr/X11R6/lib/qt/include/qlabel.h /usr/X11R6/lib/qt/include/qframe.h
+-main.o: minikarte.h sbarv.h /usr/X11R6/lib/qt/include/qscrbar.h
+-main.o: /usr/X11R6/lib/qt/include/qrangect.h
+-main.o: /usr/X11R6/lib/qt/include/qdrawutl.h sbarh.h
+-main.o: /usr/X11R6/lib/qt/include/qlayout.h
+-main.o: /usr/X11R6/lib/qt/include/qgmanagr.h
+-main.o: /usr/X11R6/lib/qt/include/qintdict.h
+-main.o: /usr/X11R6/lib/qt/include/qgdict.h
+-main.o: /usr/X11R6/lib/qt/include/qcollect.h
+-main.o: /usr/X11R6/lib/qt/include/qlist.h /usr/X11R6/lib/qt/include/qglist.h
+-main.o: /usr/X11R6/lib/qt/include/qdialog.h
+-main.o: /usr/X11R6/lib/qt/include/qpopmenu.h
+-main.o: /usr/X11R6/lib/qt/include/qtablevw.h
+-main.o: /usr/X11R6/lib/qt/include/qmenudta.h
+-main.o: /usr/X11R6/lib/qt/include/qmenubar.h
+-main.o: /usr/X11R6/lib/qt/include/qmovie.h
+-main.o: /usr/X11R6/lib/qt/include/qtabdlg.h
+-main.o: /usr/X11R6/lib/qt/include/qslider.h
+-main.o: /usr/X11R6/lib/qt/include/qradiobt.h
+-main.o: /usr/X11R6/lib/qt/include/qbttngrp.h
+-main.o: /usr/X11R6/lib/qt/include/qgrpbox.h
+-main.o: /usr/X11R6/lib/qt/include/qfiledlg.h /usr/X11R6/lib/qt/include/qdir.h
+-main.o: /usr/X11R6/lib/qt/include/qstrlist.h
+-main.o: /usr/X11R6/lib/qt/include/qfileinf.h
+-main.o: /usr/X11R6/lib/qt/include/qdatetm.h
+-main.o: /usr/X11R6/lib/qt/include/qmsgbox.h
+-main.o: /usr/X11R6/lib/qt/include/qlistbox.h
+-main.o: /usr/X11R6/lib/qt/include/qcombo.h
+-main.o: /usr/X11R6/lib/qt/include/qkeycode.h
+-minikarte.o: minikarte.h /usr/X11R6/lib/qt/include/qpushbt.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qbutton.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qwidget.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qglobal.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qobject.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qstring.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qarray.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qgarray.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qshared.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-minikarte.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-minikarte.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qevent.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qrect.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qsize.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpoint.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpalette.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qcolor.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qcursor.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qfont.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpixmap.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpainter.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qregion.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpen.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qbrush.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qpntarry.h
+-minikarte.o: /usr/X11R6/lib/qt/include/qwmatrix.h
+-sbarv.o: sbarv.h /usr/X11R6/lib/qt/include/qwidget.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qglobal.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qobject.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qstring.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qarray.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qgarray.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qshared.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-sbarv.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-sbarv.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qevent.h /usr/X11R6/lib/qt/include/qrect.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qsize.h /usr/X11R6/lib/qt/include/qpoint.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qpalette.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qcolor.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qcursor.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qfont.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qscrbar.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qrangect.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qdrawutl.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qpainter.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qregion.h /usr/X11R6/lib/qt/include/qpen.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qbrush.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qpntarry.h
+-sbarv.o: /usr/X11R6/lib/qt/include/qwmatrix.h
+-sbarh.o: sbarh.h /usr/X11R6/lib/qt/include/qwidget.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qwindefs.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qobjdefs.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qglobal.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qobject.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qstring.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qarray.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qgarray.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qshared.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qgeneric.h /usr/include/string.h
+-sbarh.o: /usr/include/features.h /usr/include/sys/cdefs.h
+-sbarh.o: /usr/lib/gcc-lib/i486-linux/2.7.2.1/include/stddef.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qevent.h /usr/X11R6/lib/qt/include/qrect.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qsize.h /usr/X11R6/lib/qt/include/qpoint.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qpaintd.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qpalette.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qcolor.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qcursor.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qfont.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qfontmet.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qfontinf.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qscrbar.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qrangect.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qdrawutl.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qpainter.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qregion.h /usr/X11R6/lib/qt/include/qpen.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qbrush.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qpntarry.h
+-sbarh.o: /usr/X11R6/lib/qt/include/qwmatrix.h