[20190] trunk/dports/kde/kdeedu3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:23:03 PDT 2006
Revision: 20190
http://trac.macosforge.org/projects/macports/changeset/20190
Author: takanori at macports.org
Date: 2006-10-27 11:22:41 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
Modified Paths:
--------------
trunk/dports/kde/kdeedu3/Portfile
trunk/dports/kde/kdeedu3/files/CompileScript.sh
trunk/dports/kde/kdeedu3/files/InstallScript.sh
trunk/dports/kde/kdeedu3/files/kdeedu3.patch
Modified: trunk/dports/kde/kdeedu3/Portfile
===================================================================
--- trunk/dports/kde/kdeedu3/Portfile 2006-10-27 18:22:35 UTC (rev 20189)
+++ trunk/dports/kde/kdeedu3/Portfile 2006-10-27 18:22:41 UTC (rev 20190)
@@ -1,55 +1,51 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdeedu3
-version 3.5.1
-revision 1
-set kdeadmin kde-admindir-3.5.1
+version 3.5.4
+set kdeadmin kde-admindir-252
categories kde
maintainers ben at macports.org takanori at macports.org
description KDE educational games and software. \
NB No KDE sound support.
+long_description ${description}
platforms darwin
-master_sites opendarwin::kde351 \
+homepage http://www.kde.org/
+master_sites opendarwin::kde354 \
opendarwin::admin
# kde:stable/${version}/src
# http://ranger.befunk.com/fink/:admin
-extract.suffix .tar.bz2
use_bzip2 yes
distname kdeedu-${version}
-distfiles ${distname}.tar.bz2:kde351 \
+distfiles ${distname}.tar.bz2:kde354 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
- port:automake
+ port:unsermake
depends_lib port:kdebase3
-checksums ${distname}.tar.bz2 md5 fe31b9a2ec4e299531c6b7beeab09534 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums ${distname}.tar.bz2 md5 81dfdea2ed6eaaa440ee868a69b8fc7e \
+ ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only ${distname}.tar.bz2
+post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
patchfiles kdeedu3.patch
patch {
cd ${worksrcpath}
foreach file $patchfiles {
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+ system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
}
+ system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
}
-post-patch {
- reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
- reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch {
+ reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
- reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
- foreach file [glob ${worksrcpath}/admin/*] {
- reinplace "s|-O2|-Os|g" $file
- reinplace "s|doc/HTML|doc/kde|g" $file
- reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
- }
+ reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+ reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
foreach file {CompileScript.sh InstallScript.sh} {
- file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+ file copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
@@ -61,17 +57,13 @@
}
}
-configure.args --disable-kig-python-scripting --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args --disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts
configure {}
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
-post-destroot {
+post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
-}
Modified: trunk/dports/kde/kdeedu3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdeedu3/files/CompileScript.sh 2006-10-27 18:22:35 UTC (rev 20189)
+++ trunk/dports/kde/kdeedu3/files/CompileScript.sh 2006-10-27 18:22:41 UTC (rev 20190)
@@ -1,16 +1,9 @@
#!/bin/sh -e
- export HOME=/tmp
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
export LDFLAGS="-L%p/lib/python2.4/config"
- export lt_cv_sys_max_cmd_len=65536
-#darwinports
- export UNSERMAKE="no"
-
- export CC=gcc CXX=g++
-
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS kvoctrain/kvoctrain/common-dialogs/prefs.h all
Modified: trunk/dports/kde/kdeedu3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeedu3/files/InstallScript.sh 2006-10-27 18:22:35 UTC (rev 20189)
+++ trunk/dports/kde/kdeedu3/files/InstallScript.sh 2006-10-27 18:22:41 UTC (rev 20190)
@@ -1,13 +1,10 @@
#!/bin/sh -e
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
-#darwinports
- export UNSERMAKE="no"
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-base
Modified: trunk/dports/kde/kdeedu3/files/kdeedu3.patch
===================================================================
--- trunk/dports/kde/kdeedu3/files/kdeedu3.patch 2006-10-27 18:22:35 UTC (rev 20189)
+++ trunk/dports/kde/kdeedu3/files/kdeedu3.patch 2006-10-27 18:22:41 UTC (rev 20190)
@@ -1,5 +1,6 @@
---- kdeedu-3.5.0/kalzium/src/Makefile.am 2005-09-10 10:24:07.000000000 -0400
-+++ kdeedu-3.5.0-new/kalzium/src/Makefile.am 2005-11-18 08:01:23.000000000 -0500
+
+--- kdeedu-3.5.3/kalzium/src/Makefile.am 2005-09-10 10:24:07.000000000 -0400
++++ kdeedu-3.5.3-new/kalzium/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400
@@ -1,8 +1,11 @@
# set the include path for X, qt and KDE
INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes)
@@ -32,8 +33,8 @@
#this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
messages-old: rc.cpp
---- kdeedu-3.5.0/kalzium/src/main.cpp 2005-10-10 10:55:44.000000000 -0400
-+++ kdeedu-3.5.0-new/kalzium/src/main.cpp 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kalzium/src/main.cpp 2006-05-22 14:03:43.000000000 -0400
++++ kdeedu-3.5.3-new/kalzium/src/main.cpp 2006-05-25 00:23:08.000000000 -0400
@@ -43,7 +43,7 @@
};
#endif
@@ -43,8 +44,8 @@
{
#ifdef HAVE_FACILE
caml_startup(argv);
---- kdeedu-3.5.0/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
-+++ kdeedu-3.5.0-new/kbruch/src/Makefile.am 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
++++ kdeedu-3.5.3-new/kbruch/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400
@@ -1,10 +1,14 @@
-bin_PROGRAMS = kbruch
@@ -65,8 +66,8 @@
EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
---- kdeedu-3.5.0/kbruch/src/kbruch.cpp 2005-09-10 04:18:00.000000000 -0400
-+++ kdeedu-3.5.0-new/kbruch/src/kbruch.cpp 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/kbruch/src/kbruch.cpp 2006-01-19 11:35:32.000000000 -0500
++++ kdeedu-3.5.3-new/kbruch/src/kbruch.cpp 2006-05-25 00:23:08.000000000 -0400
@@ -28,7 +28,7 @@
#include <kaboutdata.h>
@@ -76,8 +77,8 @@
{
// init random generator
srand(time(NULL));
---- kdeedu-3.5.0/keduca/keduca/Makefile.am 2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keduca/Makefile.am 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keduca/Makefile.am 2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keduca/Makefile.am 2006-05-25 00:23:08.000000000 -0400
@@ -1,11 +1,13 @@
# set the include path for X, qt and KDE
-INCLUDES= -I../libkeduca $(all_includes)
@@ -97,8 +98,8 @@
# Convenience library
#noinst_LTLIBRARIES = libkeduca_common.la
---- kdeedu-3.5.0/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keduca/main.cpp 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keduca/main.cpp 2006-05-25 00:23:08.000000000 -0400
@@ -31,7 +31,7 @@
KCmdLineLastOption
};
@@ -108,8 +109,8 @@
{
KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
version, description, KAboutData::License_GPL,
---- kdeedu-3.5.0/keduca/keducabuilder/Makefile.am 2005-09-10 04:17:25.000000000 -0400
-+++ kdeedu-3.5.0-new/keduca/keducabuilder/Makefile.am 2005-11-18 07:58:58.000000000 -0500
+--- kdeedu-3.5.3/keduca/keducabuilder/Makefile.am 2005-09-10 04:17:25.000000000 -0400
++++ kdeedu-3.5.3-new/keduca/keducabuilder/Makefile.am 2006-05-25 00:23:08.000000000 -0400
@@ -1,6 +1,10 @@
-bin_PROGRAMS = keducabuilder
-keducabuilder_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp main.cpp
@@ -139,8 +140,8 @@
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
More information about the macports-changes
mailing list