December 2007 - macports-changes - lists.macosforge.org

[32405] trunk/dports/net/maradns/Portfile
by boeyms＠macports.org 29 Dec '07

29 Dec '07

Revision: 32405 http://trac.macosforge.org/projects/macports/changeset/32405 Author: boeyms(a)macports.org Date: 2007-12-29 05:38:26 -0800 (Sat, 29 Dec 2007) Log Message: ----------- maradns: update to latest version (1.2.12.09). Modified Paths: -------------- trunk/dports/net/maradns/Portfile Modified: trunk/dports/net/maradns/Portfile =================================================================== --- trunk/dports/net/maradns/Portfile 2007-12-29 13:29:37 UTC (rev 32404) +++ trunk/dports/net/maradns/Portfile 2007-12-29 13:38:26 UTC (rev 32405) @@ -3,7 +3,7 @@ PortSystem 1.0 name maradns -version 1.2.12.08 +version 1.2.12.09 set branch [strsed ${version} {s/\.[0-9]*\.[0-9]*$//}] @@ -18,9 +18,9 @@ master_sites http://www.maradns.org/download/${branch}/${version} \ sourceforge -checksums md5 3ab8a3231cebe65db2bf9473848f9ddb \ - sha1 8ca495b12fefd36964c07516e375874b9fd0681c \ - rmd160 7b42102b1b4382914e48a6dbeb22488f3c35170e +checksums md5 ee82cb6d4989cee2b9937257dc48c025 \ + sha1 091964ee898d1ee79e35b9e8bb42ae1df5b076e0 \ + rmd160 47b4816d125883d0a7d676677102fc906546f2f8 use_bzip2 yes

1 0

[32404] trunk/dports/devel/libassuan/Portfile
by boeyms＠macports.org 29 Dec '07

29 Dec '07

Revision: 32404 http://trac.macosforge.org/projects/macports/changeset/32404 Author: boeyms(a)macports.org Date: 2007-12-29 05:29:37 -0800 (Sat, 29 Dec 2007) Log Message: ----------- libassuan: update to latest version (1.0.4). Modified Paths: -------------- trunk/dports/devel/libassuan/Portfile Modified: trunk/dports/devel/libassuan/Portfile =================================================================== --- trunk/dports/devel/libassuan/Portfile 2007-12-29 13:27:49 UTC (rev 32403) +++ trunk/dports/devel/libassuan/Portfile 2007-12-29 13:29:37 UTC (rev 32404) @@ -2,7 +2,7 @@ PortSystem 1.0 name libassuan -version 1.0.3 +version 1.0.4 categories devel maintainers nomaintainer description Assuan IPC Library @@ -18,9 +18,9 @@ master_sites gnupg -checksums md5 255d31915f649416938327059a99d33f \ - sha1 1a16c9d1086e2cda819a3f7d4e5ebd41eb350e5f \ - rmd160 fd4fa8bff29d8a7ee9901aa2ad665df989c5c82e +checksums md5 ffb95bf2bac23e173f5a83a270f7524a \ + sha1 4b720706a8e4251d8cb7a0f2336226907df1426c \ + rmd160 d9c46d02a5c3955f813cdac05953d779ed9f1992 depends_lib port:pth test.run yes

1 0

[32403] trunk/dports/mail/gnupg2
by boeyms＠macports.org 29 Dec '07

29 Dec '07

