[30061] trunk/dports/kde/kdeutils3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 19 00:14:15 PDT 2007
Revision: 30061
http://trac.macosforge.org/projects/macports/changeset/30061
Author: takanori at macports.org
Date: 2007-10-19 00:14:14 -0700 (Fri, 19 Oct 2007)
Log Message:
-----------
KDE 3.5.8.
Modified Paths:
--------------
trunk/dports/kde/kdeutils3/Portfile
trunk/dports/kde/kdeutils3/files/CompileScript.sh
trunk/dports/kde/kdeutils3/files/InstallScript.sh
trunk/dports/kde/kdeutils3/files/kdeutils3.patch
Modified: trunk/dports/kde/kdeutils3/Portfile
===================================================================
--- trunk/dports/kde/kdeutils3/Portfile 2007-10-19 07:14:02 UTC (rev 30060)
+++ trunk/dports/kde/kdeutils3/Portfile 2007-10-19 07:14:14 UTC (rev 30061)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.5.7-1021
+#Synced with Fink, Version 3.5.8-1021
PortSystem 1.0
name kdeutils3
-version 3.5.7
-set kdeadmin kde-admindir-790
+version 3.5.8
+set kdeadmin kde-admindir-1009
categories kde
maintainers nomaintainer at macports.org
description KDE utilities. \
@@ -13,16 +13,14 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde357 \
- http://ranger.users.finkproject.org/distfiles/:admin \
- http://ranger.befunk.com/fink/:admin \
- http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
- http://www.southofheaven.net/befunk/:admin
-# opendarwin::kde357
-# opendarwin::admin
+master_sites kde:stable/${version}/src/:kde358 \
+ http://ranger.users.finkproject.org/distfiles/kde-admindir/:admin \
+ http://ranger.befunk.com/fink/kde-admindir/:admin \
+ http://astrange.ithinksw.net/~astrange/ranger-fink/kde-admindir/:admin \
+ http://www.southofheaven.net/befunk/kde-admindir/:admin
use_bzip2 yes
distname kdeutils-${version}
-distfiles ${distname}.tar.bz2:kde357 \
+distfiles ${distname}.tar.bz2:kde358 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -31,8 +29,8 @@
# port:python24
# port:xmms
-checksums ${distname}.tar.bz2 md5 5f167f53bdbf0b8c71c2d0f0ff7593fd \
- ${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
+checksums ${distname}.tar.bz2 md5 d1a0fcc83f35428a76cf7523a04ba19c \
+ ${kdeadmin}.tar.bz2 md5 d03f14acde189186fbac313f35316572
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
Modified: trunk/dports/kde/kdeutils3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdeutils3/files/CompileScript.sh 2007-10-19 07:14:02 UTC (rev 30060)
+++ trunk/dports/kde/kdeutils3/files/CompileScript.sh 2007-10-19 07:14:14 UTC (rev 30061)
@@ -1,9 +1,9 @@
#!/bin/sh -ev
- export PREFIX="%p" USE_UNSERMAKE=1
- . ./environment-helper.sh
+ export PREFIX="%p" USE_UNSERMAKE=1
+ . ./environment-helper.sh
- ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
- ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- perl -pi -e 's, kgpg , ,' Makefile
- ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
+ ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
+ ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
+ perl -pi -e 's, kgpg , ,' Makefile
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
Modified: trunk/dports/kde/kdeutils3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeutils3/files/InstallScript.sh 2007-10-19 07:14:02 UTC (rev 30060)
+++ trunk/dports/kde/kdeutils3/files/InstallScript.sh 2007-10-19 07:14:14 UTC (rev 30061)
@@ -1,19 +1,19 @@
#!/bin/sh -ev
- export PREFIX="%p" USE_UNSERMAKE=1
- . ./environment-helper.sh
+ export PREFIX="%p" USE_UNSERMAKE=1
+ . ./environment-helper.sh
- ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d kgpg_SUBDIR_included_TRUE='#' kgpg_SUBDIR_included_FALSE=
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d kgpg_SUBDIR_included_TRUE='#' kgpg_SUBDIR_included_FALSE=
- mkdir -p %i/share/doc/installed-packages
- touch %i/share/doc/installed-packages/%N
- touch %i/share/doc/installed-packages/%N-base
+ mkdir -p %i/share/doc/installed-packages
+ touch %i/share/doc/installed-packages/%N
+ touch %i/share/doc/installed-packages/%N-base
- find %i -name \*kmilo\* -exec rm -rf {} \; || :
- find %i -name \*irkick\* -exec rm -rf {} \; || :
- find %i -name \*kcmlirc\* -exec rm -rf {} \; || :
- rm -rf %i/share/applications/kde/pcmcia.desktop
- rm -rf %i/share/applications/kde/thinkpad.desktop
- rm -rf %i/share/apps/profiles
- rm -rf %i/share/apps/remotes
- find %i -name \*kgpg\* -exec rm -rf {} \; || :
+ find %i -name \*kmilo\* -exec rm -rf {} \; || :
+ find %i -name \*irkick\* -exec rm -rf {} \; || :
+ find %i -name \*kcmlirc\* -exec rm -rf {} \; || :
+ rm -rf %i/share/applications/kde/pcmcia.desktop
+ rm -rf %i/share/applications/kde/thinkpad.desktop
+ rm -rf %i/share/apps/profiles
+ rm -rf %i/share/apps/remotes
+ find %i -name \*kgpg\* -exec rm -rf {} \; || :
Modified: trunk/dports/kde/kdeutils3/files/kdeutils3.patch
===================================================================
--- trunk/dports/kde/kdeutils3/files/kdeutils3.patch 2007-10-19 07:14:02 UTC (rev 30060)
+++ trunk/dports/kde/kdeutils3/files/kdeutils3.patch 2007-10-19 07:14:14 UTC (rev 30061)
@@ -1,6 +1,6 @@
---- kdeutils-3.5.4/klaptopdaemon/Makefile.am 2006-01-19 11:49:18.000000000 -0500
-+++ kdeutils-3.5.4-new/klaptopdaemon/Makefile.am 2006-08-01 23:42:11.000000000 -0400
+--- kdeutils-3.5.8/klaptopdaemon/Makefile.am 2007-10-08 05:49:45.000000000 -0400
++++ kdeutils-3.5.8-new/klaptopdaemon/Makefile.am 2007-10-15 13:11:26.000000000 -0400
@@ -21,7 +21,7 @@
kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
acpi.cpp sony.cpp profile.cpp buttons.cpp apm.cpp
@@ -10,24 +10,69 @@
kcm_laptop_la_COMPILE_FIRST = crcresult.h
AM_CPPFLAGS = $(all_includes)
---- kdeutils-3.5.4/ksim/monitors/snmp/configure.in.in 2006-07-22 04:12:20.000000000 -0400
-+++ kdeutils-3.5.4-new/ksim/monitors/snmp/configure.in.in 2006-08-01 23:42:11.000000000 -0400
+--- kdeutils-3.5.8/ksim/monitors/filesystem/filesystemstats.cpp 2007-10-08 05:49:45.000000000 -0400
++++ kdeutils-3.5.8-new/ksim/monitors/filesystem/filesystemstats.cpp 2007-10-15 14:15:16.000000000 -0400
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+
+-#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
++#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__) && !defined(__APPLE__)
+ #include <sys/statvfs.h>
+ #elif defined( HAVE_SYS_STATFS_H )
+ #include <sys/statfs.h>
+@@ -59,7 +59,8 @@
+ #include <stdio.h>
+ #include <unistd.h>
+
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#if defined(HAVE_STATVFS) && !defined(__DragonFly__) && !defined(__APPLE__)
++#warning "have statvfs"
+ typedef struct statvfs ksim_statfs;
+ #define ksim_getfsstat getvfsstat
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+@@ -75,7 +76,7 @@
+
+ int fsystemStats( const char * file, ksim_statfs & stats )
+ {
+-#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
++#if defined(HAVE_STATVFS) && !defined(__DragonFly__) && !defined(__APPLE__)
+ return statvfs( file, &stats );
+ #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
+ return statfs( file, &stats );
+--- kdeutils-3.5.8/ksim/monitors/lm_sensors/Makefile.am 2005-10-10 10:59:12.000000000 -0400
++++ kdeutils-3.5.8-new/ksim/monitors/lm_sensors/Makefile.am 2007-10-15 13:11:27.000000000 -0400
+@@ -1,9 +1,9 @@
+ kde_module_LTLIBRARIES = ksim_sensors.la
+
+ if include_nv
+-NVCTRL_LIB= NVCtrl.la
+-NVCtrl_la_SOURCES = NVCtrl.c
+-NVCtrl_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
++NVCTRL_LIB=libNVCtrl.la
++libNVCtrl_la_SOURCES = NVCtrl.c
++libNVCtrl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ endif
+
+ noinst_LTLIBRARIES = $(NVCTRL_LIB)
+--- kdeutils-3.5.8/ksim/monitors/snmp/configure.in.in 2006-07-22 04:12:20.000000000 -0400
++++ kdeutils-3.5.8-new/ksim/monitors/snmp/configure.in.in 2007-10-15 13:11:26.000000000 -0400
@@ -37,4 +37,4 @@
fi
fi
-AM_CONDITIONAL(include_ksim_monitors_snmp, test "x$enable_snmp" = xyes)
+AM_CONDITIONAL(include_ksim_monitors_snmp, /usr/bin/false)
---- kdeutils-3.5.4/superkaramba/configure.in.in 2006-01-20 01:49:18.000000000 -0500
-+++ kdeutils-3.5.4-new/superkaramba/configure.in.in 2006-08-01 23:42:11.000000000 -0400
+--- kdeutils-3.5.8/superkaramba/configure.in.in 2006-01-20 01:49:18.000000000 -0500
++++ kdeutils-3.5.8-new/superkaramba/configure.in.in 2007-10-15 13:11:26.000000000 -0400
@@ -75,3 +75,5 @@
if test -z "$PYTHONINC" ; then
DO_NOT_COMPILE="$DO_NOT_COMPILE superkaramba"
fi
+
+AC_CHECK_HEADERS(netinet/in.h sys/sockio.h)
---- kdeutils-3.5.4/superkaramba/src/Makefile.am 2006-01-19 11:49:35.000000000 -0500
-+++ kdeutils-3.5.4-new/superkaramba/src/Makefile.am 2006-08-01 23:42:11.000000000 -0400
+--- kdeutils-3.5.8/superkaramba/src/Makefile.am 2006-01-19 11:49:35.000000000 -0500
++++ kdeutils-3.5.8-new/superkaramba/src/Makefile.am 2007-10-15 13:11:26.000000000 -0400
@@ -40,7 +40,7 @@
# kde_cfg_DATA = superkaramba.kcfg
@@ -37,33 +82,14 @@
#superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LDADD) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
superkaramba_LDADD = -lkio $(LIB_KDEUI) $(XMMS_LIBS) $(LIBPYTHON) $(LIBKVM) $(MY_LIBKNEWSTUFF)
---- kdeutils-3.5.4/superkaramba/src/misc_python.cpp 2006-03-17 05:13:37.000000000 -0500
-+++ kdeutils-3.5.4-new/superkaramba/src/misc_python.cpp 2006-08-01 23:42:11.000000000 -0400
-@@ -617,10 +617,10 @@
+--- kdeutils-3.5.8/superkaramba/src/misc_python.cpp 2007-10-08 05:49:47.000000000 -0400
++++ kdeutils-3.5.8-new/superkaramba/src/misc_python.cpp 2007-10-15 13:11:56.000000000 -0400
+@@ -653,7 +653,7 @@
#include <sys/ioctl.h>
#include <net/if.h>
#include <arpa/inet.h>
--#ifdef __FreeBSD__
-+#ifdef HAVE_NETINET_IN_H
+-#if defined(__FreeBSD__) || defined(__DragonFly__)
++#if defined(HAVE_NETINET_IN_H)
#include <netinet/in.h>
#endif
--#if defined(Q_OS_SOLARIS)
-+#ifdef HAVE_SYS_SOCKIO_H
- #include <sys/sockio.h>
- #endif
- /* now a method we need to expose to Python */
---- kdeutils-3.5.6/ksim/monitors/lm_sensors/Makefile.am 2005-10-10 10:59:12.000000000 -0400
-+++ kdeutils-3.5.6-new/ksim/monitors/lm_sensors/Makefile.am 2007-01-17 17:35:29.000000000 -0500
-@@ -1,9 +1,9 @@
- kde_module_LTLIBRARIES = ksim_sensors.la
-
- if include_nv
--NVCTRL_LIB= NVCtrl.la
--NVCtrl_la_SOURCES = NVCtrl.c
--NVCtrl_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
-+NVCTRL_LIB=libNVCtrl.la
-+libNVCtrl_la_SOURCES = NVCtrl.c
-+libNVCtrl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- endif
-
- noinst_LTLIBRARIES = $(NVCTRL_LIB)
+ #if defined(Q_OS_SOLARIS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071019/0cce9603/attachment-0001.html
More information about the macports-changes
mailing list