[55865] trunk/dports/kde

takanori at macports.org takanori at macports.org
Thu Aug 20 06:41:54 PDT 2009


Revision: 55865
          http://trac.macports.org/changeset/55865
Author:   takanori at macports.org
Date:     2009-08-20 06:41:53 -0700 (Thu, 20 Aug 2009)
Log Message:
-----------
KDE3: Force use of autoconf 2.63 instead of 2.64. (#20513)

Modified Paths:
--------------
    trunk/dports/kde/kdeaccessibility3/Portfile
    trunk/dports/kde/kdeaddons3/Portfile
    trunk/dports/kde/kdeartwork3/Portfile
    trunk/dports/kde/kdebase3/Portfile
    trunk/dports/kde/kdeedu3/Portfile
    trunk/dports/kde/kdegames3/Portfile
    trunk/dports/kde/kdegraphics3/Portfile
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/kde/kdenetwork3/Portfile
    trunk/dports/kde/kdepim3/Portfile
    trunk/dports/kde/kdesdk3/Portfile
    trunk/dports/kde/kdetoys3/Portfile
    trunk/dports/kde/kdeutils3/Portfile
    trunk/dports/kde/kdewebdev3/Portfile
    trunk/dports/kde/koffice/Portfile
    trunk/dports/kde/konversation/Portfile

Modified: trunk/dports/kde/kdeaccessibility3/Portfile
===================================================================
--- trunk/dports/kde/kdeaccessibility3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdeaccessibility3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdeaccessibility3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:freetts
@@ -64,10 +65,12 @@
 configure.args	--enable-kttsd-gstreamer --with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} COPYING INSTALL ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdeaddons3/Portfile
===================================================================
--- trunk/dports/kde/kdeaddons3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdeaddons3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdeaddons3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:doxygen \
 		port:kdebase3 \
@@ -66,10 +67,12 @@
 configure.args	--with-sdl-prefix=${prefix} --disable-sdltest --with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdeartwork3/Portfile
===================================================================
--- trunk/dports/kde/kdeartwork3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdeartwork3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdeartwork3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:xscreensaver
@@ -62,10 +63,12 @@
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdebase3/Portfile
===================================================================
--- trunk/dports/kde/kdebase3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdebase3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -6,7 +6,7 @@
 
 name                    kdebase3
 version                 3.5.10
-revision                3
+revision                4
 set kdeadmin            kde-admindir-1502
 categories              kde kde3
 maintainers             nomaintainer
@@ -31,7 +31,7 @@
                         ${kdeadmin}.tar.bz2:admin
 dist_subdir             kde3
 
-depends_build           port:autoconf \
+depends_build           port:autoconf263 \
                         port:unsermake
 
 depends_lib             port:cyrus-sasl2 \
@@ -99,15 +99,10 @@
 use_configure           no
 
 use_parallel_build      yes
+build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd               ./CompileScript.sh
 
-build {
-    system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh"
-}
-
-destroot {
-    system "cd ${worksrcpath} && ./InstallScript.sh"
-}
-
+destroot.cmd            ./InstallScript.sh
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README README.pam ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdeedu3/Portfile
===================================================================
--- trunk/dports/kde/kdeedu3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdeedu3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdeedu3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 
@@ -62,10 +63,12 @@
 configure.args	--disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdegames3/Portfile
===================================================================
--- trunk/dports/kde/kdegames3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdegames3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdegames3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 #		port:libcapsinetwork
@@ -63,10 +64,12 @@
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdegraphics3/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdegraphics3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -6,7 +6,7 @@
 
 name            kdegraphics3
 version         3.5.10
-revision        2
+revision        3
 set kdeadmin    kde-admindir-1502
 categories      kde kde3
 maintainers     nomaintainer