Revision: 32403 http://trac.macosforge.org/projects/macports/changeset/32403 Author: boeyms(a)macports.org Date: 2007-12-29 05:27:49 -0800 (Sat, 29 Dec 2007) Log Message: ----------- gnupg2: update to latest version (2.0.8), including removing obsolete patch. Modified Paths: -------------- trunk/dports/mail/gnupg2/Portfile Removed Paths: ------------- trunk/dports/mail/gnupg2/files/patch-g10_status.c.diff Modified: trunk/dports/mail/gnupg2/Portfile =================================================================== --- trunk/dports/mail/gnupg2/Portfile 2007-12-29 12:50:35 UTC (rev 32402) +++ trunk/dports/mail/gnupg2/Portfile 2007-12-29 13:27:49 UTC (rev 32403) @@ -3,7 +3,7 @@ PortSystem 1.0 name gnupg2 -version 2.0.7 +version 2.0.8 categories mail security maintainers waqar(a)macports.org boeyms description GNU pretty-good-privacy package @@ -19,9 +19,9 @@ master_sites gnupg:gnupg use_bzip2 yes -checksums md5 433de7aca1f5d4342121ea09d98a2360 \ - sha1 f7d9ae7695bd9b849475b482bb7b027ec6fadbae \ - rmd160 70bd8dbf52fe2ccc9d89791c374a5507f6a61ee8 +checksums md5 fc4377ca67e1bf687eeaf22e79c0b9d1 \ + sha1 baeb7962f9d3d4628ada78036d1f5d4480aaa2d9 \ + rmd160 bfd8cfb48ff74834c80d09d040921e005af9550c post-patch { reinplace "s|/var|${prefix}/var|" \ @@ -45,8 +45,7 @@ port:libgpg-error \ port:pth -patchfiles patch-configure.diff \ - patch-g10_status.c.diff +patchfiles patch-configure.diff test.run yes test.dir ${worksrcpath}/tests Deleted: trunk/dports/mail/gnupg2/files/patch-g10_status.c.diff =================================================================== --- trunk/dports/mail/gnupg2/files/patch-g10_status.c.diff 2007-12-29 12:50:35 UTC (rev 32402) +++ trunk/dports/mail/gnupg2/files/patch-g10_status.c.diff 2007-12-29 13:27:49 UTC (rev 32403) @@ -1,12 +0,0 @@ ---- g10/status.c.orig 2007-07-04 22:55:02.000000000 +0900 -+++ g10/status.c 2007-11-05 10:14:05.000000000 +0900 -@@ -37,6 +37,9 @@ - - #define CONTROL_D ('D' - 'A' + 1) - -+#ifdef bool -+#undef bool -+#endif - - - static FILE *statusfp;

1 0

[32402] trunk/dports/security/tor-devel/Portfile
by boeyms＠macports.org 29 Dec '07

29 Dec '07

Revision: 32402 http://trac.macosforge.org/projects/macports/changeset/32402 Author: boeyms(a)macports.org Date: 2007-12-29 04:50:35 -0800 (Sat, 29 Dec 2007) Log Message: ----------- tor-devel: update to latest version (0.2.0.14-alpha). Modified Paths: -------------- trunk/dports/security/tor-devel/Portfile Modified: trunk/dports/security/tor-devel/Portfile =================================================================== --- trunk/dports/security/tor-devel/Portfile 2007-12-29 11:41:43 UTC (rev 32401) +++ trunk/dports/security/tor-devel/Portfile 2007-12-29 12:50:35 UTC (rev 32402) @@ -3,7 +3,7 @@ PortSystem 1.0 name tor-devel -version 0.2.0.12-alpha +version 0.2.0.14-alpha categories security maintainers boeyms openmaintainer description anonymizing overlay network for TCP @@ -18,9 +18,9 @@ platforms darwin master_sites ${homepage}dist/ distname tor-${version} -checksums md5 6315a83e6f116d793231e9ba3f8fda1f \ - sha1 5d0541ec88ab191c8ca9a48e9e56aae444d1fe19 \ - rmd160 d9a4335db39c76c2559a3eb4a297a6fb29d49d47 +checksums md5 339c4effdc85dd1dc74f94c89ee9fadc \ + sha1 1bc4f5d27f5b13f61b387e00a81158505702e288 \ + rmd160 a7be352cdc066b9d271056cb1a3ee8368140bba0 depends_lib port:libevent port:openssl port:zlib configure.args --with-libevent-dir=${prefix} \ --with-openssl-dir=${prefix} \

1 0

[32401] trunk/dports/aqua/qt4-mac/Portfile
by jochen＠macports.org 29 Dec '07

29 Dec '07

