Unbreak port and upgrade to link against Qt-1.42 and KDe-1.1

5 files changed, 91 insertions, 29 deletions

diff --git a/games/ktamaga/Makefile b/games/ktamaga/Makefile
index 9aa1513eb077..5e33b581176b 100644
--- a/games/ktamaga/Makefile
+++ b/games/ktamaga/Makefile
@@ -3,7 +3,7 @@
 # Date created:        13 November 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.8 1998/09/30 02:07:28 jseger Exp $
+# $Id: Makefile,v 1.9 1998/10/02 18:21:31 brian Exp $
 #
 
 DISTNAME=	ktamaga-0.2
@@ -13,9 +13,8 @@ MASTER_SITES=	ftp://ftp.net.lut.ac.uk/kde/unstable/apps/games/ \
 
 MAINTAINER=	se@freebsd.org
 
-LIB_DEPENDS=	kdecore.1:${PORTSDIR}/x11/kdelibs
-
-BROKEN=		upgrade
+LIB_DEPENDS=	kdecore.2:${PORTSDIR}/x11/kdelibs
+MAKE_ENV=	DEBUG_FL="$(CFLAGS)"
 
 USE_QT=		yes
 WRKSRC=		${WRKDIR}/tamaga-0.2
diff --git a/games/ktamaga/files/patch-aa b/games/ktamaga/files/patch-aa
index 7942461c1e5b..a3e578a93f65 100644
--- a/games/ktamaga/files/patch-aa
+++ b/games/ktamaga/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile~	Thu Nov 13 23:49:08 1997
---- Makefile	Wed Dec  3 00:48:04 1997
+*** Makefile~	Sun Nov 30 20:46:24 1997
+--- Makefile	Mon Feb 15 21:44:29 1999
 ***************
-*** 11,19 ****
+*** 11,22 ****
   HAVE_KDE=1
   
 ! QTDIR	= /usr/lib/qt
@@ -11,7 +11,10 @@
 ! KDEDIR	= /opt/kde
   
   # Uncomment, if you need debug info in the prog.
---- 11,19 ----
+! DEBUG_FL = -g
+  
+  # Binaries
+--- 11,22 ----
   HAVE_KDE=1
   
 ! QTDIR	= $(X11BASE)
@@ -21,6 +24,9 @@
 ! KDEDIR	= $(PREFIX)
   
   # Uncomment, if you need debug info in the prog.
+! #DEBUG_FL = -g
+  
+  # Binaries
 ***************
 *** 24,28 ****
   SHELL   = /bin/sh
@@ -48,7 +54,7 @@
   QTLIBDIR	= $(QTDIR)/lib
   KDEINCDIR	= $(KDEDIR)/include 
 ***************
-*** 43,66 ****
+*** 43,74 ****
   INSTALL_DIR_PRIVATE = $(install) -d -m 0700
   
 - ifdef HAVE_KDE
@@ -73,18 +79,34 @@
 - endif
   
   INCLUDES	= -I $(QTINCDIR) -I $(X11INCDIR) $(KINC)
---- 43,55 ----
-***************
-*** 70,74 ****
+! LIBS		= -L $(X11LIBDIR) $(KLIB) -lqt -lm
+  DEFINES		= -DSTDC_HEADERS $(KDEF)
+  #DEFINES		= -DHAVE_CONFIG_H $(KDEF)
   # maybe -DSTDC_HEADERS needed instead of -DHAVE_CONFIG_H
   
 ! CFLAGS	= $(DEBUG_FL) -O2 -fno-strength-reduce -Wall -W $(INCLUDES) $(DEFINES)
   LFLAGS  = $(DEBUG_FL) $(LIBS)
   
---- 59,63 ----
+--- 43,63 ----
+  INSTALL_DIR_PRIVATE = $(install) -d -m 0700
+  
+  BINDIR = $(KDEDIR)/bin
+  DATADIR = $(KDEDIR)/share/apps/ktamaga
+  HELPDIR = $(KDEDIR)/share/doc/HTML/default/ktamaga
+  
+  ###########################################################
+  
+  KINC	= -I $(KDEINCDIR)
+  KLIB	= -L $(KDELIBDIR) -lkdecore -lkdeui -lXext
+  KDEF	= -DUSEKDE
+  
+  INCLUDES	= -I $(QTINCDIR) -I $(X11INCDIR) $(KINC)
+! LIBS		= -L $(X11LIBDIR) $(KLIB) -lqt -lm -lstdc++
+  DEFINES		= -DSTDC_HEADERS $(KDEF)
+  #DEFINES		= -DHAVE_CONFIG_H $(KDEF)
   # maybe -DSTDC_HEADERS needed instead of -DHAVE_CONFIG_H
   