@@ -25,7 +25,7 @@
 distfiles       ${distname}.tar.bz2:kde \
                 ${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build   port:autoconf \
+depends_build   port:autoconf263 \
                 port:unsermake
 depends_lib     port:fribidi \
                 port:imlib \
@@ -72,10 +72,12 @@
 configure.args  --without-kamera --with-imlib-config=${prefix}/bin --with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot        { system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot   {
                 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
                 xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdelibs3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -6,7 +6,7 @@
 
 name                    kdelibs3
 version                 3.5.10
-revision                1
+revision                2
 set kdeadmin            kde-admindir-1502
 categories              kde kde3
 maintainers             nomaintainer
@@ -31,7 +31,7 @@
                         ${kdeadmin}.tar.bz2:admin
 dist_subdir             kde3
 
-depends_build           port:autoconf \
+depends_build           port:autoconf263 \
                         port:pkgconfig \
                         port:unsermake
 
@@ -69,17 +69,6 @@
 checksums               ${distname}.tar.bz2 md5 43cd55ed15f63b5738d620ef9f9fd568 \
                         ${kdeadmin}.tar.bz2 md5 92a60282c1d81f38835ce7d495255cc3
 
-pre-extract {
-    set autoconf_maximum_version 2.63
-    set autoconf_installed_version [exec autoconf --version | awk "NR==1 {print \$NF}"]
-    if {[rpm-vercomp ${autoconf_installed_version} ${autoconf_maximum_version}] > 0} {
-        ui_error "${name} ${version} requires autoconf ${autoconf_maximum_version} or earlier but you have autoconf ${autoconf_installed_version}."
-        ui_error "See http://trac.macports.org/ticket/20513"
-        ui_error "and http://trac.macports.org/wiki/howto/InstallingOlderPort"
-        return -code error "incompatible autoconf version"
-    }
-}
-
 extract.only            ${distname}.tar.bz2
 
 post-extract {
@@ -130,12 +119,10 @@
 use_configure           no
 
 use_parallel_build      yes
-
-build.env               MAKEFLAGS="-j${build.jobs}"
+build.env               MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
 build.cmd               ./CompileScript.sh
 
 destroot.cmd            ./InstallScript.sh
-
 post-destroot {
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} COPYING COPYING.LIB INSTALL ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdenetwork3/Portfile
===================================================================
--- trunk/dports/kde/kdenetwork3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdenetwork3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,7 +5,7 @@
 PortSystem 1.0
 name		kdenetwork3
 version		3.5.10
-revision        1
+revision        2
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -24,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3 \
 		port:openslp \
@@ -72,10 +72,12 @@
 # --with-libgadu-libs=${prefix}/lib --with-libgadu-includes=${prefix}/include 
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 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}

Modified: trunk/dports/kde/kdepim3/Portfile
===================================================================
--- trunk/dports/kde/kdepim3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdepim3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdepim3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:gpgme \
 		port:kdeaccessibility3 \
@@ -71,10 +72,12 @@
 configure.args	--disable-indexlib --with-distribution='MacPorts/Mac OS X' --without-gnokii --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} README README.Kolab README.libical ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdesdk3/Portfile
===================================================================
--- trunk/dports/kde/kdesdk3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdesdk3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdesdk3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -24,7 +25,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:db46 \
 		port:kdebase3 \
@@ -70,10 +71,12 @@
 configure.args	--with-db-name=db-4.6 --with-db-include-dir=${prefix}/include/db46 --with-db-lib-dir=${prefix}/lib/db46 --with-distribution='MacPorts/Mac OS X' --without-subversion --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} COPYING README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/kdetoys3/Portfile
===================================================================
--- trunk/dports/kde/kdetoys3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdetoys3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdetoys3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 
@@ -61,10 +62,12 @@
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 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}

Modified: trunk/dports/kde/kdeutils3/Portfile
===================================================================
--- trunk/dports/kde/kdeutils3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdeutils3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdeutils3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:gmp \
 		port:kdebase3
@@ -67,10 +68,12 @@
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 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}

Modified: trunk/dports/kde/kdewebdev3/Portfile
===================================================================
--- trunk/dports/kde/kdewebdev3/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/kdewebdev3/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -5,6 +5,7 @@
 PortSystem 1.0
 name		kdewebdev3
 version		3.5.10
+revision	1
 set kdeadmin	kde-admindir-1502
 categories	kde kde3
 maintainers	nomaintainer
@@ -23,7 +24,7 @@
 distfiles	${distname}.tar.bz2:kde \
 		${kdeadmin}.tar.bz2:admin
 dist_subdir     kde3
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3
 
@@ -61,10 +62,12 @@
 configure.args	--with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/koffice/Portfile
===================================================================
--- trunk/dports/kde/koffice/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/koffice/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -1,29 +1,28 @@
 # $Id$
 
-#Synced with Fink, Version 1.6.3-1024
+PortSystem      1.0
 
-PortSystem 1.0
 name		koffice
 version		1.6.3
-revision	2
+revision	3
 set kdeadmin	kde-admindir-790
-categories	kde
+categories	kde kde3
 maintainers	nomaintainer
 description	KDE office suite. \
 		NB KDE sound does not work.
 long_description ${description}
 platforms	darwin
 homepage	http://www.koffice.org/
-master_sites	kde:stable/${name}-${version}/src/:koffice163 \
+master_sites	kde:stable/${name}-${version}/src/:koffice \
 		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
 use_bzip2	yes
 distname	${name}-${version}
-distfiles	${distname}.tar.bz2:koffice163 \
+distfiles	${distname}.tar.bz2:koffice \
 		${kdeadmin}.tar.bz2:admin
-depends_build	port:autoconf \
+depends_build	port:autoconf263 \
 		port:unsermake
 depends_lib	port:kdebase3 \
 		port:ImageMagick \