Revision: 32401 http://trac.macosforge.org/projects/macports/changeset/32401 Author: jochen(a)macports.org Date: 2007-12-29 03:41:43 -0800 (Sat, 29 Dec 2007) Log Message: ----------- fix typo Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2007-12-29 11:32:29 UTC (rev 32400) +++ trunk/dports/aqua/qt4-mac/Portfile 2007-12-29 11:41:43 UTC (rev 32401) @@ -80,7 +80,7 @@ configure.args-append -framework } -variant ipv6 decription "Include IPv6 support" { +variant ipv6 description "Include IPv6 support" { configure.args-delete -no-ipv6 configure.args-append -ipv6 }

1 0

[32400] trunk/dports/aqua/qt4-mac/Portfile
by jochen＠macports.org 29 Dec '07

29 Dec '07

Revision: 32400 http://trac.macosforge.org/projects/macports/changeset/32400 Author: jochen(a)macports.org Date: 2007-12-29 03:32:29 -0800 (Sat, 29 Dec 2007) Log Message: ----------- update SQL variants, sqlite now build as plugin. Add variant descriptions Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2007-12-29 08:44:30 UTC (rev 32399) +++ trunk/dports/aqua/qt4-mac/Portfile 2007-12-29 11:32:29 UTC (rev 32400) @@ -53,60 +53,57 @@ build.target first destroot.destdir INSTALL_ROOT="${destroot}" + set appPath ${destroot}/Applications/MacPorts/Qt +set docPath ${destroot}${prefix}/share/doc/qt4-mac post-destroot { xinstall -d -m 0755 ${appPath} foreach app {assistant Designer Linguist pixeltool} { - move ${destroot}${prefix}/bin/${app}.app \ - ${appPath} + move ${destroot}${prefix}/bin/${app}.app ${appPath} } foreach doc {INSTALL LICENSE.GPL OPENSOURCE-NOTICE.TXT README} { - xinstall -c -m 644 ${worksrcpath}/$doc \ - ${destroot}${prefix}/share/doc/qt4-mac + xinstall -c -m 644 ${worksrcpath}/$doc ${docPath} } if {![file exists ${destroot}${prefix}/lib/libqt.dylib]} { set majorver [strsed ${version} {s/\.[0-9]*\.[0-9]*$//}] set minorver [strsed ${version} {s/\.[0-9]*$//}] system "cd ${destroot}${prefix}/lib && - ln -s libqt-mt.${version}.dylib libqt.dylib && ln -s libqt-mt.${version}.dylib libqt.${majorver}.dylib && ln -s libqt-mt.${version}.dylib libqt.${minorver}.dylib" } } -variant framework { +variant framework description "Build frameworks" { configure.args-delete -no-framework configure.args-append -framework } -variant ipv6 { +variant ipv6 decription "Include IPv6 support" { configure.args-delete -no-ipv6 configure.args-append -ipv6 } -variant mysql { +variant mysql description "Include support for SQL via mysql driver" { depends_lib-append lib:libmysqlclient.12:mysql4 configure.args-delete -no-sql-mysql - configure.args-append -qt-sql-mysql \ - -L${prefix}/lib/mysql \ - -I${prefix}/include/mysql \ - -plugin-sql-mysql + configure.args-append -qt-sql-mysql -plugin-sql-mysql \ + -I${prefix}/include/mysql -L${prefix}/lib/mysql } -variant sqlite { +variant sqlite description "Include support for SQL via sqlite driver" { depends_lib-append port:sqlite3 configure.args-delete -no-sql-sqlite - configure.args-append -system-sqlite + configure.args-append -qt-sql-sqlite -plugin-sql-sqlite -system-sqlite } -variant examples { +variant examples description "Build Qt examples" { configure.args-delete -nomake examples configure.args-append -make examples } -variant demos { +variant demos description "Build Qt demos" { configure.args-delete -nomake demos configure.args-append -make demos post-destroot {

1 0

[32399] trunk/dports/PortIndex
by dluke＠macports.org 29 Dec '07

29 Dec '07

