kdeedu CVS

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@3021 d073be05-634f-4543-b044-5fe20cf6d1d6

x11/kdeedu3/Portfile

@@ -1,4 +1,4 @@
-# $Id: Portfile,v 1.8 2003/06/18 03:32:43 ranger Exp $
+# $Id: Portfile,v 1.9 2003/07/10 03:39:33 ranger Exp $
 
 PortSystem 1.0
 name		kdeedu3
@@ -56,17 +56,10 @@ variant cvs {
 		##### I MEAN IT, LANDONF WILL KILL YOU IF YOU DO THIS! #####
 
 		distname kdeedu
-		distfiles kde-admindir-cvs-20030616.tar.bz2:admin detect-autoconf.tar.bz2:darwin
-		checksums kde-admindir-cvs-20030616.tar.bz2 md5 caf9880587ddc3fab8f5b9ba97eae470 \
-			detect-autoconf.tar.bz2 md5 1f511627496be40174169dbab4d6d78a
+		distfiles kde-admindir-cvs-20030701.tar.bz2:admin
+		checksums kde-admindir-cvs-20030701.tar.bz2 md5 b9bf2dc286d2e434c2cfdadc421c79b6
 
-		patchfiles \
-			current/patch-kdeedu-flashkard-flashkard-main.cpp.diff \
-			current/patch-kdeedu-kalzium-calculations-Makefile.am.diff \
-			current/patch-kdeedu-kig-misc-lists.cc.diff \
-			current/patch-kdeedu-kig-misc-object_hierarchy.cc.diff \
-			current/patch-kdeedu-kiten-Makefile.am.diff \
-			current/patch-kdeedu-kmplot-kmplot-diagr.cpp.diff
+		patchfiles current/patch-kdeedu.diff
 		post-extract {
 			system "rm -rf '${workpath}/${distname}/khangman'"
 		}
@@ -83,11 +76,11 @@ post-patch      {
 		system "cd '${worksrcpath}' && make -f admin/Makefile.common cvs"
 }
 configure.env	CPPFLAGS='-I/usr/X11R6/include -I${prefix}/include -I${prefix}/include/qt3 -no-cpp-precomp -fno-common' \
-		LDFLAGS='-L/usr/X11R6/lib' LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='/usr/X11R6/lib:${prefix}/lib'
+		LDFLAGS='-L/usr/X11R6/lib' LIBS='-L${prefix}/lib' DYLD_LIBRARY_PATH='${prefix}/lib'
 configure.args	--prefix='${prefix}' --includedir='${prefix}/include' --libdir='${prefix}/lib' \
 		--with-extra-includes='${prefix}/include' --with-extra-libs='${prefix}/lib' \
 		--with-qt-dir='${prefix}' --with-qt-includes='${prefix}/include/qt3' \
 		--enable-rpath --with-pic --enable-shared=yes --enable-static=no --enable-mt \
-		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --enable-final \
+		--libexecdir='${prefix}/lib' --with-xinerama --with-pam --disable-final \
 		--disable-dependency-tracking
 build.env	${configure.env}

x11/kdeedu3/files/current/patch-kdeedu.diff

@@ -0,0 +1,50 @@
+Index: kig/misc/lists.cc
+===================================================================
+RCS file: /home/kde/kdeedu/kig/misc/lists.cc,v
+retrieving revision 1.11
+diff -u -u -r1.11 lists.cc
+--- kig/misc/lists.cc	4 Jun 2003 12:43:56 -0000	1.11
++++ kig/misc/lists.cc	10 Jul 2003 02:14:47 -0000
+@@ -234,7 +234,7 @@
+
+   QDomElement docelem = doc.createElement( "KigMacroFile" );
+   docelem.setAttribute( "Version", "0.5.1" );
+-  docelem.setAttribute( "Number", ms.size() );
++  docelem.setAttribute( "Number", (unsigned int)ms.size() );
+
+   for ( uint i = 0; i < ms.size(); ++i )
+   {
+Index: kig/misc/object_hierarchy.cc
+===================================================================
+RCS file: /home/kde/kdeedu/kig/misc/object_hierarchy.cc,v
+retrieving revision 1.11
+diff -u -u -r1.11 object_hierarchy.cc
+--- kig/misc/object_hierarchy.cc	3 Jul 2003 11:42:39 -0000	1.11
++++ kig/misc/object_hierarchy.cc	10 Jul 2003 02:14:47 -0000
+@@ -464,7 +464,7 @@
+       ObjectImp* imp = ObjectImpFactory::instance()->deserialize( typen, e );
+       newnode = new PushStackNode( imp );
+     };
+-    mnodes.resize( kMax( id - mnumberofargs, mnodes.size() ) );
++    mnodes.resize( kMax( id - mnumberofargs, (unsigned int)mnodes.size() ) );
+     mnodes[id - mnumberofargs - 1] = newnode;
+   };
+ }
+Index: kstars/kstars/kstarsdata.h
+===================================================================
+RCS file: /home/kde/kdeedu/kstars/kstars/kstarsdata.h,v
+retrieving revision 1.50
+diff -u -u -r1.50 kstarsdata.h
+--- kstars/kstars/kstarsdata.h	4 Jul 2003 17:53:43 -0000	1.50
++++ kstars/kstars/kstarsdata.h	10 Jul 2003 02:14:47 -0000
+@@ -54,6 +54,10 @@
+ #include "jupitermoons.h"
+ #include "indidriver.h"
+
++#include <iostream>
++using std::cout;
++using std::endl;
++
+ #define NSAOFILES 40
+ #define NMWFILES  11
+ #define NNGCFILES 13