[20679] trunk/dports/kde/kdelibs3

[source_changes at macosforge.org]

Revision: 20679
          http://trac.macosforge.org/projects/macports/changeset/20679
Author:   takanori at macports.org
Date:     2006-11-17 10:37:44 -0800 (Fri, 17 Nov 2006)

Log Message:
-----------
Version 3.5.5.

Modified Paths:
--------------
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2006-11-17 18:24:39 UTC (rev 20678)
+++ trunk/dports/kde/kdelibs3/Portfile	2006-11-17 18:37:44 UTC (rev 20679)
@@ -1,11 +1,11 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.4-1021
+#Synced with Fink, Version 3.5.5-1021
 
 PortSystem 1.0
 name		kdelibs3
-version		3.5.4
-set kdeadmin	kde-admindir-252
+version		3.5.5
+set kdeadmin	kde-admindir-429
 categories	kde
 maintainers	ben at macports.org takanori at macports.org
 description	Essential libraries for KDE applications. \
@@ -13,13 +13,16 @@
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	opendarwin::kde354 \
-		opendarwin::admin
-#		kde:stable/${version}/src
-#		http://ranger.befunk.com/fink/:admin
+master_sites	kde:stable/${version}/src/:kde355 \
+		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::kde355
+#		opendarwin::admin
 use_bzip2	yes
 distname	kdelibs-${version}
-distfiles	${distname}.tar.bz2:kde354 \
+distfiles	${distname}.tar.bz2:kde355 \
 		${kdeadmin}.tar.bz2:admin
 depends_build	port:autoconf \
 		port:unsermake
@@ -57,8 +60,8 @@
 #		port:dbus-qt3
 #		port:hal
 
-checksums	${distname}.tar.bz2 md5 979d056ca0e21c12caed270126e60e3e \
-		${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
+checksums	${distname}.tar.bz2 md5 2cba792e3b0a766431b837c8ef924117 \
+		${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
 
 extract.only	${distname}.tar.bz2
 post-extract	{ system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
@@ -121,3 +124,5 @@
 		depends_lib-append port:doxygen
 		post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
 }
+
+livecheck.check	none

Modified: trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch
===================================================================
--- trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2006-11-17 18:24:39 UTC (rev 20678)
+++ trunk/dports/kde/kdelibs3/files/kdelibs3-unified.patch	2006-11-17 18:37:44 UTC (rev 20679)
@@ -472,3 +472,39 @@
  
  kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
  kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
+--- kdelibs-3.5.5/kinit/configure.in.in	(.../tags/KDE/3.5.5/kdelibs/kinit)	(revision 599303)
++++ kdelibs-3.5.5-new/kinit/configure.in.in	(.../branches/KDE/3.5/kdelibs/kinit)	(revision 599303)
+@@ -49,10 +49,11 @@
+ case $target_os in
+     linux*)
+         AC_MSG_RESULT(yes)
+-        kdeinit_setuid=1
++        KDEINIT_SETUID=1
+         AC_DEFINE(KDEINIT_OOM_PROTECT,1,[Enable prevention against poor Linux OOM-killer])
+         ;;
+     *)  AC_MSG_RESULT(no)
++        KDEINIT_SETUID=0
+         ;;
+ esac
+-AM_CONDITIONAL(KDEINIT_SETUID, test -n "$kdeinit_setuid" )
++AC_SUBST(KDEINIT_SETUID)
+--- kdelibs-3.5.5/kinit/Makefile.am	(.../tags/KDE/3.5.5/kdelibs/kinit)	(revision 599303)
++++ kdelibs-3.5.5-new/kinit/Makefile.am	(.../branches/KDE/3.5/kdelibs/kinit)	(revision 599303)
+@@ -82,14 +82,9 @@
+ dummy.cpp:
+ 	echo > dummy.cpp
+ 
+-if KDEINIT_SETUID
+-# start_kdeinit needs to be installed setuid root on Linux
+ install-exec-hook:
+-	@(chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" >&2
+-	@echo ""
+-	@echo "start_kdeinit is by default installed on Linux with a set SETUID root bit!"
+-	@echo "This is needed to prevent kdeinit from being killed by a bad heuristic in the OOM-killer when running out of memory."
+-	@echo ""
+-endif
++	@if test \${KDEINIT_SETUID} != 0; then \
++		(chown 0 $(DESTDIR)$(bindir)/start_kdeinit && chmod 4755 $(DESTDIR)$(bindir)/start_kdeinit) || echo "Please make start_kdeinit setuid root" ; \
++	fi
+ 
+ include $(top_srcdir)/admin/Doxyfile.am

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061117/d194cf62/attachment.html