Revision: 32399 http://trac.macosforge.org/projects/macports/changeset/32399 Author: dluke(a)macports.org Date: 2007-12-29 00:44:30 -0800 (Sat, 29 Dec 2007) Log Message: ----------- Total number of ports parsed: 4406 Ports successfully parsed: 4406 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2007-12-29 05:37:39 UTC (rev 32398) +++ trunk/dports/PortIndex 2007-12-29 08:44:30 UTC (rev 32399) @@ -2383,7 +2383,7 @@ GraphicsMagick 656 variants {universal i386 darwin_8} portdir graphics/GraphicsMagick description {image processing tools collection} homepage http://www.graphicsmagick.org/ epoch 0 platforms darwin name GraphicsMagick depends_lib {port:libxml2 port:bzip2 port:zlib port:libpng port:tiff port:freetype} maintainers nomaintainer long_description {GraphicsMagick is the swiss army knife of image processing. It provides a robust collection of tools and libraries which support reading, writing, and manipulating an image in over 88 major formats including important formats like DPX, GIF, JPEG, JPEG-2000, PNG, PDF, SVG, and TIFF.} version 1.1.7 categories graphics revision 0 ImageMagick 1333 -variants {universal perl gs lcms wmf mpeg jbig jpeg2 graphviz q8 q16 q32 no_x11 no_plus_plus darwin_6 darwin_8} depends_build port:pkgconfig variant_desc {q8 {Use 8 bits per pixel quantum} q16 {Use 16 bits per pixel quantum (default)} q32 {Use 32 bits per pixel quantum}} portdir graphics/ImageMagick description {Tools and libraries to manipulate images in many formats} homepage http://www.imagemagick.org/ epoch 0 platforms darwin name ImageMagick depends_lib {lib:libX11.6:XFree86 port:bzip2 port:jpeg port:libpng port:tiff port:zlib port:freetype port:fontconfig port:libiconv port:expat port:libxml2} maintainers ryandesign long_description {ImageMagick is a robust collection of tools and libraries to create, edit and compose bitmap images in a wide variety of formats. You can crop, resize, rotate, sharpen, color reduce or add effects or text or straight or curved lines to an image or image sequence and save your completed work in the same or differing image format. You can ev en create images from scratch. Image processing operations are available from the command line as well as through C, Ch, C++, Java, Perl, PHP, Python, Ruby and Tcl/Tk programming interfaces. Over 90 image formats are supported, including GIF, JPEG, JPEG 2000, PNG, PDF, PhotoCD and TIFF.} categories {graphics devel} version 6.3.7-7 revision 0 +variants {universal perl gs lcms wmf mpeg jbig jpeg2 graphviz q8 q16 q32 no_x11 no_plus_plus darwin_6 darwin_8} depends_build port:pkgconfig variant_desc {q8 {Use 8 bits per pixel quantum} q16 {Use 16 bits per pixel quantum (default)} q32 {Use 32 bits per pixel quantum}} portdir graphics/ImageMagick description {Tools and libraries to manipulate images in many formats} homepage http://www.imagemagick.org/ epoch 0 platforms darwin name ImageMagick depends_lib {lib:libX11.6:XFree86 port:bzip2 port:jpeg port:libpng port:tiff port:zlib port:freetype port:fontconfig port:libiconv port:expat port:libxml2} maintainers ryandesign long_description {ImageMagick is a robust collection of tools and libraries to create, edit and compose bitmap images in a wide variety of formats. You can crop, resize, rotate, sharpen, color reduce or add effects or text or straight or curved lines to an image or image sequence and save your completed work in the same or differing image format. You can ev en create images from scratch. Image processing operations are available from the command line as well as through C, Ch, C++, Java, Perl, PHP, Python, Ruby and Tcl/Tk programming interfaces. Over 90 image formats are supported, including GIF, JPEG, JPEG 2000, PNG, PDF, PhotoCD and TIFF.} categories {graphics devel} version 6.3.7-8 revision 0 openexr 395 variants {universal darwin_7} description {OpenEXR Graphics Library} portdir graphics/OpenEXR homepage http://www.openexr.org epoch 0 platforms darwin name openexr long_description {OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications.} maintainers waqar(a)macports.org categories graphics version 1.4.0 revision 0 Renaissance-Framework 622 @@ -4436,8 +4436,8 @@ variants universal description {netcat clone supporting strong encryption.} portdir net/sbd homepage http://tigerteam.se/dl/sbd/ epoch 0 platforms darwin name sbd long_description {sbd is a netcat-clone, designed to be portable and offer strong encryption. It features AES-CBC-128 + HMAC-SHA1 encryption, program execution, choosing source port, continuous reconnection with delay, and other nice features.} maintainers nomaintainer categories {net security} version 1.37 revision 0 scanssh 704 variants universal portdir net/scanssh description {scanner for finding ssh servers and their software version} homepage http://monkey.org/~provos/scanssh/ epoch 0 platforms darwin name scanssh depends_lib {lib:libpcap:libpcap bin:dnet-config:libdnet lib:libevent:libevent} maintainers nomaintainer long_description {scanssh protocol scanner scans a list of addresses and networks for running SSH protocol servers and their version numbers. scanssh protocol scanner supports random selection of IP addresses from large network ranges and is useful for gathering statistics on the deployment of SSH protocol servers in a company or the Internet as whole.} version 2.1 categories {net security} revision 0 -scapy 1072 -variants universal description {A powerful packet manipulation tool} portdir net/scapy homepage http://www.secdev.org/projects/scapy epoch 0 name scapy depends_lib {port:python24 port:py-readline port:py-pylibpcap port:py-libdnet port:py-crypto port:py-gnuplot port:py-pyx port:graphviz} long_description {Scapy is a powerful interactive packet manipulation program. It is able to forge or decode packets of a wide number of protocols, send them on the wire, capture them, match requests and replies, and much more. It can easily handle most classical tasks like scanning, tracerouting, probing, unit tests, attacks or network discovery (it can replace hping, 85% of nmap, arpspoof, arp-sk, arping, tcpdump, tethereal, p0f, etc.). It also performs very well at a lot of other specific tasks that most other tools can't handle, like sending invalid frames, injecting your own 802.11 frames, combining technics (VLAN hopping+ARP cache poisoning, VOIP decoding on WEP encrypted channel, ...), etc.} maintainers pmq version 1.2.0.2 categories {net security python} revision 0 +scapy 1089 +variants universal portdir net/scapy description {A powerful packet manipulation tool} homepage http://www.secdev.org/projects/scapy epoch 0 platforms darwin depends_lib {port:python24 port:py-readline port:py-pylibpcap port:py-libdnet port:py-crypto port:py-gnuplot port:py-pyx port:graphviz} name scapy maintainers pmq long_description {Scapy is a powerful interactive packet manipulation program. It is able to forge or decode packets of a wide number of protocols, send them on the wire, capture them, match requests and replies, and much more. It can easily handle most classical tasks like scanning, tracerouting, probing, unit tests, attacks or network discovery (it can replace hping, 85% of nmap, arpspoof, arp-sk, arping, tcpdump, tethereal, p0f, etc.). It also performs very well at a lot of other specific tasks that most other tools can't handle, like sending invalid frames, injecting your own 802.11 frames, combining technics (VLAN hopping+ARP cache poisoning, VOIP decodin g on WEP encrypted channel, ...), etc.} categories {net security python} version 1.2.0.2 revision 0 sclj 361 variants universal portdir net/sclj description {A livejournal client} homepage http://sclj.sourceforge.net/ epoch 0 depends_run port:perl5.8 platforms darwin name sclj maintainers kayos(a)genetikayos.com long_description {JLJ is a command-line interface for posting to livejournal. Posts are edited in your default editor.} version 3.2 categories net revision 0 scotty 572

