Ignore:
Timestamp:
Oct 27, 2006, 6:22:41 PM (13 years ago)
Author:
takanori@…
Message:

Version 3.5.4.

Location:
trunk/dports/kde/kdeedu3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/kdeedu3/Portfile

    r19815 r20190  
    11# $Id$
    22
    3 #Synced with Fink, Version 3.5.1-1023
     3#Synced with Fink, Version 3.5.4-1021
    44
    55PortSystem 1.0
    66name            kdeedu3
    7 version         3.5.1
    8 revision        1
    9 set kdeadmin    kde-admindir-3.5.1
     7version         3.5.4
     8set kdeadmin    kde-admindir-252
    109categories      kde
    1110maintainers     ben@macports.org takanori@macports.org
    1211description     KDE educational games and software. \
    1312                NB No KDE sound support.
     13long_description ${description}
    1414platforms       darwin
    15 master_sites    opendarwin::kde351 \
     15homepage        http://www.kde.org/
     16master_sites    opendarwin::kde354 \
    1617                opendarwin::admin
    1718#               kde:stable/${version}/src
    1819#               http://ranger.befunk.com/fink/:admin
    19 extract.suffix  .tar.bz2
    2020use_bzip2       yes
    2121distname        kdeedu-${version}
    22 distfiles       ${distname}.tar.bz2:kde351 \
     22distfiles       ${distname}.tar.bz2:kde354 \
    2323                ${kdeadmin}.tar.bz2:admin
    2424depends_build   port:autoconf \
    25                 port:automake
     25                port:unsermake
    2626depends_lib     port:kdebase3
    2727
    28 checksums       ${distname}.tar.bz2 md5 fe31b9a2ec4e299531c6b7beeab09534 \
    29                 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
     28checksums       ${distname}.tar.bz2 md5 81dfdea2ed6eaaa440ee868a69b8fc7e \
     29                ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
    3030
    31 extract.only ${distname}.tar.bz2
    32 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
     31extract.only    ${distname}.tar.bz2
     32post-extract    { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
    3333
    3434patchfiles      kdeedu3.patch
     
    3636                cd ${worksrcpath}
    3737                foreach file $patchfiles {
    38                     system "sed -e 's,@FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
     38                    system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
    3939                }
     40                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/*"
    4041}
    41 post-patch      {
    42                 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
    43                 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
     42post-patch      {
     43                reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
    4444                reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
    45                 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
    46                 foreach file [glob ${worksrcpath}/admin/*] {
    47                     reinplace "s|-O2|-Os|g" $file
    48                     reinplace "s|doc/HTML|doc/kde|g" $file
    49                     reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
    50                 }
     45                reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
     46                reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
    5147                foreach file {CompileScript.sh InstallScript.sh} {
    52                     file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
     48                    file copy ${filespath}/${file} ${worksrcpath}
    5349                    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
    5450                    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
     
    6258}
    6359
    64 configure.args  --disable-kig-python-scripting --with-distribution='DarwinPorts/Mac OS X' --without-arts
     60configure.args  --disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts
    6561
    6662configure       {}
     
    6864destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
    6965
    70 post-destroot   {
     66post-destroot   {
    7167                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    7268                xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
    7369}
    74 
    75 platform darwin 6 {
    76         depends_lib-append      lib:libdl:dlcompat
    77 }
  • trunk/dports/kde/kdeedu3/files/CompileScript.sh

    r17712 r20190  
    11#!/bin/sh -e
    22
    3         export HOME=/tmp
    4         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    54        . ./environment-helper.sh
    65        export LDFLAGS="-L%p/lib/python2.4/config"
    7         export lt_cv_sys_max_cmd_len=65536
    8 
    9 #darwinports
    10         export UNSERMAKE="no"
    11 
    12         export CC=gcc CXX=g++
    136
    147        ./build-helper.sh cvs       %N %v %r make -f admin/Makefile.common cvs
    158        ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
    16         ./build-helper.sh make      %N %v %r make all all_libraries="$ALL_LIBRARIES"
     9        ./build-helper.sh make      %N %v %r unsermake $UNSERMAKEFLAGS kvoctrain/kvoctrain/common-dialogs/prefs.h all
  • trunk/dports/kde/kdeedu3/files/InstallScript.sh

    r17712 r20190  
    11#!/bin/sh -e
    22
    3         export PREFIX="%p"
     3        export PREFIX="%p" USE_UNSERMAKE=1
    44        . ./environment-helper.sh
    55
    6 #darwinports
    7         export UNSERMAKE="no"
    8 
    9         ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
     6        ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
    107
    118        mkdir -p %i/share/doc/installed-packages
  • trunk/dports/kde/kdeedu3/files/kdeedu3.patch

    r16917 r20190  
    1 --- kdeedu-3.5.0/kalzium/src/Makefile.am        2005-09-10 10:24:07.000000000 -0400
    2 +++ kdeedu-3.5.0-new/kalzium/src/Makefile.am    2005-11-18 08:01:23.000000000 -0500
     1
     2--- kdeedu-3.5.3/kalzium/src/Makefile.am        2005-09-10 10:24:07.000000000 -0400
     3+++ kdeedu-3.5.3-new/kalzium/src/Makefile.am    2006-05-25 00:23:08.000000000 -0400
    34@@ -1,8 +1,11 @@
    45 # set the include path for X, qt and KDE
     
    3334 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
    3435 messages-old: rc.cpp
    35 --- kdeedu-3.5.0/kalzium/src/main.cpp   2005-10-10 10:55:44.000000000 -0400
    36 +++ kdeedu-3.5.0-new/kalzium/src/main.cpp       2005-11-18 07:58:58.000000000 -0500
     36--- kdeedu-3.5.3/kalzium/src/main.cpp   2006-05-22 14:03:43.000000000 -0400
     37+++ kdeedu-3.5.3-new/kalzium/src/main.cpp       2006-05-25 00:23:08.000000000 -0400
    3738@@ -43,7 +43,7 @@
    3839 };
     
    4445 #ifdef HAVE_FACILE
    4546     caml_startup(argv);
    46 --- kdeedu-3.5.0/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
    47 +++ kdeedu-3.5.0-new/kbruch/src/Makefile.am     2005-11-18 07:58:58.000000000 -0500
     47--- kdeedu-3.5.3/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400
     48+++ kdeedu-3.5.3-new/kbruch/src/Makefile.am     2006-05-25 00:23:08.000000000 -0400
    4849@@ -1,10 +1,14 @@
    4950-bin_PROGRAMS = kbruch
     
    6667 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
    6768 
    68 --- kdeedu-3.5.0/kbruch/src/kbruch.cpp  2005-09-10 04:18:00.000000000 -0400
    69 +++ kdeedu-3.5.0-new/kbruch/src/kbruch.cpp      2005-11-18 07:58:58.000000000 -0500
     69--- kdeedu-3.5.3/kbruch/src/kbruch.cpp  2006-01-19 11:35:32.000000000 -0500
     70+++ kdeedu-3.5.3-new/kbruch/src/kbruch.cpp      2006-05-25 00:23:08.000000000 -0400
    7071@@ -28,7 +28,7 @@
    7172 #include <kaboutdata.h>
     
    7778        // init random generator
    7879        srand(time(NULL));
    79 --- kdeedu-3.5.0/keduca/keduca/Makefile.am      2005-09-10 04:17:25.000000000 -0400
    80 +++ kdeedu-3.5.0-new/keduca/keduca/Makefile.am  2005-11-18 07:58:58.000000000 -0500
     80--- kdeedu-3.5.3/keduca/keduca/Makefile.am      2005-09-10 04:17:25.000000000 -0400
     81+++ kdeedu-3.5.3-new/keduca/keduca/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    8182@@ -1,11 +1,13 @@
    8283 # set the include path for X, qt and KDE
     
    9899 # Convenience library
    99100 #noinst_LTLIBRARIES = libkeduca_common.la
    100 --- kdeedu-3.5.0/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
    101 +++ kdeedu-3.5.0-new/keduca/keduca/main.cpp     2005-11-18 07:58:58.000000000 -0500
     101--- kdeedu-3.5.3/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400
     102+++ kdeedu-3.5.3-new/keduca/keduca/main.cpp     2006-05-25 00:23:08.000000000 -0400
    102103@@ -31,7 +31,7 @@
    103104     KCmdLineLastOption
     
    109110     KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
    110111                           version, description, KAboutData::License_GPL,
    111 --- kdeedu-3.5.0/keduca/keducabuilder/Makefile.am       2005-09-10 04:17:25.000000000 -0400
    112 +++ kdeedu-3.5.0-new/keduca/keducabuilder/Makefile.am   2005-11-18 07:58:58.000000000 -0500
     112--- kdeedu-3.5.3/keduca/keducabuilder/Makefile.am       2005-09-10 04:17:25.000000000 -0400
     113+++ kdeedu-3.5.3-new/keduca/keducabuilder/Makefile.am   2006-05-25 00:23:08.000000000 -0400
    113114@@ -1,6 +1,10 @@
    114115-bin_PROGRAMS = keducabuilder
     
    140141 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
    141142 # KDE´s XML GUI builing
    142 --- kdeedu-3.5.0/keduca/keducabuilder/main.cpp  2005-09-10 04:17:25.000000000 -0400
    143 +++ kdeedu-3.5.0-new/keduca/keducabuilder/main.cpp      2005-11-18 07:58:58.000000000 -0500
     143--- kdeedu-3.5.3/keduca/keducabuilder/main.cpp  2005-09-10 04:17:25.000000000 -0400
     144+++ kdeedu-3.5.3-new/keduca/keducabuilder/main.cpp      2006-05-25 00:23:08.000000000 -0400
    144145@@ -32,7 +32,7 @@
    145146     KCmdLineLastOption
     
    151152     KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
    152153                           version, description, KAboutData::License_GPL,
    153 --- kdeedu-3.5.0/khangman/khangman/Makefile.am  2005-09-10 04:16:50.000000000 -0400
    154 +++ kdeedu-3.5.0-new/khangman/khangman/Makefile.am      2005-11-18 08:02:27.000000000 -0500
     154--- kdeedu-3.5.3/khangman/khangman/Makefile.am  2005-09-10 04:16:50.000000000 -0400
     155+++ kdeedu-3.5.3-new/khangman/khangman/Makefile.am      2006-05-25 00:23:08.000000000 -0400
    155156@@ -1,7 +1,11 @@
    156157 ####### kdevelop will overwrite this part!!! (begin)##########
     
    177178 rc_DATA = khangmanui.rc
    178179 rcdir = $(kde_datadir)/khangman
    179 --- kdeedu-3.5.0/khangman/khangman/main.cpp     2005-10-10 10:55:19.000000000 -0400
    180 +++ kdeedu-3.5.0-new/khangman/khangman/main.cpp 2005-11-18 07:58:58.000000000 -0500
     180--- kdeedu-3.5.3/khangman/khangman/main.cpp     2005-10-10 10:55:19.000000000 -0400
     181+++ kdeedu-3.5.3-new/khangman/khangman/main.cpp 2006-05-25 00:23:08.000000000 -0400
    181182@@ -39,7 +39,7 @@
    182183     KCmdLineLastOption
     
    188189     KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
    189190                               KHM_VERSION, description, KAboutData::License_GPL,
    190 --- kdeedu-3.5.0/kig/kig/Makefile.am    2005-09-10 04:17:20.000000000 -0400
    191 +++ kdeedu-3.5.0-new/kig/kig/Makefile.am        2005-11-18 07:58:58.000000000 -0500
     191--- kdeedu-3.5.3/kig/kig/Makefile.am    2005-09-10 04:17:20.000000000 -0400
     192+++ kdeedu-3.5.3-new/kig/kig/Makefile.am        2006-05-25 00:23:08.000000000 -0400
    192193@@ -19,12 +19,14 @@
    193194 #########################################################################
     
    209210 # this is where the desktop file will go
    210211 xdg_apps_DATA = kig.desktop
    211 --- kdeedu-3.5.0/kig/kig/main.cpp       2005-10-10 10:55:35.000000000 -0400
    212 +++ kdeedu-3.5.0-new/kig/kig/main.cpp   2005-11-18 07:58:58.000000000 -0500
     212--- kdeedu-3.5.3/kig/kig/main.cpp       2005-10-10 10:55:35.000000000 -0400
     213+++ kdeedu-3.5.3-new/kig/kig/main.cpp   2006-05-25 00:23:08.000000000 -0400
    213214@@ -101,7 +101,7 @@
    214215   return (*converterfunction)( file, outfile );
     
    220221   KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
    221222 
    222 --- kdeedu-3.5.0/kiten/Makefile.am      2005-09-10 04:17:15.000000000 -0400
    223 +++ kdeedu-3.5.0-new/kiten/Makefile.am  2005-11-18 07:58:58.000000000 -0500
     223--- kdeedu-3.5.3/kiten/Makefile.am      2005-09-10 04:17:15.000000000 -0400
     224+++ kdeedu-3.5.3-new/kiten/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    224225@@ -2,15 +2,16 @@
    225226 
     
    243244 libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
    244245 libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
    245 --- kdeedu-3.5.0/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400
    246 +++ kdeedu-3.5.0-new/kiten/main.cpp     2005-11-18 07:58:58.000000000 -0500
     246--- kdeedu-3.5.3/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400
     247+++ kdeedu-3.5.3-new/kiten/main.cpp     2006-05-25 00:23:08.000000000 -0400
    247248@@ -37,7 +37,7 @@
    248249        // INSERT YOUR COMMANDLINE OPTIONS HERE
     
    254255        qInstallMsgHandler(noMessageOutput);
    255256        KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
    256 --- kdeedu-3.5.0/klatin/klatin/Makefile.am      2005-09-10 04:17:24.000000000 -0400
    257 +++ kdeedu-3.5.0-new/klatin/klatin/Makefile.am  2005-11-18 07:58:58.000000000 -0500
     257--- kdeedu-3.5.3/klatin/klatin/Makefile.am      2005-09-10 04:17:24.000000000 -0400
     258+++ kdeedu-3.5.3-new/klatin/klatin/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    258259@@ -6,19 +6,21 @@
    259260 
     
    282283        klatinresultsdialog.ui klatinsettings_vocabpage.ui
    283284 
    284 --- kdeedu-3.5.0/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400
    285 +++ kdeedu-3.5.0-new/klatin/klatin/main.cpp     2005-11-18 07:58:58.000000000 -0500
     285--- kdeedu-3.5.3/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400
     286+++ kdeedu-3.5.3-new/klatin/klatin/main.cpp     2006-05-25 00:23:08.000000000 -0400
    286287@@ -29,7 +29,7 @@
    287288        KCmdLineLastOption
     
    293294 
    294295        KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
    295 --- kdeedu-3.5.0/klettres/klettres/Makefile.am  2005-09-10 04:16:56.000000000 -0400
    296 +++ kdeedu-3.5.0-new/klettres/klettres/Makefile.am      2005-11-18 08:03:30.000000000 -0500
     296--- kdeedu-3.5.3/klettres/klettres/Makefile.am  2005-09-10 04:16:56.000000000 -0400
     297+++ kdeedu-3.5.3-new/klettres/klettres/Makefile.am      2006-05-25 00:23:08.000000000 -0400
    297298@@ -1,10 +1,13 @@
    298299 ####### kdevelop will overwrite this part!!! (begin)##########
     
    321322 messages: rc.cpp
    322323        $(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
    323 --- kdeedu-3.5.0/klettres/klettres/main.cpp     2005-10-10 10:55:20.000000000 -0400
    324 +++ kdeedu-3.5.0-new/klettres/klettres/main.cpp 2005-11-18 07:58:58.000000000 -0500
     324--- kdeedu-3.5.3/klettres/klettres/main.cpp     2006-03-17 05:10:09.000000000 -0500
     325+++ kdeedu-3.5.3-new/klettres/klettres/main.cpp 2006-05-25 00:23:08.000000000 -0400
    325326@@ -43,7 +43,7 @@
    326327         KCmdLineLastOption
     
    331332 {
    332333     KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
    333                       KAboutData::License_GPL, "(C) 2001-2005 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
    334 --- kdeedu-3.5.0/kmplot/kmplot/Makefile.am      2005-09-10 04:17:09.000000000 -0400
    335 +++ kdeedu-3.5.0-new/kmplot/kmplot/Makefile.am  2005-11-18 07:59:04.000000000 -0500
     334                      KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
     335--- kdeedu-3.5.3/kmplot/kmplot/Makefile.am      2005-09-10 04:17:09.000000000 -0400
     336+++ kdeedu-3.5.3-new/kmplot/kmplot/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    336337@@ -21,12 +21,14 @@
    337338 #########################################################################
     
    353354 # this is where the desktop file will go
    354355 appmimedir = $(kde_mimedir)/application
    355 --- kdeedu-3.5.0/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400
    356 +++ kdeedu-3.5.0-new/kmplot/kmplot/main.cpp     2005-11-18 07:59:04.000000000 -0500
     356--- kdeedu-3.5.3/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400
     357+++ kdeedu-3.5.3-new/kmplot/kmplot/main.cpp     2006-05-25 00:23:08.000000000 -0400
    357358@@ -50,7 +50,7 @@
    358359     };
     
    364365        KAboutData aboutData(
    365366            "kmplot",
    366 --- kdeedu-3.5.0/kpercentage/kpercentage/Makefile.am    2005-09-10 04:16:51.000000000 -0400
    367 +++ kdeedu-3.5.0-new/kpercentage/kpercentage/Makefile.am        2005-11-18 07:59:04.000000000 -0500
     367--- kdeedu-3.5.3/kpercentage/kpercentage/Makefile.am    2005-09-10 04:16:51.000000000 -0400
     368+++ kdeedu-3.5.3-new/kpercentage/kpercentage/Makefile.am        2006-05-25 00:23:08.000000000 -0400
    368369@@ -1,6 +1,10 @@
    369370-bin_PROGRAMS = kpercentage
     
    389390 
    390391 stringstocpp:
    391 --- kdeedu-3.5.0/kpercentage/kpercentage/main.cpp       2005-09-10 04:16:51.000000000 -0400
    392 +++ kdeedu-3.5.0-new/kpercentage/kpercentage/main.cpp   2005-11-18 07:59:04.000000000 -0500
     392--- kdeedu-3.5.3/kpercentage/kpercentage/main.cpp       2005-09-10 04:16:51.000000000 -0400
     393+++ kdeedu-3.5.3-new/kpercentage/kpercentage/main.cpp   2006-05-25 00:23:08.000000000 -0400
    393394@@ -34,7 +34,7 @@
    394395         KCmdLineLastOption
     
    400401     KAboutData aboutData
    401402     (
    402 --- kdeedu-3.5.0/kstars/kstars/Makefile.am      2005-09-10 04:17:55.000000000 -0400
    403 +++ kdeedu-3.5.0-new/kstars/kstars/Makefile.am  2005-11-18 08:04:21.000000000 -0500
     403--- kdeedu-3.5.3/kstars/kstars/Makefile.am      2005-09-10 04:17:55.000000000 -0400
     404+++ kdeedu-3.5.3-new/kstars/kstars/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    404405@@ -1,6 +1,8 @@
    405406-bin_PROGRAMS = kstars
     
    438439 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
    439440 # KDE
    440 --- kdeedu-3.5.0/kstars/kstars/indi/fli_ccd.c   2005-10-10 10:55:39.000000000 -0400
    441 +++ kdeedu-3.5.0-new/kstars/kstars/indi/fli_ccd.c       2005-11-18 07:59:04.000000000 -0500
     441--- kdeedu-3.5.3/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400
     442+++ kdeedu-3.5.3-new/kstars/kstars/indi/apmount.cpp     2006-05-25 00:23:08.000000000 -0400
     443@@ -39,8 +39,9 @@
     444 */
     445 
     446 
     447-#if !(TIMEZONE_IS_INT)
     448-static int daylight = 0;
     449+/* FIXME: hack!, make a real test for extern int daylight on darwin */
     450+#if !(TIMEZONE_IS_INT) || defined(__APPLE__)
     451+int daylight = 0;
     452 #endif
     453 
     454 static inline double timezoneOffset()
     455--- kdeedu-3.5.3/kstars/kstars/indi/fli_ccd.c   2005-10-10 10:55:39.000000000 -0400
     456+++ kdeedu-3.5.3-new/kstars/kstars/indi/fli_ccd.c       2006-05-25 00:23:08.000000000 -0400
    442457@@ -19,6 +19,7 @@
    443458 
     
    448463 #include <stdlib.h>
    449464 #include <string.h>
    450 --- kdeedu-3.5.0/kstars/kstars/indi/lx200generic.cpp    2005-10-10 10:55:39.000000000 -0400
    451 +++ kdeedu-3.5.0-new/kstars/kstars/indi/lx200generic.cpp        2005-11-18 07:59:04.000000000 -0500
     465--- kdeedu-3.5.3/kstars/kstars/indi/lx200generic.cpp    2005-10-10 10:55:39.000000000 -0400
     466+++ kdeedu-3.5.3-new/kstars/kstars/indi/lx200generic.cpp        2006-05-25 00:23:08.000000000 -0400
    452467@@ -41,7 +41,7 @@
    453468 
     
    459474 
    460475 static inline double timezoneOffset()
    461 --- kdeedu-3.5.0/kstars/kstars/main.cpp 2005-11-08 17:24:02.000000000 -0500
    462 +++ kdeedu-3.5.0-new/kstars/kstars/main.cpp     2005-11-18 07:59:04.000000000 -0500
     476--- kdeedu-3.5.3/kstars/kstars/indi/webcam/Makefile.am  2005-09-10 04:17:35.000000000 -0400
     477+++ kdeedu-3.5.3-new/kstars/kstars/indi/webcam/Makefile.am      2006-05-25 00:23:08.000000000 -0400
     478@@ -1,7 +1,7 @@
     479 if HAVE_V4L2
     480    libwebcam_linux = libwebcam_v4l2_linux.la
     481 else
     482-   libwebcam_linux = libwebcam_v4l1_linux.la
     483+   libwebcam_linux =
     484 endif
     485 
     486 noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
     487--- kdeedu-3.5.3/kstars/kstars/main.cpp 2005-11-19 05:33:39.000000000 -0500
     488+++ kdeedu-3.5.3-new/kstars/kstars/main.cpp     2006-05-25 00:23:08.000000000 -0400
    463489@@ -49,7 +49,7 @@
    464490        KCmdLineLastOption
     
    470496        KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
    471497                KSTARS_VERSION, description, KAboutData::License_GPL,
    472 --- kdeedu-3.5.0/ktouch/src/Makefile.am 2005-09-10 04:17:27.000000000 -0400
    473 +++ kdeedu-3.5.0-new/ktouch/src/Makefile.am     2005-11-18 08:05:16.000000000 -0500
    474 @@ -42,7 +42,7 @@
    475         ktouchutils.h
     498--- kdeedu-3.5.3/ktouch/src/Makefile.am 2006-05-22 14:03:38.000000000 -0400
     499+++ kdeedu-3.5.3-new/ktouch/src/Makefile.am     2006-05-25 00:23:58.000000000 -0400
     500@@ -26,7 +26,7 @@
     501                ktouchstatistics.h      ktouchstatus.h  ktouchtrainer.h         ktouchutils.h ktouchcoloreditor.h
    476502 
    477503 # let automoc handle all of the meta source files (moc)
     
    481507 messages: rc.cpp
    482508        $(XGETTEXT) *.cpp -o $(podir)/ktouch.pot
    483 @@ -53,10 +53,12 @@
     509@@ -37,10 +37,12 @@
    484510 #########################################################################
    485511 # this is the program that gets installed.  it's name is used for all
     
    491517 
    492518 # the application source, library search path, and link libraries
    493 -ktouch_SOURCES = \
    494 +ktouch_la_SOURCES = \
    495         ktouchchartwidget.cpp \
    496         ktouchcolorscheme.cpp \
    497         ktouch.cpp \
    498 @@ -90,11 +92,11 @@
    499         prefs.kcfgc
     519-ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
     520+ktouch_la_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
     521        ktouchcolorscheme.cpp ktouch.cpp        ktouchdefaults.cpp ktouchkeyboardwidget.cpp \
     522        ktouchkeyconnector.cpp ktouchkey.cpp    ktouchkeys.cpp ktouchlecture.cpp ktouchlectureeditor.cpp \
     523        ktouchlectureeditor_dlg.ui      ktouchleveldata.cpp ktouchopenrequest.cpp ktouchopenrequest_dlg.ui \
     524@@ -50,11 +52,11 @@
     525                ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
    500526 
    501527 # the library search path.
     
    510536 rcdir = $(kde_datadir)/ktouch
    511537 rc_DATA = ktouchui.rc
    512 --- kdeedu-3.5.0/ktouch/src/main.cpp    2005-09-10 04:17:27.000000000 -0400
    513 +++ kdeedu-3.5.0-new/ktouch/src/main.cpp        2005-11-18 07:59:04.000000000 -0500
     538--- kdeedu-3.5.3/ktouch/src/main.cpp    2006-05-22 14:03:38.000000000 -0400
     539+++ kdeedu-3.5.3-new/ktouch/src/main.cpp        2006-05-25 00:23:08.000000000 -0400
    514540@@ -26,7 +26,7 @@
    515541     KCmdLineLastOption
     
    521547     KAboutData about("ktouch",
    522548                      I18N_NOOP("KTouch"),
    523 --- kdeedu-3.5.0/kturtle/src/Makefile.am        2005-09-10 04:16:51.000000000 -0400
    524 +++ kdeedu-3.5.0-new/kturtle/src/Makefile.am    2005-11-18 07:59:04.000000000 -0500
     549--- kdeedu-3.5.3/kturtle/src/Makefile.am        2005-09-10 04:16:51.000000000 -0400
     550+++ kdeedu-3.5.3-new/kturtle/src/Makefile.am    2006-05-25 00:23:08.000000000 -0400
    525551@@ -6,20 +6,22 @@
    526552 # added from kjots
     
    551577 # these are the headers for your project
    552578 noinst_HEADERS = kturtle.h canvas.h dialogs.cpp value.h lexer.h parser.h executer.h treenode.h token.h translate.h
    553 --- kdeedu-3.5.0/kturtle/src/main.cpp   2005-10-10 10:55:19.000000000 -0400
    554 +++ kdeedu-3.5.0-new/kturtle/src/main.cpp       2005-11-18 07:59:05.000000000 -0500
     579--- kdeedu-3.5.3/kturtle/src/main.cpp   2005-10-10 10:55:19.000000000 -0400
     580+++ kdeedu-3.5.3-new/kturtle/src/main.cpp       2006-05-25 00:23:08.000000000 -0400
    555581@@ -43,7 +43,7 @@
    556582 };
     
    562588        KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
    563589        about.addAuthor("Cies Breijs",
    564 --- kdeedu-3.5.0/kverbos/kverbos/Makefile.am    2005-09-10 04:17:22.000000000 -0400
    565 +++ kdeedu-3.5.0-new/kverbos/kverbos/Makefile.am        2005-11-18 07:59:05.000000000 -0500
     590--- kdeedu-3.5.3/kverbos/kverbos/Makefile.am    2005-09-10 04:17:22.000000000 -0400
     591+++ kdeedu-3.5.3-new/kverbos/kverbos/Makefile.am        2006-05-25 00:23:08.000000000 -0400
    566592@@ -1,8 +1,11 @@
    567593 SUBDIRS = icons data
     
    588614 rcdir = $(kde_datadir)/kverbos
    589615 rc_DATA = kverbosui.rc
    590 --- kdeedu-3.5.0/kverbos/kverbos/main.cpp       2005-09-10 04:17:22.000000000 -0400
    591 +++ kdeedu-3.5.0-new/kverbos/kverbos/main.cpp   2005-11-18 07:59:05.000000000 -0500
     616--- kdeedu-3.5.3/kverbos/kverbos/main.cpp       2005-09-10 04:17:22.000000000 -0400
     617+++ kdeedu-3.5.3-new/kverbos/kverbos/main.cpp   2006-05-25 00:23:08.000000000 -0400
    592618@@ -32,7 +32,7 @@
    593619 
     
    599625 
    600626        KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
    601 --- kdeedu-3.5.0/kwordquiz/src/Makefile.am      2005-09-10 04:16:57.000000000 -0400
    602 +++ kdeedu-3.5.0-new/kwordquiz/src/Makefile.am  2005-11-18 08:05:43.000000000 -0500
     627--- kdeedu-3.5.3/kwordquiz/src/Makefile.am      2005-09-10 04:16:57.000000000 -0400
     628+++ kdeedu-3.5.3-new/kwordquiz/src/Makefile.am  2006-05-25 00:23:08.000000000 -0400
    603629@@ -1,9 +1,11 @@
    604630 ####### kdevelop will overwrite this part!!! (begin)##########
     
    633659 rcdir = $(kde_datadir)/kwordquiz
    634660 rc_DATA = kwordquizui.rc eventsrc
    635 --- kdeedu-3.5.0/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400
    636 +++ kdeedu-3.5.0-new/kwordquiz/src/main.cpp     2005-11-18 07:59:05.000000000 -0500
     661--- kdeedu-3.5.3/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400
     662+++ kdeedu-3.5.3-new/kwordquiz/src/main.cpp     2006-05-25 00:23:08.000000000 -0400
    637663@@ -33,7 +33,7 @@
    638664   { 0, 0, 0 }
     
    644670   KAboutData aboutData("kwordquiz",
    645671                        I18N_NOOP("KWordQuiz"),
    646 --- kdeedu-3.5.0/kstars/kstars/indi/webcam/Makefile.am  2005-09-10 04:17:35.000000000 -0400
    647 +++ kdeedu-3.5.0-new/kstars/kstars/indi/webcam/Makefile.am      2005-11-18 15:07:17.000000000 -0500
    648 @@ -1,7 +1,7 @@
    649  if HAVE_V4L2
    650     libwebcam_linux = libwebcam_v4l2_linux.la
    651  else
    652 -   libwebcam_linux = libwebcam_v4l1_linux.la
    653 +   libwebcam_linux =
    654  endif
    655  
    656  noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)
    657 --- kdeedu-3.5.1/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400
    658 +++ kdeedu-3.5.1-new/kstars/kstars/indi/apmount.cpp     2006-02-01 21:27:56.000000000 -0500
    659 @@ -39,8 +39,9 @@
    660  */
    661  
    662  
    663 -#if !(TIMEZONE_IS_INT)
    664 -static int daylight = 0;
    665 +/* FIXME: hack!, make a real test for extern int daylight on darwin */
    666 +#if !(TIMEZONE_IS_INT) || defined(__APPLE__)
    667 +int daylight = 0;
    668  #endif
    669  
Note: See TracChangeset for help on using the changeset viewer.