[20187] trunk/dports/kde/kdenetwork3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:22:19 PDT 2006
Revision: 20187
http://trac.macosforge.org/projects/macports/changeset/20187
Author: takanori at macports.org
Date: 2006-10-27 11:22:19 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
Modified Paths:
--------------
trunk/dports/kde/kdenetwork3/Portfile
trunk/dports/kde/kdenetwork3/files/CompileScript.sh
trunk/dports/kde/kdenetwork3/files/InstallScript.sh
trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch
Modified: trunk/dports/kde/kdenetwork3/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork3/Portfile 2006-10-27 18:22:12 UTC (rev 20186)
+++ trunk/dports/kde/kdenetwork3/Portfile 2006-10-27 18:22:19 UTC (rev 20187)
@@ -1,60 +1,58 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdenetwork3
-version 3.5.1
-revision 2
-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 network tools. \
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 kdenetwork-${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 \
- port:glib2 \
- port:openslp \
- port:xmms
+ port:openslp
+# port:ekg
+# port:gtk1
+# port:qca
+# port:xmms
# what about libgadu?
-checksums ${distname}.tar.bz2 md5 02ced8c14c80f28635056488949d56d7 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums ${distname}.tar.bz2 md5 81660b1a73e81b6c01a55861c154dd3b \
+ ${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 kdenetwork3.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}
@@ -66,19 +64,14 @@
}
}
-configure.args --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args --with-distribution='MacPorts/Mac OS X' --without-arts
# --with-libgadu-libs=${prefix}/lib --with-libgadu-includes=${prefix}/include
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} AUTHORS COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
-}
-
Modified: trunk/dports/kde/kdenetwork3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdenetwork3/files/CompileScript.sh 2006-10-27 18:22:12 UTC (rev 20186)
+++ trunk/dports/kde/kdenetwork3/files/CompileScript.sh 2006-10-27 18:22:19 UTC (rev 20187)
@@ -1,15 +1,8 @@
#!/bin/sh -e
- export HOME=/tmp
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1 CC=gcc
. ./environment-helper.sh
- 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
Modified: trunk/dports/kde/kdenetwork3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdenetwork3/files/InstallScript.sh 2006-10-27 18:22:12 UTC (rev 20186)
+++ trunk/dports/kde/kdenetwork3/files/InstallScript.sh 2006-10-27 18:22:19 UTC (rev 20187)
@@ -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/kdenetwork3/files/kdenetwork3.patch
===================================================================
--- trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch 2006-10-27 18:22:12 UTC (rev 20186)
+++ trunk/dports/kde/kdenetwork3/files/kdenetwork3.patch 2006-10-27 18:22:19 UTC (rev 20187)
@@ -1,5 +1,17 @@
---- kdenetwork-3.4.2/ktalkd/ktalkd/talkd.cpp 2005-05-23 08:08:13.000000000 -0400
-+++ kdenetwork-3.4.2-new/ktalkd/ktalkd/talkd.cpp 2005-09-17 16:01:46.000000000 -0400
+
+--- kdenetwork-3.5.4/kopete/protocols/oscar/liboscar/oscartypes.h 2006-07-22 04:11:33.000000000 -0400
++++ kdenetwork-3.5.4-new/kopete/protocols/oscar/liboscar/oscartypes.h 2006-08-03 12:21:04.000000000 -0400
+@@ -237,7 +237,7 @@
+ const WORD ICQ_MAJOR = 0x0014;
+ const WORD ICQ_MINOR = 0x0034;
+ const WORD ICQ_POINT = 0x0000;
+- const WORD ICQ_BUILD = 0x0A0F;
++ const WORD ICQ_BUILD = 0x0BB8;
+ const char ICQ_OTHER[] = { 0x00, 0x00, 0x04, 0x3d };
+ const char ICQ_COUNTRY[] = "us";
+ const char ICQ_LANG[] = "en";
+--- kdenetwork-3.5.4/ktalkd/ktalkd/talkd.cpp 2006-03-17 05:12:34.000000000 -0500
++++ kdenetwork-3.5.4-new/ktalkd/ktalkd/talkd.cpp 2006-08-03 12:19:57.000000000 -0400
@@ -183,7 +183,7 @@
struct hostent *hp;
struct sockaddr_in sn;
@@ -18,8 +30,8 @@
int do_debug=0, do_badpackets=0, ch;
new KInstance("ktalkd"); // for KConfig and friends
---- kdenetwork-3.4.2/lanbrowsing/lisa/netmanager.cpp 2005-05-23 08:07:29.000000000 -0400
-+++ kdenetwork-3.4.2-new/lanbrowsing/lisa/netmanager.cpp 2005-09-17 16:01:46.000000000 -0400
+--- kdenetwork-3.5.4/lanbrowsing/lisa/netmanager.cpp 2005-09-10 04:20:14.000000000 -0400
++++ kdenetwork-3.5.4-new/lanbrowsing/lisa/netmanager.cpp 2006-08-03 12:19:57.000000000 -0400
@@ -413,7 +413,7 @@
{
mdcerr<<"NetManager::run: on m_listenFD"<<std::endl;
@@ -47,9 +59,9 @@
mdcerr<<" NetManager::findServerServer: broadcasting to: "
<<std::ios::hex<<m_broadcastAddress<<std::ios::dec<<std::endl;
---- kdenetwork-3.4.2/lanbrowsing/lisa/netscanner.cpp 2005-05-23 08:07:29.000000000 -0400
-+++ kdenetwork-3.4.2-new/lanbrowsing/lisa/netscanner.cpp 2005-09-17 16:01:46.000000000 -0400
-@@ -561,7 +561,7 @@
+--- kdenetwork-3.5.4/lanbrowsing/lisa/netscanner.cpp 2006-07-22 04:11:31.000000000 -0400
++++ kdenetwork-3.5.4-new/lanbrowsing/lisa/netscanner.cpp 2006-08-03 12:19:57.000000000 -0400
+@@ -550,7 +550,7 @@
select(0,0,0,0,&tv1);
//now read the answers, hopefully
struct sockaddr_in fromAddr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/c247a38d/attachment.html
More information about the macports-changes
mailing list