1 0

[32398] trunk/base/Mk/macports.upgrade.mk
by jmpp＠macports.org 29 Dec '07

29 Dec '07

Revision: 32398 http://trac.macosforge.org/projects/macports/changeset/32398 Author: jmpp(a)macports.org Date: 2007-12-28 21:37:39 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Whitespace cleanups. Modified Paths: -------------- trunk/base/Mk/macports.upgrade.mk Modified: trunk/base/Mk/macports.upgrade.mk =================================================================== --- trunk/base/Mk/macports.upgrade.mk 2007-12-29 05:29:39 UTC (rev 32397) +++ trunk/base/Mk/macports.upgrade.mk 2007-12-29 05:37:39 UTC (rev 32398) @@ -30,8 +30,9 @@ # Move the default ports tree to the new layout: [ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -vp \ - ${localstatedir}/macports/sources/rsync.macports.org/release && mv -v \ - ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/macports/sources/rsync.macports.org/release/ports ; } + ${localstatedir}/macports/sources/rsync.macports.org/release && mv -v \ + ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/macports/sources/rsync.macports.org/release/ports ; \ + } # Open up receipts and upgrade any paths in them containing old conventions to the new namespace: for receipt in ${localstatedir}/macports/receipts/*/*/receipt.bz2 ; do [ ! $ -f $${receipt} -a ! -f $${receipt}.mpsaved $ ] || { \ @@ -111,4 +112,4 @@ # Upgrade success announcement (meaning we're done ;): @[ -f ${UPGRADECHECK} ] || { echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo ""; \ - echo "MacPorts rename update done!" > ${UPGRADECHECK} ; } + echo "MacPorts rename update done!" > ${UPGRADECHECK} ; }