-! CFLAGS	= $(DEBUG_FL) -O2 -fno-strength-reduce -Wall -W $(INCLUDES) $(DEFINES) -DX11BASE=\"$(X11BASE)\"
+! CFLAGS	= $(DEBUG_FL) $(INCLUDES) $(DEFINES) -DX11BASE=\"$(X11BASE)\" -DKDEDIR=\"$(KDEDIR)\"
   LFLAGS  = $(DEBUG_FL) $(LIBS)
   
 ***************
@@ -131,18 +153,3 @@
   
   	$(INSTALL_DIR) $(DATADIR)
 --- 121,124 ----
-** tamaga.h~	Thu Nov 13 23:55:28 1997
---- tamaga.h	Thu Nov 13 23:56:18 1997
-***************
-*** 28,32 ****
-  
-  // The Data dir for the X-only version
-! #define XDATPATH	"/usr/lib/X11/tamaga"
-  
-  //------------------------------------
---- 28,32 ----
-  
-  // The Data dir for the X-only version
-! #define XDATPATH	X11BASE "/lib/X11/tamaga"
-  
-  //------------------------------------
diff --git a/games/ktamaga/files/patch-ab b/games/ktamaga/files/patch-ab
new file mode 100644
index 000000000000..67df327fb729
--- /dev/null
+++ b/games/ktamaga/files/patch-ab
@@ -0,0 +1,15 @@
+*** tamaga.h~	Thu Nov 13 23:55:28 1997
+--- tamaga.h	Thu Nov 13 23:56:18 1997
+***************
+*** 28,32 ****
+  
+  // The Data dir for the X-only version
+! #define XDATPATH	"/usr/lib/X11/tamaga"
+  
+  //------------------------------------
+--- 28,32 ----
+  
+  // The Data dir for the X-only version
+! #define XDATPATH	KDEDIR"/share/apps/ktamaga"
+  
+  //------------------------------------
diff --git a/games/ktamaga/files/patch-ac b/games/ktamaga/files/patch-ac
new file mode 100644
index 000000000000..8fc67ff7365e
--- /dev/null
+++ b/games/ktamaga/files/patch-ac
@@ -0,0 +1,27 @@
+*** tlcd.cpp~	Thu Nov 13 12:18:14 1997
+--- tlcd.cpp	Mon Feb 15 21:57:52 1999
+***************
+*** 12,20 ****
+  tlcd::tlcd( QWidget *parent, const char *name ) : QWidget( parent, name )
+  {
+- #ifdef USEKDE
+-  datadir = app->kdedir()+TDATADS;
+- #else
+   datadir = XDATPATH;
+- #endif
+  
+   pbase = new QPixmap();
+--- 12,16 ----
+***************
+*** 220,224 ****
+   r=q;
+   for ( ; *p ; p++ ) {
+!   if (pspec[cnt]) delete pspec[cnt];
+    if (r>=qend) { printf(".%d. ",cnt); cnt++; continue; } 
+  
+--- 216,220 ----
+   r=q;
+   for ( ; *p ; p++ ) {
+!    /*  if (pspec[cnt]) delete pspec[cnt];*/
+    if (r>=qend) { printf(".%d. ",cnt); cnt++; continue; } 
+  
diff --git a/games/ktamaga/files/patch-ad b/games/ktamaga/files/patch-ad
new file mode 100644
index 000000000000..83ff2998b94f
--- /dev/null
+++ b/games/ktamaga/files/patch-ad
@@ -0,0 +1,14 @@
+*** lwinstat.cpp~	Sun Nov 30 11:53:16 1997
+--- lwinstat.cpp	Mon Feb 15 21:22:30 1999
+***************
+*** 18,26 ****
+  
+   cont = new QWidget( this );
+- #ifdef USEKDE
+-  datadir = app->kdedir()+TDATADS;
+- #else
+   datadir = XDATPATH;
+- #endif 
+  
+   bp.load(datadir+"/bg1.xpm");
+--- 18,22 ----