[59018] trunk/dports/kde/kdeedu4

[sharky at macports.org]

Revision: 59018
          http://trac.macports.org/changeset/59018
Author:   sharky at macports.org
Date:     2009-10-08 09:08:03 -0700 (Thu, 08 Oct 2009)
Log Message:
-----------
update kdeedu4 to version 4.3.2 (#21912)

Modified Paths:
--------------
    trunk/dports/kde/kdeedu4/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdeedu4/files/
    trunk/dports/kde/kdeedu4/files/byteswap-osx.patch

Modified: trunk/dports/kde/kdeedu4/Portfile
===================================================================
--- trunk/dports/kde/kdeedu4/Portfile	2009-10-08 16:07:54 UTC (rev 59017)
+++ trunk/dports/kde/kdeedu4/Portfile	2009-10-08 16:08:03 UTC (rev 59018)
@@ -4,9 +4,9 @@
 PortGroup           kde4   1.0
 
 name                kdeedu4
-version             4.2.4
+version             4.3.2
 categories          kde kde4
-maintainers         nomaintainer
+maintainers         snc sharky
 description         Education based applications for the KDE4 platform
 long_description    ${description}. This includes programs such as Marble and Kalzium.
 platforms           darwin
@@ -14,10 +14,14 @@
 master_sites        kde:stable/${version}/src/
 use_bzip2           yes
 distname            kdeedu-${version}
-checksums           md5     007f3fd746e4a20dec255b8b5bae6023
+checksums           md5     d96d87627471d5b34ccfbb44a5fa50f8
 
 depends_lib-append  port:kdelibs4 port:kdebase4 \
                     port:ocaml port:openbabel \
                     port:eigen
 
+patchfiles          byteswap-osx.patch
+patch.dir           ${workpath}/${distname}
+patch.pre_args      -p1
+
 configure.args-append   ../${distname}

Added: trunk/dports/kde/kdeedu4/files/byteswap-osx.patch
===================================================================
--- trunk/dports/kde/kdeedu4/files/byteswap-osx.patch	                        (rev 0)
+++ trunk/dports/kde/kdeedu4/files/byteswap-osx.patch	2009-10-08 16:08:03 UTC (rev 59018)
@@ -0,0 +1,77 @@
+Index: kdeedu-4.3.2/kstars/kstars/binfilehelper.cpp
+===================================================================
+--- kdeedu-4.3.2.orig/kstars/kstars/binfilehelper.cpp	2009-10-07 18:49:26.000000000 +0200
++++ kdeedu-4.3.2/kstars/kstars/binfilehelper.cpp	2009-10-07 18:49:51.000000000 +0200
+@@ -38,9 +38,15 @@
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
+ #else
++#if defined(Q_OS_MAC)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
++#else
+ #include <byteswap.h>
+ #endif
+ #endif
++#endif
+ 
+ class BinFileHelper;
+ 
+Index: kdeedu-4.3.2/kstars/kstars/skycomponents/starcomponent.cpp
+===================================================================
+--- kdeedu-4.3.2.orig/kstars/kstars/skycomponents/starcomponent.cpp	2009-10-07 18:49:26.000000000 +0200
++++ kdeedu-4.3.2/kstars/kstars/skycomponents/starcomponent.cpp	2009-10-07 18:49:51.000000000 +0200
+@@ -38,13 +38,32 @@
+ #include "binfilehelper.h"
+ #include "starblockfactory.h"
+ 
++// Byte-swapping support.
++//
++// bswap_16 is a linuxism, use BSWAP_16 define on Solaris,
++// probably need to usw BSD's swap16() on FreeBSD. This could
++// use some cmake checks to actually check for the supported
++// include files and which form of byte swapping to use.
++//
++#ifdef Q_OS_SOLARIS
++#include <sys/byteorder.h>
++#define bswap_16(x) BSWAP_16(x)
++#define bswap_32(x) BSWAP_32(x)
++#else
+ #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ #include <sys/endian.h>
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
+ #else
++#if defined(Q_OS_MAC)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
++#else
+ #include <byteswap.h>
+ #endif
++#endif
++#endif
+ 
+ #include <kde_file.h>
+ 
+Index: kdeedu-4.3.2/kstars/kstars/skycomponents/deepstarcomponent.cpp
+===================================================================
+--- kdeedu-4.3.2.orig/kstars/kstars/skycomponents/deepstarcomponent.cpp	2009-10-07 18:49:26.000000000 +0200
++++ kdeedu-4.3.2/kstars/kstars/skycomponents/deepstarcomponent.cpp	2009-10-07 18:50:02.000000000 +0200
+@@ -53,9 +53,15 @@
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
+ #else
++#if defined(Q_OS_MAC)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
++#else
+ #include <byteswap.h>
+ #endif
+ #endif
++#endif
+ 
+ DeepStarComponent::DeepStarComponent( SkyComponent *parent, QString fileName, float trigMag, bool staticstars )
+     : ListComponent(parent), m_reindexNum( J2000 ), triggerMag( trigMag ), m_FaintMagnitude(-5.0), 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091008/44feb717/attachment.html>