1 0

[32397] trunk/base/portmgr/dmg/preflight
by jmpp＠macports.org 29 Dec '07

29 Dec '07

Revision: 32397 http://trac.macosforge.org/projects/macports/changeset/32397 Author: jmpp(a)macports.org Date: 2007-12-28 21:29:39 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Some syntax tweaks: * we're using bash, to use echo's -e flag and remove useless echo calls for newline characters; * whitespace cleanups; * remove useless semicolons. Modified Paths: -------------- trunk/base/portmgr/dmg/preflight Modified: trunk/base/portmgr/dmg/preflight =================================================================== --- trunk/base/portmgr/dmg/preflight 2007-12-29 05:17:25 UTC (rev 32396) +++ trunk/base/portmgr/dmg/preflight 2007-12-29 05:29:39 UTC (rev 32397) @@ -59,61 +59,61 @@ [ ! -d /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -vp /opt/local/var/macports/sources/rsync.macports.org/release && mv -v \ - /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports /opt/local/var/macports/sources/rsync.macports.org/release/ports ; + /opt/local/var/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports /opt/local/var/macports/sources/rsync.macports.org/release/ports } -for receipt in /opt/local/var/macports/receipts/*/*/receipt.bz2 ; do +for receipt in /opt/local/var/macports/receipts/*/*/receipt.bz2; do [ ! $ -f ${receipt} -a ! -f ${receipt}.mpsaved $ ] || { cp -v ${receipt} ${receipt}.mpsaved && { - bzip2 -q -dc ${receipt} | sed 's/db\/dports/macports/g' | bzip2 -q -zf > ${receipt}.new ; - } && mv -v ${receipt}.new ${receipt} ; + bzip2 -q -dc ${receipt} | sed 's/db\/dports/macports/g' | bzip2 -q -zf > ${receipt}.new + } && mv -v ${receipt}.new ${receipt} }; done [ ! $ -f /opt/local/etc/macports/ports.conf -a ! -f ${UPGRADECHECK} $ ] || { - mv -v /opt/local/etc/macports/ports.conf /opt/local/etc/macports/macports.conf.mpsaved - sed 's/etc\/ports/etc\/macports/g' /opt/local/etc/macports/macports.conf.mpsaved > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/db\/dports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc//macports/macports.conf.tmp && \ - mv -v /opt/local/etc//macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/darwinports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/dpupdate1\/base/release\/base/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed '/^rsync_options/s/"$.*$"/\1/' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/ --delete / /' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf - sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ - mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + mv -v /opt/local/etc/macports/ports.conf /opt/local/etc/macports/macports.conf.mpsaved + sed 's/etc\/ports/etc\/macports/g' /opt/local/etc/macports/macports.conf.mpsaved > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/db\/dports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc//macports/macports.conf.tmp && \ + mv -v /opt/local/etc//macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/darwinports/macports/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/dpupdate1\/base/release\/base/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed '/^rsync_options/s/"$.*$"/\1/' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/ --delete / /' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf + sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \ + mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf } [ ! $ -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} $ ] || { - cp -v /opt/local/etc/macports/sources.conf /opt/local/etc/macports/sources.conf.mpsaved - sed 's/darwinports/macports/g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \ - mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf - sed 's/dpupdate\/dports/release\/ports\//g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \ - mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf + cp -v /opt/local/etc/macports/sources.conf /opt/local/etc/macports/sources.conf.mpsaved + sed 's/darwinports/macports/g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \ + mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf + sed 's/dpupdate\/dports/release\/ports\//g' /opt/local/etc/macports/sources.conf > /opt/local/etc/macports/sources.conf.tmp && \ + mv -v /opt/local/etc/macports/sources.conf.tmp /opt/local/etc/macports/sources.conf } [ ! $ -f "${HOME}/.macports/ports.conf" -a ! -f ${UPGRADECHECK} $ ] || { - mv -v "${HOME}/.macports/ports.conf" "${HOME}/.macports/macports.conf.mpsaved" - sed 's/etc\/ports/etc\/macports/g' "${HOME}/.macports/macports.conf.mpsaved" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/db\/dports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/darwinports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/dpupdate1\/base/release\/base/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed '/^rsync_options/s/"$.*$"/\1/' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/ --delete / /' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" - sed 's/ ports.conf(5)/ macports.conf(5)/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ - mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + mv -v "${HOME}/.macports/ports.conf" "${HOME}/.macports/macports.conf.mpsaved" + sed 's/etc\/ports/etc\/macports/g' "${HOME}/.macports/macports.conf.mpsaved" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/db\/dports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/darwinports/macports/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/dpupdate1\/base/release\/base/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed '/^rsync_options/s/"$.*$"/\1/' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/ --delete / /' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" + sed 's/ ports.conf(5)/ macports.conf(5)/g' "${HOME}/.macports/macports.conf" > "${HOME}/.macports/macports.conf.tmp" && \ + mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" } @@ -121,6 +121,6 @@ [ -f ${UPGRADECHECK} ] || { - echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo "" - echo "MacPorts rename update done!" > ${UPGRADECHECK} ; + echo -e "\nMacPorts installation successfully upgraded from the old DarwinPorts namespace!\n" + echo "MacPorts rename update done!" > ${UPGRADECHECK} }