@@ -43,11 +42,11 @@
 
 patchfiles	koffice-tiger.patch.bz2 CVE-2007-3387_4352_5392_5393.patch
 patch		{
-		foreach file $patchfiles {
-		    if {[regexp "\.bz2$" ${file}]} {
-		        system "cd ${worksrcpath} && bzip2 -dc ${filespath}/${file} | sed -e 's, at FINKPREFIX@,${prefix},g' | patch -p1"
+		foreach f $patchfiles {
+		    if {[regexp "\.bz2$" ${f}]} {
+		        system "cd ${worksrcpath} && bzip2 -dc ${filespath}/${f} | sed -e 's, at FINKPREFIX@,${prefix},g' | patch -p1"
 		    } else {
-		        system "cd ${worksrcpath} && cat ${filespath}/${file} | patch -p1"
+		        system "cd ${worksrcpath} && cat ${filespath}/${f} | 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;' ${worksrcpath}/admin/*"
@@ -57,16 +56,17 @@
 		reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
 		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 ${filespath}/${file} ${worksrcpath}
-		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-		    reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-		    reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-		    file attributes ${worksrcpath}/${file} -permissions 0755
+		foreach f {CompileScript.sh InstallScript.sh} {
+		    copy ${filespath}/${f} ${worksrcpath}
+		    reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+		    reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+		    reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+		    reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+		    reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+		    reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+		    reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+                    reinplace "s|%b|${worksrcpath}|g" ${worksrcpath}/${f}
+		    file attributes ${worksrcpath}/${f} -permissions 0755
 		}
 }
 
@@ -74,11 +74,13 @@
 # (libpqxx is missing.)
 # --enable-pgsql --with-pgsqlincdir=${prefix}/include/pgsql8 --with-pgsqllibdir=${prefix}/lib/pgsql8 --with-pqxx-includes=${prefix}/include --with-pqxx-libraries=${prefix}/lib 
 
-configure	{}
+use_configure       no
+
 use_parallel_build  yes
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-destroot	{ system "cd ${worksrcpath} && ./InstallScript.sh" }
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
+destroot.cmd        ./InstallScript.sh
 post-destroot	{
 		xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
 		xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING COPYING.LIB INSTALL README ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/kde/konversation/Portfile
===================================================================
--- trunk/dports/kde/konversation/Portfile	2009-08-20 13:40:48 UTC (rev 55864)
+++ trunk/dports/kde/konversation/Portfile	2009-08-20 13:41:53 UTC (rev 55865)
@@ -4,8 +4,9 @@
 
 name             konversation
 version          1.1
+revision         1
 set kdeadmin     kde-admindir-1024
-categories       kde
+categories       kde kde3
 maintainers      nomaintainer
 description      KDE IRC client.\
                  NB No KDE sound support.
@@ -20,7 +21,7 @@
 use_bzip2        yes
 distname         ${name}-${version}
 distfiles        ${distname}.tar.bz2 ${kdeadmin}.tar.bz2:admin
-depends_build    port:autoconf \
+depends_build    port:autoconf263 \
                  port:unsermake
 depends_lib      port:kdebase3 \
                  port:doxygen \
@@ -34,8 +35,8 @@
 
 patchfiles
 patch       {
-        foreach file $patchfiles {
-            system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
+        foreach f $patchfiles {
+            system "cd ${worksrcpath} && sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${f} | 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;' ${worksrcpath}/admin/*"
         system "echo \"KDE_ENABLE_HIDDEN_VISIBILITY\" >> ${worksrcpath}/configure.in.in"
@@ -46,28 +47,28 @@
         reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
         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 ${filespath}/${file} ${worksrcpath}
-            reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
-            reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
-            reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
-            reinplace "s|%r|${revision}|g" ${worksrcpath}/${file}
-            reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${file}
-            reinplace "s|%d|${destroot}|g" ${worksrcpath}/${file}
-            reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
-            file attributes ${worksrcpath}/${file} -permissions 0755
+        foreach f {CompileScript.sh InstallScript.sh} {
+            copy ${filespath}/${f} ${worksrcpath}
+            reinplace "s|%p|${prefix}|g" ${worksrcpath}/${f}
+            reinplace "s|%N|${name}|g" ${worksrcpath}/${f}
+            reinplace "s|%v|${version}|g" ${worksrcpath}/${f}
+            reinplace "s|%r|${revision}|g" ${worksrcpath}/${f}
+            reinplace "s|%c|${configure.args}|g" ${worksrcpath}/${f}
+            reinplace "s|%d|${destroot}|g" ${worksrcpath}/${f}
+            reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${f}
+            file attributes ${worksrcpath}/${f} -permissions 0755
         }
 }
 
 configure.args  --with-distribution='MacPorts/Mac OS X' --without-arts
 
 use_configure       no
+
 use_parallel_build  yes
+build.env           MAKEFLAGS="-j${build.jobs}" AUTOCONF=autoconf263
+build.cmd           ./CompileScript.sh
 
-build           { system "cd ${worksrcpath} && MAKEFLAGS=\"-j ${build.jobs}\" ./CompileScript.sh" }
-
-destroot    { system "cd ${worksrcpath} && ./InstallScript.sh" }
-
+destroot.cmd        ./InstallScript.sh
 post-destroot   {
         xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
         xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README TODO ${destroot}${prefix}/share/doc/${name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090820/adf531ed/attachment-0001.html>


More information about the macports-changes mailing list