1 0

[32396] trunk/base/portmgr/dmg/preflight
by jmpp＠macports.org 29 Dec '07

29 Dec '07

Revision: 32396 http://trac.macosforge.org/projects/macports/changeset/32396 Author: jmpp(a)macports.org Date: 2007-12-28 21:17:25 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Include my r32395 deletion of the /opt/local/etc/macports/mp_version file deletion into the preflight script of the pkg, for future major version releases. Note that this is not the best place to put this rule, as currently preflight takes care of the dp2mp-move for the pkg installer and they are orthogonal sets of upgrading rules..., but I simply don't know of anywhere else to put this one so that it is performed when installing from the pkg. Modified Paths: -------------- trunk/base/portmgr/dmg/preflight Modified: trunk/base/portmgr/dmg/preflight =================================================================== --- trunk/base/portmgr/dmg/preflight 2007-12-29 05:08:23 UTC (rev 32395) +++ trunk/base/portmgr/dmg/preflight 2007-12-29 05:17:25 UTC (rev 32396) @@ -116,6 +116,10 @@ mv -v "${HOME}/.macports/macports.conf.tmp" "${HOME}/.macports/macports.conf" } + +[ ! -f /opt/local/etc/macports/mp_version ] || rm -vf /opt/local/etc/macports/mp_version + + [ -f ${UPGRADECHECK} ] || { echo ""; echo "MacPorts installation successfully upgraded from the old DarwinPorts namespace!"; echo "" echo "MacPorts rename update done!" > ${UPGRADECHECK} ;

1 0