From takeshi at macports.org Fri May 1 00:21:55 2009 From: takeshi at macports.org (takeshi at macports.org) Date: Fri, 1 May 2009 00:21:55 -0700 (PDT) Subject: [50459] trunk/dports/science/nco/Portfile Message-ID: <20090501072156.5D23716D53B1@beta.macosforge.org> Revision: 50459 http://trac.macports.org/changeset/50459 Author: takeshi at macports.org Date: 2009-05-01 00:21:52 -0700 (Fri, 01 May 2009) Log Message: ----------- nco: updated to 3.9.8 Modified Paths: -------------- trunk/dports/science/nco/Portfile Modified: trunk/dports/science/nco/Portfile =================================================================== --- trunk/dports/science/nco/Portfile 2009-05-01 06:53:12 UTC (rev 50458) +++ trunk/dports/science/nco/Portfile 2009-05-01 07:21:52 UTC (rev 50459) @@ -4,15 +4,15 @@ PortSystem 1.0 name nco -version 3.9.7 +version 3.9.8 platforms darwin maintainers takeshi at macports.org categories science description The netCDF Operators master_sites http://${name}.sourceforge.net/src/ -checksums md5 d91e478fd98725086dfb088705935bb2 \ - sha1 6c622232bbc949b5f77b00ee2df701ebdb48efb1 \ - rmd160 8e3c41468c41cb71b7bbba91ee32750e6fa046b7 +checksums md5 412e3dce53abef435d415d39c0dc36a0 \ + sha1 c8d803282d028f87891a3a464ef2ca5029877a17 \ + rmd160 10e79a92b114c808614f1ccbb8743155d349d386 homepage http://nco.sourceforge.net/ long_description \ Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Fri May 1 00:30:17 2009 From: toby at macports.org (toby at macports.org) Date: Fri, 1 May 2009 00:30:17 -0700 (PDT) Subject: [50460] trunk/base/src/port1.0/portconfigure.tcl Message-ID: <20090501073017.D85F016D5463@beta.macosforge.org> Revision: 50460 http://trac.macports.org/changeset/50460 Author: toby at macports.org Date: 2009-05-01 00:30:17 -0700 (Fri, 01 May 2009) Log Message: ----------- rearrange Modified Paths: -------------- trunk/base/src/port1.0/portconfigure.tcl Modified: trunk/base/src/port1.0/portconfigure.tcl =================================================================== --- trunk/base/src/port1.0/portconfigure.tcl 2009-05-01 07:21:52 UTC (rev 50459) +++ trunk/base/src/port1.0/portconfigure.tcl 2009-05-01 07:30:17 UTC (rev 50460) @@ -181,6 +181,7 @@ gcc-4.0 { set name "Mac OS X gcc 4.0" } gcc-4.2 { set name "Mac OS X gcc 4.2" } llvm-gcc-4.2 { set name "Mac OS X llvm-gcc 4.2" } + clang { set name "Mac OS X clang" } apple-gcc-3.3 { set name "MacPorts Apple gcc 3.3" } apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" } apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" } @@ -191,7 +192,6 @@ macports-gcc-4.2 { set name "MacPorts gcc 4.2" } macports-gcc-4.3 { set name "MacPorts gcc 4.3" } macports-gcc-4.4 { set name "MacPorts gcc 4.4" } - clang { set name "Mac OS X clang" } default { return -code error "Invalid value for configure.compiler" } } ui_debug "Using compiler '$name'" @@ -342,6 +342,12 @@ cpp { set ret /Developer/usr/llvm-gcc-4.2/bin/llvm-cpp-4.2 } } } + clang { + switch -exact ${type} { + cc { set ret /usr/bin/clang } + objc { set ret /usr/bin/clang } + } + } apple-gcc-3.3 { switch -exact ${type} { cc { set ret ${prefix}/bin/gcc-apple-3.3 } @@ -431,12 +437,6 @@ f90 { set ret ${prefix}/bin/gfortran-mp-4.4 } } } - clang { - switch -exact ${type} { - cc { set ret /usr/bin/clang } - objc { set ret /usr/bin/clang } - } - } } return $ret } -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Fri May 1 00:49:34 2009 From: toby at macports.org (toby at macports.org) Date: Fri, 1 May 2009 00:49:34 -0700 (PDT) Subject: [50461] trunk/dports/aqua/iTerm/Portfile Message-ID: <20090501074935.8861016D5697@beta.macosforge.org> Revision: 50461 http://trac.macports.org/changeset/50461 Author: toby at macports.org Date: 2009-05-01 00:49:32 -0700 (Fri, 01 May 2009) Log Message: ----------- #14319 (Can't build iTerm on macbook running Leopard 10.5.2) Modified Paths: -------------- trunk/dports/aqua/iTerm/Portfile Modified: trunk/dports/aqua/iTerm/Portfile =================================================================== --- trunk/dports/aqua/iTerm/Portfile 2009-05-01 07:30:17 UTC (rev 50460) +++ trunk/dports/aqua/iTerm/Portfile 2009-05-01 07:49:32 UTC (rev 50461) @@ -1,10 +1,13 @@ # $Id$ PortSystem 1.0 +PortGroup xcode 1.0 + name iTerm -version 0.8.2 +version 0.9.6 +set svntag RC_[strsed $version {g/\./_/}] categories aqua shells -maintainers waqar at macports.org +maintainers waqar description Enhanced terminal emulator program for Mac OS X long_description \ iTerm is a full featured terminal emulation program written \ @@ -14,21 +17,20 @@ interface, and an emphasis on complete international support. homepage http://iterm.sourceforge.net -platforms macosx -fetch.type cvs -cvs.root :pserver:anonymous at iterm.cvs.sourceforge.net:/cvsroot/iterm -cvs.module ${name} +fetch.type svn +svn.url http://iterm.svn.sourceforge.net/svnroot/iterm/tags/$svntag/ +worksrcdir ${svntag} -worksrcdir ${name} -use_configure no +xcode.project ${name}.xcodeproj +xcode.target ${name} -build.type pbx -build.target -target ${name} -build.args build -project ${name}.xcodeproj +# Remove this after MacPorts 1.7.1 is released +pre-destroot { + xinstall -d -m 755 ${destroot}${applications_dir} +} -destroot { - xinstall -d -m 755 ${destroot}/Applications/MacPorts - file copy ${build.dir}/build/Default/${name}.app \ - ${destroot}/Applications/MacPorts/${name}.app +destroot { + file copy ${build.dir}/build/Deployment/${name}.app \ + ${destroot}${applications_dir}/${name}.app } -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 00:53:14 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 00:53:14 -0700 (PDT) Subject: [50462] trunk/dports/PortIndex Message-ID: <20090501075315.9303116D573F@beta.macosforge.org> Revision: 50462 http://trac.macports.org/changeset/50462 Author: portindex at macports.org Date: 2009-05-01 00:53:14 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 07:49:32 UTC (rev 50461) +++ trunk/dports/PortIndex 2009-05-01 07:53:14 UTC (rev 50462) @@ -9213,7 +9213,7 @@ ncbi_tools 358 portdir science/ncbi_tools description {blast is a set of tools for doing nucleotide and protein searches} homepage http://www.ncbi.nlm.nih.gov/blast/ epoch 0 platforms darwin name ncbi_tools maintainers mike.thon at gmail.com long_description {{blast is a set of tools for doing nucleotide and protein searches}} version 20080302 categories science revision 0 nco 941 -variants {mpich2 openmpi universal} depends_build {port:bison port:m4} portdir science/nco description {The netCDF Operators} homepage http://nco.sourceforge.net/ depends_run port:wget epoch 0 platforms darwin name nco depends_lib {port:curl port:gettext port:libdap port:libiconv port:libnc-dap port:libxml2 port:netcdf port:openssl port:udunits port:zlib port:antlr port:gsl} long_description {Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), performs an operation (e.g., averaging, hyperslabbing, or renaming), and outputs a processed netCDF file. Although most users of netCDF and HDF data are involved in scientific research, these data formats, and thus NCO, are generic and are equally useful in fields like finance. This version is OPeNDAP/DODS enabled, so it can be given URLs to read remote datasets as if they were local netCDF files.} maintainers takeshi at macports.org categories science version 3.9.7 revision 0 +variants {mpich2 openmpi universal} depends_build {port:bison port:m4} portdir science/nco description {The netCDF Operators} homepage http://nco.sourceforge.net/ depends_run port:wget epoch 0 platforms darwin name nco depends_lib {port:curl port:gettext port:libdap port:libiconv port:libnc-dap port:libxml2 port:netcdf port:openssl port:udunits port:zlib port:antlr port:gsl} long_description {Each NCO operator (e.g., ncks) takes netCDF or HDF input file(s), performs an operation (e.g., averaging, hyperslabbing, or renaming), and outputs a processed netCDF file. Although most users of netCDF and HDF data are involved in scientific research, these data formats, and thus NCO, are generic and are equally useful in fields like finance. This version is OPeNDAP/DODS enabled, so it can be given URLs to read remote datasets as if they were local netCDF files.} maintainers takeshi at macports.org categories science version 3.9.8 revision 0 ncview 606 variants universal portdir science/ncview description {X windows point'n'click NetCDF viewer.} homepage http://meteora.ucsd.edu/~pierce/ncview_home_page.html epoch 0 platforms darwin name ncview depends_lib port:netcdf long_description {Ncview is a visual browser for NetCDF format files. Typically you would use ncview to get a quick and easy, push-button look at your NetCDF files. You can view simple movies of the data, view along various dimensions, take a look at the actual data values, change color maps, invert the data, etc.} maintainers m at nnutter.com categories science version 1.93c revision 1 netcdf 675 -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 01:53:12 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 01:53:12 -0700 (PDT) Subject: [50463] trunk/dports Message-ID: <20090501085313.A7C2A16D5C95@beta.macosforge.org> Revision: 50463 http://trac.macports.org/changeset/50463 Author: portindex at macports.org Date: 2009-05-01 01:53:11 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 07:53:14 UTC (rev 50462) +++ trunk/dports/PortIndex 2009-05-01 08:53:11 UTC (rev 50463) @@ -118,8 +118,8 @@ variants {quartz universal} portdir aqua/gimp-app description {Gimp.app application bundle} homepage http://gimp-app.sourceforge.net/ epoch 0 depends_run bin:gimp:gimp2 platforms macosx name gimp-app long_description {{Gimp.app application bundle}} maintainers devans version 2.6.0 categories {aqua graphics} revision 1 huevos 419 variants universal portdir aqua/huevos description {customizable search engine helper for OS X} homepage http://ranchero.com/huevos/ epoch 0 platforms darwin name huevos maintainers nomaintainer long_description {Huevos is a customizable search engine helper for Mac OS X. It's easy to use: type in some text to search for, choose a search engine, then hit the Return key.} version 1.1 categories {aqua www} revision 0 -iTerm 572 -depends_build bin:cvs:cvs portdir aqua/iTerm description {Enhanced terminal emulator program for Mac OS X} homepage http://iterm.sourceforge.net epoch 0 platforms macosx name iTerm maintainers waqar at macports.org long_description {iTerm is a full featured terminal emulation program written for OS X using Cocoa. We are aiming at providing users with best command line experience under OS X. The letter i represents a native Apple look and feel of the program interface, and an emphasis on complete international support.} version 0.8.2 categories {aqua shells} revision 0 +iTerm 585 +variants universal depends_build bin:svn:subversion portdir aqua/iTerm description {Enhanced terminal emulator program for Mac OS X} homepage http://iterm.sourceforge.net epoch 0 platforms macosx name iTerm long_description {iTerm is a full featured terminal emulation program written for OS X using Cocoa. We are aiming at providing users with best command line experience under OS X. The letter i represents a native Apple look and feel of the program interface, and an emphasis on complete international support.} maintainers waqar version 0.9.6 categories {aqua shells} revision 0 ihook 507 variants universal portdir aqua/ihook description {A graphical interface frontend for commandline executables} homepage http://rsug.itd.umich.edu/software/ihook/ epoch 0 platforms macosx name ihook maintainers nomaintainer long_description {iHook is a graphical frontend for any commandline executable. It gives scripts a pleasant Aqua face, allows script writers to provide graphical feedback without having to learn one of the higher APIs available for Mac OS X.} version 1.1.0 categories aqua revision 0 istumbler 567 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Fri May 1 03:01:42 2009 From: toby at macports.org (toby at macports.org) Date: Fri, 1 May 2009 03:01:42 -0700 (PDT) Subject: [50464] trunk/dports/www/shttpd/ Message-ID: <20090501100143.91F3116D6474@beta.macosforge.org> Revision: 50464 http://trac.macports.org/changeset/50464 Author: toby at macports.org Date: 2009-05-01 03:01:38 -0700 (Fri, 01 May 2009) Log Message: ----------- remove very obsolete shttpd port Removed Paths: ------------- trunk/dports/www/shttpd/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Fri May 1 03:02:56 2009 From: toby at macports.org (toby at macports.org) Date: Fri, 1 May 2009 03:02:56 -0700 (PDT) Subject: [50465] trunk/dports/www Message-ID: <20090501100257.2B80D16D64C8@beta.macosforge.org> Revision: 50465 http://trac.macports.org/changeset/50465 Author: toby at macports.org Date: 2009-05-01 03:02:56 -0700 (Fri, 01 May 2009) Log Message: ----------- mongoose 2.5 Added Paths: ----------- trunk/dports/www/mongoose/ trunk/dports/www/mongoose/Portfile trunk/dports/www/mongoose/files/ trunk/dports/www/mongoose/files/patch-Makefile Added: trunk/dports/www/mongoose/Portfile =================================================================== --- trunk/dports/www/mongoose/Portfile (rev 0) +++ trunk/dports/www/mongoose/Portfile 2009-05-01 10:02:56 UTC (rev 50465) @@ -0,0 +1,41 @@ +# $Id$ + +PortSystem 1.0 + +name mongoose +version 2.5 +categories www +maintainers toby +description easy to use web server +long_description \ + Easy to use web server for Windows and UNIX. Mongoose provides simple \ + and clean API for embedding it into existing programs. Targeting Web \ + application developers, embedded system developers, and people who \ + need to setup file sharing quickly. +homepage http://code.google.com/p/mongoose/ +platforms darwin + +master_sites googlecode +extract.suffix .tgz + +checksums md5 07f2647603fb75672f3c4b38298ab462 \ + sha1 8788462bda7cbcdd64b50baff221dc0c90033245 \ + rmd160 db7d24c48fae5b0146f7ff5ef01d6b3f50afd114 + +worksrcdir ${name} + +patchfiles patch-Makefile + +configure { + reinplace s|__CFLAGS__|${configure.cflags}| ${worksrcpath}/Makefile +} + +build.target bsd +build.env CC=${configure.cc} + +destroot { + xinstall -m 555 ${worksrcpath}/mongoose ${destroot}${prefix}/bin + xinstall -m 444 ${worksrcpath}/mongoose.1 ${destroot}${prefix}/share/man/man1 +} + +test.run yes Property changes on: trunk/dports/www/mongoose/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: trunk/dports/www/mongoose/files/patch-Makefile =================================================================== --- trunk/dports/www/mongoose/files/patch-Makefile (rev 0) +++ trunk/dports/www/mongoose/files/patch-Makefile 2009-05-01 10:02:56 UTC (rev 50465) @@ -0,0 +1,20 @@ +--- Makefile.orig 2009-05-01 02:51:49.000000000 -0700 ++++ Makefile 2009-05-01 02:55:49.000000000 -0700 +@@ -1,6 +1,7 @@ + PROG= mongoose + SRCS= main.c mongoose.c +-COPT= -W -Wall -std=c99 -pedantic -Os -s ++COPT= -W -Wall -std=c99 -pedantic ++CFLAGS= __CFLAGS__ + + # Possible flags: (in brackets are rough numbers for 'gcc -O2' on i386) + # -DHAVE_MD5 - use system md5 library (-2kb) +@@ -20,7 +21,7 @@ + $(SRCS) -ldl -lpthread -o $(PROG) + + bsd: +- $(CC) $(COPT) $(CFLAGS) $(SRCS) -lpthread -o $(PROG) ++ $(CC) $(COPT) $(CFLAGS) $(SRCS) -o $(PROG) + + rtems: + $(CC) -c $(COPT) $(CFLAGS) mongoose.c compat_rtems.c -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 03:53:31 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 03:53:31 -0700 (PDT) Subject: [50466] trunk/dports Message-ID: <20090501105333.145DD16D6AA9@beta.macosforge.org> Revision: 50466 http://trac.macports.org/changeset/50466 Author: portindex at macports.org Date: 2009-05-01 03:53:29 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 10:02:56 UTC (rev 50465) +++ trunk/dports/PortIndex 2009-05-01 10:53:29 UTC (rev 50466) @@ -10602,6 +10602,8 @@ variants universal portdir www/mod_wsgi description {Python WSGI adapter module for Apache.} homepage http://www.modwsgi.org/ epoch 0 platforms darwin name mod_wsgi depends_lib {port:apache2 port:python24} long_description {The mod_wsgi module is written in C code directly against the internal Apache and Python application programming interfaces. As such, for hosting WSGI applications in conjunction with Apache it has a lower memory overhead and performs better than existing WSGI adapters for mod_python or alternative FASTCGI/SCGI/CGI based solutions.} maintainers taywa.ch:ys categories {www python} version 1.1 revision 1 moin 465 portdir www/moin description {a Python-based WikiEngine} homepage http://moinmo.in/ epoch 0 platforms darwin depends_lib port:python25 name moin maintainers nomaintainer long_description {MoinMoin is an advanced, easy to use and extensible WikiEngine with a large community of users. Said in a few words, it is about collaboration on easily editable web pages. MoinMoin is Free Software licensed under the GNU GPL.} categories {www python} version 1.8.2 revision 0 +mongoose 476 +variants universal portdir www/mongoose description {easy to use web server} homepage http://code.google.com/p/mongoose/ epoch 0 platforms darwin name mongoose maintainers toby long_description {Easy to use web server for Windows and UNIX. Mongoose provides simple and clean API for embedding it into existing programs. Targeting Web application developers, embedded system developers, and people who need to setup file sharing quickly.} categories www version 2.5 revision 0 monkeyd 459 variants universal portdir www/monkeyd description {fast, efficient, small and easy to configure web server} homepage http://monkeyd.sourceforge.net/ epoch 0 platforms darwin name monkeyd maintainers nomaintainer long_description {Monkey is a Web server written in C. This is an open source project based on the HTTP/1.1 protocol. The objective is to develop a fast, efficient, small and easy to configure web server.} categories www version 0.9.0 revision 0 moodle 669 @@ -10656,8 +10658,6 @@ variants {nomail calendar no_crypto aqua darwin_7 darwin_8 darwin_9 universal} depends_build {bin:zip:zip bin:gmake:gmake} portdir www/seamonkey description {Mozilla browser.} homepage http://www.mozilla.org/projects/seamonkey/ epoch 0 platforms darwin name seamonkey depends_lib {bin:libIDL-config-2:libidl lib:libgtk.2:gtk2 port:nspr} maintainers {afb at macports.org openmaintainer} long_description {{Mozilla browser.}} categories www version 1.1.9 revision 0 serf 560 variants universal portdir www/serf description {C-based HTTP client library} homepage http://code.google.com/p/serf/ epoch 0 platforms darwin name serf depends_lib {port:apr port:apr-util port:openssl} long_description {The serf library is a C-based HTTP client library built upon the Apache Portable Runtime (APR) library. It multiplexes connections, running the read/write communication asynchronously. Memory copies and transformations are kept to a minimum to provide high performance operation.} maintainers blair categories www version 0.3.0 revision 0 -shttpd 1048 -portdir www/shttpd description {embeddable MIT-licensed web server} homepage http://shttpd.sourceforge.net/ epoch 0 platforms darwin name shttpd maintainers nomaintainer long_description {SHTTPD is simple, easy to use, embeddable web server with CGI, SSL, cookies support. It is written in C, as one single source file shttpd.c. It compiles both in UNIX and Windows environments. It gives very small footprint when linked against uclibc or dietlibc. It is a good choice to serve Web based GUI for various applications, where other sophisticated servers like Apache, IIS etc are too big, hard to install and configure or overcomplicated. It is good for implementing a web interface for daemons. Ideal for web-oriented software demos. Beginner (and not just beginner) web developers may find it very useful as well: shttpd serves PHP, Perl and other CGI applications without any additional configuration. Regardless its small size, shttpd is fully functional and is ready to be used in produ ction environment.} version 1.34 categories www revision 0 siege 598 variants universal portdir www/siege description {http regression testing and benchmarking utility} homepage http://www.joedog.org/JoeDog/Siege epoch 0 platforms darwin name siege depends_lib port:openssl long_description {Siege is an http regression testing and benchmarking utility. It was designed to let web developers measure the performance of their code under duress, to see how it will stand up to load on the internet. It lets the user hit a web server with a configurable number of concurrent simulated users.} maintainers nomaintainer categories {www benchmarks} version 2.67 revision 0 sitecopy 521 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From vinc17 at macports.org Fri May 1 05:41:02 2009 From: vinc17 at macports.org (vinc17 at macports.org) Date: Fri, 1 May 2009 05:41:02 -0700 (PDT) Subject: [50467] trunk/dports/graphics/optipng/Portfile Message-ID: <20090501124103.8AB2016D7863@beta.macosforge.org> Revision: 50467 http://trac.macports.org/changeset/50467 Author: vinc17 at macports.org Date: 2009-05-01 05:41:00 -0700 (Fri, 01 May 2009) Log Message: ----------- optipng: use OptiPNG's configure script as suggested by #19498 (it is experimental, but it works in case of gcc and is a cleaner method). Modified Paths: -------------- trunk/dports/graphics/optipng/Portfile Modified: trunk/dports/graphics/optipng/Portfile =================================================================== --- trunk/dports/graphics/optipng/Portfile 2009-05-01 10:53:29 UTC (rev 50466) +++ trunk/dports/graphics/optipng/Portfile 2009-05-01 12:41:00 UTC (rev 50467) @@ -26,25 +26,23 @@ # Doesn't depend on libpng or zlib since it uses its own, modified versions -worksrcdir ${name}-${version}/src - -use_configure no - # Make sure gmake 3.81+ is used, as scripts/gcc.mak needs POSIX # backslash-newline sequence compatibility. depends_build port:gmake -build.cmd gmake -f scripts/gcc.mak -build.target "" +# Avoid --prefix option (not supported by OptiPNG's configure file). +configure.pre_args +build.cmd ${prefix}/bin/gmake + destroot { xinstall -m 755 -d ${destroot}${prefix}/bin \ ${destroot}${prefix}/share/doc/${name} \ ${destroot}${prefix}/share/man/man1 - xinstall -m 755 -W ${worksrcpath} optipng ${destroot}${prefix}/bin - eval xinstall -m 644 [glob ${worksrcpath}/../doc/*] \ - ${worksrcpath}/../README.txt ${destroot}${prefix}/share/doc/${name} - xinstall -m 644 ${worksrcpath}/../man/optipng.1 \ + xinstall -m 755 -W ${worksrcpath}/src optipng ${destroot}${prefix}/bin + eval xinstall -m 644 [glob ${worksrcpath}/doc/*] \ + ${worksrcpath}/README.txt ${destroot}${prefix}/share/doc/${name} + xinstall -m 644 ${worksrcpath}/man/optipng.1 \ ${destroot}${prefix}/share/man/man1 } -------------- next part -------------- An HTML attachment was scrubbed... URL: From vinc17 at macports.org Fri May 1 05:43:11 2009 From: vinc17 at macports.org (vinc17 at macports.org) Date: Fri, 1 May 2009 05:43:11 -0700 (PDT) Subject: [50468] trunk/dports/graphics/optipng/Portfile Message-ID: <20090501124312.0149716D78F5@beta.macosforge.org> Revision: 50468 http://trac.macports.org/changeset/50468 Author: vinc17 at macports.org Date: 2009-05-01 05:43:11 -0700 (Fri, 01 May 2009) Log Message: ----------- optipng: minor comment correction in Portfile. Modified Paths: -------------- trunk/dports/graphics/optipng/Portfile Modified: trunk/dports/graphics/optipng/Portfile =================================================================== --- trunk/dports/graphics/optipng/Portfile 2009-05-01 12:41:00 UTC (rev 50467) +++ trunk/dports/graphics/optipng/Portfile 2009-05-01 12:43:11 UTC (rev 50468) @@ -30,7 +30,7 @@ # backslash-newline sequence compatibility. depends_build port:gmake -# Avoid --prefix option (not supported by OptiPNG's configure file). +# Avoid --prefix option (not supported by OptiPNG's configure script). configure.pre_args build.cmd ${prefix}/bin/gmake -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 05:53:18 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 05:53:18 -0700 (PDT) Subject: [50469] trunk/dports Message-ID: <20090501125319.7EB6516D7A45@beta.macosforge.org> Revision: 50469 http://trac.macports.org/changeset/50469 Author: portindex at macports.org Date: 2009-05-01 05:53:17 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 12:43:11 UTC (rev 50468) +++ trunk/dports/PortIndex 2009-05-01 12:53:17 UTC (rev 50469) @@ -3152,8 +3152,8 @@ variants universal portdir graphics/openjpeg description {Library for manipulating JPEG-2000 images} homepage http://www.openjpeg.org/ epoch 0 platforms darwin name openjpeg maintainers mcalhoun long_description {The OpenJPEG library is an open-source JPEG 2000 codec. It has been developed in order to promote the use of JPEG 2000, the new still-image compression standard from the Joint Photographic Experts Group (JPEG).} categories graphics version 1.3 revision 3 openvrml 815 variants {js_mozilla no_opengl xembed player mozilla_plugin no_x11 universal} depends_build port:pkgconfig portdir graphics/openvrml description {a cross-platform VRML and X3D browser and C++ runtime library} homepage http://www.openvrml.org/ epoch 0 platforms darwin name openvrml depends_lib {port:boost port:libpng port:jpeg port:fontconfig port:mesa port:libsdl} long_description {OpenVRML is a free cross-platform runtime for VRML and X3D available under the GNU Lesser General Public License. The OpenVRML distribution includes libraries you can use to add VRML/X3D support to an application. On platforms where GTK+ is available, OpenVRML also provides a plug-in to render VRML/X3D worlds in Web browsers.} maintainers {ira.uka.de:raphael openmaintainer} categories {graphics x11} version 0.17.12 revision 0 -optipng 657 -depends_build port:gmake portdir graphics/optipng description {PNG file optimizer} homepage http://optipng.sourceforge.net/ epoch 0 platforms darwin name optipng maintainers vincent-opdarw at vinc17.org long_description {OptiPNG is a PNG optimizer that recompresses the image files to a smaller size, without losing any information. The idea has been inspired from pngcrush (http://pmt.sourceforge.net/pngcrush), and is explained in detail in the PNG-Tech article 'A guide to PNG optimization'. The implementation is carried forward in OptiPNG, which offers a faster execution per trial, and a wider search space.} version 0.6.2 categories graphics revision 0 +optipng 676 +variants universal depends_build port:gmake portdir graphics/optipng description {PNG file optimizer} homepage http://optipng.sourceforge.net/ epoch 0 platforms darwin name optipng long_description {OptiPNG is a PNG optimizer that recompresses the image files to a smaller size, without losing any information. The idea has been inspired from pngcrush (http://pmt.sourceforge.net/pngcrush), and is explained in detail in the PNG-Tech article 'A guide to PNG optimization'. The implementation is carried forward in OptiPNG, which offers a faster execution per trial, and a wider search space.} maintainers vincent-opdarw at vinc17.org categories graphics version 0.6.2 revision 0 pdf2djvu 499 variants universal depends_build port:pkgconfig portdir graphics/pdf2djvu description {Convert PDF to DjVu} homepage http://code.google.com/p/pdf2djvu/ epoch 0 platforms darwin name pdf2djvu depends_lib {port:djvulibre port:poppler port:libiconv} long_description {pdf2djvu creates DjVu files from PDF files. It's able to extract: graphics, text layer, hyperlinks, document outline (bookmarks), and metadata.} maintainers {blb openmaintainer} categories {graphics textproc} version 0.5.5 revision 0 pdf2svg 306 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From vinc17 at macports.org Fri May 1 05:57:06 2009 From: vinc17 at macports.org (vinc17 at macports.org) Date: Fri, 1 May 2009 05:57:06 -0700 (PDT) Subject: [50470] trunk/dports/graphics/optipng Message-ID: <20090501125706.E00C116D7AD3@beta.macosforge.org> Revision: 50470 http://trac.macports.org/changeset/50470 Author: vinc17 at macports.org Date: 2009-05-01 05:57:06 -0700 (Fri, 01 May 2009) Log Message: ----------- optipng: upstream security patch. Closes #19498. Modified Paths: -------------- trunk/dports/graphics/optipng/Portfile Added Paths: ----------- trunk/dports/graphics/optipng/files/ trunk/dports/graphics/optipng/files/optipng-0.6.2.1.diff Modified: trunk/dports/graphics/optipng/Portfile =================================================================== --- trunk/dports/graphics/optipng/Portfile 2009-05-01 12:53:17 UTC (rev 50469) +++ trunk/dports/graphics/optipng/Portfile 2009-05-01 12:57:06 UTC (rev 50470) @@ -4,6 +4,7 @@ name optipng version 0.6.2 +revision 1 categories graphics maintainers vincent-opdarw at vinc17.org description PNG file optimizer @@ -26,6 +27,9 @@ # Doesn't depend on libpng or zlib since it uses its own, modified versions +patch.pre_args -p1 +patchfiles optipng-0.6.2.1.diff + # Make sure gmake 3.81+ is used, as scripts/gcc.mak needs POSIX # backslash-newline sequence compatibility. depends_build port:gmake Added: trunk/dports/graphics/optipng/files/optipng-0.6.2.1.diff =================================================================== --- trunk/dports/graphics/optipng/files/optipng-0.6.2.1.diff (rev 0) +++ trunk/dports/graphics/optipng/files/optipng-0.6.2.1.diff 2009-05-01 12:57:06 UTC (rev 50470) @@ -0,0 +1,57 @@ +diff -ru optipng-0.6.2/lib/pngxtern/gif/gifread.c optipng-0.6.2.1/lib/pngxtern/gif/gifread.c +--- optipng-0.6.2/lib/pngxtern/gif/gifread.c 2006-08-10 20:17:00.000000000 -0400 ++++ optipng-0.6.2.1/lib/pngxtern/gif/gifread.c 2009-02-20 03:11:00.000000000 -0500 +@@ -219,8 +219,7 @@ + **/ + static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream) + { +- unsigned char *ptr; +- unsigned int len; ++ unsigned int offset, len; + int count, label; + + GIF_FGETC(label, stream); +@@ -233,7 +232,7 @@ + return; + } + +- ptr = ext->Buffer; ++ offset = 0; + len = ext->BufferSize; + for ( ;; ) + { +@@ -243,10 +242,10 @@ + ext->BufferSize += 1024; + ext->Buffer = realloc(ext->Buffer, ext->BufferSize); + } +- count = ReadDataBlock(ptr, stream); ++ count = ReadDataBlock(ext->Buffer + offset, stream); + if (count == 0) + break; +- ptr += count; ++ offset += count; + len -= count; + } + } +diff -ru optipng-0.6.2/src/optipng.c optipng-0.6.2.1/src/optipng.c +--- optipng-0.6.2/src/optipng.c 2008-11-09 23:56:00.000000000 -0500 ++++ optipng-0.6.2.1/src/optipng.c 2008-11-11 13:57:00.000000000 -0500 +@@ -542,6 +542,7 @@ + static void + app_init(void) + { ++ setvbuf(stdout, NULL, _IONBF, 0); + if (options.log_name != NULL) + { + /* Open the log file, line-buffered. */ +diff -ru optipng-0.6.2/src/proginfo.h optipng-0.6.2.1/src/proginfo.h +--- optipng-0.6.2/src/proginfo.h 2008-11-09 23:56:00.000000000 -0500 ++++ optipng-0.6.2.1/src/proginfo.h 2009-02-22 23:38:00.000000000 -0500 +@@ -1,5 +1,5 @@ + #define PROGRAM_NAME "OptiPNG" + #define PROGRAM_DESCRIPTION "Advanced PNG optimizer" +-#define PROGRAM_VERSION "0.6.2" +-#define PROGRAM_COPYRIGHT "Copyright (C) 2001-2008 Cosmin Truta" ++#define PROGRAM_VERSION "0.6.2.1" ++#define PROGRAM_COPYRIGHT "Copyright (C) 2001-2009 Cosmin Truta" + #define PROGRAM_URI "http://optipng.sourceforge.net/" -------------- next part -------------- An HTML attachment was scrubbed... URL: From raimue at macports.org Fri May 1 06:42:58 2009 From: raimue at macports.org (raimue at macports.org) Date: Fri, 1 May 2009 06:42:58 -0700 (PDT) Subject: [50471] trunk/dports/databases/postgresql-devel/Portfile Message-ID: <20090501134259.6B17116D8014@beta.macosforge.org> Revision: 50471 http://trac.macports.org/changeset/50471 Author: raimue at macports.org Date: 2009-05-01 06:42:56 -0700 (Fri, 01 May 2009) Log Message: ----------- databses/postgresql-devel: Maintainer update, #19502 Modified Paths: -------------- trunk/dports/databases/postgresql-devel/Portfile Modified: trunk/dports/databases/postgresql-devel/Portfile =================================================================== --- trunk/dports/databases/postgresql-devel/Portfile 2009-05-01 12:57:06 UTC (rev 50470) +++ trunk/dports/databases/postgresql-devel/Portfile 2009-05-01 13:42:56 UTC (rev 50471) @@ -3,7 +3,7 @@ PortSystem 1.0 name postgresql-devel -version devel +version 20090410 maintainers gmail.com:chepra categories databases platforms darwin @@ -20,10 +20,10 @@ fetch.type cvs cvs.root :pserver:anoncvs at anoncvs.postgresql.org:/projects/cvsroot cvs.password macportrules -cvs.date "13-March-2009" +cvs.date "[string range $version 0 3]-[string range $version 4 5]-[string range $version 6 7]" depends_lib port:readline port:openssl port:zlib port:libxml2 port:libxslt port:ossp-uuid -depends_build port:bison +depends_build port:bison worksrcdir ${distname} -------------- next part -------------- An HTML attachment was scrubbed... URL: From raimue at macports.org Fri May 1 06:43:20 2009 From: raimue at macports.org (raimue at macports.org) Date: Fri, 1 May 2009 06:43:20 -0700 (PDT) Subject: [50472] trunk/dports/databases/postgresql-server-devel/Portfile Message-ID: <20090501134320.7126D16D808D@beta.macosforge.org> Revision: 50472 http://trac.macports.org/changeset/50472 Author: raimue at macports.org Date: 2009-05-01 06:43:20 -0700 (Fri, 01 May 2009) Log Message: ----------- databses/postgresql-devel: Maintainer update, #19502 Modified Paths: -------------- trunk/dports/databases/postgresql-server-devel/Portfile Modified: trunk/dports/databases/postgresql-server-devel/Portfile =================================================================== --- trunk/dports/databases/postgresql-server-devel/Portfile 2009-05-01 13:42:56 UTC (rev 50471) +++ trunk/dports/databases/postgresql-server-devel/Portfile 2009-05-01 13:43:20 UTC (rev 50472) @@ -3,7 +3,7 @@ PortSystem 1.0 name postgresql-server-devel -version devel +version 20090410 categories databases platforms darwin maintainers gmail.com:chepra -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 06:53:03 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 06:53:03 -0700 (PDT) Subject: [50473] trunk/dports Message-ID: <20090501135304.4A00016D81D8@beta.macosforge.org> Revision: 50473 http://trac.macports.org/changeset/50473 Author: portindex at macports.org Date: 2009-05-01 06:53:03 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 13:43:20 UTC (rev 50472) +++ trunk/dports/PortIndex 2009-05-01 13:53:03 UTC (rev 50473) @@ -758,10 +758,10 @@ variants universal portdir databases/pgtcl description {Tcl PostgreSQL interface} homepage http://pgtcl.projects.postgresql.org/ epoch 0 platforms darwin name pgtcl depends_lib {port:tcl port:postgresql83} long_description {Tcl client interface to PostgreSQL} maintainers mac.com:giorgio_v categories databases version 1.5 revision 0 postgis 812 variants {postgresql82 universal} portdir databases/postgis description {adds support for geographic objects to the postgresql database} homepage http://postgis.refractions.net/ epoch 0 platforms darwin name postgis depends_lib {port:geos port:proj port:libiconv port:postgresql83} long_description {PostGIS adds support for geographic objects to the PostgreSQL object-relational database. In effect, PostGIS {spatially enables} the PostgreSQL server, allowing it to be used as a backend spatial database for geographic information systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS Simple Features Specification for SQL and will be submitted for conformance testing at version 1.0.} maintainers frank-lists at auroralux.net categories databases version 1.3.3 revision 1 -postgresql-devel 697 -variants {python krb5 perl tcl universal} depends_build port:bison portdir databases/postgresql-devel description {The most advanced open-source database available anywhere.} homepage http://www.postgresql.org/ epoch 0 platforms darwin name postgresql-devel depends_lib {port:readline port:openssl port:zlib port:libxml2 port:libxslt port:ossp-uuid} long_description {PostgreSQL is Object-Relational Database Management System. It supports almost all SQL constructs, including transactions, subselects, and user-defined types and functions. Write-ahead logging means increased performance while retaining data integrity.} maintainers gmail.com:chepra categories databases version devel revision 0 -postgresql-server-devel 338 -portdir databases/postgresql-server-devel description {run postgresql-devel as server} homepage http://www.postgresql.org/ epoch 0 depends_run port:postgresql-devel platforms darwin name postgresql-server-devel maintainers gmail.com:chepra long_description {{run postgresql-devel as server}} version devel categories databases revision 0 +postgresql-devel 700 +variants {python krb5 perl tcl universal} depends_build port:bison portdir databases/postgresql-devel description {The most advanced open-source database available anywhere.} homepage http://www.postgresql.org/ epoch 0 platforms darwin name postgresql-devel depends_lib {port:readline port:openssl port:zlib port:libxml2 port:libxslt port:ossp-uuid} long_description {PostgreSQL is Object-Relational Database Management System. It supports almost all SQL constructs, including transactions, subselects, and user-defined types and functions. Write-ahead logging means increased performance while retaining data integrity.} maintainers gmail.com:chepra categories databases version 20090410 revision 0 +postgresql-server-devel 341 +portdir databases/postgresql-server-devel description {run postgresql-devel as server} homepage http://www.postgresql.org/ epoch 0 depends_run port:postgresql-devel platforms darwin name postgresql-server-devel maintainers gmail.com:chepra long_description {{run postgresql-devel as server}} version 20090410 categories databases revision 0 postgresql7 685 variants {perl java tcltk server darwin_i386 universal} portdir databases/postgresql7 description {The most advanced open-source database available anywhere} homepage http://www.postgresql.org/ epoch 0 platforms darwin name postgresql7 depends_lib {port:readline port:openssl port:zlib port:bison} long_description {PostgreSQL is Object-Relational Database Management System. It supports almost all SQL constructs, including transactions, subselects, and user-defined types and functions. Write-ahead logging means increased performance while retaining data integrity. This version does not work on Mac OS X Intel!} maintainers {mww jwa} categories databases version 7.4.24 revision 0 postgresql80 637 @@ -3153,7 +3153,7 @@ openvrml 815 variants {js_mozilla no_opengl xembed player mozilla_plugin no_x11 universal} depends_build port:pkgconfig portdir graphics/openvrml description {a cross-platform VRML and X3D browser and C++ runtime library} homepage http://www.openvrml.org/ epoch 0 platforms darwin name openvrml depends_lib {port:boost port:libpng port:jpeg port:fontconfig port:mesa port:libsdl} long_description {OpenVRML is a free cross-platform runtime for VRML and X3D available under the GNU Lesser General Public License. The OpenVRML distribution includes libraries you can use to add VRML/X3D support to an application. On platforms where GTK+ is available, OpenVRML also provides a plug-in to render VRML/X3D worlds in Web browsers.} maintainers {ira.uka.de:raphael openmaintainer} categories {graphics x11} version 0.17.12 revision 0 optipng 676 -variants universal depends_build port:gmake portdir graphics/optipng description {PNG file optimizer} homepage http://optipng.sourceforge.net/ epoch 0 platforms darwin name optipng long_description {OptiPNG is a PNG optimizer that recompresses the image files to a smaller size, without losing any information. The idea has been inspired from pngcrush (http://pmt.sourceforge.net/pngcrush), and is explained in detail in the PNG-Tech article 'A guide to PNG optimization'. The implementation is carried forward in OptiPNG, which offers a faster execution per trial, and a wider search space.} maintainers vincent-opdarw at vinc17.org categories graphics version 0.6.2 revision 0 +variants universal depends_build port:gmake portdir graphics/optipng description {PNG file optimizer} homepage http://optipng.sourceforge.net/ epoch 0 platforms darwin name optipng long_description {OptiPNG is a PNG optimizer that recompresses the image files to a smaller size, without losing any information. The idea has been inspired from pngcrush (http://pmt.sourceforge.net/pngcrush), and is explained in detail in the PNG-Tech article 'A guide to PNG optimization'. The implementation is carried forward in OptiPNG, which offers a faster execution per trial, and a wider search space.} maintainers vincent-opdarw at vinc17.org categories graphics version 0.6.2 revision 1 pdf2djvu 499 variants universal depends_build port:pkgconfig portdir graphics/pdf2djvu description {Convert PDF to DjVu} homepage http://code.google.com/p/pdf2djvu/ epoch 0 platforms darwin name pdf2djvu depends_lib {port:djvulibre port:poppler port:libiconv} long_description {pdf2djvu creates DjVu files from PDF files. It's able to extract: graphics, text layer, hyperlinks, document outline (bookmarks), and metadata.} maintainers {blb openmaintainer} categories {graphics textproc} version 0.5.5 revision 0 pdf2svg 306 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From nottwo at macports.org Fri May 1 07:08:44 2009 From: nottwo at macports.org (nottwo at macports.org) Date: Fri, 1 May 2009 07:08:44 -0700 (PDT) Subject: [50474] trunk/.gitignore Message-ID: <20090501140844.8A86616D8379@beta.macosforge.org> Revision: 50474 http://trac.macports.org/changeset/50474 Author: nottwo at macports.org Date: 2009-05-01 07:08:43 -0700 (Fri, 01 May 2009) Log Message: ----------- Add more generated files to .gitignore Modified Paths: -------------- trunk/.gitignore Modified: trunk/.gitignore =================================================================== --- trunk/.gitignore 2009-05-01 13:53:03 UTC (rev 50473) +++ trunk/.gitignore 2009-05-01 14:08:43 UTC (rev 50474) @@ -22,11 +22,15 @@ base/src/Makefile base/src/config.h base/src/cregistry/cregistry.a +base/src/macports1.0/portconf.o base/src/macports1.0/macports_autoconf.tcl base/src/macports1.0/macports_fastload.tcl +base/src/macports1.0/session.o +base/src/macports1.0/util.o base/src/pathconf/Makefile base/src/pathconf/manpaths base/src/pathconf/paths +base/src/pextlib1.0/compat.o base/src/port/port base/src/port/portindex base/src/port/portmirror -------------- next part -------------- An HTML attachment was scrubbed... URL: From jmr at macports.org Fri May 1 07:14:37 2009 From: jmr at macports.org (jmr at macports.org) Date: Fri, 1 May 2009 07:14:37 -0700 (PDT) Subject: [50475] trunk/base/src/macports1.0/macports.tcl Message-ID: <20090501141437.853F816D8525@beta.macosforge.org> Revision: 50475 http://trac.macports.org/changeset/50475 Author: jmr at macports.org Date: 2009-05-01 07:14:37 -0700 (Fri, 01 May 2009) Log Message: ----------- upgrade: simplify check for whether we have to uninstall an installed version Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2009-05-01 14:08:43 UTC (rev 50474) +++ trunk/base/src/macports1.0/macports.tcl 2009-05-01 14:14:37 UTC (rev 50475) @@ -2165,8 +2165,6 @@ upvar $depscachename depscache } - # set to 1 if epoch overrides version - set epoch_override 0 # Is this a dry run? set is_dryrun no if {[info exists options(ports_dryrun)] && $options(ports_dryrun) eq "yes"} { @@ -2401,7 +2399,6 @@ return 0 } else { ui_debug "epoch override ... upgrading!" - set epoch_override 1 } } @@ -2440,8 +2437,7 @@ } } else { # are we installing an existing version due to force or epoch override? - if {([info exists options(ports_force)] || $epoch_override == 1) - && [registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { + if {[registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { ui_debug "Uninstalling $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants)" # we have to force the uninstall in case of dependents set force_cur [info exists options(ports_force)] -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Fri May 1 07:17:49 2009 From: jwa at macports.org (jwa at macports.org) Date: Fri, 1 May 2009 07:17:49 -0700 (PDT) Subject: [50476] trunk/dports/www/midgard-core/Portfile Message-ID: <20090501141749.C745616D858D@beta.macosforge.org> Revision: 50476 http://trac.macports.org/changeset/50476 Author: jwa at macports.org Date: 2009-05-01 07:17:49 -0700 (Fri, 01 May 2009) Log Message: ----------- version bump to 8.09.5 Modified Paths: -------------- trunk/dports/www/midgard-core/Portfile Modified: trunk/dports/www/midgard-core/Portfile =================================================================== --- trunk/dports/www/midgard-core/Portfile 2009-05-01 14:14:37 UTC (rev 50475) +++ trunk/dports/www/midgard-core/Portfile 2009-05-01 14:17:49 UTC (rev 50476) @@ -3,7 +3,7 @@ PortSystem 1.0 name midgard-core -version 8.09.4 +version 8.09.5 categories www maintainers jwa description A content management system @@ -12,17 +12,18 @@ platforms darwin homepage http://www.midgard-project.org/ -master_sites http://www.midgard-project.org/midcom-serveattachmentguid-9af6484c0f0911de86286f3b452c6f1a6f1a/ +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-a380eb50332d11debe5361285656cf1ecf1e/ #use_bzip2 yes -checksums md5 22bb3d209965e925446cdb03c51b7e51 \ - sha1 a8b5a4680b5b2ed0e9e7041a7e1577ed92b7397a \ - rmd160 f2f64c10e42f4a0ecb2821160697b20a4c3429ab +checksums md5 e55a66d3f530faf6c8dd905e4bcde7ff \ + sha1 8b2edab52ed224f38f57faa13cee7eac48b37b36 \ + rmd160 dc97d3cfb44282ee2e5acf1453dd18f9abbbf9bf depends_lib port:expat \ port:gettext \ port:glib2 \ port:dbus \ + port:dbus-glib \ port:libiconv \ port:libxml2 \ port:mysql5 \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Fri May 1 07:18:10 2009 From: jwa at macports.org (jwa at macports.org) Date: Fri, 1 May 2009 07:18:10 -0700 (PDT) Subject: [50477] trunk/dports/www/midgard-apache2/Portfile Message-ID: <20090501141810.F224716D861D@beta.macosforge.org> Revision: 50477 http://trac.macports.org/changeset/50477 Author: jwa at macports.org Date: 2009-05-01 07:18:10 -0700 (Fri, 01 May 2009) Log Message: ----------- version bump to 8.09.5 Modified Paths: -------------- trunk/dports/www/midgard-apache2/Portfile Modified: trunk/dports/www/midgard-apache2/Portfile =================================================================== --- trunk/dports/www/midgard-apache2/Portfile 2009-05-01 14:17:49 UTC (rev 50476) +++ trunk/dports/www/midgard-apache2/Portfile 2009-05-01 14:18:10 UTC (rev 50477) @@ -3,7 +3,7 @@ PortSystem 1.0 name midgard-apache2 -version 8.09.4 +version 8.09.5 categories www maintainers jwa description A content management system @@ -12,12 +12,12 @@ platforms darwin homepage http://www.midgard-project.org/ -master_sites http://www.midgard-project.org/midcom-serveattachmentguid-743b83020f0911de8c3cbf2796b96dc56dc5/ +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-b20cd814332d11de99e797ba4966ad3bad3b/ #use_bzip2 yes -checksums md5 b66317b6f4e3d1bb17f1a2ea6d0cb6ec \ - sha1 d8651dce58631ee54e8946f9db5472b30d442cbb \ - rmd160 b23008b01a7de8e90a3bc12bcf71710bee8aeb7f +checksums md5 5c593a4a14105f71282bd2c80c6ab2d1 \ + sha1 5c60fc3dfe2ba80a58e40328063c1a3a29ab78b6 \ + rmd160 d28664aa462e316b9ead85960aa7e7dcb9f79d7a depends_lib port:midgard-core \ port:apache2 \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Fri May 1 07:18:39 2009 From: jwa at macports.org (jwa at macports.org) Date: Fri, 1 May 2009 07:18:39 -0700 (PDT) Subject: [50478] trunk/dports/www/php5-midgard/Portfile Message-ID: <20090501141839.1AFE916D867F@beta.macosforge.org> Revision: 50478 http://trac.macports.org/changeset/50478 Author: jwa at macports.org Date: 2009-05-01 07:18:38 -0700 (Fri, 01 May 2009) Log Message: ----------- version bump to 8.09.5 Modified Paths: -------------- trunk/dports/www/php5-midgard/Portfile Modified: trunk/dports/www/php5-midgard/Portfile =================================================================== --- trunk/dports/www/php5-midgard/Portfile 2009-05-01 14:18:10 UTC (rev 50477) +++ trunk/dports/www/php5-midgard/Portfile 2009-05-01 14:18:38 UTC (rev 50478) @@ -3,7 +3,7 @@ PortSystem 1.0 name php5-midgard -version 8.09.4 +version 8.09.5 categories www maintainers jwa description A content management system @@ -12,12 +12,12 @@ platforms darwin homepage http://www.midgard-project.org/ -master_sites http://www.midgard-project.org/midcom-serveattachmentguid-53774ed40f0a11deaa05e5e643e61e971e97/ +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-8b1b48ee332d11dea2e5071583792a5b2a5b/ #use_bzip2 yes -checksums md5 81808f71a06109a0bd5c6ea17ec14af7 \ - sha1 34c01c877b15525f0653deefe2c3795b1876d739 \ - rmd160 12ba790f09b98492dbc30e81574f83c393b9ff71 +checksums md5 0ed1af1d30fa302c6b14ebca22563e83 \ + sha1 c04d70995601e6ecfa87b5044efecd71611a3ead \ + rmd160 9f4c616f6660b8354a2ee2baa4a8e6be0f492b06 depends_lib port:midgard-core \ port:php5 -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Fri May 1 07:19:00 2009 From: jwa at macports.org (jwa at macports.org) Date: Fri, 1 May 2009 07:19:00 -0700 (PDT) Subject: [50479] trunk/dports/www/midgard-data/Portfile Message-ID: <20090501141900.7126E16D86DB@beta.macosforge.org> Revision: 50479 http://trac.macports.org/changeset/50479 Author: jwa at macports.org Date: 2009-05-01 07:18:59 -0700 (Fri, 01 May 2009) Log Message: ----------- version bump to 8.09.5 Modified Paths: -------------- trunk/dports/www/midgard-data/Portfile Modified: trunk/dports/www/midgard-data/Portfile =================================================================== --- trunk/dports/www/midgard-data/Portfile 2009-05-01 14:18:38 UTC (rev 50478) +++ trunk/dports/www/midgard-data/Portfile 2009-05-01 14:18:59 UTC (rev 50479) @@ -3,7 +3,7 @@ PortSystem 1.0 name midgard-data -version 8.09.4 +version 8.09.5 categories www @@ -16,12 +16,12 @@ platforms darwin homepage http://www.midgard-project.org/ -master_sites http://www.midgard-project.org/midcom-serveattachmentguid-ae1df32a0f0911dea211d7f3881258885888/ +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-9498a498332d11de9399df456ea19fb79fb7/ #use_bzip2 yes -checksums md5 a3b414f8ed7e1a6b4b4974c6dc51c046 \ - sha1 c7ac2eea586eaed1ed41a830f3d11e8d513d8a72 \ - rmd160 148d33886f0cdcca4eac01721e4ca2cacad5b6b0 +checksums md5 47833265a2e3b516b55dd0fb386ad243 \ + sha1 03d8efe74732fb6c360b193439d4e023cd61ec33 \ + rmd160 b967531ca60a62602b65020ddf4e4ddc460b71be depends_lib port:midgard-core \ port:midgard-apache2 \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From nottwo at macports.org Fri May 1 07:19:28 2009 From: nottwo at macports.org (nottwo at macports.org) Date: Fri, 1 May 2009 07:19:28 -0700 (PDT) Subject: [50480] trunk/dports/lang/erlang Message-ID: <20090501141928.7386A16D8761@beta.macosforge.org> Revision: 50480 http://trac.macports.org/changeset/50480 Author: nottwo at macports.org Date: 2009-05-01 07:19:27 -0700 (Fri, 01 May 2009) Log Message: ----------- erlang: correct patch-erts_configure.diff Fixes #19493 Modified Paths: -------------- trunk/dports/lang/erlang/Portfile trunk/dports/lang/erlang/files/patch-erts_configure.diff Modified: trunk/dports/lang/erlang/Portfile =================================================================== --- trunk/dports/lang/erlang/Portfile 2009-05-01 14:18:59 UTC (rev 50479) +++ trunk/dports/lang/erlang/Portfile 2009-05-01 14:19:27 UTC (rev 50480) @@ -3,7 +3,7 @@ PortSystem 1.0 name erlang version R13B -revision 1 +revision 2 categories lang erlang maintainers bfulgham at macports.org platforms darwin Modified: trunk/dports/lang/erlang/files/patch-erts_configure.diff =================================================================== --- trunk/dports/lang/erlang/files/patch-erts_configure.diff 2009-05-01 14:18:59 UTC (rev 50479) +++ trunk/dports/lang/erlang/files/patch-erts_configure.diff 2009-05-01 14:19:27 UTC (rev 50480) @@ -1,14 +1,14 @@ --- erts/configure.orig 2009-04-21 11:33:14.000000000 -0400 +++ erts/configure 2009-04-21 10:49:56.000000000 -0400 -@@ -19528,6 +19742,91 @@ +@@ -19528,6 +19742,95 @@ esac fi fi + +case $ARCH-$OPSYS in + amd64-darwin*|x86-darwin*) -+ { $as_echo "$as_me:$LINENO: checking For modern (leopard) style mcontext_t" >&5 -+$as_echo_n "checking For modern (leopard) style mcontext_t... " >&6; } ++ echo "$as_me:$LINENO: checking For modern (leopard) style mcontext_t" >&5 ++echo $ECHO_N "checking For modern (leopard) style mcontext_t... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF @@ -46,43 +46,47 @@ +} +_ACEOF +rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + darwin_mcontext_leopard=yes +else -+ $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + darwin_mcontext_leopard=no +fi + -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + if test X"$darwin_mcontext_leopard" = X"yes"; then + +cat >>confdefs.h <<\_ACEOF +#define DARWIN_MODERN_MCONTEXT /**/ +_ACEOF + -+ { $as_echo "$as_me:$LINENO: result: yes" >&5 -+$as_echo "yes" >&6; } ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + else -+ { $as_echo "$as_me:$LINENO: result: no" >&5 -+$as_echo "no" >&6; } ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + ;; + *) -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 07:53:12 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 07:53:12 -0700 (PDT) Subject: [50481] trunk/dports Message-ID: <20090501145314.B390616D8BCD@beta.macosforge.org> Revision: 50481 http://trac.macports.org/changeset/50481 Author: portindex at macports.org Date: 2009-05-01 07:53:07 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 14:19:27 UTC (rev 50480) +++ trunk/dports/PortIndex 2009-05-01 14:53:07 UTC (rev 50481) @@ -3969,7 +3969,7 @@ elk 509 variants {x11 universal} portdir lang/elk description {Scheme Extension Language Kit} homepage http://sam.zoy.org/elk epoch 0 platforms darwin name elk maintainers waqar at macports.org long_description {Elk (the Extension Language Kit) is an implementation of the Scheme programming language. It can be used as a standalone Scheme interpreter, or as an embeddable, reusable extension language subsystem for applications written in C or C++ through the libelk library.} categories lang version 3.99.7 revision 0 erlang 831 -variants {ssl nohipe universal} depends_build {port:gawk port:wxWidgets} portdir lang/erlang description {The Erlang Programming Language} homepage http://www.erlang.org/ depends_run port:tk epoch 0 platforms darwin name erlang long_description {Erlang is a programming language designed at the Ericsson Computer Science Laboratory. Open-source Erlang is being released to help encourage the spread of Erlang outside Ericsson. We are releasing free of charge: The entire source code of the current Erlang system. Extensive libraries of code for building robust fault-tolerant distributed applications. All with documentation. All the above software has been battle tested in a number of Ericsson products, for example the new Ericsson ATM switch.} maintainers bfulgham at macports.org categories {lang erlang} version R13B revision 1 +variants {ssl nohipe universal} depends_build {port:gawk port:wxWidgets} portdir lang/erlang description {The Erlang Programming Language} homepage http://www.erlang.org/ depends_run port:tk epoch 0 platforms darwin name erlang long_description {Erlang is a programming language designed at the Ericsson Computer Science Laboratory. Open-source Erlang is being released to help encourage the spread of Erlang outside Ericsson. We are releasing free of charge: The entire source code of the current Erlang system. Extensive libraries of code for building robust fault-tolerant distributed applications. All with documentation. All the above software has been battle tested in a number of Ericsson products, for example the new Ericsson ATM switch.} maintainers bfulgham at macports.org categories {lang erlang} version R13B revision 2 ferite 431 variants universal portdir lang/ferite description {embeddable scripting language} homepage http://www.ferite.org/ epoch 0 platforms darwin name ferite depends_lib {port:pcre port:libxml2} long_description {A scripting language designed to be embedded in other applications, that aims to provide a powerful object oriented syntax with low memory and cpu overhead.} maintainers nomaintainer categories lang version 1.0.2 revision 0 ficl 410 @@ -10553,11 +10553,11 @@ mediawiki 770 variants {mysql4 postgresql83} portdir www/mediawiki description {The wiki engine used by Wikipedia} homepage http://www.mediawiki.org epoch 0 depends_run {port:libiconv port:jpeg port:jasper port:tiff port:lcms port:libpng port:freetype port:libxml2 port:jbigkit port:expat port:fontconfig port:ghostscript port:ImageMagick port:pkgconfig port:aspell} platforms {darwin freebsd} name mediawiki depends_lib {path:bin/php:php5 path:bin/mysql_config5:mysql5} long_description {MediaWiki is the collaborative editing software that runs Wikipedia, the free encyclopedia, and other projects. It's designed to handle a large number of users and pages without imposing too rigid a structure or workflow.} maintainers nomaintainer categories {www php} version 1.14.0 revision 0 midgard-apache2 397 -variants universal portdir www/midgard-apache2 description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-apache2 depends_lib {port:midgard-core port:apache2 port:apr port:apr-util} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.4 revision 0 -midgard-core 452 -variants {check universal} portdir www/midgard-core description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-core depends_lib {port:expat port:gettext port:glib2 port:dbus port:libiconv port:libxml2 port:mysql5 port:openssl port:zlib} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.4 revision 0 +variants universal portdir www/midgard-apache2 description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-apache2 depends_lib {port:midgard-core port:apache2 port:apr port:apr-util} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 +midgard-core 467 +variants {check universal} portdir www/midgard-core description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-core depends_lib {port:expat port:gettext port:glib2 port:dbus port:dbus-glib port:libiconv port:libxml2 port:mysql5 port:openssl port:zlib} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 midgard-data 423 -variants universal portdir www/midgard-data description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-data depends_lib {port:midgard-core port:midgard-apache2 port:php5-midgard port:dialog port:ImageMagick} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.4 revision 0 +variants universal portdir www/midgard-data description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-data depends_lib {port:midgard-core port:midgard-apache2 port:php5-midgard port:dialog port:ImageMagick} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 midori 454 variants universal portdir www/midori description {Midori is a lightweight web browser} homepage http://www.twotoasts.de/index.php?/pages/midori_summary.html epoch 0 platforms darwin name midori depends_lib {port:gtk2 path:include/gio/gio.h:glib2 port:webkit-gtk lib:libxml2:libxml2 port:libtool port:intltool} maintainers {afb at macports.org openmaintainer} long_description {{Midori is a lightweight web browser}} categories www version 0.1.2 revision 0 mnogosearch 702 @@ -10623,7 +10623,7 @@ pathalizer 582 variants universal portdir www/pathalizer description {visualize the paths most users take when browsing a website} homepage http://pathalizer.sourceforge.net/ epoch 0 depends_run {bin:gs:ghostscript bin:dot:graphviz port:netpbm} platforms darwin name pathalizer long_description {Pathalizer is a tool to visualize the paths most users take when browsing a website. This information can then be used to decide how to improve the navigation of the site, and which parts are most worth improving and keeping up to date.} maintainers nomaintainer categories www version 0.7 revision 0 php5-midgard 365 -variants universal portdir www/php5-midgard description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name php5-midgard depends_lib {port:midgard-core port:php5} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.4 revision 0 +variants universal portdir www/php5-midgard description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name php5-midgard depends_lib {port:midgard-core port:php5} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 php5-rrdtool 350 variants universal portdir www/php5-rrdtool description {PHP 5 glue for rrdtool} homepage http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.txt epoch 0 platforms darwin name php5-rrdtool depends_lib {port:rrdtool port:php5 port:re2c} long_description {{PHP 5 glue for rrdtool}} maintainers markd categories {www net devel} version 1.0 revision 1 phpbb 748 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From markd at macports.org Fri May 1 08:44:00 2009 From: markd at macports.org (markd at macports.org) Date: Fri, 1 May 2009 08:44:00 -0700 (PDT) Subject: [50482] trunk/dports/net/flow-tools/Portfile Message-ID: <20090501154401.242D416D9599@beta.macosforge.org> Revision: 50482 http://trac.macports.org/changeset/50482 Author: markd at macports.org Date: 2009-05-01 08:43:59 -0700 (Fri, 01 May 2009) Log Message: ----------- Close #19499. Drop maintainership. Modified Paths: -------------- trunk/dports/net/flow-tools/Portfile Modified: trunk/dports/net/flow-tools/Portfile =================================================================== --- trunk/dports/net/flow-tools/Portfile 2009-05-01 14:53:07 UTC (rev 50481) +++ trunk/dports/net/flow-tools/Portfile 2009-05-01 15:43:59 UTC (rev 50482) @@ -5,7 +5,7 @@ name flow-tools version 0.68 categories net -maintainers markd at macports.org +maintainers nomaintainer platforms darwin description Suite of tools and library to work with netflow data @@ -50,7 +50,8 @@ } configure.args --with-openssl=${prefix} \ - --localstatedir=${prefix} + --localstatedir=${prefix} \ + --mandir=${prefix}/share/man post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 08:53:03 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 08:53:03 -0700 (PDT) Subject: [50483] trunk/dports Message-ID: <20090501155304.D300516D9706@beta.macosforge.org> Revision: 50483 http://trac.macports.org/changeset/50483 Author: portindex at macports.org Date: 2009-05-01 08:53:03 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 15:43:59 UTC (rev 50482) +++ trunk/dports/PortIndex 2009-05-01 15:53:03 UTC (rev 50483) @@ -5122,8 +5122,8 @@ variants universal depends_build bin:ginstall:coreutils portdir net/ffp description {generates fuzzy fingerprints to facilitate MiM attacks} homepage http://thc.org/thc-ffp/ epoch 0 platforms darwin name ffp depends_lib port:openssl long_description {ffp is a tool that generates fuzzy fingerprints. Fuzzy fingerprinting is a technique that extends common man-in-the-middle attacks by generating fingerprints that closely resemble the target's public key fingerprint.} maintainers eridius at macports.org categories {net security} version 0.0.8 revision 1 finch 686 variants universal portdir net/finch description {Multi-protocol Instant Messaging client} homepage http://www.pidgin.im/ epoch 0 platforms darwin name finch depends_lib {port:audiofile port:libao port:libxml2 port:nspr port:nss port:p5-xml-parser port:glib2} long_description {Pidgin is an Open Source clone of America OnLine's Instant Messenger client that uses GTK+ version 2. It features multiple groups, group chat, user information fetching and registration, time stamping, and more. It also supports other IM protocols, including Yahoo!, MSN, ICQ, Jabber, Napster, IRC, and Zephyr via included plugins.} maintainers {simon openmaintainer} categories net version 2.5.5 revision 1 -flow-tools 390 -variants {mysql5 universal} portdir net/flow-tools description {Suite of tools and library to work with netflow data} homepage http://www.splintered.net/sw/flow-tools/ epoch 0 platforms darwin name flow-tools depends_lib {port:openssl port:zlib} long_description {{Suite of tools and library to work with netflow data}} maintainers markd at macports.org categories net version 0.68 revision 0 +flow-tools 384 +variants {mysql5 universal} portdir net/flow-tools description {Suite of tools and library to work with netflow data} homepage http://www.splintered.net/sw/flow-tools/ epoch 0 platforms darwin name flow-tools depends_lib {port:openssl port:zlib} long_description {{Suite of tools and library to work with netflow data}} maintainers nomaintainer categories net version 0.68 revision 0 flowd 320 variants universal portdir net/flowd description {flowd is a small, fast and secure NetFlow collector.} homepage http://www.mindrot.org/flowd.html epoch 0 platforms darwin name flowd maintainers nomaintainer long_description {{flowd is a small, fast and secure NetFlow collector.}} categories net version 0.9 revision 0 fping 743 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Fri May 1 09:39:29 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Fri, 1 May 2009 09:39:29 -0700 (PDT) Subject: [50484] trunk/dports/x11/mesa/Portfile Message-ID: <20090501163930.2A76716D9BEA@beta.macosforge.org> Revision: 50484 http://trac.macports.org/changeset/50484 Author: mcalhoun at macports.org Date: 2009-05-01 09:39:29 -0700 (Fri, 01 May 2009) Log Message: ----------- mesa: Ensure correct compilers are used. Modified Paths: -------------- trunk/dports/x11/mesa/Portfile Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2009-05-01 15:53:03 UTC (rev 50483) +++ trunk/dports/x11/mesa/Portfile 2009-05-01 16:39:29 UTC (rev 50484) @@ -67,6 +67,11 @@ build.args-append INSTALL_DIR=${prefix} destroot.args-append INSTALL_DIR=${prefix} +# Ensure correct compilers are used in Makefiles. +build.args-append \ + CC=${configure.cc} \ + CXX=${configure.cxx} + variant universal { if {![info exists universal_archs]} { set universal_archs {i386 ppc} @@ -86,6 +91,10 @@ post-patch { reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin reinplace "s:osmesa::g" ${worksrcpath}/configs/darwin + + # Ensure correct compilers are used in mklib. + reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":" ${worksrcpath}/bin/mklib + reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":" ${worksrcpath}/bin/mklib } post-extract { -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Fri May 1 09:56:20 2009 From: toby at macports.org (toby at macports.org) Date: Fri, 1 May 2009 09:56:20 -0700 (PDT) Subject: [50485] trunk/dports/devel/check/Portfile Message-ID: <20090501165620.A0EA616D9E4B@beta.macosforge.org> Revision: 50485 http://trac.macports.org/changeset/50485 Author: toby at macports.org Date: 2009-05-01 09:56:20 -0700 (Fri, 01 May 2009) Log Message: ----------- check 0.9.6 Modified Paths: -------------- trunk/dports/devel/check/Portfile Modified: trunk/dports/devel/check/Portfile =================================================================== --- trunk/dports/devel/check/Portfile 2009-05-01 16:39:29 UTC (rev 50484) +++ trunk/dports/devel/check/Portfile 2009-05-01 16:56:20 UTC (rev 50485) @@ -2,8 +2,7 @@ PortSystem 1.0 name check -version 0.9.5 -revision 1 +version 0.9.6 categories devel maintainers landonf at macports.org homepage http://check.sf.net/ @@ -17,10 +16,11 @@ segmentation faults or other signals. The \ output from unit tests can be used within \ source code editors and IDEs. +platforms darwin master_sites sourceforge:check -checksums md5 30143c7974b547a12a7da47809a90951 +checksums md5 6f80cd4a24d14ad706117a7714222420 configure.args --infodir=${prefix}/share/info \ --mandir=${prefix}/share/info -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 09:58:22 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 09:58:22 -0700 (PDT) Subject: [50486] trunk/dports/gnome/gnome-session/Portfile Message-ID: <20090501165822.D74FB16D9F83@beta.macosforge.org> Revision: 50486 http://trac.macports.org/changeset/50486 Author: devans at macports.org Date: 2009-05-01 09:58:22 -0700 (Fri, 01 May 2009) Log Message: ----------- gnome-session: take maintainership open maintainer. Modified Paths: -------------- trunk/dports/gnome/gnome-session/Portfile Modified: trunk/dports/gnome/gnome-session/Portfile =================================================================== --- trunk/dports/gnome/gnome-session/Portfile 2009-05-01 16:56:20 UTC (rev 50485) +++ trunk/dports/gnome/gnome-session/Portfile 2009-05-01 16:58:22 UTC (rev 50486) @@ -9,7 +9,7 @@ long_description \ Session component for the GNOME 2.0 desktop. This package contains the \ commands needed to start GNOME 2.0. -maintainers nomaintainer +maintainers devans openmaintainer categories gnome platforms darwin homepage http://www.gnome.org/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Fri May 1 10:12:45 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Fri, 1 May 2009 10:12:45 -0700 (PDT) Subject: [50487] trunk/dports/x11/xorg-cf-files/Portfile Message-ID: <20090501171246.1A4CF16DA8BA@beta.macosforge.org> Revision: 50487 http://trac.macports.org/changeset/50487 Author: mcalhoun at macports.org Date: 2009-05-01 10:12:45 -0700 (Fri, 01 May 2009) Log Message: ----------- xorg-cf-files: By default, X11 is installed into prefix. Modified Paths: -------------- trunk/dports/x11/xorg-cf-files/Portfile Modified: trunk/dports/x11/xorg-cf-files/Portfile =================================================================== --- trunk/dports/x11/xorg-cf-files/Portfile 2009-05-01 16:58:22 UTC (rev 50486) +++ trunk/dports/x11/xorg-cf-files/Portfile 2009-05-01 17:12:45 UTC (rev 50487) @@ -7,7 +7,7 @@ version 1.0.2 categories x11 devel platforms darwin -maintainers mcalhoun +maintainers mcalhoun openmaintainer description Build files for discontinued imake build system. long_description ${description} @@ -28,9 +28,6 @@ rmd160 dc42aa06d7fb5bc073d51958763bf1bfcfd22926 post-configure { - #ensure that X11 libraries and includes are found - reinplace s|${prefix}|${x11prefix}|g ${worksrcpath}/site.def - #ensure that configuration files are found reinplace "s|#define ConfigDir \$(LIBDIR)/config|#define ConfigDir ${prefix}/lib/X11/config|g" ${worksrcpath}/X11.tmpl -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 10:27:27 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 10:27:27 -0700 (PDT) Subject: [50488] trunk/dports/gnome/gnome-session Message-ID: <20090501172728.7764116DBDD8@beta.macosforge.org> Revision: 50488 http://trac.macports.org/changeset/50488 Author: devans at macports.org Date: 2009-05-01 10:27:27 -0700 (Fri, 01 May 2009) Log Message: ----------- gnome-session: * update to version 2.26.1 * update dependencies * add patch to build on pre-Leopard systems * ensure appropriate X11 configuration paths * disable generation of DocBook documentation by default * add docs variant to enable generation of DocBook documentation if desired * disable gconf schema installation during destroot * install/update gconf schemas after activation Modified Paths: -------------- trunk/dports/gnome/gnome-session/Portfile Added Paths: ----------- trunk/dports/gnome/gnome-session/files/ trunk/dports/gnome/gnome-session/files/patch-pre-leopard-gnome-session-gdm-signal-handler.c.diff Modified: trunk/dports/gnome/gnome-session/Portfile =================================================================== --- trunk/dports/gnome/gnome-session/Portfile 2009-05-01 17:12:45 UTC (rev 50487) +++ trunk/dports/gnome/gnome-session/Portfile 2009-05-01 17:27:27 UTC (rev 50488) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,5 +4,5 @@ name gnome-session -version 2.24.2 +version 2.26.1 set branch [join [lrange [split ${version} .] 0 1] .] description Session component for the GNOME 2 desktop @@ -15,24 +16,46 @@ homepage http://www.gnome.org/ master_sites gnome:sources/${name}/${branch}/ -checksums md5 13e882a8c73bebb5403c207da0455156 \ - sha1 dff795c6fd372910e9fc613dfc4b9b2326be1f97 \ - rmd160 19532398cae3f9e54029824676df749ad2c4738f +checksums md5 aa280939a3e07209081095e8e10fe619 \ + sha1 3c8dc68f197c6b5a7d30e3ce04e65954bfe12070 \ + rmd160 d4eb6a0fc639a257645b2e4138055d9e1bd9f9a6 -depends_lib port:gnome-desktop \ - port:gnome-control-center \ - port:dbus \ - port:dbus-glib \ - port:libwnck \ - port:gnome-keyring +if {${os.platform} == "darwin" && ${os.major} < 9} { + patchfiles patch-pre-leopard-gnome-session-gdm-signal-handler.c.diff +} +depends_build port:pkgconfig \ + port:gettext + +depends_lib port:gconf \ + port:libglade2 \ + port:startup-notification \ + port:xorg-xtrans \ + port:xorg-libXtst + use_bzip2 yes +configure.args --disable-polkit \ + --disable-docbook-docs \ + --disable-schemas-install + +if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} { + configure.args-append --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib +} + +variant docs description {build docbook documentation} { + configure.args-delete --disable-docbook-docs + configure.args-append --enable-docbook-docs + depends_build-append port:xmlto +} + post-activate { system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" + system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \ + gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas" } livecheck.check regex livecheck.url http://ftp.gnome.org/pub/GNOME/sources/${name}/${branch}/ livecheck.regex {LATEST-IS-([0-9\.]+)} - Added: trunk/dports/gnome/gnome-session/files/patch-pre-leopard-gnome-session-gdm-signal-handler.c.diff =================================================================== --- trunk/dports/gnome/gnome-session/files/patch-pre-leopard-gnome-session-gdm-signal-handler.c.diff (rev 0) +++ trunk/dports/gnome/gnome-session/files/patch-pre-leopard-gnome-session-gdm-signal-handler.c.diff 2009-05-01 17:27:27 UTC (rev 50488) @@ -0,0 +1,34 @@ +--- gnome-session/gdm-signal-handler.c.orig 2009-05-01 09:12:16.000000000 -0700 ++++ gnome-session/gdm-signal-handler.c 2009-05-01 09:31:42.000000000 -0700 +@@ -27,7 +27,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -160,22 +159,7 @@ + static void + fallback_get_backtrace (void) + { +- void * frames[64]; +- size_t size; +- char ** strings; +- size_t i; +- +- size = backtrace (frames, G_N_ELEMENTS (frames)); +- if ((strings = backtrace_symbols (frames, size))) { +- syslog (LOG_CRIT, "******************* START ********************************"); +- for (i = 0; i < size; i++) { +- syslog (LOG_CRIT, "Frame %zd: %s", i, strings[i]); +- } +- free (strings); +- syslog (LOG_CRIT, "******************* END **********************************"); +- } else { +- g_warning ("GDM crashed, but symbols couldn't be retrieved."); +- } ++ g_warning ("GDM crashed, but symbols couldn't be retrieved."); + } + + -------------- next part -------------- An HTML attachment was scrubbed... URL: From dweber at macports.org Fri May 1 10:37:13 2009 From: dweber at macports.org (dweber at macports.org) Date: Fri, 1 May 2009 10:37:13 -0700 (PDT) Subject: [50489] trunk/dports/graphics/vtk44/Portfile Message-ID: <20090501173713.A636116DC616@beta.macosforge.org> Revision: 50489 http://trac.macports.org/changeset/50489 Author: dweber at macports.org Date: 2009-05-01 10:37:13 -0700 (Fri, 01 May 2009) Log Message: ----------- Note in long_description about no support for lang wrappers; Added x11 dep on xorg-proto; minor code layout changes. Modified Paths: -------------- trunk/dports/graphics/vtk44/Portfile Modified: trunk/dports/graphics/vtk44/Portfile =================================================================== --- trunk/dports/graphics/vtk44/Portfile 2009-05-01 17:27:27 UTC (rev 50488) +++ trunk/dports/graphics/vtk44/Portfile 2009-05-01 17:37:13 UTC (rev 50489) @@ -12,11 +12,12 @@ categories graphics maintainers css description 3D visualization toolkit -long_description an open source, freely available software system \ +long_description An open source, freely available software system \ for 3D computer graphics, image processing, and visualization \ used by thousands of researchers and developers around the world. \ VTK consists of a C++ class library, and several interpreted \ - interface layers including Tcl/Tk, Java, and Python. + interface layers including Tcl/Tk, Java, and Python. (This port \ + does not currently provide wrappers for these languages.) homepage http://www.vtk.org/ master_sites http://www.vtk.org/files/release/${branch} @@ -36,7 +37,9 @@ system "cd ${workpath}; mv VTK ${distname}" } -configure { system "cd ${worksrcpath} && cmake ${configure.args} ${worksrcpath}" } +configure { + system "cd ${worksrcpath} && cmake ${configure.args} ${worksrcpath};" +} configure.args \ -DBUILD_SHARED_LIBS:BOOL=ON \ @@ -74,9 +77,10 @@ } } -variant x11 description {Build VTK with the MacPorts X11 libraries} { +variant x11 description {build VTK with MacPorts X11} { depends_build-append \ port:xorg-libs \ + port:xorg-proto \ port:mesa configure.args-delete \ -DVTK_USE_COCOA:BOOL=ON @@ -88,5 +92,3 @@ -DOPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib } -#variant system_x11 description {Build VTK with the Apple X11 libraries} { -#} -------------- next part -------------- An HTML attachment was scrubbed... URL: From jmr at macports.org Fri May 1 10:41:02 2009 From: jmr at macports.org (jmr at macports.org) Date: Fri, 1 May 2009 10:41:02 -0700 (PDT) Subject: [50490] trunk/base/src Message-ID: <20090501174102.ECD3D16DCA3D@beta.macosforge.org> Revision: 50490 http://trac.macports.org/changeset/50490 Author: jmr at macports.org Date: 2009-05-01 10:41:02 -0700 (Fri, 01 May 2009) Log Message: ----------- Rewrite logic for skipping install and activate targets when the port is already installed or active. Fixes #16260. Also removes the need to use -f when explicitly running a target prior to install for an installed port. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2009-05-01 17:37:13 UTC (rev 50489) +++ trunk/base/src/macports1.0/macports.tcl 2009-05-01 17:41:02 UTC (rev 50490) @@ -2367,6 +2367,7 @@ ui_debug "Not following dependencies" } + set epoch_override 0 # check installed version against version in ports if { ( [rpm-vercomp $version_installed $version_in_tree] > 0 || ([rpm-vercomp $version_installed $version_in_tree] == 0 @@ -2398,23 +2399,28 @@ return 0 } else { + set epoch_override 1 ui_debug "epoch override ... upgrading!" } } - # install version_in_tree + # build or unarchive version_in_tree if {0 == [string compare "yes" ${macports::portarchivemode}]} { set upgrade_action "archive" } else { set upgrade_action "destroot" } - if {[catch {set result [mportexec $workername $upgrade_action]} result] || $result != 0} { - global errorInfo - ui_debug "$errorInfo" - ui_error "Unable to upgrade port: $result" - return 1 + # avoid building again unnecessarily + if {[info exists options(ports_force)] || $epoch_override == 1 + || ![registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { + if {[catch {set result [mportexec $workername $upgrade_action]} result] || $result != 0} { + global errorInfo + ui_debug "$errorInfo" + ui_error "Unable to upgrade port: $result" + return 1 + } } # always uninstall old port in direct mode Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2009-05-01 17:37:13 UTC (rev 50489) +++ trunk/base/src/port1.0/portutil.tcl 2009-05-01 17:41:02 UTC (rev 50490) @@ -1188,7 +1188,7 @@ set ports_dry_last_skipped "" proc target_run {ditem} { - global target_state_fd portpath portname portversion portrevision portvariants ports_force variations workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped errorisprivileges + global target_state_fd portname workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped errorisprivileges set result 0 set skipped 0 set procedure [ditem_key $ditem procedure] @@ -1206,50 +1206,11 @@ if {$result == 0} { # Skip the step if required and explain why through ui_debug. - # 1st case: the step was already done (as mentioned in the state file) + # check if the step was already done (as mentioned in the state file) if {[ditem_key $ditem state] != "no" && [check_statefile target $name $target_state_fd]} { ui_debug "Skipping completed $name ($portname)" set skipped 1 - # 2nd case: the step is not to always be performed - # and this exact port/version/revision/variants is already installed - # and user didn't mention -f - # and portfile didn't change since installation. - } elseif {[ditem_key $ditem runtype] != "always" - && [registry_exists $portname $portversion $portrevision $portvariants] - && !([info exists ports_force] && $ports_force == "yes")} { - - # Did the Portfile change since installation? - set regref [registry_open $portname $portversion $portrevision $portvariants] - - set installdate [registry_prop_retr $regref date] - if { $installdate != 0 - && $installdate < [file mtime ${portpath}/Portfile]} { - ui_debug "Portfile changed since installation" - } else { - # Say we're skipping. - set skipped 1 - - ui_debug "Skipping $name ($portname) since this port is already installed" - } - - # Something to close the registry entry may be called here, if it existed. - # 3rd case: the same port/version/revision/Variants is already active - # and user didn't mention -f - } elseif {$name == "org.macports.activate" - && [registry_exists $portname $portversion $portrevision $portvariants] - && !([info exists ports_force] && $ports_force == "yes")} { - - # Is port active? - set regref [registry_open $portname $portversion $portrevision $portvariants] - - if { [registry_prop_retr $regref active] != 0 } { - # Say we're skipping. - set skipped 1 - - ui_msg "Skipping $name ($portname $portvariants) since this port is already active" - } - } # Of course, if this is a dry run, don't do the task: @@ -1456,10 +1417,33 @@ proc eval_targets {target} { - global targets target_state_fd portname errorisprivileges + global targets target_state_fd portname portversion portrevision portvariants ports_dryrun user_options errorisprivileges set dlist $targets set errorisprivileges "no" + # the statefile will likely be autocleaned away after install, + # so special-case ignore already-completed install and activate + if {[registry_exists $portname $portversion $portrevision $portvariants]} { + if {$target == "install"} { + ui_debug "Skipping $target ($portname) since this port is already installed" + return 0 + } elseif {$target == "activate"} { + set regref [registry_open $portname $portversion $portrevision $portvariants] + if {[registry_prop_retr $regref active] != 0} { + # Something to close the registry entry may be called here, if it existed. + ui_debug "Skipping $target ($portname @${portversion}_${portrevision}${portvariants}) since this port is already active" + } else { + # do the activate here since target_run doesn't know how to selectively ignore the preceding steps + if {[info exists ports_dryrun] && $ports_dryrun == "yes"} { + ui_msg "For $portname: skipping $target (dry run)" + } else { + registry_activate $portname ${portversion}_${portrevision}${portvariants} [array get user_options] + } + } + return 0 + } + } + # Select the subset of targets under $target if {$target != ""} { set matches [dlist_search $dlist provides $target] -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 10:53:22 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 10:53:22 -0700 (PDT) Subject: [50491] trunk/dports Message-ID: <20090501175323.AE80A16DD559@beta.macosforge.org> Revision: 50491 http://trac.macports.org/changeset/50491 Author: portindex at macports.org Date: 2009-05-01 10:53:22 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 17:41:02 UTC (rev 50490) +++ trunk/dports/PortIndex 2009-05-01 17:53:22 UTC (rev 50491) @@ -998,8 +998,8 @@ variants universal portdir devel/cflow description {A program for generating call graphs from C code.} homepage http://www.gnu.org/software/cflow/ epoch 0 name cflow depends_lib {port:gettext port:libiconv} maintainers gnn at freebsd.org long_description {The cflow program is a tool which generates a call graph from C source files. It is most often used with a program like dot (from the graphviz package) in order to present visual graphs of the paths along which a piece of software may run.} categories devel version 1.0 revision 0 cgdb 467 variants universal portdir devel/cgdb description {A curses-based interface to the GNU Debugger (GDB).} homepage http://cgdb.sourceforge.net epoch 0 platforms darwin name cgdb depends_lib {port:ncurses port:readline} long_description {CGDB is a curses-based interface to the GNU Debugger (GDB). The goal of CGDB is to be lightweight and responsive, not encumbered with unnecessary features.} maintainers jfrederich at gmail.com categories devel version 0.6.4 revision 0 -check 586 -variants universal portdir devel/check description {C unit testing framework} homepage http://check.sf.net/ epoch 0 name check maintainers landonf at macports.org long_description {Check is a unit test framework for C. It features a simple interface for defining unit tests, putting little in the way of the developer. Tests are run in a separate address space, so Check can catch both assertion failures and code errors that cause segmentation faults or other signals. The output from unit tests can be used within source code editors and IDEs.} categories devel version 0.9.5 revision 1 +check 603 +variants universal portdir devel/check description {C unit testing framework} homepage http://check.sf.net/ epoch 0 platforms darwin name check maintainers landonf at macports.org long_description {Check is a unit test framework for C. It features a simple interface for defining unit tests, putting little in the way of the developer. Tests are run in a separate address space, so Check can catch both assertion failures and code errors that cause segmentation faults or other signals. The output from unit tests can be used within source code editors and IDEs.} categories devel version 0.9.6 revision 0 chipmunk 420 variants {universal debug demos ruby} depends_build port:cmake portdir devel/chipmunk description {Fast and lightweight 2D rigid body physics library in C} homepage http://wiki.slembcke.net/main/published/Chipmunk epoch 0 platforms darwin name chipmunk long_description {{Fast and lightweight 2D rigid body physics library in C}} maintainers {fs.ei.tum.de:jonas openmaintainer} categories devel version 4.1.0 revision 0 cl-ppcre 430 @@ -2580,8 +2580,8 @@ variants {darwin_9 universal} portdir gnome/gnome-python-desktop description {Python modules for some GNOME Desktop libraries.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name gnome-python-desktop depends_lib {port:py25-gnome port:gtksourceview2 port:libgtop port:gnome-media port:totem-pl-parser} long_description {{Python modules for some GNOME Desktop libraries.}} maintainers nomaintainer categories {gnome python} version 2.24.1 revision 0 gnome-python-extras 460 variants {darwin_9 universal} portdir gnome/gnome-python-extras description {Extra Python modules for some GNOME Desktop libraries.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name gnome-python-extras depends_lib {port:py25-gnome port:gdl port:libgda3 port:libgtkhtml} long_description {{Extra Python modules for some GNOME Desktop libraries.}} maintainers {landonf at macports.org openmaintainer} categories {gnome python} version 2.19.1 revision 1 -gnome-session 488 -variants universal portdir gnome/gnome-session description {Session component for the GNOME 2 desktop} homepage http://www.gnome.org/ epoch 0 platforms darwin name gnome-session depends_lib {port:gnome-desktop port:gnome-control-center port:dbus port:dbus-glib port:libwnck port:gnome-keyring} maintainers nomaintainer long_description {Session component for the GNOME 2.0 desktop. This package contains the commands needed to start GNOME 2.0.} categories gnome version 2.24.2 revision 0 +gnome-session 535 +variants {docs universal} depends_build {port:pkgconfig port:gettext} portdir gnome/gnome-session description {Session component for the GNOME 2 desktop} homepage http://www.gnome.org/ epoch 0 platforms darwin name gnome-session depends_lib {port:gconf port:libglade2 port:startup-notification port:xorg-xtrans port:xorg-libXtst} maintainers {devans openmaintainer} long_description {Session component for the GNOME 2.0 desktop. This package contains the commands needed to start GNOME 2.0.} categories gnome version 2.26.1 revision 0 gnome-settings-daemon 409 variants universal depends_build port:gnome-doc-utils portdir gnome/gnome-settings-daemon description {Gnome 2 settings daemon.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gnome-settings-daemon depends_lib {port:gnome-desktop port:libgnomekbd port:gst-plugins-good} maintainers {devans openmaintainer} long_description {{Gnome 2 settings daemon.}} categories gnome version 2.26.1 revision 0 gnome-sharp2 576 @@ -3234,8 +3234,8 @@ variants {darwin x11 universal} depends_build bin:cmake:cmake portdir graphics/vtk description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name VTK long_description {an open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python.} maintainers css categories graphics version 4.4.2 revision 0 vtk-devel 798 variants {darwin_9 data doc examples shared testing carbon cocoa x11 java python25 python26 tcl tcl_apple mysql pgsql odbc mpi boost universal} depends_build port:cmake portdir graphics/vtk-devel description {3D visualization toolkit (www.vtk.org)} homepage http://www.vtk.org/ epoch 0 platforms darwin name vtk-devel depends_lib port:readline long_description {An open source, freely available software system for computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python. default_variants: +examples +testing +tclSys} maintainers {dweber openmaintainer} categories {graphics math science devel} version 5.4.0 revision 0 -vtk44 570 -variants {darwin x11 universal} depends_build bin:cmake:cmake portdir graphics/vtk44 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk44 long_description {an open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python.} maintainers css categories graphics version 4.4.2 revision 0 +vtk44 639 +variants {darwin x11 universal} depends_build bin:cmake:cmake portdir graphics/vtk44 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk44 long_description {An open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python. (This port does not currently provide wrappers for these languages.)} maintainers css categories graphics version 4.4.2 revision 0 vtk5 661 variants {darwin_8 darwin_9 x11 tcltk carbon python universal} depends_build {bin:cmake:cmake port:readline port:xorg-libs port:python25} portdir graphics/vtk5 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk5 long_description {an open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python.} maintainers nomaintainer categories {graphics devel} version 5.2.1 revision 1 whirlgif 345 @@ -11240,8 +11240,8 @@ portdir x11/xorg-apps description {X.org apps meta-package} homepage http://www.x.org epoch 0 depends_run {port:appres port:bdftopcf port:bitmap port:editres port:fonttosfnt port:fslsfonts port:fstobdf port:iceauth port:ico port:listres port:luit port:mkfontdir port:mkfontscale port:oclock port:rgb port:sessreg port:setxkbmap port:showfont port:twm port:viewres port:x11perf port:xauth port:xcalc port:xclipboard port:xclock port:xconsole port:xcursorgen port:xditview port:xdm port:xdpyinfo port:xedit port:xev port:xeyes port:xfd port:xfontsel port:xfs port:xfsinfo port:xgc port:xhost port:xinit port:xinput port:xkbcomp port:xkbevd port:xkbprint port:xkbutils port:xkill port:xload port:xlogo port:xlsatoms port:xlsclients port:xlsfonts port:xmag port:xman port:xmessage port:xmh port:xmodmap port:xmore port:xorg-scripts port:xpr port:xprop port:xrandr port:xrdb port:xrefresh port:xset port:xsetmode port:xsetpointer port:xsetroot port:xsm port:xstdcmap port:xterm port:xtrap port: xvinfo port:xwd port:xwininfo port:xwud} platforms {darwin macosx} name xorg-apps maintainers {jeremyhu blb openmaintainer} long_description {This package builds all of the x.org app packages.} version 20090102 categories x11 revision 0 xorg-bigreqsproto 289 portdir x11/xorg-bigreqsproto description {X.org bigreqsproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-bigreqsproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for BigReqs extension to X11} version 1.0.2 categories {x11 devel} revision 0 -xorg-cf-files 309 -portdir x11/xorg-cf-files description {Build files for discontinued imake build system.} homepage http://xorg.freedesktop.org epoch 0 platforms darwin name xorg-cf-files maintainers mcalhoun long_description {{Build files for discontinued imake build system.}} version 1.0.2 categories {x11 devel} revision 0 +xorg-cf-files 326 +portdir x11/xorg-cf-files description {Build files for discontinued imake build system.} homepage http://xorg.freedesktop.org epoch 0 platforms darwin name xorg-cf-files maintainers {mcalhoun openmaintainer} long_description {{Build files for discontinued imake build system.}} version 1.0.2 categories {x11 devel} revision 0 xorg-compositeproto 295 portdir x11/xorg-compositeproto description {X.org compositeproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-compositeproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for Composite extension to X11} version 0.4 categories {x11 devel} revision 0 xorg-damageproto 289 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From arthurk at macports.org Fri May 1 11:10:38 2009 From: arthurk at macports.org (arthurk at macports.org) Date: Fri, 1 May 2009 11:10:38 -0700 (PDT) Subject: [50492] trunk/dports/python/py25-virtualenv/Portfile Message-ID: <20090501181039.0CF6F16DE006@beta.macosforge.org> Revision: 50492 http://trac.macports.org/changeset/50492 Author: arthurk at macports.org Date: 2009-05-01 11:10:38 -0700 (Fri, 01 May 2009) Log Message: ----------- Updated py25-virtualenv to 1.3.3 Modified Paths: -------------- trunk/dports/python/py25-virtualenv/Portfile Modified: trunk/dports/python/py25-virtualenv/Portfile =================================================================== --- trunk/dports/python/py25-virtualenv/Portfile 2009-05-01 17:53:22 UTC (rev 50491) +++ trunk/dports/python/py25-virtualenv/Portfile 2009-05-01 18:10:38 UTC (rev 50492) @@ -5,10 +5,10 @@ PortGroup python25 1.0 name py25-virtualenv -version 1.3.2 -categories python +version 1.3.3 +categories-append devel platforms darwin -maintainers arthurkoziel.com:arthur +maintainers arthurk homepage http://pypi.python.org/pypi/virtualenv description Virtual Python Environment builder long_description virtualenv is a tool to create isolated Python \ @@ -16,9 +16,9 @@ master_sites http://pypi.python.org/packages/source/v/virtualenv/ distname virtualenv-${version} -checksums md5 a013d5a7d9aeddc16bee88604d6de636 \ - sha1 151e94beae9bb22025ae0752f40e5cc6c760aeeb \ - rmd160 848466ac8950bdab46756b8a675d5f9f9da9a5ac +checksums md5 28e2955aed4ffc4dc3df02dc632b5c42 \ + sha1 1907ab65de03b210ef350d7f54a3a2be7e488b39 \ + rmd160 cd247e05ec2514aacba818e3cd58e46acde67e54 depends_lib-append port:py25-setuptools @@ -26,6 +26,9 @@ xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} xinstall -m 644 -W ${worksrcpath}/docs index.txt license.txt \ ${destroot}${prefix}/share/doc/${name} + + move ${destroot}${prefix}/bin/virtualenv \ + ${destroot}${prefix}/bin/virtualenv-${python.branch} } livecheck.check regex -------------- next part -------------- An HTML attachment was scrubbed... URL: From arthurk at macports.org Fri May 1 11:16:30 2009 From: arthurk at macports.org (arthurk at macports.org) Date: Fri, 1 May 2009 11:16:30 -0700 (PDT) Subject: [50493] trunk/dports/python/py-virtualenv/Portfile Message-ID: <20090501181630.5A09416DE42C@beta.macosforge.org> Revision: 50493 http://trac.macports.org/changeset/50493 Author: arthurk at macports.org Date: 2009-05-01 11:16:29 -0700 (Fri, 01 May 2009) Log Message: ----------- Updated py-virtualenv to 1.3.3 Modified Paths: -------------- trunk/dports/python/py-virtualenv/Portfile Modified: trunk/dports/python/py-virtualenv/Portfile =================================================================== --- trunk/dports/python/py-virtualenv/Portfile 2009-05-01 18:10:38 UTC (rev 50492) +++ trunk/dports/python/py-virtualenv/Portfile 2009-05-01 18:16:29 UTC (rev 50493) @@ -5,10 +5,10 @@ PortGroup python24 1.0 name py-virtualenv -version 1.3.2 -categories python +version 1.3.3 +categories-append devel platforms darwin -maintainers arthurkoziel.com:arthur openmaintainer +maintainers arthurk openmaintainer homepage http://pypi.python.org/pypi/virtualenv description Virtual Python Environment builder long_description virtualenv is a tool to create isolated Python \ @@ -16,9 +16,9 @@ master_sites http://pypi.python.org/packages/source/v/virtualenv/ distname virtualenv-${version} -checksums md5 a013d5a7d9aeddc16bee88604d6de636 \ - sha1 151e94beae9bb22025ae0752f40e5cc6c760aeeb \ - rmd160 848466ac8950bdab46756b8a675d5f9f9da9a5ac +checksums md5 28e2955aed4ffc4dc3df02dc632b5c42 \ + sha1 1907ab65de03b210ef350d7f54a3a2be7e488b39 \ + rmd160 cd247e05ec2514aacba818e3cd58e46acde67e54 depends_lib-append port:py-setuptools @@ -27,7 +27,8 @@ xinstall -m 644 -W ${worksrcpath}/docs index.txt license.txt \ ${destroot}${prefix}/share/doc/${name} - move ${destroot}${prefix}/bin/virtualenv ${destroot}${prefix}/bin/virtualenv-2.4 + move ${destroot}${prefix}/bin/virtualenv \ + ${destroot}${prefix}/bin/virtualenv-${python.branch} } livecheck.check regex -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Fri May 1 11:46:34 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Fri, 1 May 2009 11:46:34 -0700 (PDT) Subject: [50494] trunk/dports/x11/mesa/Portfile Message-ID: <20090501184635.41F5316DF36F@beta.macosforge.org> Revision: 50494 http://trac.macports.org/changeset/50494 Author: mcalhoun at macports.org Date: 2009-05-01 11:46:34 -0700 (Fri, 01 May 2009) Log Message: ----------- mesa: Not all libraries were universal with hw_render variant. Fixes #19369. Modified Paths: -------------- trunk/dports/x11/mesa/Portfile Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2009-05-01 18:16:29 UTC (rev 50493) +++ trunk/dports/x11/mesa/Portfile 2009-05-01 18:46:34 UTC (rev 50494) @@ -73,11 +73,9 @@ CXX=${configure.cxx} variant universal { - if {![info exists universal_archs]} { - set universal_archs {i386 ppc} - } - build.args-append RC_ARCHS="${universal_archs}" build.args-append RC_CFLAGS="${configure.universal_cflags}" + eval configure.cflags-append ${configure.universal_cflags} + eval configure.ldflags-append ${configure.universal_ldflags} } if { ![file exists /usr/include/Xplugin.h] } { -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 11:53:01 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 11:53:01 -0700 (PDT) Subject: [50495] trunk/dports Message-ID: <20090501185302.12B5616DF70B@beta.macosforge.org> Revision: 50495 http://trac.macports.org/changeset/50495 Author: portindex at macports.org Date: 2009-05-01 11:53:00 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 18:46:34 UTC (rev 50494) +++ trunk/dports/PortIndex 2009-05-01 18:53:00 UTC (rev 50495) @@ -7860,8 +7860,8 @@ portdir python/py-urwid description {curses-based UI/widget library for Python} homepage http://excess.org/urwid/ epoch 0 platforms darwin depends_lib port:python24 name py-urwid maintainers nomaintainer long_description {Urwid is a curses-based UI/widget library for Python. It features fluid interface resizing, multiple text layout options, simple markup for attributes, powerful scrolling list boxes and flexible edit boxes.} categories python version 0.9.8 revision 0 py-utidylib 414 depends_build bin:unzip:unzip portdir python/py-utidylib description {Python interface to html tidy} homepage http://utidylib.berlios.de/ epoch 0 platforms darwin depends_lib {port:python24 lib:libtidy:tidy port:py-ctypes port:py-epydoc} name py-utidylib maintainers nomaintainer long_description {Python interface to html tidy, the html and xml cleanup tool from the w3c} version 0.2 categories python revision 1 -py-virtualenv 393 -portdir python/py-virtualenv description {Virtual Python Environment builder} homepage http://pypi.python.org/pypi/virtualenv epoch 0 platforms darwin depends_lib {port:python24 port:py-setuptools} name py-virtualenv maintainers {arthurkoziel.com:arthur openmaintainer} long_description {virtualenv is a tool to create isolated Python environments.} categories python version 1.3.2 revision 0 +py-virtualenv 385 +portdir python/py-virtualenv description {Virtual Python Environment builder} homepage http://pypi.python.org/pypi/virtualenv epoch 0 platforms darwin depends_lib {port:python24 port:py-setuptools} name py-virtualenv maintainers {arthurk openmaintainer} long_description {virtualenv is a tool to create isolated Python environments.} categories {python devel} version 1.3.3 revision 0 py-virtualenvwrapper 419 portdir python/py-virtualenvwrapper description {Enhancements to virtualenv.} homepage http://www.doughellmann.com/projects/virtualenvwrapper/ epoch 0 platforms darwin depends_lib {port:python24 port:py-setuptools port:py-virtualenv} name py-virtualenvwrapper maintainers {arthurkoziel.com:arthur openmaintainer} long_description {Extensions to Ian Bicking's virtualenv tool.} categories python version 1.12 revision 0 py-vobject 557 @@ -8396,8 +8396,8 @@ depends_build bin:unzip:unzip portdir python/py25-utidylib description {Python interface to html tidy} homepage http://utidylib.berlios.de/ epoch 0 platforms darwin depends_lib {port:python25 port:tidy port:py25-epydoc} name py25-utidylib maintainers {amln.net:dima openmaintainer} long_description {Python interface to html tidy, the html and xml cleanup tool from the w3c.} version 0.2 categories python revision 0 py25-uuid 731 portdir python/py25-uuid description {UUID objects (universally unique identifiers) according to RFC 4122.} homepage http://zesty.ca/python/uuid.html epoch 0 platforms darwin depends_lib {port:python25 port:py25-setuptools} name py25-uuid maintainers alakazam long_description {This module is automatically provided in python 2.5 and is only provided for ports that depend. Using the standard module should be adequate for all other uses. UUID objects (universally unique identifiers) according to RFC 4122. This module provides immutable UUID objects (class UUID) and the functions uuid1(), uuid3(), uuid4(), uuid5() for generating version 1, 3, 4, and 5 UUIDs as specified in RFC 4122.} categories python version 1.30 revision 0 -py25-virtualenv 382 -portdir python/py25-virtualenv description {Virtual Python Environment builder} homepage http://pypi.python.org/pypi/virtualenv epoch 0 platforms darwin depends_lib {port:python25 port:py25-setuptools} name py25-virtualenv maintainers arthurkoziel.com:arthur long_description {virtualenv is a tool to create isolated Python environments.} categories python version 1.3.2 revision 0 +py25-virtualenv 374 +portdir python/py25-virtualenv description {Virtual Python Environment builder} homepage http://pypi.python.org/pypi/virtualenv epoch 0 platforms darwin depends_lib {port:python25 port:py25-setuptools} name py25-virtualenv maintainers arthurk long_description {virtualenv is a tool to create isolated Python environments.} categories {python devel} version 1.3.3 revision 0 py25-virtualenvwrapper 427 portdir python/py25-virtualenvwrapper description {Enhancements to virtualenv.} homepage http://www.doughellmann.com/projects/virtualenvwrapper/ epoch 0 platforms darwin depends_lib {port:python25 port:py25-setuptools port:py25-virtualenv} name py25-virtualenvwrapper maintainers {arthurkoziel.com:arthur openmaintainer} long_description {Extensions to Ian Bicking's virtualenv tool.} categories python version 1.12 revision 0 py25-vobject 551 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Fri May 1 12:38:21 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Fri, 1 May 2009 12:38:21 -0700 (PDT) Subject: [50496] trunk/dports/x11/php5-gtk/Portfile Message-ID: <20090501193821.9CB5F16E0936@beta.macosforge.org> Revision: 50496 http://trac.macports.org/changeset/50496 Author: ryandesign at macports.org Date: 2009-05-01 12:38:21 -0700 (Fri, 01 May 2009) Log Message: ----------- php5-gtk: allow php5-devel to satisfy the php5 dependency, and remove glib2 dependency because gtk2 already depends on it in a way that allows glib2-devel to satisfy the glib2 dependency; closes #18837 (maintainer timeout) Modified Paths: -------------- trunk/dports/x11/php5-gtk/Portfile Modified: trunk/dports/x11/php5-gtk/Portfile =================================================================== --- trunk/dports/x11/php5-gtk/Portfile 2009-05-01 18:53:00 UTC (rev 50495) +++ trunk/dports/x11/php5-gtk/Portfile 2009-05-01 19:38:21 UTC (rev 50496) @@ -28,9 +28,8 @@ rmd160 2e305f45d95a2c1abbe8cd551c794823dfc3d919 depends_lib \ - port:glib2 \ port:gtk2 \ - port:php5 \ + path:bin/php:php5 \ port:libglade2 configure.args \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 12:53:12 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 12:53:12 -0700 (PDT) Subject: [50497] trunk/dports Message-ID: <20090501195313.C9CA816E0D51@beta.macosforge.org> Revision: 50497 http://trac.macports.org/changeset/50497 Author: portindex at macports.org Date: 2009-05-01 12:53:11 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5796 Ports successfully parsed: 5796 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 19:38:21 UTC (rev 50496) +++ trunk/dports/PortIndex 2009-05-01 19:53:11 UTC (rev 50497) @@ -11030,8 +11030,8 @@ variants universal portdir x11/pangomm description {C++ interface to Pango.} homepage http://www.gtkmm.org/ epoch 0 platforms darwin name pangomm depends_lib {path:lib/pkgconfig/pango.pc:pango path:lib/pkgconfig/cairomm-1.0.pc:cairomm port:glibmm port:libsigcxx2} maintainers {devans openmaintainer} long_description {pangomm is the official C++ interface for the Pango text layout library.} categories {x11 devel} version 2.24.0 revision 0 pcb 702 variants universal portdir x11/pcb description {Printed Circuit Board Layout Tool} homepage http://pcb.sourceforge.net epoch 0 depends_run bin:wish:tk platforms darwin name pcb depends_lib port:gtk2 long_description {PCB is an interactive printed circuit board editor for the X11 window system. PCB includes a rats nest feature, design rule checking, and can provide industry standard RS-274-X (Gerber), NC drill, and centroid data (X-Y data) output for use in the board fabrication and assembly process. PCB offers high end features such as an autorouter and trace optimizer which can tremendously reduce layout time.} maintainers adam at megacz.com categories {x11 graphics} version 20060321 revision 0 -php5-gtk 499 -variants {extra html libsexy sourceview spell universal} portdir x11/php5-gtk description {PHP-GTK: Gtk+ bindings for PHP 5.} homepage http://gtk.php.net/ epoch 0 platforms {darwin freebsd} name php5-gtk depends_lib {port:glib2 port:gtk2 port:php5 port:libglade2} long_description {PHP-GTK is a Gtk+ bindings for the PHP 5 scripting language, allowing you to build rich, cross-platform desktop applications using PHP.} maintainers anant at kix.in categories {x11 lang php www} version 2.0.1 revision 0 +php5-gtk 496 +variants {extra html libsexy sourceview spell universal} portdir x11/php5-gtk description {PHP-GTK: Gtk+ bindings for PHP 5.} homepage http://gtk.php.net/ epoch 0 platforms {darwin freebsd} name php5-gtk depends_lib {port:gtk2 path:bin/php:php5 port:libglade2} long_description {PHP-GTK is a Gtk+ bindings for the PHP 5 scripting language, allowing you to build rich, cross-platform desktop applications using PHP.} maintainers anant at kix.in categories {x11 lang php www} version 2.0.1 revision 0 pure-gtk 679 portdir x11/pure-gtk description {a collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure} homepage http://pure-lang.googlecode.com/ epoch 0 platforms darwin name pure-gtk depends_lib {path:lib/libpure.dylib:pure path:lib/pkgconfig/atk.pc:atk path:lib/pkgconfig/cairo.pc:cairo path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/gtk+-2.0.pc:gtk2 path:lib/pkgconfig/pango.pc:pango} maintainers ryandesign long_description {pure-gtk is {a collection of bindings to use the GTK+ GUI toolkit version 2.x with Pure.} The bindings include the gtk (+gdk), glib, atk, cairo and pango libraries, each in their own Pure module} version 0.2 categories x11 revision 0 qt3 442 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at macports.org Fri May 1 13:06:01 2009 From: noreply at macports.org (MacPorts) Date: Fri, 01 May 2009 20:06:01 -0000 Subject: [MacPorts] MacPortsDevelopers modified Message-ID: <20090501200601.A219C28088@relay13.apple.com> Changed page "MacPortsDevelopers" by enl at macports.org from 81.200.6.25* Page URL: Diff URL: Revision 145 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: MacPortsDevelopers ========================================================================= --- MacPortsDevelopers (version: 144) +++ MacPortsDevelopers (version: 145) @@ -56,6 +56,7 @@ ||[wiki:dweber dweber] || Darren L. Weber |||| ||[wiki:easieste easieste] || Mark Evenson |||| ||[wiki:ecronin ecronin] || Eric Cronin |||| +||[wiki:enl enl] || Dmitry Gorbik || Enlightened |||| ||[wiki:epimenov epimenov] || Eugene Pimenov || libc || ||[wiki:erickt erickt] || Erick Tryzelaar |||| ||[wiki:eridius eridius] || Kevin Ballard |||| -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on MacPortsDevelopers. If it was not you, please report to . From noreply at macports.org Fri May 1 13:08:40 2009 From: noreply at macports.org (MacPorts) Date: Fri, 01 May 2009 20:08:40 -0000 Subject: [MacPorts] enl added Message-ID: <20090501200840.1914A28053@relay10.apple.com> Added page "enl" by enl at macports.org from 81.200.6.25* Page URL: Content: -------8<------8<------8<------8<------8<------8<------8<------8<-------- == Gorbik Dmitry == '''email''':: enl (at) macports.org '''IRC nickname''':: Enlightened === Duties === I've been selected as a GSoC student, and I'll be working on Logging project. -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on enl. If it was not you, please report to . From noreply at macports.org Fri May 1 13:09:47 2009 From: noreply at macports.org (MacPorts) Date: Fri, 01 May 2009 20:09:47 -0000 Subject: [MacPorts] MacPortsDevelopers modified Message-ID: <20090501200947.9C68928051@relay10.apple.com> Changed page "MacPortsDevelopers" by enl at macports.org from 81.200.6.25* Page URL: Diff URL: Revision 146 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: MacPortsDevelopers ========================================================================= --- MacPortsDevelopers (version: 145) +++ MacPortsDevelopers (version: 146) @@ -56,7 +56,7 @@ ||[wiki:dweber dweber] || Darren L. Weber |||| ||[wiki:easieste easieste] || Mark Evenson |||| ||[wiki:ecronin ecronin] || Eric Cronin |||| -||[wiki:enl enl] || Dmitry Gorbik || Enlightened |||| +||[wiki:enl enl] || Dmitry Gorbik || Enlightened || ||[wiki:epimenov epimenov] || Eugene Pimenov || libc || ||[wiki:erickt erickt] || Erick Tryzelaar |||| ||[wiki:eridius eridius] || Kevin Ballard |||| -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on MacPortsDevelopers. If it was not you, please report to . From raimue at macports.org Fri May 1 13:19:49 2009 From: raimue at macports.org (raimue at macports.org) Date: Fri, 1 May 2009 13:19:49 -0700 (PDT) Subject: [50498] trunk/dports/python Message-ID: <20090501201949.9C69316E172C@beta.macosforge.org> Revision: 50498 http://trac.macports.org/changeset/50498 Author: raimue at macports.org Date: 2009-05-01 13:19:48 -0700 (Fri, 01 May 2009) Log Message: ----------- python/py26-mapnik: New port, closes #19114 Added Paths: ----------- trunk/dports/python/py26-mapnick/ trunk/dports/python/py26-mapnick/Portfile trunk/dports/python/py26-mapnick/files/ trunk/dports/python/py26-mapnick/files/patch-src-Sconscript.diff Added: trunk/dports/python/py26-mapnick/Portfile =================================================================== --- trunk/dports/python/py26-mapnick/Portfile (rev 0) +++ trunk/dports/python/py26-mapnick/Portfile 2009-05-01 20:19:48 UTC (rev 50498) @@ -0,0 +1,125 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name py26-mapnik +version 0.6.0 +categories python gis + +maintainers gmail.com:dbsgeo +homepage http://mapnik.org/ +platforms darwin + +master_sites http://download.berlios.de/mapnik/ \ + http://download2.berlios.de/mapnik/ + +distname mapnik-${version} +worksrcdir mapnik-${version} +checksums md5 981271ac1cd1432314a963809c245fe1 \ + sha1 4a092f27fe66b8a9f9800a3944a50c6f5b97473a \ + rmd160 aa1cbe18a9d0ce96b5c826ea3c8546e1fdf0cc86 +use_bzip2 yes + +universal_variant no + +patchfiles patch-src-Sconscript.diff + +description Open Source C++/Python mapping toolkit. +long_description \ + Mapnik is a Open Source tookit for developing mapping \ + applications. It is written in C++ and there are \ + Python bindings to facilitate fast-paced agile \ + development. It can comfortably be used for both \ + desktop and web development. \ + \ + Mapnik is about making beautiful maps. It uses the \ + AGG library and offers world class anti-aliasing \ + rendering with subpixel accuracy for geographic \ + data. It is written from scratch in modern C++ and \ + does not suffer from design decisions made a decade \ + ago. When it comes to handling common software tasks \ + such as memory management, filesystem access, \ + regular expressions, parsing and so on, Mapnik \ + does not re-invent the wheel, but utilises best of \ + breed industry standard libraries from boost.org. \ + +depends_lib port:boost \ + port:libpng \ + port:jpeg \ + port:tiff \ + port:icu \ + port:zlib \ + port:freetype \ + port:proj \ + port:libxml2 \ + port:python26 \ + +set python "${prefix}/bin/python2.6" + +configure.pkg_config ${prefix}/bin/pkg-config + +variant cairo description {Builds port with Cairo Support} { + configure.pkg_config_path ${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig:${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/pkgconfig + depends_lib-append port:cairo + depends_lib-append port:cairomm + depends_lib-append port:py26-cairo + configure.args-delete CAIRO=False + configure.args-append CAIRO=True +} + +variant postgis description {Builds port with PostGIS plugin} { + depends_lib-append port:postgresql83 + depends_lib-append port:postgresql83-server + depends_lib-append port:postgis + configure.args-append PG_CONFIG=${prefix}/lib/postgresql83/bin/pg_config +} + +variant gdal description {Builds port with GDAL/OGR plugin} { + depends_lib-append port:gdal + configure.args-append GDAL_CONFIG=${prefix}/bin/gdal-config +} + +variant sqlite description {Builds port with SQLite3 plugin} { + depends_lib-append port:sqlite3 + configure.args-append SQLITE_INCLUDES=${prefix}/include \ + SQLITE_LIBS=${prefix}/lib +} + +use_parallel_build yes + +configure.args PREFIX=${prefix} \ + JOBS=4 \ + CAIRO=False \ + INPUT_PLUGINS=all \ + PYTHON=${python} \ + FREETYPE_CONFIG=${prefix}/bin/freetype-config \ + XML2_CONFIG=${prefix}/bin/xml2-config \ + BOOST_INCLUDES=${prefix}/include \ + BOOST_LIBS=${prefix}/lib \ + SQLITE_INCLUDES=${prefix}/include \ + SQLITE_LIBS=${prefix}/lib \ + ICU_INCLUDES=${prefix}/include \ + ICU_LIBS=${prefix}/lib \ + PNG_INCLUDES=${prefix}/include \ + PNG_LIBS=${prefix}/lib \ + JPEG_INCLUDES=${prefix}/include \ + JPEG_LIBS=${prefix}/lib \ + TIFF_INCLUDES=${prefix}/include \ + TIFF_LIBS=${prefix}/lib \ + PROJ_INCLUDES=${prefix}/include \ + PROJ_LIBS=${prefix}/lib \ + FRAMEWORK_PYTHON=False \ + DESTDIR=${destroot} + +configure { + system "cd ${worksrcpath} && ${python} scons/scons.py ${configure.args} configure" +} + +build { + system "cd ${worksrcpath} && ${python} scons/scons.py" +} + +destroot { + system "cd ${worksrcpath} && ${python} scons/scons.py install" +} \ No newline at end of file Property changes on: trunk/dports/python/py26-mapnick/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native Added: trunk/dports/python/py26-mapnick/files/patch-src-Sconscript.diff =================================================================== --- trunk/dports/python/py26-mapnick/files/patch-src-Sconscript.diff (rev 0) +++ trunk/dports/python/py26-mapnick/files/patch-src-Sconscript.diff 2009-05-01 20:19:48 UTC (rev 50498) @@ -0,0 +1,21 @@ +Index: src/SConscript +=================================================================== +--- src/SConscript (revision 1105) ++++ src/SConscript (working copy) +@@ -31,13 +31,15 @@ + + install_prefix = env['DESTDIR'] + '/' + prefix + ++libdir = os.path.normpath(prefix + '/' + env['LIBDIR_SCHEMA']) ++ + libraries = env['LIBS'] + + if env['INTERNAL_LIBAGG']: + libraries.insert(0, 'agg') + + if env['PLATFORM'] == 'Darwin': +- linkflags = '-Wl,-install_name,libmapnik.dylib' ++ linkflags = '-Wl,-install_name,%s/libmapnik.dylib' % libdir + elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'): + linkflags = '-R. -h libmapnik.so' + else: # Linux and others -------------- next part -------------- An HTML attachment was scrubbed... URL: From raimue at macports.org Fri May 1 13:25:02 2009 From: raimue at macports.org (raimue at macports.org) Date: Fri, 1 May 2009 13:25:02 -0700 (PDT) Subject: [50499] trunk/dports/python Message-ID: <20090501202503.A998516E1B1D@beta.macosforge.org> Revision: 50499 http://trac.macports.org/changeset/50499 Author: raimue at macports.org Date: 2009-05-01 13:25:02 -0700 (Fri, 01 May 2009) Log Message: ----------- python/py26-mapnik: Correct typo in the directory name Added Paths: ----------- trunk/dports/python/py26-mapnik/ Removed Paths: ------------- trunk/dports/python/py26-mapnick/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 13:52:48 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 13:52:48 -0700 (PDT) Subject: [50500] trunk/dports Message-ID: <20090501205249.3410916E236E@beta.macosforge.org> Revision: 50500 http://trac.macports.org/changeset/50500 Author: portindex at macports.org Date: 2009-05-01 13:52:47 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 20:25:02 UTC (rev 50499) +++ trunk/dports/PortIndex 2009-05-01 20:52:47 UTC (rev 50500) @@ -8550,6 +8550,8 @@ portdir python/py26-macholib description {Mach-O header analysis and editing} homepage http://undefined.org/python/#macholib epoch 0 platforms darwin depends_lib {port:python26 port:py26-altgraph} name py26-macholib maintainers {jmr openmaintainer} long_description {macholib can be used to analyze and edit Mach-O headers, the executable format used by Mac OS X. It is typically used as a dependency analysis tool, and also to rewrite dylib references in Mach-O headers to be @executable_path relative. Though this tool targets a platform specific file format, it is pure python code that is platform and endian independent.} categories {python devel} version 1.2 revision 0 py26-mako 900 portdir python/py26-mako description {A super-fast templating language that borrows the best ideas from the existing templating languages.} homepage http://www.makotemplates.org/ epoch 0 platforms darwin depends_lib port:python26 name py26-mako maintainers akitada long_description {Mako is a template library written in Python. It provides a familiar, non-XML syntax which compiles into Python modules for maximum performance. Mako's syntax and API borrows from the best ideas of many others, including Django templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded Python (i.e. Python Server Page) language, which refines the familiar ideas of componentized layout and inheritance to produce one of the most straightforward and flexible models available, while also maintaining close ties to Python calling and scoping semantics.} categories {python www} version 0.2.4 revision 0 +py26-mapnik 1138 +variants {cairo postgis gdal sqlite} portdir python/py26-mapnik description {Open Source C++/Python mapping toolkit.} homepage http://mapnik.org/ epoch 0 platforms darwin name py26-mapnik depends_lib {port:boost port:libpng port:jpeg port:tiff port:icu port:zlib port:freetype port:proj port:libxml2 port:python26} long_description {Mapnik is a Open Source tookit for developing mapping applications. It is written in C++ and there are Python bindings to facilitate fast-paced agile development. It can comfortably be used for both desktop and web development. Mapnik is about making beautiful maps. It uses the AGG library and offers world class anti-aliasing rendering with subpixel accuracy for geographic data. It is written from scratch in modern C++ and does not suffer from design decisions made a decade ago. When it comes to handling common software tasks such as memory management, filesystem access, regular expressions, parsing and so on, Mapnik does not re-invent the wheel, b ut utilises best of breed industry standard libraries from boost.org.} maintainers gmail.com:dbsgeo categories {python gis} version 0.6.0 revision 0 py26-markdown 352 portdir python/py26-markdown description {Python implementation of Markdown} homepage http://www.freewisdom.org/projects/python-markdown/ epoch 0 platforms darwin depends_lib port:python26 name py26-markdown maintainers {openmaintainer arthurk} long_description {{Python implementation of Markdown}} categories {python textproc} version 2.0 revision 0 py26-matplotlib 830 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 13:58:13 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 13:58:13 -0700 (PDT) Subject: [50501] trunk/dports/gnome/totem-pl-parser/Portfile Message-ID: <20090501205813.F01B816E269A@beta.macosforge.org> Revision: 50501 http://trac.macports.org/changeset/50501 Author: devans at macports.org Date: 2009-05-01 13:58:13 -0700 (Fri, 01 May 2009) Log Message: ----------- totem-pl-parser: take maintainership openmaintainer. Modified Paths: -------------- trunk/dports/gnome/totem-pl-parser/Portfile Modified: trunk/dports/gnome/totem-pl-parser/Portfile =================================================================== --- trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-01 20:52:47 UTC (rev 50500) +++ trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-01 20:58:13 UTC (rev 50501) @@ -7,7 +7,7 @@ version 2.24.4 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome -maintainers nomaintainer +maintainers devans openmaintainer description Gnome Playlist parser long_description \ totem-pl-parser is a simple GObject-based library to parse \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 13:59:09 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 13:59:09 -0700 (PDT) Subject: [50502] trunk/dports/gnome/totem/Portfile Message-ID: <20090501205909.D540C16E2804@beta.macosforge.org> Revision: 50502 http://trac.macports.org/changeset/50502 Author: devans at macports.org Date: 2009-05-01 13:59:09 -0700 (Fri, 01 May 2009) Log Message: ----------- totem: take maintainership openmaintainer. Modified Paths: -------------- trunk/dports/gnome/totem/Portfile Modified: trunk/dports/gnome/totem/Portfile =================================================================== --- trunk/dports/gnome/totem/Portfile 2009-05-01 20:58:13 UTC (rev 50501) +++ trunk/dports/gnome/totem/Portfile 2009-05-01 20:59:09 UTC (rev 50502) @@ -7,7 +7,7 @@ version 2.24.4 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome -maintainers nomaintainer +maintainers devans openmaintainer description Official movie player of the GNOME desktop environment long_description \ Totem is based on xine-lib or GStreamer. It features a \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 14:53:09 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 14:53:09 -0700 (PDT) Subject: [50503] trunk/dports Message-ID: <20090501215311.559FA16E3BA9@beta.macosforge.org> Revision: 50503 http://trac.macports.org/changeset/50503 Author: portindex at macports.org Date: 2009-05-01 14:53:06 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 20:59:09 UTC (rev 50502) +++ trunk/dports/PortIndex 2009-05-01 21:53:06 UTC (rev 50503) @@ -2772,10 +2772,10 @@ variants universal depends_build {port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/startup-notification description {Library that supports startup notification specs.} homepage http://www.gnome.org/ epoch 0 platforms darwin name startup-notification depends_lib {port:xorg-libsm port:xorg-libX11} long_description {startup-notification is a minimal library that supports the startup notification spec described at www.freedesktop.org.} maintainers nomaintainer categories gnome version 0.9 revision 1 system-tools-backends 780 variants universal depends_build {port:pkgconfig port:p5-net-dbus} portdir gnome/system-tools-backends description {Tools aimed to ease computer administration.} homepage http://system-tools-backends.freedesktop.org/ depends_run port:p5-net-dbus epoch 0 platforms darwin name system-tools-backends depends_lib port:libgnomeui long_description {Formerly known as the Ximian Setup Tools, the GST are a fully integrated set of tools aimed to make easy the job that means the computer administration on an UNIX or Linux system. They're thought to help from the new Linux or UNIX user to the system administrators. The GNOME System Tools are free software, licensed under the terms of the GNU General Public License.} maintainers nomaintainer categories gnome version 2.6.1 revision 0 -totem 813 -variants {xine universal} depends_build port:pkgconfig portdir gnome/totem description {Official movie player of the GNOME desktop environment} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem depends_lib {port:p5-xml-parser port:gnome-doc-utils port:gst-plugins-good port:gnome-icon-theme port:totem-pl-parser port:eel port:dbus-glib} long_description {Totem is based on xine-lib or GStreamer. It features a playlist, a full-screen mode, seek and volume controls, as well as keyboard navigation. It comes with added functionality such as: * Video thumbnailer for the file manager * Nautilus properties tab * Mozilla (Firefox) plugin to view movies inside your browser (in development) * Webcam utility (in development)} maintainers nomaintainer categories gnome version 2.24.4 revision 0 -totem-pl-parser 516 -variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib {port:gnome-vfs port:evolution-data-server} long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers nomaintainer categories gnome version 2.24.4 revision 0 +totem 824 +variants {xine universal} depends_build port:pkgconfig portdir gnome/totem description {Official movie player of the GNOME desktop environment} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem depends_lib {port:p5-xml-parser port:gnome-doc-utils port:gst-plugins-good port:gnome-icon-theme port:totem-pl-parser port:eel port:dbus-glib} long_description {Totem is based on xine-lib or GStreamer. It features a playlist, a full-screen mode, seek and volume controls, as well as keyboard navigation. It comes with added functionality such as: * Video thumbnailer for the file manager * Nautilus properties tab * Mozilla (Firefox) plugin to view movies inside your browser (in development) * Webcam utility (in development)} maintainers {devans openmaintainer} categories gnome version 2.24.4 revision 0 +totem-pl-parser 527 +variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib {port:gnome-vfs port:evolution-data-server} long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers {devans openmaintainer} categories gnome version 2.24.4 revision 0 tsclient 443 variants universal portdir gnome/tsclient description {A GNOME frontend for rdesktop and other remote desktop tools.} homepage http://www.gnomepro.com/tsclient/ epoch 0 platforms darwin name tsclient depends_lib {lib:libpanelapplet-2:gnome-panel bin:rdesktop:rdesktop bin:vncviewer:vnc} maintainers nomaintainer long_description {{A GNOME frontend for rdesktop and other remote desktop tools.}} categories {gnome net} version 0.148 revision 0 vino 343 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Fri May 1 14:59:03 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Fri, 1 May 2009 14:59:03 -0700 Subject: propchange - r50188 svn:log Message-ID: <20090501215903.577FE2807E@relay11.apple.com> Author: ryandesign at macports.org (original author: nox at macports.org) Revision: 50188 Property Name: svn:log @@ -1 +1 @@ -php5-uploadprogress: Port to php5peclextension port. +php5-uploadprogress: Port to php5peclextension portgroup. From ryandesign at macports.org Fri May 1 15:33:03 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Fri, 1 May 2009 15:33:03 -0700 (PDT) Subject: [50504] trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl Message-ID: <20090501223304.1178216E452B@beta.macosforge.org> Revision: 50504 http://trac.macports.org/changeset/50504 Author: ryandesign at macports.org Date: 2009-05-01 15:33:02 -0700 (Fri, 01 May 2009) Log Message: ----------- php5extension-1.0.tcl: fix livecheck for PECL-hosted extensions to only identify stable versions Modified Paths: -------------- trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl 2009-05-01 21:53:06 UTC (rev 50503) +++ trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl 2009-05-01 22:33:02 UTC (rev 50504) @@ -93,8 +93,8 @@ master_sites http://pecl.php.net/get/ extract.suffix .tgz - livecheck.check regex + livecheck.check regexm livecheck.url ${php5extension.homepage} - livecheck.regex >(\[0-9.\]+)< + livecheck.regex {>([0-9.]+)\s*<[^>]+>stable<} } } -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Fri May 1 15:35:33 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Fri, 1 May 2009 15:35:33 -0700 (PDT) Subject: [50505] trunk/dports/php/php5-memcache/Portfile Message-ID: <20090501223534.10BD516E468A@beta.macosforge.org> Revision: 50505 http://trac.macports.org/changeset/50505 Author: ryandesign at macports.org Date: 2009-05-01 15:35:33 -0700 (Fri, 01 May 2009) Log Message: ----------- php5-memcache: update to 2.2.5; closes #18231 Modified Paths: -------------- trunk/dports/php/php5-memcache/Portfile Modified: trunk/dports/php/php5-memcache/Portfile =================================================================== --- trunk/dports/php/php5-memcache/Portfile 2009-05-01 22:33:02 UTC (rev 50504) +++ trunk/dports/php/php5-memcache/Portfile 2009-05-01 22:35:33 UTC (rev 50505) @@ -3,8 +3,7 @@ PortSystem 1.0 PortGroup php5extension 1.0 -php5extension.setup memcache 2.1.2 pecl -revision 1 +php5extension.setup memcache 2.2.5 pecl categories-append net devel platforms darwin freebsd openbsd maintainers emory.smith at gmail.com openmaintainer @@ -16,8 +15,8 @@ to work with memcached through handy OO and \ procedural interfaces. -checksums md5 cfde0918360f3909a242c3211604ad46 \ - sha1 e382e19982b787999dd630bd3e39826d2dc5ab03 \ - rmd160 b6831e67d7bb6457bc5a8b90734604babd8b1343 +checksums md5 72e56a3e4ab5742c4877fd4b6563e9bf \ + sha1 6bc7d8fc9c9b9a247316e35d0cac3fe9dd37b68c \ + rmd160 2c055a018f765a9572fa04beecd7797b7f69e796 depends_lib-append port:memcached port:zlib -------------- next part -------------- An HTML attachment was scrubbed... URL: From dluke at macports.org Fri May 1 15:41:30 2009 From: dluke at macports.org (dluke at macports.org) Date: Fri, 1 May 2009 15:41:30 -0700 (PDT) Subject: [50506] trunk/dports/perl/p5-svn-notify/Portfile Message-ID: <20090501224131.A5F3416E49E0@beta.macosforge.org> Revision: 50506 http://trac.macports.org/changeset/50506 Author: dluke at macports.org Date: 2009-05-01 15:41:30 -0700 (Fri, 01 May 2009) Log Message: ----------- version bump, p5-svn-notify to 2.79 Modified Paths: -------------- trunk/dports/perl/p5-svn-notify/Portfile Modified: trunk/dports/perl/p5-svn-notify/Portfile =================================================================== --- trunk/dports/perl/p5-svn-notify/Portfile 2009-05-01 22:35:33 UTC (rev 50505) +++ trunk/dports/perl/p5-svn-notify/Portfile 2009-05-01 22:41:30 UTC (rev 50506) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.setup SVN-Notify 2.77 +perl5.setup SVN-Notify 2.79 maintainers dluke at geeklair.net description Subversion activity notification long_description \ @@ -18,9 +18,9 @@ platforms darwin -checksums md5 a6909bfca5d623db5f019b57da6e97e6 \ - sha1 51b7869cde88365b1973c8847e5c81f1d8cdf414 \ - rmd160 e2953d7b659f4521e7582e2ad80d76f832a97916 +checksums md5 0af32564780bab2ac3e639c4d3d0f663 \ + sha1 f84a3cc42014572d473ef364b4f40cd960c6083a \ + rmd160 f49a2b5e1cb987848b7e8928d889b1592eed4a0b depends_lib-append port:p5-module-build \ port:p5-pathtools \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Fri May 1 15:47:25 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Fri, 1 May 2009 15:47:25 -0700 (PDT) Subject: [50507] trunk/dports/x11/mesa/Portfile Message-ID: <20090501224725.A7BEA16E5602@beta.macosforge.org> Revision: 50507 http://trac.macports.org/changeset/50507 Author: mcalhoun at macports.org Date: 2009-05-01 15:47:24 -0700 (Fri, 01 May 2009) Log Message: ----------- mesa: Build glxgears and glxinfo as universal. Partial fix of #19369. Modified Paths: -------------- trunk/dports/x11/mesa/Portfile Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2009-05-01 22:41:30 UTC (rev 50506) +++ trunk/dports/x11/mesa/Portfile 2009-05-01 22:47:24 UTC (rev 50507) @@ -76,6 +76,12 @@ build.args-append RC_CFLAGS="${configure.universal_cflags}" eval configure.cflags-append ${configure.universal_cflags} eval configure.ldflags-append ${configure.universal_ldflags} + + # Ensure test programs glxgears and glxinfo are universal. + post-patch { + reinplace "s|(CC) tests|(CC) ${configure.universal_cflags} ${configure.universal_ldflags} tests|" \ + ${worksrcpath}/../AppleSGLX-${ASGLX_version}/Makefile + } } if { ![file exists /usr/include/Xplugin.h] } { -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Fri May 1 15:51:52 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Fri, 1 May 2009 15:51:52 -0700 Subject: propchange - r50506 svn:log Message-ID: <20090501225152.2870328081@relay13.apple.com> Author: ryandesign at macports.org (original author: dluke at macports.org) Revision: 50506 Property Name: svn:log @@ -1 +1 @@ -version bump, p5-svn-notify to 2.79 +version bump, p5-svn-notify to 2.79; fixes #19509 From portindex at macports.org Fri May 1 15:53:11 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 15:53:11 -0700 (PDT) Subject: [50508] trunk/dports/PortIndex Message-ID: <20090501225313.E619F16E56D4@beta.macosforge.org> Revision: 50508 http://trac.macports.org/changeset/50508 Author: portindex at macports.org Date: 2009-05-01 15:53:09 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-01 22:47:24 UTC (rev 50507) +++ trunk/dports/PortIndex 2009-05-01 22:53:09 UTC (rev 50508) @@ -6807,7 +6807,7 @@ p5-svn-mirror 651 variants universal portdir perl/p5-svn-mirror description {This is a Perl extension for mirroring a remote repository to a local subversion one.} homepage http://search.cpan.org/~clkao/ epoch 0 platforms darwin name p5-svn-mirror depends_lib {path:bin/perl:perl5 port:p5-uri port:p5-term-readkey port:p5-svn-simple port:subversion-perlbindings port:p5-vcp-autrijus-snapshot port:p5-data-uuid port:p5-bsd-resource port:p5-class-accessor port:p5-file-chdir port:p5-timedate} long_description {{This is a Perl extension for mirroring a remote repository to a local subversion one.}} maintainers dluke at geeklair.net categories perl version 0.74 revision 0 p5-svn-notify 851 -variants universal portdir perl/p5-svn-notify description {Subversion activity notification} homepage http://search.cpan.org/dist/SVN-Notify/ epoch 0 platforms darwin name p5-svn-notify depends_lib {path:bin/perl:perl5 port:p5-module-build port:p5-pathtools port:p5-version port:p5-html-parser port:p5-net-smtp_auth} long_description {This class may be used for sending email messages for Subversion repository activity. There are a number of different modes supported, and SVN::Notify is fully subclassable to easily add new functionality. By default, a list of all the files affected by the commit will be assembled and listed in a single message. An additional option allows diffs to be calculated for the changes and either appended to the message or added as an attachment.} maintainers dluke at geeklair.net categories perl version 2.77 revision 0 +variants universal portdir perl/p5-svn-notify description {Subversion activity notification} homepage http://search.cpan.org/dist/SVN-Notify/ epoch 0 platforms darwin name p5-svn-notify depends_lib {path:bin/perl:perl5 port:p5-module-build port:p5-pathtools port:p5-version port:p5-html-parser port:p5-net-smtp_auth} long_description {This class may be used for sending email messages for Subversion repository activity. There are a number of different modes supported, and SVN::Notify is fully subclassable to easily add new functionality. By default, a list of all the files affected by the commit will be assembled and listed in a single message. An additional option allows diffs to be calculated for the changes and either appended to the message or added as an attachment.} maintainers dluke at geeklair.net categories perl version 2.79 revision 0 p5-svn-simple 439 variants universal portdir perl/p5-svn-simple description {This is a Perl extension for driving svn delta editors (used by svk).} homepage http://search.cpan.org/~clkao/ epoch 0 platforms darwin name p5-svn-simple depends_lib {path:bin/perl:perl5 port:subversion-perlbindings} long_description {{This is a Perl extension for driving svn delta editors (used by svk).}} maintainers dluke at geeklair.net categories perl version 0.27 revision 0 p5-sys-filesystem 769 @@ -7075,7 +7075,7 @@ php5-intl 399 variants universal portdir php/php5-intl description {Internationalization extension for PHP 5} homepage http://pecl.php.net/package/intl/ epoch 0 platforms darwin name php5-intl depends_lib {path:bin/phpize:php5 port:icu} long_description {Internationalization extension implements ICU library functionality in PHP.} maintainers {nox openmaintainer} categories {php devel} version 1.0.2 revision 0 php5-memcache 605 -variants universal portdir php/php5-memcache description {PHP5 bindings for memcache} homepage http://pecl.php.net/package/memcache/ epoch 0 platforms {darwin freebsd openbsd} name php5-memcache depends_lib {path:bin/phpize:php5 port:memcached port:zlib} long_description {Memcached is a caching daemon designed especially for dynamic web applications to decrease database load by storing objects in memory. This extension allows you to work with memcached through handy OO and procedural interfaces.} maintainers {emory.smith at gmail.com openmaintainer} categories {php net devel} version 2.1.2 revision 1 +variants universal portdir php/php5-memcache description {PHP5 bindings for memcache} homepage http://pecl.php.net/package/memcache/ epoch 0 platforms {darwin freebsd openbsd} name php5-memcache depends_lib {path:bin/phpize:php5 port:memcached port:zlib} long_description {Memcached is a caching daemon designed especially for dynamic web applications to decrease database load by storing objects in memory. This extension allows you to work with memcached through handy OO and procedural interfaces.} maintainers {emory.smith at gmail.com openmaintainer} categories {php net devel} version 2.2.5 revision 0 php5-sqlite3 380 variants universal portdir php/php5-sqlite3 description {SQLite 3 bindings for PHP 5} homepage http://pecl.php.net/package/sqlite3/ epoch 0 platforms darwin name php5-sqlite3 depends_lib path:bin/phpize:php5 long_description {SQLite3 is a PHP extension for use with the SQLite 3 database system.} maintainers {nox openmaintainer} categories {php databases} version 0.6 revision 1 php5-syck 500 -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 18:37:23 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 18:37:23 -0700 (PDT) Subject: [50509] trunk/dports/gnome/totem-pl-parser/Portfile Message-ID: <20090502013724.7B38D16E6D0B@beta.macosforge.org> Revision: 50509 http://trac.macports.org/changeset/50509 Author: devans at macports.org Date: 2009-05-01 18:37:20 -0700 (Fri, 01 May 2009) Log Message: ----------- totem-pl-parser: * update to version 2.26.1 * update dependencies Modified Paths: -------------- trunk/dports/gnome/totem-pl-parser/Portfile Modified: trunk/dports/gnome/totem-pl-parser/Portfile =================================================================== --- trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-01 22:53:09 UTC (rev 50508) +++ trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-02 01:37:20 UTC (rev 50509) @@ -4,10 +4,10 @@ PortSystem 1.0 name totem-pl-parser -version 2.24.4 +version 2.26.1 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome -maintainers devans openmaintainer +maintainers nomaintainer description Gnome Playlist parser long_description \ totem-pl-parser is a simple GObject-based library to parse \ @@ -16,25 +16,29 @@ homepage http://live.gnome.org/Totem platforms darwin master_sites gnome:sources/${name}/${branch}/ -checksums md5 cff146663fe307a7d929e08ab0e4b3ca \ - sha1 7c6650fc9ee2190270e80a00a9afe77629c07700 \ - rmd160 af92fc1ccd8b51e16eea4d3b33d3dbace7859fc8 +patchfiles patch-configure.in.diff + +post-patch { + # http://bugzilla.gnome.org/show_bug.cgi?id=578358 + reinplace "s:libtotem_glibc_la_SOURCES =:libtotem_glibc_la_SOURCES = stub.c:" ${worksrcpath}/lib/Makefile.am + copy ${filespath}/stub.c ${worksrcpath}/lib/stub.c +} + +checksums md5 269a003146eaca6b9af0b90ad592571f \ + sha1 d4fdd73903af1955a262b43c2260ad9bc5912e92 \ + rmd160 05455ac451b621166b2d170a4decb797b5786913 + use_bzip2 yes depends_build port:pkgconfig \ port:autoconf \ port:automake \ - port:libtool + port:libtool \ + port:gtk-doc -depends_lib port:gnome-vfs \ - port:evolution-data-server +depends_lib port:evolution-data-server -post-patch { - # http://bugzilla.gnome.org/show_bug.cgi?id=578358 - reinplace "s:libtotem_glibc_la_SOURCES =:libtotem_glibc_la_SOURCES = stub.c:" ${worksrcpath}/lib/Makefile.am - copy ${filespath}/stub.c ${worksrcpath}/lib/stub.c -} use_autoreconf yes autoreconf.args -fvi -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 18:39:24 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 18:39:24 -0700 (PDT) Subject: [50510] trunk/dports/gnome/totem-pl-parser/files/patch-configure.in.diff Message-ID: <20090502013924.20EAC16E6D83@beta.macosforge.org> Revision: 50510 http://trac.macports.org/changeset/50510 Author: devans at macports.org Date: 2009-05-01 18:39:23 -0700 (Fri, 01 May 2009) Log Message: ----------- totem-pl-parser: add required patch file. Added Paths: ----------- trunk/dports/gnome/totem-pl-parser/files/patch-configure.in.diff Added: trunk/dports/gnome/totem-pl-parser/files/patch-configure.in.diff =================================================================== --- trunk/dports/gnome/totem-pl-parser/files/patch-configure.in.diff (rev 0) +++ trunk/dports/gnome/totem-pl-parser/files/patch-configure.in.diff 2009-05-02 01:39:23 UTC (rev 50510) @@ -0,0 +1,11 @@ +--- configure.in.orig 2009-05-01 13:31:18.000000000 -0700 ++++ configure.in 2009-05-01 13:32:53.000000000 -0700 +@@ -122,6 +122,8 @@ + + GTK_DOC_CHECK(1.11) + ++AC_PATH_PROGS(GTKDOC_REBASE,gtkdoc-rebase,) ++ + AC_CONFIG_FILES([ + Makefile + totem-plparser.pc -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 18:46:27 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 18:46:27 -0700 (PDT) Subject: [50511] trunk/dports/gnome/totem Message-ID: <20090502014627.7037D16E6EFD@beta.macosforge.org> Revision: 50511 http://trac.macports.org/changeset/50511 Author: devans at macports.org Date: 2009-05-01 18:46:26 -0700 (Fri, 01 May 2009) Log Message: ----------- totem: * update to version 2.26.1 * update dependencies and config args * ensure appropriate X11 configuration paths * update xine variant * install/update gconf schemas post-activate Modified Paths: -------------- trunk/dports/gnome/totem/Portfile Added Paths: ----------- trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff Modified: trunk/dports/gnome/totem/Portfile =================================================================== --- trunk/dports/gnome/totem/Portfile 2009-05-02 01:39:23 UTC (rev 50510) +++ trunk/dports/gnome/totem/Portfile 2009-05-02 01:46:26 UTC (rev 50511) @@ -4,7 +4,7 @@ PortSystem 1.0 name totem -version 2.24.4 +version 2.26.1 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome maintainers devans openmaintainer @@ -24,24 +24,26 @@ platforms darwin master_sites gnome:sources/${name}/${branch}/ -checksums md5 f5d96849a4ca0a4edce9bd6f62b93f7d \ - sha1 0fadda7c9eb70f3407866b18f97a9757ed65c6a2 \ - rmd160 42bfbace2d213c7c51adcc4d72852d7793928472 +checksums md5 410d14957f48ae179c03e5c663607536 \ + sha1 2485a78bba37f380cafafcf03527da8fcaf7d900 \ + rmd160 6c4036f7ad4b6283fe3e01ce45045b14b36e26b2 use_bzip2 yes patchfiles patch-bindings-python-totem.override.diff \ - patch-src-plugins-totem-python-module.c.diff + patch-src-plugins-totem-python-module.c.diff \ + patch-src-backend-Makefile.in.diff -depends_build port:pkgconfig +depends_build port:pkgconfig \ + port:gtk-doc -depends_lib port:p5-xml-parser \ - port:gnome-doc-utils \ +depends_lib port:gconf \ + port:totem-pl-parser \ + port:xorg-libXtst \ + port:xorg-libXxf86vm \ + port:py25-gtk \ port:gst-plugins-good \ - port:gnome-icon-theme \ - port:totem-pl-parser \ - port:eel \ - port:dbus-glib + port:nautilus configure.python ${prefix}/bin/python2.5 @@ -49,12 +51,23 @@ --disable-static \ --enable-browser-plugins \ --enable-complex-plugin \ + --enable-easy-codec-installation \ + --enable-nautilus \ + --disable-schemas-install \ + --disable-scrollkeeper \ BROWSER_PLUGIN_DIR=${prefix}/lib/nsplugins +if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} { + configure.args-append --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib +} + variant xine description {Use xine-lib instead of gstreamer} { depends_lib-delete port:gst-plugins-good depends_lib-append port:xine-lib configure.args-append --enable-xine + configure.args-delete --enable-easy-codec-installation + configure.args-append --disable-easy-codec-installation } post-patch { @@ -65,6 +78,11 @@ eval delete [glob "${destroot}${prefix}/lib/nsplugins/*.la"] } +post-activate { + system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \ + gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas" +} + livecheck.check regex livecheck.url http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/ livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)} Added: trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff =================================================================== --- trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff (rev 0) +++ trunk/dports/gnome/totem/files/patch-src-backend-Makefile.in.diff 2009-05-02 01:46:26 UTC (rev 50511) @@ -0,0 +1,10 @@ +--- src/backend/Makefile.in.orig 2009-05-01 16:18:51.000000000 -0700 ++++ src/backend/Makefile.in 2009-05-01 16:25:16.000000000 -0700 +@@ -407,6 +407,7 @@ + $(MM_LIBS) \ + $(GST_LIBS) \ + $(EXTRA_BACKEND_LIBS) \ ++ $(GTK_LIBS) \ + $(X_LIBS) \ + $(MISSING_PLUGINS_LIBS) + -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 18:50:40 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 18:50:40 -0700 (PDT) Subject: [50512] trunk/dports/gnome/totem-pl-parser/Portfile Message-ID: <20090502015040.D857F16E6FAC@beta.macosforge.org> Revision: 50512 http://trac.macports.org/changeset/50512 Author: devans at macports.org Date: 2009-05-01 18:50:40 -0700 (Fri, 01 May 2009) Log Message: ----------- totem-pl-parser: restore maintainership. Modified Paths: -------------- trunk/dports/gnome/totem-pl-parser/Portfile Modified: trunk/dports/gnome/totem-pl-parser/Portfile =================================================================== --- trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-02 01:46:26 UTC (rev 50511) +++ trunk/dports/gnome/totem-pl-parser/Portfile 2009-05-02 01:50:40 UTC (rev 50512) @@ -7,7 +7,7 @@ version 2.26.1 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome -maintainers nomaintainer +maintainers devans openmaintainer description Gnome Playlist parser long_description \ totem-pl-parser is a simple GObject-based library to parse \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 18:52:49 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 18:52:49 -0700 (PDT) Subject: [50513] trunk/dports Message-ID: <20090502015249.E686D16E7038@beta.macosforge.org> Revision: 50513 http://trac.macports.org/changeset/50513 Author: portindex at macports.org Date: 2009-05-01 18:52:48 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 01:50:40 UTC (rev 50512) +++ trunk/dports/PortIndex 2009-05-02 01:52:48 UTC (rev 50513) @@ -2774,8 +2774,8 @@ variants universal depends_build {port:pkgconfig port:p5-net-dbus} portdir gnome/system-tools-backends description {Tools aimed to ease computer administration.} homepage http://system-tools-backends.freedesktop.org/ depends_run port:p5-net-dbus epoch 0 platforms darwin name system-tools-backends depends_lib port:libgnomeui long_description {Formerly known as the Ximian Setup Tools, the GST are a fully integrated set of tools aimed to make easy the job that means the computer administration on an UNIX or Linux system. They're thought to help from the new Linux or UNIX user to the system administrators. The GNOME System Tools are free software, licensed under the terms of the GNU General Public License.} maintainers nomaintainer categories gnome version 2.6.1 revision 0 totem 824 variants {xine universal} depends_build port:pkgconfig portdir gnome/totem description {Official movie player of the GNOME desktop environment} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem depends_lib {port:p5-xml-parser port:gnome-doc-utils port:gst-plugins-good port:gnome-icon-theme port:totem-pl-parser port:eel port:dbus-glib} long_description {Totem is based on xine-lib or GStreamer. It features a playlist, a full-screen mode, seek and volume controls, as well as keyboard navigation. It comes with added functionality such as: * Video thumbnailer for the file manager * Nautilus properties tab * Mozilla (Firefox) plugin to view movies inside your browser (in development) * Webcam utility (in development)} maintainers {devans openmaintainer} categories gnome version 2.24.4 revision 0 -totem-pl-parser 527 -variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib {port:gnome-vfs port:evolution-data-server} long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers {devans openmaintainer} categories gnome version 2.24.4 revision 0 +totem-pl-parser 512 +variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:gtk-doc bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib port:evolution-data-server long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers nomaintainer categories gnome version 2.26.1 revision 0 tsclient 443 variants universal portdir gnome/tsclient description {A GNOME frontend for rdesktop and other remote desktop tools.} homepage http://www.gnomepro.com/tsclient/ epoch 0 platforms darwin name tsclient depends_lib {lib:libpanelapplet-2:gnome-panel bin:rdesktop:rdesktop bin:vncviewer:vnc} maintainers nomaintainer long_description {{A GNOME frontend for rdesktop and other remote desktop tools.}} categories {gnome net} version 0.148 revision 0 vino 343 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Fri May 1 19:52:50 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 19:52:50 -0700 (PDT) Subject: [50514] trunk/dports Message-ID: <20090502025252.28FE316E7607@beta.macosforge.org> Revision: 50514 http://trac.macports.org/changeset/50514 Author: portindex at macports.org Date: 2009-05-01 19:52:50 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 01:52:48 UTC (rev 50513) +++ trunk/dports/PortIndex 2009-05-02 02:52:50 UTC (rev 50514) @@ -2772,10 +2772,10 @@ variants universal depends_build {port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/startup-notification description {Library that supports startup notification specs.} homepage http://www.gnome.org/ epoch 0 platforms darwin name startup-notification depends_lib {port:xorg-libsm port:xorg-libX11} long_description {startup-notification is a minimal library that supports the startup notification spec described at www.freedesktop.org.} maintainers nomaintainer categories gnome version 0.9 revision 1 system-tools-backends 780 variants universal depends_build {port:pkgconfig port:p5-net-dbus} portdir gnome/system-tools-backends description {Tools aimed to ease computer administration.} homepage http://system-tools-backends.freedesktop.org/ depends_run port:p5-net-dbus epoch 0 platforms darwin name system-tools-backends depends_lib port:libgnomeui long_description {Formerly known as the Ximian Setup Tools, the GST are a fully integrated set of tools aimed to make easy the job that means the computer administration on an UNIX or Linux system. They're thought to help from the new Linux or UNIX user to the system administrators. The GNOME System Tools are free software, licensed under the terms of the GNU General Public License.} maintainers nomaintainer categories gnome version 2.6.1 revision 0 -totem 824 -variants {xine universal} depends_build port:pkgconfig portdir gnome/totem description {Official movie player of the GNOME desktop environment} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem depends_lib {port:p5-xml-parser port:gnome-doc-utils port:gst-plugins-good port:gnome-icon-theme port:totem-pl-parser port:eel port:dbus-glib} long_description {Totem is based on xine-lib or GStreamer. It features a playlist, a full-screen mode, seek and volume controls, as well as keyboard navigation. It comes with added functionality such as: * Video thumbnailer for the file manager * Nautilus properties tab * Mozilla (Firefox) plugin to view movies inside your browser (in development) * Webcam utility (in development)} maintainers {devans openmaintainer} categories gnome version 2.24.4 revision 0 -totem-pl-parser 512 -variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:gtk-doc bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib port:evolution-data-server long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers nomaintainer categories gnome version 2.26.1 revision 0 +totem 831 +variants {xine universal} depends_build {port:pkgconfig port:gtk-doc} portdir gnome/totem description {Official movie player of the GNOME desktop environment} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem depends_lib {port:gconf port:totem-pl-parser port:xorg-libXtst port:xorg-libXxf86vm port:py25-gtk port:gst-plugins-good port:nautilus} long_description {Totem is based on xine-lib or GStreamer. It features a playlist, a full-screen mode, seek and volume controls, as well as keyboard navigation. It comes with added functionality such as: * Video thumbnailer for the file manager * Nautilus properties tab * Mozilla (Firefox) plugin to view movies inside your browser (in development) * Webcam utility (in development)} maintainers {devans openmaintainer} categories gnome version 2.26.1 revision 0 +totem-pl-parser 523 +variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:gtk-doc bin:autoreconf:autoconf} portdir gnome/totem-pl-parser description {Gnome Playlist parser} homepage http://live.gnome.org/Totem epoch 0 platforms darwin name totem-pl-parser depends_lib port:evolution-data-server long_description {totem-pl-parser is a simple GObject-based library to parse a host of playlist formats, as well as save those} maintainers {devans openmaintainer} categories gnome version 2.26.1 revision 0 tsclient 443 variants universal portdir gnome/tsclient description {A GNOME frontend for rdesktop and other remote desktop tools.} homepage http://www.gnomepro.com/tsclient/ epoch 0 platforms darwin name tsclient depends_lib {lib:libpanelapplet-2:gnome-panel bin:rdesktop:rdesktop bin:vncviewer:vnc} maintainers nomaintainer long_description {{A GNOME frontend for rdesktop and other remote desktop tools.}} categories {gnome net} version 0.148 revision 0 vino 343 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 21:33:48 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 21:33:48 -0700 (PDT) Subject: [50515] trunk/dports/gnome/gnome-python-desktop/Portfile Message-ID: <20090502043349.15D0716E7CEE@beta.macosforge.org> Revision: 50515 http://trac.macports.org/changeset/50515 Author: devans at macports.org Date: 2009-05-01 21:33:47 -0700 (Fri, 01 May 2009) Log Message: ----------- gnome-python-desktop: * take maintainership openmaintainer * update to version 2.26.1 * update dependencies and configuration options Modified Paths: -------------- trunk/dports/gnome/gnome-python-desktop/Portfile Modified: trunk/dports/gnome/gnome-python-desktop/Portfile =================================================================== --- trunk/dports/gnome/gnome-python-desktop/Portfile 2009-05-02 02:52:50 UTC (rev 50514) +++ trunk/dports/gnome/gnome-python-desktop/Portfile 2009-05-02 04:33:47 UTC (rev 50515) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,27 +4,59 @@ name gnome-python-desktop -version 2.24.1 +version 2.26.0 set branch [join [lrange [split ${version} .] 0 1] .] categories gnome python -maintainers nomaintainer +maintainers devans openmaintainer description Python modules for some GNOME Desktop libraries. long_description ${description} platforms darwin homepage http://www.pygtk.org/ master_sites gnome:sources/${name}/${branch}/ -checksums md5 3eac6b859bff98148b021c9d11224ca5 \ - sha1 97b04ca811670d6cfa208074c1644cee7486ade3 + +checksums md5 fbcf4ef5ec4a8c4eec4d390c5889c80f \ + sha1 9f30c470ea73cb11b1daa6e10f1e980ec5698086 \ + rmd160 dda34b9fe39567d591f654af9a9c9f6dab5f9a15 + use_bzip2 yes -depends_lib \ - port:py25-gnome \ - port:gtksourceview2 \ - port:libgtop \ - port:gnome-media \ - port:totem-pl-parser + +depends_lib port:py25-gtk \ + port:py25-cairo \ + port:gtksourceview \ + port:libgtop \ + port:gnome-media \ + port:gnome-panel \ + port:metacity \ + port:evince \ + port:bug-buddy \ + port:totem-pl-parser + # TODO port:nautilus-cd-burner -configure.args --enable-metacity +configure.args --enable-metacity \ + --disable-nautilusburn + configure.python ${prefix}/bin/python2.5 +configure.env-append RSVG_CFLAGS="\ + -I${prefix}/include/librsvg-2 \ + -I${prefix}/include/glib-2.0 \ + -I${prefix}/lib/glib-2.0/include \ + -I${prefix}/include \ + -I${prefix}/include/gtk-2.0 \ + -I${prefix}/include/cairo \ + -I${prefix}/include/pixman-1 \ + -I${prefix}/include/freetype2 \ + -I${prefix}/include/libpng12 \ + -I${prefix}/include/python2.5/pycairo \ + -I${prefix}/include/pygtk-2.0" \ + RSVG_LIBS="\ + -Wl,-framework,CoreServices \ + -Wl,-framework,ApplicationServices \ + -L${prefix}/lib -lrsvg-2 -lgdk_pixbuf-2.0 -lm \ + -lcairo -lgmodule-2.0 -lpixman-1 -lfontconfig \ + -lexpat -lfreetype -lpng12 -lz -lXrender -lX11 \ + -lXau -lXdmcp -lffi -lgobject-2.0 -lglib-2.0 \ + -lintl -liconv" + platform darwin 9 { post-patch { -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Fri May 1 21:40:54 2009 From: devans at macports.org (devans at macports.org) Date: Fri, 1 May 2009 21:40:54 -0700 Subject: propchange - r50515 svn:log Message-ID: <20090502044054.A29EC2807B@relay11.apple.com> Author: devans at macports.org (original author: devans at macports.org) Revision: 50515 Property Name: svn:log @@ -1,5 +1,5 @@ gnome-python-desktop: * take maintainership openmaintainer - * update to version 2.26.1 + * update to version 2.26.0 * update dependencies and configuration options From portindex at macports.org Fri May 1 21:53:05 2009 From: portindex at macports.org (portindex at macports.org) Date: Fri, 1 May 2009 21:53:05 -0700 (PDT) Subject: [50516] trunk/dports Message-ID: <20090502045306.BB79616E7F3F@beta.macosforge.org> Revision: 50516 http://trac.macports.org/changeset/50516 Author: portindex at macports.org Date: 2009-05-01 21:53:05 -0700 (Fri, 01 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 04:33:47 UTC (rev 50515) +++ trunk/dports/PortIndex 2009-05-02 04:53:05 UTC (rev 50516) @@ -2576,8 +2576,8 @@ variants quartz portdir gnome/gnome-platform-suite description {The GNOME developer platform} homepage http://www.gnome.org/ epoch 0 platforms darwin name gnome-platform-suite depends_lib {port:at-spi port:atk port:gconf port:gnome-mime-data port:gnome-vfs port:gnome-vfs-monikers port:gtk2 port:gvfs port:libart_lgpl port:libbonobo port:libbonoboui port:libglade2 port:libgnome port:libgnomecanvas port:libgnomeui port:libidl port:libxml2 port:libxslt port:orbit2} long_description {The GNOME developer platform is the set of libraries and services that developers can rely upon to develop fully GNOME compliant applications. The platform is one of the suites of software packages that form the complete GNOME project offerings.} maintainers nomaintainer categories {gnome devel} version 2.26.1 revision 1 gnome-print 410 variants universal portdir gnome/gnome-print description {This is an implementation of the Gnome Printing Architecture.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gnome-print depends_lib {lib:libgdk-pixbuf:gdk-pixbuf lib:libgnome:gnome-libs} maintainers nomaintainer long_description {{This is an implementation of the Gnome Printing Architecture.}} categories gnome version 0.36 revision 0 -gnome-python-desktop 458 -variants {darwin_9 universal} portdir gnome/gnome-python-desktop description {Python modules for some GNOME Desktop libraries.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name gnome-python-desktop depends_lib {port:py25-gnome port:gtksourceview2 port:libgtop port:gnome-media port:totem-pl-parser} long_description {{Python modules for some GNOME Desktop libraries.}} maintainers nomaintainer categories {gnome python} version 2.24.1 revision 0 +gnome-python-desktop 540 +variants {darwin_9 universal} portdir gnome/gnome-python-desktop description {Python modules for some GNOME Desktop libraries.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name gnome-python-desktop depends_lib {port:py25-gtk port:py25-cairo port:gtksourceview port:libgtop port:gnome-media port:gnome-panel port:metacity port:evince port:bug-buddy port:totem-pl-parser} long_description {{Python modules for some GNOME Desktop libraries.}} maintainers {devans openmaintainer} categories {gnome python} version 2.26.0 revision 0 gnome-python-extras 460 variants {darwin_9 universal} portdir gnome/gnome-python-extras description {Extra Python modules for some GNOME Desktop libraries.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name gnome-python-extras depends_lib {port:py25-gnome port:gdl port:libgda3 port:libgtkhtml} long_description {{Extra Python modules for some GNOME Desktop libraries.}} maintainers {landonf at macports.org openmaintainer} categories {gnome python} version 2.19.1 revision 1 gnome-session 535 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Sat May 2 00:11:23 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Sat, 2 May 2009 00:11:23 -0700 (PDT) Subject: [50517] trunk/dports/x11/xorg-cf-files/Portfile Message-ID: <20090502071125.7FB7216E9710@beta.macosforge.org> Revision: 50517 http://trac.macports.org/changeset/50517 Author: mcalhoun at macports.org Date: 2009-05-02 00:11:18 -0700 (Sat, 02 May 2009) Log Message: ----------- xorg-cf-files: r50487 should have increased revision. Modified Paths: -------------- trunk/dports/x11/xorg-cf-files/Portfile Modified: trunk/dports/x11/xorg-cf-files/Portfile =================================================================== --- trunk/dports/x11/xorg-cf-files/Portfile 2009-05-02 04:53:05 UTC (rev 50516) +++ trunk/dports/x11/xorg-cf-files/Portfile 2009-05-02 07:11:18 UTC (rev 50517) @@ -5,6 +5,7 @@ name xorg-cf-files version 1.0.2 +revision 1 categories x11 devel platforms darwin maintainers mcalhoun openmaintainer -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 00:53:28 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 00:53:28 -0700 (PDT) Subject: [50518] trunk/dports/PortIndex Message-ID: <20090502075330.5D85516EA747@beta.macosforge.org> Revision: 50518 http://trac.macports.org/changeset/50518 Author: portindex at macports.org Date: 2009-05-02 00:53:26 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5797 Ports successfully parsed: 5797 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 07:11:18 UTC (rev 50517) +++ trunk/dports/PortIndex 2009-05-02 07:53:26 UTC (rev 50518) @@ -11243,7 +11243,7 @@ xorg-bigreqsproto 289 portdir x11/xorg-bigreqsproto description {X.org bigreqsproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-bigreqsproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for BigReqs extension to X11} version 1.0.2 categories {x11 devel} revision 0 xorg-cf-files 326 -portdir x11/xorg-cf-files description {Build files for discontinued imake build system.} homepage http://xorg.freedesktop.org epoch 0 platforms darwin name xorg-cf-files maintainers {mcalhoun openmaintainer} long_description {{Build files for discontinued imake build system.}} version 1.0.2 categories {x11 devel} revision 0 +portdir x11/xorg-cf-files description {Build files for discontinued imake build system.} homepage http://xorg.freedesktop.org epoch 0 platforms darwin name xorg-cf-files maintainers {mcalhoun openmaintainer} long_description {{Build files for discontinued imake build system.}} version 1.0.2 categories {x11 devel} revision 1 xorg-compositeproto 295 portdir x11/xorg-compositeproto description {X.org compositeproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-compositeproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for Composite extension to X11} version 0.4 categories {x11 devel} revision 0 xorg-damageproto 289 -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Sat May 2 05:11:57 2009 From: jwa at macports.org (jwa at macports.org) Date: Sat, 2 May 2009 05:11:57 -0700 (PDT) Subject: [50519] trunk/dports/www/midgard-core/Portfile Message-ID: <20090502121157.C1A9E16EC829@beta.macosforge.org> Revision: 50519 http://trac.macports.org/changeset/50519 Author: jwa at macports.org Date: 2009-05-02 05:11:55 -0700 (Sat, 02 May 2009) Log Message: ----------- fix ui_message referring to a wrong port, closes #19504 Modified Paths: -------------- trunk/dports/www/midgard-core/Portfile Modified: trunk/dports/www/midgard-core/Portfile =================================================================== --- trunk/dports/www/midgard-core/Portfile 2009-05-02 07:53:26 UTC (rev 50518) +++ trunk/dports/www/midgard-core/Portfile 2009-05-02 12:11:55 UTC (rev 50519) @@ -42,7 +42,7 @@ post-install { ui_msg "NB! The other parts of the package are:" - ui_msg "midgard-apache2, midgard-php4 and midgard-data" + ui_msg "midgard-apache2, php5-midgard and midgard-data" } livecheck.check regex -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Sat May 2 07:19:31 2009 From: jwa at macports.org (jwa at macports.org) Date: Sat, 2 May 2009 07:19:31 -0700 (PDT) Subject: [50520] trunk/dports/www Message-ID: <20090502141932.6937316ED6BA@beta.macosforge.org> Revision: 50520 http://trac.macports.org/changeset/50520 Author: jwa at macports.org Date: 2009-05-02 07:19:28 -0700 (Sat, 02 May 2009) Log Message: ----------- new port Midgard's second major version to provide content repository Added Paths: ----------- trunk/dports/www/midgard2-core/ trunk/dports/www/midgard2-core/Portfile trunk/dports/www/php5-midgard2/ trunk/dports/www/php5-midgard2/Portfile Added: trunk/dports/www/midgard2-core/Portfile =================================================================== --- trunk/dports/www/midgard2-core/Portfile (rev 0) +++ trunk/dports/www/midgard2-core/Portfile 2009-05-02 14:19:28 UTC (rev 50520) @@ -0,0 +1,37 @@ +# $Id: Portfile 49571 2009-04-12 12:52:38Z jwa at macports.org $ + +PortSystem 1.0 + +name midgard2-core +version 9.03.0 +categories www +maintainers jwa +description A content repository system +long_description Midgard is a content repository system platform \ + with bindings in PHP, Python etc. +platforms darwin +homepage http://www.midgard-project.org/ + +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-04bfc79a349d11de8fce75943884a55aa55a/ + +#use_bzip2 yes +checksums md5 66e342bfc448b9e71ad3ed8013a2239f \ + sha1 cd4cfb375cfe6e3722fce7509a3d8733f94f4fa6 \ + rmd160 d806dc6c3aa55e5fce5baae2ee19f86ca33b3e1f + +depends_lib port:glib2 \ + port:dbus \ + port:libxml2 \ + port:libgda3 + +configure.args --sysconfdir=${prefix}/etc/midgard/ \ + --with-dbus-support + +post-install { + ui_msg "NB! The other parts of the package are:" + ui_msg "php5-midgard2, and python bindings for 2.5/2.6" +} + +livecheck.check regex +livecheck.url ${homepage}download +livecheck.regex ${name}-(\[1-9\]+.\[0-9\]+.\[0-9\]+).tar.\[bg\]z Added: trunk/dports/www/php5-midgard2/Portfile =================================================================== --- trunk/dports/www/php5-midgard2/Portfile (rev 0) +++ trunk/dports/www/php5-midgard2/Portfile 2009-05-02 14:19:28 UTC (rev 50520) @@ -0,0 +1,47 @@ +# $Id: Portfile 50478 2009-05-01 14:18:38Z jwa at macports.org $ + +PortSystem 1.0 + +name php5-midgard2 +version 9.03.0 +categories www +maintainers jwa +description A content management system +long_description Midgard is a content management system platform using \ + Apache, PHP and MySQL. +platforms darwin +homepage http://www.midgard-project.org/ + +master_sites http://www.midgard-project.org/midcom-serveattachmentguid-f81d4896349c11deb45bcbc6657b90569056/ + +#use_bzip2 yes +checksums md5 885447a4e9eb24c713cfe0fe4d223f34 \ + sha1 4ad83380a4a31c2a4833784a62ac8e03f5747e25 \ + rmd160 9c8d64305f061854c812c506cc445d7917763632 + +depends_lib port:midgard2-core \ + port:php5 + +pre-configure { + system "cd ${worksrcpath} && phpize" +} + +configure.args --sysconfdir=${prefix}/etc/midgard/ \ + --with-apxs=${prefix}/apache2/bin/apxs \ + --with-apr-config=${prefix}/bin/apr-1-config \ + --with-php-config=${prefix}/bin/php-config + +destroot.destdir INSTALL_ROOT=${destroot} + +post-install { + ui_msg "======================== IMPORTANT =========================" + ui_msg "If this is the first time you're installing Midgard, or you have" + ui_msg "recently upgraded PHP, make sure to check your php.ini to verify" + ui_msg "that extension_dir at least includes" + system "php-config --extension-dir" + ui_msg "================================================================" +} + +livecheck.check regex +livecheck.url ${homepage}download +livecheck.regex ${name}-(\[1-9\]+.\[0-9\]+.\[0-9\]+).tar.\[bg\]z -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 07:53:26 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 07:53:26 -0700 (PDT) Subject: [50521] trunk/dports Message-ID: <20090502145327.A8FE616EDC3A@beta.macosforge.org> Revision: 50521 http://trac.macports.org/changeset/50521 Author: portindex at macports.org Date: 2009-05-02 07:53:26 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5799 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 14:19:28 UTC (rev 50520) +++ trunk/dports/PortIndex 2009-05-02 14:53:26 UTC (rev 50521) @@ -10560,6 +10560,8 @@ variants {check universal} portdir www/midgard-core description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-core depends_lib {port:expat port:gettext port:glib2 port:dbus port:dbus-glib port:libiconv port:libxml2 port:mysql5 port:openssl port:zlib} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 midgard-data 423 variants universal portdir www/midgard-data description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-data depends_lib {port:midgard-core port:midgard-apache2 port:php5-midgard port:dialog port:ImageMagick} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 +midgard2-core 391 +variants universal portdir www/midgard2-core description {A content repository system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard2-core depends_lib {port:glib2 port:dbus port:libxml2 port:libgda3} long_description {Midgard is a content repository system platform with bindings in PHP, Python etc.} maintainers jwa categories www version 9.03.0 revision 0 midori 454 variants universal portdir www/midori description {Midori is a lightweight web browser} homepage http://www.twotoasts.de/index.php?/pages/midori_summary.html epoch 0 platforms darwin name midori depends_lib {port:gtk2 path:include/gio/gio.h:glib2 port:webkit-gtk lib:libxml2:libxml2 port:libtool port:intltool} maintainers {afb at macports.org openmaintainer} long_description {{Midori is a lightweight web browser}} categories www version 0.1.2 revision 0 mnogosearch 702 @@ -10626,6 +10628,8 @@ variants universal portdir www/pathalizer description {visualize the paths most users take when browsing a website} homepage http://pathalizer.sourceforge.net/ epoch 0 depends_run {bin:gs:ghostscript bin:dot:graphviz port:netpbm} platforms darwin name pathalizer long_description {Pathalizer is a tool to visualize the paths most users take when browsing a website. This information can then be used to decide how to improve the navigation of the site, and which parts are most worth improving and keeping up to date.} maintainers nomaintainer categories www version 0.7 revision 0 php5-midgard 365 variants universal portdir www/php5-midgard description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name php5-midgard depends_lib {port:midgard-core port:php5} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 8.09.5 revision 0 +php5-midgard2 368 +variants universal portdir www/php5-midgard2 description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name php5-midgard2 depends_lib {port:midgard2-core port:php5} long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} maintainers jwa categories www version 9.03.0 revision 0 php5-rrdtool 350 variants universal portdir www/php5-rrdtool description {PHP 5 glue for rrdtool} homepage http://oss.oetiker.ch/rrdtool/pub/contrib/php_rrdtool.txt epoch 0 platforms darwin name php5-rrdtool depends_lib {port:rrdtool port:php5 port:re2c} long_description {{PHP 5 glue for rrdtool}} maintainers markd categories {www net devel} version 1.0 revision 1 phpbb 748 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jwa at macports.org Sat May 2 08:17:40 2009 From: jwa at macports.org (jwa at macports.org) Date: Sat, 2 May 2009 08:17:40 -0700 (PDT) Subject: [50522] trunk/dports/www/php5-midgard2/Portfile Message-ID: <20090502151741.1D3FD16EDEC8@beta.macosforge.org> Revision: 50522 http://trac.macports.org/changeset/50522 Author: jwa at macports.org Date: 2009-05-02 08:17:38 -0700 (Sat, 02 May 2009) Log Message: ----------- dropping two unused configure options Modified Paths: -------------- trunk/dports/www/php5-midgard2/Portfile Modified: trunk/dports/www/php5-midgard2/Portfile =================================================================== --- trunk/dports/www/php5-midgard2/Portfile 2009-05-02 14:53:26 UTC (rev 50521) +++ trunk/dports/www/php5-midgard2/Portfile 2009-05-02 15:17:38 UTC (rev 50522) @@ -27,8 +27,6 @@ } configure.args --sysconfdir=${prefix}/etc/midgard/ \ - --with-apxs=${prefix}/apache2/bin/apxs \ - --with-apr-config=${prefix}/bin/apr-1-config \ --with-php-config=${prefix}/bin/php-config destroot.destdir INSTALL_ROOT=${destroot} -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Sat May 2 08:48:05 2009 From: devans at macports.org (devans at macports.org) Date: Sat, 2 May 2009 08:48:05 -0700 (PDT) Subject: [50523] trunk/dports/multimedia/libtheora/Portfile Message-ID: <20090502154806.0F29F16EE25D@beta.macosforge.org> Revision: 50523 http://trac.macports.org/changeset/50523 Author: devans at macports.org Date: 2009-05-02 08:48:05 -0700 (Sat, 02 May 2009) Log Message: ----------- libtheora: current version is 1.0 but previous version was 1.0beta3 so will not upgrade. Increment epoch to force the upgrade, add mode line. Modified Paths: -------------- trunk/dports/multimedia/libtheora/Portfile Modified: trunk/dports/multimedia/libtheora/Portfile =================================================================== --- trunk/dports/multimedia/libtheora/Portfile 2009-05-02 15:17:38 UTC (rev 50522) +++ trunk/dports/multimedia/libtheora/Portfile 2009-05-02 15:48:05 UTC (rev 50523) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -4,6 +5,7 @@ name libtheora version 1.0 +epoch 1 categories multimedia platforms darwin maintainers nomaintainer -------------- next part -------------- An HTML attachment was scrubbed... URL: From macsforever2000 at macports.org Sat May 2 09:27:54 2009 From: macsforever2000 at macports.org (macsforever2000 at macports.org) Date: Sat, 2 May 2009 09:27:54 -0700 (PDT) Subject: [50524] trunk/dports/net/pureftpd/Portfile Message-ID: <20090502162755.758A916EE595@beta.macosforge.org> Revision: 50524 http://trac.macports.org/changeset/50524 Author: macsforever2000 at macports.org Date: 2009-05-02 09:27:53 -0700 (Sat, 02 May 2009) Log Message: ----------- Add mysql variant. (#19436) Modified Paths: -------------- trunk/dports/net/pureftpd/Portfile Modified: trunk/dports/net/pureftpd/Portfile =================================================================== --- trunk/dports/net/pureftpd/Portfile 2009-05-02 15:48:05 UTC (rev 50523) +++ trunk/dports/net/pureftpd/Portfile 2009-05-02 16:27:53 UTC (rev 50524) @@ -70,7 +70,7 @@ platform darwin 6 { configure.args-delete --with-pam } -variant tls { depends_lib lib:libssl.0.9:openssl +variant tls { depends_lib lib:libssl.dylib:openssl configure.args-append --with-tls \ --with-certfile=${prefix}/etc/ssl/private/pure-ftpd.pem } @@ -113,3 +113,9 @@ variant simplified_chinese { configure.args-append --with-language=simplified-chinese } +variant mysql5 { + depends_lib-append path:/opt/local/bin/mysql_config5:mysql5 + configure.args-append --with-mysql + configure.cflags-append "-I${prefix}/include/mysql5/mysql" + configure.ldflags-append "-L${prefix}/lib/mysql5/mysql" +} -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 09:52:59 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 09:52:59 -0700 (PDT) Subject: [50525] trunk/dports Message-ID: <20090502165300.E8F5916EE8C0@beta.macosforge.org> Revision: 50525 http://trac.macports.org/changeset/50525 Author: portindex at macports.org Date: 2009-05-02 09:52:59 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5799 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 16:27:53 UTC (rev 50524) +++ trunk/dports/PortIndex 2009-05-02 16:52:59 UTC (rev 50525) @@ -4873,7 +4873,7 @@ libquicktime 498 variants universal portdir multimedia/libquicktime description {library for reading and writing quicktime files} homepage http://libquicktime.sourceforge.net/ epoch 0 platforms darwin name libquicktime depends_lib {port:gettext port:jpeg port:libiconv port:libpng port:zlib path:lib/libavcodec.dylib:ffmpeg port:faac port:faad2 port:libvorbis port:libogg port:lame} long_description {{library for reading and writing quicktime files}} maintainers mww categories multimedia version 1.1.1 revision 1 libtheora 642 -variants {doc darwin_9_i386 universal} depends_build port:pkgconfig portdir multimedia/libtheora description {Xiph.org Foundation's open video codec} homepage http://www.theora.org/ epoch 0 platforms darwin name libtheora depends_lib {port:libvorbis port:libogg} long_description {Theora is an open video codec being developed by the Xiph.org Foundation as part of their Ogg project (It is a project that aims to integrate On2's VP3 video codec, Ogg Vorbis audio codec and Ogg multimedia container formats into a multimedia solution that can compete with MPEG-4 format).} maintainers nomaintainer categories multimedia version 1.0 revision 0 +variants {doc darwin_9_i386 universal} depends_build port:pkgconfig portdir multimedia/libtheora description {Xiph.org Foundation's open video codec} homepage http://www.theora.org/ epoch 1 platforms darwin name libtheora depends_lib {port:libvorbis port:libogg} long_description {Theora is an open video codec being developed by the Xiph.org Foundation as part of their Ogg project (It is a project that aims to integrate On2's VP3 video codec, Ogg Vorbis audio codec and Ogg multimedia container formats into a multimedia solution that can compete with MPEG-4 format).} maintainers nomaintainer categories multimedia version 1.0 revision 0 live555 576 variants {macosx linux} portdir multimedia/live555 description {LIVE555 Streaming Media} homepage http://www.live555.com/liveMedia/ epoch 0 platforms darwin name live555 maintainers {milosh openmaintainer} long_description {This code forms a set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP). These libraries - which can be compiled for Unix (including Linux and Mac OS X), Windows, and QNX (and other POSIX-compliant systems) - can be used to build streaming applications.} categories multimedia version 2009.04.07 revision 0 lmms 442 @@ -5476,8 +5476,8 @@ variants universal portdir net/psi-otr description {otr-plugin for psi - for plugin-enabled psi} homepage http://www.tfh-berlin.de/~s30935/ epoch 0 platforms darwin name psi-otr depends_lib {port:psi port:libotr} long_description {Psi is a capable Jabber client aimed at experienced users. Its design goals are simplicity and stability. This plugin adds the support fot off the message recording to psi} maintainers rowue at digitalis.org categories {net chat} version 0.4 revision 0 ptunnel 405 portdir net/ptunnel description {tunnel over ICMP} homepage http://www.cs.uit.no/~daniels/PingTunnel/ epoch 0 platforms darwin name ptunnel maintainers nomaintainer long_description {Ptunnel is an application that allows you to reliably tunnel TCP connections to a remote host using ICMP echo request and reply packets, commonly known as ping requests and replies.} version 0.61 categories net revision 0 -pureftpd 1130 -variants {darwin_6 tls nobanner french french_funny german spanish italian polish danish romanian brazilian slovak dutch korean swedish norwegian russian czech traditional_chinese simplified_chinese universal} portdir net/pureftpd description {A fast and standard-conformant FTP server} homepage http://pureftpd.org/ epoch 0 platforms darwin name pureftpd maintainers nomaintainer long_description {Pure-FTPd is a fast, production-quality, standard-conformant FTP server, based upon Troll-FTPd. Unlike other popular FTP servers, it's designed to be secure in default configuration, has no known buffer overflow, it is really trivial to set up and it is especially designed for modern kernels. Features include chroot()ed and/or virtual chroot()ed home directories, virtual domains, built-in 'ls', anti-warez system, bounded ports for passive downloads, FXP protocol, bandwidth throttling, ratios, LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like log files, fast s tandalone mode, text / HTML / XML real-time status report, virtual users, virtual quotas and more.} categories net version 1.0.21 revision 0 +pureftpd 1137 +variants {darwin_6 tls nobanner french french_funny german spanish italian polish danish romanian brazilian slovak dutch korean swedish norwegian russian czech traditional_chinese simplified_chinese mysql5 universal} portdir net/pureftpd description {A fast and standard-conformant FTP server} homepage http://pureftpd.org/ epoch 0 platforms darwin name pureftpd maintainers nomaintainer long_description {Pure-FTPd is a fast, production-quality, standard-conformant FTP server, based upon Troll-FTPd. Unlike other popular FTP servers, it's designed to be secure in default configuration, has no known buffer overflow, it is really trivial to set up and it is especially designed for modern kernels. Features include chroot()ed and/or virtual chroot()ed home directories, virtual domains, built-in 'ls', anti-warez system, bounded ports for passive downloads, FXP protocol, bandwidth throttling, ratios, LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like log files, fast standalone mode, text / HTML / XML real-time status report, virtual users, virtual quotas and more.} categories net version 1.0.21 revision 0 pwlib 347 variants universal portdir net/pwlib description {PWLib libraries for openh323} homepage http://www.openh323.org epoch 0 platforms darwin name pwlib depends_lib {lib:libldap:openldap lib:libsdl:libsdl lib:libexpat:expat lib:libssl:openssl} long_description {libraries for openh323} maintainers nomaintainer categories net version 1.5.2 revision 0 rabbitmq-server 493 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From macsforever2000 at macports.org Sat May 2 10:00:19 2009 From: macsforever2000 at macports.org (macsforever2000 at macports.org) Date: Sat, 2 May 2009 10:00:19 -0700 (PDT) Subject: [50526] trunk/dports/net/pureftpd/Portfile Message-ID: <20090502170019.8FB6416EE98A@beta.macosforge.org> Revision: 50526 http://trac.macports.org/changeset/50526 Author: macsforever2000 at macports.org Date: 2009-05-02 10:00:19 -0700 (Sat, 02 May 2009) Log Message: ----------- Whitespace and lint. Modified Paths: -------------- trunk/dports/net/pureftpd/Portfile Modified: trunk/dports/net/pureftpd/Portfile =================================================================== --- trunk/dports/net/pureftpd/Portfile 2009-05-02 16:52:59 UTC (rev 50525) +++ trunk/dports/net/pureftpd/Portfile 2009-05-02 17:00:19 UTC (rev 50526) @@ -1,121 +1,112 @@ # $Id$ -PortSystem 1.0 -name pureftpd -version 1.0.21 -categories net -platforms darwin -maintainers nomaintainer -homepage http://pureftpd.org/ -description A fast and standard-conformant FTP server +PortSystem 1.0 -long_description Pure-FTPd is a fast, production-quality, standard-conformant FTP server, \ - based upon Troll-FTPd. \ - Unlike other popular FTP servers, it's designed to be secure in default \ - configuration, has no known buffer overflow, it is really trivial to set \ - up and it is especially designed for modern kernels. \ - Features include chroot()ed and/or virtual chroot()ed home directories, \ - virtual domains, built-in 'ls', anti-warez system, bounded ports for \ - passive downloads, FXP protocol, bandwidth throttling, ratios, \ - LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like \ - log files, fast standalone mode, text / HTML / XML real-time status report, \ - virtual users, virtual quotas and more. +name pureftpd +version 1.0.21 +categories net +platforms darwin +maintainers nomaintainer -master_sites ftp://ftp.pureftpd.org/pure-ftpd/releases/ \ - ftp://ftp.fr.pureftpd.org/pure-ftpd/releases/ +homepage http://pureftpd.org/ +description A fast and standard-conformant FTP server -distname pure-ftpd-${version} -use_bzip2 yes +long_description "Pure-FTPd is a fast, production-quality, standard-conformant FTP server, \ + based upon Troll-FTPd. \ + Unlike other popular FTP servers, it's designed to be secure in default \ + configuration, has no known buffer overflow, it is really trivial to set \ + up and it is especially designed for modern kernels. \ + Features include chroot()ed and/or virtual chroot()ed home directories, \ + virtual domains, built-in 'ls', anti-warez system, bounded ports for \ + passive downloads, FXP protocol, bandwidth throttling, ratios, \ + LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like \ + log files, fast standalone mode, text / HTML / XML real-time status report, \ + virtual users, virtual quotas and more." -checksums md5 ca8a8dbec0cd9c8ea92fc4c37ea9c410 \ - sha1 1405ff2b9b9c3616c4e390eb99779884173a3347 \ - rmd160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 +master_sites ftp://ftp.pureftpd.org/pure-ftpd/releases/ \ + ftp://ftp.fr.pureftpd.org/pure-ftpd/releases/ -patchfiles patch-pam_pureftpd.diff +distname pure-ftpd-${version} +use_bzip2 yes -configure.args --with-everything \ - --with-virtualchroot \ - --with-paranoidmsg \ - --with-pam \ - --with-rendezvous \ - --without-capabilities \ - --mandir=${prefix}/share/man \ - --infodir=${prefix}/share/info +checksums md5 ca8a8dbec0cd9c8ea92fc4c37ea9c410 \ + sha1 1405ff2b9b9c3616c4e390eb99779884173a3347 \ + rmd160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 -destroot.destdir prefix=${destroot}${prefix} \ - mandir=${destroot}${prefix}/share/man +patchfiles patch-pam_pureftpd.diff -post-destroot { file mkdir ${destroot}${prefix}/share/doc/${name} - xinstall -m 644 -v -W ${worksrcpath} \ - AUTHORS CONTACT FAQ HISTORY NEWS README \ - README.Authentication-Modules README.Configuration-File \ - README.LDAP README.MacOS-X README.MySQL README.PGSQL \ - README.TLS README.Virtual-Users pureftpd-ldap.conf \ - pureftpd-mysql.conf pureftpd-pgsql.conf THANKS \ - ${destroot}${prefix}/share/doc/${name} - file copy ${worksrcpath}/pam/pure-ftpd \ - ${destroot}${prefix}/share/doc/${name} - } +configure.args --with-everything \ + --with-virtualchroot \ + --with-paranoidmsg \ + --with-pam \ + --with-rendezvous \ + --without-capabilities \ + --mandir=${prefix}/share/man \ + --infodir=${prefix}/share/info -# Notify the user how to launch the ftpd -post-install { ui_msg "\nYou can now start PureFTPd in 3 ways," - ui_msg "either via xinetd, in standalone mode, or" - ui_msg "if you're using Mac OS X 10.4 / Darwin 8.x" - ui_msg "via launchd(8).\n" - ui_msg "If you're under Mac OS X 10.3 or Mac OS X 10.4," - ui_msg "you have to copy ${prefix}/share/doc/${name}/pure-ftpd" - ui_msg "to /etc/pam.d and use the '-lpam' flag when" - ui_msg "launching pure-ftpd to have PAM working.\n" - } - -platform darwin 6 { configure.args-delete --with-pam } +destroot.destdir prefix=${destroot}${prefix} \ + mandir=${destroot}${prefix}/share/man -variant tls { depends_lib lib:libssl.dylib:openssl - configure.args-append --with-tls \ - --with-certfile=${prefix}/etc/ssl/private/pure-ftpd.pem - } +post-destroot { \ + file mkdir ${destroot}${prefix}/share/doc/${name} + xinstall -m 644 -v -W ${worksrcpath} \ + AUTHORS CONTACT FAQ HISTORY NEWS README \ + README.Authentication-Modules README.Configuration-File \ + README.LDAP README.MacOS-X README.MySQL README.PGSQL \ + README.TLS README.Virtual-Users pureftpd-ldap.conf \ + pureftpd-mysql.conf pureftpd-pgsql.conf THANKS \ + ${destroot}${prefix}/share/doc/${name} + file copy ${worksrcpath}/pam/pure-ftpd \ + ${destroot}${prefix}/share/doc/${name} +} -variant nobanner { configure.args-append --without-banner } +# Notify the user how to launch the ftpd +post-install { + ui_msg "\nYou can now start PureFTPd in 3 ways," + ui_msg "either via xinetd, in standalone mode, or" + ui_msg "if you're using Mac OS X 10.4 / Darwin 8.x" + ui_msg "via launchd(8).\n" + ui_msg "If you're under Mac OS X 10.3 or Mac OS X 10.4," + ui_msg "you have to copy ${prefix}/share/doc/${name}/pure-ftpd" + ui_msg "to /etc/pam.d and use the '-lpam' flag when" + ui_msg "launching pure-ftpd to have PAM working.\n" +} + +platform darwin 6 { + configure.args-delete --with-pam +} -variant french { configure.args-append --with-language=french } +# Langugage variants, should only be able to choose one. +variant brazilian description "Use Bazilian language for server messages" { configure.args-append --with-language=brazilian } +variant czech description "Use Czech language for server messages" { configure.args-append --with-language=czech } +variant danish description "Use Danish language for server messages" { configure.args-append --with-language=danish } +variant dutch description "Use Dutch language for server messages" { configure.args-append --with-language=dutch } +variant french description "Use French language for server messages" { configure.args-append --with-language=french } +variant french_funny description "Use French funny language for server messages" { configure.args-append --with-language=french-funny } +variant german description "Use German language for server messages" { configure.args-append --with-language=german } +variant italian description "Use Italian language for server messages" { configure.args-append --with-language=italian } +variant korean description "Use Korean language for server messages" { configure.args-append --with-language=korean } +variant norwegian description "Use Norwegian language for server messages" { configure.args-append --with-language=norwegian } +variant polish description "Use Polish language for server messages" { configure.args-append --with-language=polish } +variant romanian description "Use Romanian language for server messages" { configure.args-append --with-language=romanian } +variant russian description "Use Russian language for server messages" { configure.args-append --with-language=russian } +variant simplified_chinese description "Use simplified Chinese for server messages" { configure.args-append --with-language=simplified-chinese } +variant slovak description "Use Slovak language for server messages" { configure.args-append --with-language=slovak } +variant spanish description "Use Spanish language for server messages" { configure.args-append --with-language=spanish } +variant swedish description "Use Swedish language for server messages" { configure.args-append --with-language=swedish } +variant traditional_chinese description "Use traditional Chinese language for server messages" { configure.args-append --with-language=traditional-chinese } -variant french_funny { configure.args-append --with-language=french-funny } +variant mysql5 description "Use the native MySQL support for users database." { + depends_lib-append path:/opt/local/bin/mysql_config5:mysql5 + configure.args-append --with-mysql + configure.cflags-append "-I${prefix}/include/mysql5/mysql" + configure.ldflags-append "-L${prefix}/lib/mysql5/mysql" +} -variant german { configure.args-append --with-language=german } +variant nobanner description "Don't display the initial banner" { configure.args-append --without-banner } -variant spanish { configure.args-append --with-language=spanish } - -variant italian { configure.args-append --with-language=italian } - -variant polish { configure.args-append --with-language=polish } - -variant danish { configure.args-append --with-language=danish } - -variant romanian { configure.args-append --with-language=romanian } - -variant brazilian { configure.args-append --with-language=brazilian } - -variant slovak { configure.args-append --with-language=slovak } - -variant dutch { configure.args-append --with-language=dutch } - -variant korean { configure.args-append --with-language=korean } - -variant swedish { configure.args-append --with-language=swedish } - -variant norwegian { configure.args-append --with-language=norwegian } - -variant russian { configure.args-append --with-language=russian } - -variant czech { configure.args-append --with-language=czech } - -variant traditional_chinese { configure.args-append --with-language=traditional-chinese } - -variant simplified_chinese { configure.args-append --with-language=simplified-chinese } - -variant mysql5 { - depends_lib-append path:/opt/local/bin/mysql_config5:mysql5 - configure.args-append --with-mysql - configure.cflags-append "-I${prefix}/include/mysql5/mysql" - configure.ldflags-append "-L${prefix}/lib/mysql5/mysql" +variant tls description "Encryption of the control channel using SSL/TLS" { + depends_lib lib:libssl.dylib:openssl + configure.args-append --with-tls \ + --with-certfile=${prefix}/etc/ssl/private/pure-ftpd.pem } -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Sat May 2 10:26:30 2009 From: devans at macports.org (devans at macports.org) Date: Sat, 2 May 2009 10:26:30 -0700 (PDT) Subject: [50527] trunk/dports/gnome/gnome-python-desktop/Portfile Message-ID: <20090502172631.1251C16EEBE9@beta.macosforge.org> Revision: 50527 http://trac.macports.org/changeset/50527 Author: devans at macports.org Date: 2009-05-02 10:26:29 -0700 (Sat, 02 May 2009) Log Message: ----------- gnome-python-desktop: use configure.pkg_config_path to specify non-standard location for py25-cairo pkg-config file instead of environment variables RSVG_CFLAGS and RSVG_LIBS. Modified Paths: -------------- trunk/dports/gnome/gnome-python-desktop/Portfile Modified: trunk/dports/gnome/gnome-python-desktop/Portfile =================================================================== --- trunk/dports/gnome/gnome-python-desktop/Portfile 2009-05-02 17:00:19 UTC (rev 50526) +++ trunk/dports/gnome/gnome-python-desktop/Portfile 2009-05-02 17:26:29 UTC (rev 50527) @@ -37,28 +37,8 @@ --disable-nautilusburn configure.python ${prefix}/bin/python2.5 +configure.pkg_config_path ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/lib/pkgconfig -configure.env-append RSVG_CFLAGS="\ - -I${prefix}/include/librsvg-2 \ - -I${prefix}/include/glib-2.0 \ - -I${prefix}/lib/glib-2.0/include \ - -I${prefix}/include \ - -I${prefix}/include/gtk-2.0 \ - -I${prefix}/include/cairo \ - -I${prefix}/include/pixman-1 \ - -I${prefix}/include/freetype2 \ - -I${prefix}/include/libpng12 \ - -I${prefix}/include/python2.5/pycairo \ - -I${prefix}/include/pygtk-2.0" \ - RSVG_LIBS="\ - -Wl,-framework,CoreServices \ - -Wl,-framework,ApplicationServices \ - -L${prefix}/lib -lrsvg-2 -lgdk_pixbuf-2.0 -lm \ - -lcairo -lgmodule-2.0 -lpixman-1 -lfontconfig \ - -lexpat -lfreetype -lpng12 -lz -lXrender -lX11 \ - -lXau -lXdmcp -lffi -lgobject-2.0 -lglib-2.0 \ - -lintl -liconv" - platform darwin 9 { post-patch { reinplace "s| -export-symbols-regex.*||g" \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Sat May 2 10:33:50 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Sat, 2 May 2009 10:33:50 -0700 (PDT) Subject: [50528] trunk/dports/x11/gtk2/Portfile Message-ID: <20090502173350.DFE6016EEDE2@beta.macosforge.org> Revision: 50528 http://trac.macports.org/changeset/50528 Author: mcalhoun at macports.org Date: 2009-05-02 10:33:49 -0700 (Sat, 02 May 2009) Log Message: ----------- gtk2: When cross-compiling, allow installation when not upgrading. Modified Paths: -------------- trunk/dports/x11/gtk2/Portfile Modified: trunk/dports/x11/gtk2/Portfile =================================================================== --- trunk/dports/x11/gtk2/Portfile 2009-05-02 17:26:29 UTC (rev 50527) +++ trunk/dports/x11/gtk2/Portfile 2009-05-02 17:33:49 UTC (rev 50528) @@ -130,6 +130,8 @@ gio_can_sniff=yes \ GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache \ GDK_PIXBUF_CSOURCE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf-csource + lappend merger_build_env(${arch}) \ + GDK_PIXBUF_MODULE_FILE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf.loaders } post-configure { -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 10:53:05 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 10:53:05 -0700 (PDT) Subject: [50529] trunk/dports Message-ID: <20090502175306.3471116EEFA6@beta.macosforge.org> Revision: 50529 http://trac.macports.org/changeset/50529 Author: portindex at macports.org Date: 2009-05-02 10:53:02 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5799 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 17:33:49 UTC (rev 50528) +++ trunk/dports/PortIndex 2009-05-02 17:53:02 UTC (rev 50529) @@ -5476,8 +5476,8 @@ variants universal portdir net/psi-otr description {otr-plugin for psi - for plugin-enabled psi} homepage http://www.tfh-berlin.de/~s30935/ epoch 0 platforms darwin name psi-otr depends_lib {port:psi port:libotr} long_description {Psi is a capable Jabber client aimed at experienced users. Its design goals are simplicity and stability. This plugin adds the support fot off the message recording to psi} maintainers rowue at digitalis.org categories {net chat} version 0.4 revision 0 ptunnel 405 portdir net/ptunnel description {tunnel over ICMP} homepage http://www.cs.uit.no/~daniels/PingTunnel/ epoch 0 platforms darwin name ptunnel maintainers nomaintainer long_description {Ptunnel is an application that allows you to reliably tunnel TCP connections to a remote host using ICMP echo request and reply packets, commonly known as ping requests and replies.} version 0.61 categories net revision 0 -pureftpd 1137 -variants {darwin_6 tls nobanner french french_funny german spanish italian polish danish romanian brazilian slovak dutch korean swedish norwegian russian czech traditional_chinese simplified_chinese mysql5 universal} portdir net/pureftpd description {A fast and standard-conformant FTP server} homepage http://pureftpd.org/ epoch 0 platforms darwin name pureftpd maintainers nomaintainer long_description {Pure-FTPd is a fast, production-quality, standard-conformant FTP server, based upon Troll-FTPd. Unlike other popular FTP servers, it's designed to be secure in default configuration, has no known buffer overflow, it is really trivial to set up and it is especially designed for modern kernels. Features include chroot()ed and/or virtual chroot()ed home directories, virtual domains, built-in 'ls', anti-warez system, bounded ports for passive downloads, FXP protocol, bandwidth throttling, ratios, LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like log files, fast standalone mode, text / HTML / XML real-time status report, virtual users, virtual quotas and more.} categories net version 1.0.21 revision 0 +pureftpd 1149 +variants {darwin_6 brazilian czech danish dutch french french_funny german italian korean norwegian polish romanian russian simplified_chinese slovak spanish swedish traditional_chinese mysql5 nobanner tls universal} portdir net/pureftpd description {A fast and standard-conformant FTP server} homepage http://pureftpd.org/ epoch 0 platforms darwin name pureftpd maintainers nomaintainer long_description {{Pure-FTPd is a fast, production-quality, standard-conformant FTP server, based upon Troll-FTPd. Unlike other popular FTP servers, it's designed to be secure in default configuration, has no known buffer overflow, it is really trivial to set up and it is especially designed for modern kernels. Features include chroot()ed and/or virtual chroot()ed home directories, virtual domains, built-in 'ls', anti-warez system, bounded ports for passive downloads, FXP protocol, bandwidth throttling, ratios, LDAP / MySQL / PostgreSQL-based authentication, fortune files, Apache-like log files, fast standalone mode, text / HTML / XML real-time status report, virtual users, virtual quotas and more.}} categories net version 1.0.21 revision 0 pwlib 347 variants universal portdir net/pwlib description {PWLib libraries for openh323} homepage http://www.openh323.org epoch 0 platforms darwin name pwlib depends_lib {lib:libldap:openldap lib:libsdl:libsdl lib:libexpat:expat lib:libssl:openssl} long_description {libraries for openh323} maintainers nomaintainer categories net version 1.5.2 revision 0 rabbitmq-server 493 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From devans at macports.org Sat May 2 10:58:07 2009 From: devans at macports.org (devans at macports.org) Date: Sat, 2 May 2009 10:58:07 -0700 (PDT) Subject: [50530] trunk/dports/gnome/gnome-control-center/Portfile Message-ID: <20090502175807.CBA1B16EF02F@beta.macosforge.org> Revision: 50530 http://trac.macports.org/changeset/50530 Author: devans at macports.org Date: 2009-05-02 10:58:07 -0700 (Sat, 02 May 2009) Log Message: ----------- gnome-control-center: patch applies to pre-Leopard only. Modified Paths: -------------- trunk/dports/gnome/gnome-control-center/Portfile Modified: trunk/dports/gnome/gnome-control-center/Portfile =================================================================== --- trunk/dports/gnome/gnome-control-center/Portfile 2009-05-02 17:53:02 UTC (rev 50529) +++ trunk/dports/gnome/gnome-control-center/Portfile 2009-05-02 17:58:07 UTC (rev 50530) @@ -28,7 +28,9 @@ depends_build port:gnome-doc-utils -patchfiles patch-libslab-director-tile.c.diff +if {${os.platform} == "darwin" && ${os.major} < 9} { + patchfiles patch-libslab-director-tile.c.diff +} use_bzip2 yes -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Sat May 2 11:43:43 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Sat, 2 May 2009 11:43:43 -0700 (PDT) Subject: [50531] trunk/dports/graphics/poppler/Portfile Message-ID: <20090502184344.544F416EF4D5@beta.macosforge.org> Revision: 50531 http://trac.macports.org/changeset/50531 Author: mcalhoun at macports.org Date: 2009-05-02 11:43:40 -0700 (Sat, 02 May 2009) Log Message: ----------- poppler: Use muniversal PortGroup to build universal binaries. Modified Paths: -------------- trunk/dports/graphics/poppler/Portfile Modified: trunk/dports/graphics/poppler/Portfile =================================================================== --- trunk/dports/graphics/poppler/Portfile 2009-05-02 17:58:07 UTC (rev 50530) +++ trunk/dports/graphics/poppler/Portfile 2009-05-02 18:43:40 UTC (rev 50531) @@ -2,6 +2,7 @@ # $Id$ PortSystem 1.0 +PortGroup muniversal 1.0 name poppler version 0.10.6 @@ -67,7 +68,7 @@ configure.pkg_config_path ${qt_dir}/lib/pkgconfig } -variant docs description {Build gtk-doc documentation} { +variant docs conflicts universal description {Build gtk-doc documentation} { depends_build-append port:gtk-doc configure.args-append --enable-gtk-doc } -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Sat May 2 11:51:36 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Sat, 2 May 2009 11:51:36 -0700 (PDT) Subject: [50532] trunk/dports/x11 Message-ID: <20090502185137.BE33A16EF71F@beta.macosforge.org> Revision: 50532 http://trac.macports.org/changeset/50532 Author: jeremyhu at macports.org Date: 2009-05-02 11:51:35 -0700 (Sat, 02 May 2009) Log Message: ----------- xorg: Nuked the +system_x11 variant. Modified Paths: -------------- trunk/dports/x11/Xft2/Portfile trunk/dports/x11/imake/Portfile trunk/dports/x11/mesa/Portfile trunk/dports/x11/xorg-libAppleWM/Portfile trunk/dports/x11/xorg-libFS/Portfile trunk/dports/x11/xorg-libX11/Portfile trunk/dports/x11/xorg-libXScrnSaver/Portfile trunk/dports/x11/xorg-libXTrap/Portfile trunk/dports/x11/xorg-libXau/Portfile trunk/dports/x11/xorg-libXaw/Portfile trunk/dports/x11/xorg-libXcomposite/Portfile trunk/dports/x11/xorg-libXcursor/Portfile trunk/dports/x11/xorg-libXdamage/Portfile trunk/dports/x11/xorg-libXdmcp/Portfile trunk/dports/x11/xorg-libXevie/Portfile trunk/dports/x11/xorg-libXext/Portfile trunk/dports/x11/xorg-libXfixes/Portfile trunk/dports/x11/xorg-libXfont/Portfile trunk/dports/x11/xorg-libXfontcache/Portfile trunk/dports/x11/xorg-libXi/Portfile trunk/dports/x11/xorg-libXinerama/Portfile trunk/dports/x11/xorg-libXmu/Portfile trunk/dports/x11/xorg-libXp/Portfile trunk/dports/x11/xorg-libXrandr/Portfile trunk/dports/x11/xorg-libXres/Portfile trunk/dports/x11/xorg-libXt/Portfile trunk/dports/x11/xorg-libXtst/Portfile trunk/dports/x11/xorg-libXv/Portfile trunk/dports/x11/xorg-libXvMC/Portfile trunk/dports/x11/xorg-libXxf86dga/Portfile trunk/dports/x11/xorg-libXxf86misc/Portfile trunk/dports/x11/xorg-libXxf86vm/Portfile trunk/dports/x11/xorg-libdmx/Portfile trunk/dports/x11/xorg-libfontenc/Portfile trunk/dports/x11/xorg-libice/Portfile trunk/dports/x11/xorg-liblbxutil/Portfile trunk/dports/x11/xorg-liboldX/Portfile trunk/dports/x11/xorg-libsm/Portfile trunk/dports/x11/xorg-libxcb/Portfile trunk/dports/x11/xorg-libxkbfile/Portfile trunk/dports/x11/xorg-libxkbui/Portfile trunk/dports/x11/xorg-xcb-util/Portfile trunk/dports/x11/xpm/Portfile trunk/dports/x11/xrender/Portfile Modified: trunk/dports/x11/Xft2/Portfile =================================================================== --- trunk/dports/x11/Xft2/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/Xft2/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -48,21 +48,3 @@ livecheck.check regex livecheck.url ${master_sites}?C=M&O=D livecheck.regex libXft-(\[0-9.\]+)\\.tar\\.bz2 - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXft.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/imake/Portfile =================================================================== --- trunk/dports/x11/imake/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/imake/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -37,30 +37,6 @@ ${worksrcpath}/mkhtmlindex.pl } -variant system_x11 description {Use the system X11 rather than MacPorts} { - if { ! [string equal ${prefix} ${x11prefix}] } { - if { [file exists ${x11prefix}/bin/imake] } { - # imake was installed by system X11. - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } elseif { ${os.major} >= 9 && [file exists ${x11prefix}/lib/pkgconfig/xproto.pc] && ![file exists ${prefix}/lib/pkgconfig/xproto.pc]} { - # Current versions of XQuartz no longer provide imake, so system_x11 means use the X11 headers. - depends_build-delete port:xorg-xproto - } - } -} - livecheck.check regex livecheck.url "http://xorg.freedesktop.org/releases/individual/util/?C=M;O=D" livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/mesa/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -89,40 +89,29 @@ configure.cppflags-append -I${filespath}/include } -if {! [variant_isset system_x11]} { - default_variants +hw_render +default_variants +hw_render - post-patch { - reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin - reinplace "s:osmesa::g" ${worksrcpath}/configs/darwin +post-patch { + reinplace "s:-fno-strict-aliasing:-fno-strict-aliasing -fno-common:g" ${worksrcpath}/configs/darwin + reinplace "s:osmesa::g" ${worksrcpath}/configs/darwin - # Ensure correct compilers are used in mklib. - reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":" ${worksrcpath}/bin/mklib - reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":" ${worksrcpath}/bin/mklib - } + # Ensure correct compilers are used in mklib. + reinplace "s:LINK=\"g++\":LINK=\"${configure.cxx}\":" ${worksrcpath}/bin/mklib + reinplace "s:LINK=\"cc\":LINK=\"${configure.cc}\":" ${worksrcpath}/bin/mklib +} - post-extract { - if {! [file exists "${worksrcpath}/configs/current"]} { - ln -s darwin ${worksrcpath}/configs/current - } +post-extract { + if {! [file exists "${worksrcpath}/configs/current"]} { + ln -s darwin ${worksrcpath}/configs/current } +} - # This next hunk supports building -system_x11 mesa on a system that is otherwise +system_x11 - pre-build { - if {! [file exists ${prefix}/lib/libX11.dylib]} { - build.args-append X11_DIR=${x11prefix} - destroot.args-append X11_DIR=${x11prefix} - } - } - # Do this if you want to install the mesa-provided glxinfo and glxgears... doesn't work on Tiger -# post-destroot { -# xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin" -# } +#post-destroot { +# xinstall -m 755 -W "${worksrcpath}/progs/xdemos" glxgears glxinfo "${destroot}${prefix}/bin" +#} -} - -variant hw_render conflicts system_x11 description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} { +variant hw_render description {Install a libGL.dylib that uses OpenGL.framework to allow rendering on your graphics hardware} { # post-patch { # system "cd ${worksrcpath}/../AppleSGLX-${ASGLX_version} && cat ${filespath}/asglx-*.patch | patch -p0" # } @@ -146,23 +135,4 @@ } } -variant system_x11 conflicts hw_render description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libGLU.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - distfiles - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} - livecheck.regex "MesaLib (.*) released.*" Modified: trunk/dports/x11/xorg-libAppleWM/Portfile =================================================================== --- trunk/dports/x11/xorg-libAppleWM/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libAppleWM/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -38,23 +38,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libAppleWM-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libAppleWM.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - distfiles - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } -} Modified: trunk/dports/x11/xorg-libFS/Portfile =================================================================== --- trunk/dports/x11/xorg-libFS/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libFS/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -27,21 +27,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libFS-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libFS.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libX11/Portfile =================================================================== --- trunk/dports/x11/xorg-libX11/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libX11/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -41,21 +41,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libX11-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libX11.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXScrnSaver/Portfile =================================================================== --- trunk/dports/x11/xorg-libXScrnSaver/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXScrnSaver/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -28,22 +28,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXScrnSaver-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXss.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXTrap/Portfile =================================================================== --- trunk/dports/x11/xorg-libXTrap/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXTrap/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -32,21 +32,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXTrap-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXTrap.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXau/Portfile =================================================================== --- trunk/dports/x11/xorg-libXau/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXau/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -25,22 +25,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXau-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXau.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXaw/Portfile =================================================================== --- trunk/dports/x11/xorg-libXaw/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXaw/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -43,24 +43,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXaw-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXaw.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - use_autoreconf no - patch { } - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXcomposite/Portfile =================================================================== --- trunk/dports/x11/xorg-libXcomposite/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXcomposite/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -30,28 +30,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXcomposite-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXcomposite.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - XCOMPOSITE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - XCOMPOSITE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lXfixes -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libXcursor/Portfile =================================================================== --- trunk/dports/x11/xorg-libXcursor/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXcursor/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -31,22 +31,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXcursor-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXcursor.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXdamage/Portfile =================================================================== --- trunk/dports/x11/xorg-libXdamage/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXdamage/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,28 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXdamage-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXdamage.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - XDAMAGE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - XDAMAGE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXfixes -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libXdmcp/Portfile =================================================================== --- trunk/dports/x11/xorg-libXdmcp/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXdmcp/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -23,22 +23,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXdmcp-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXdmcp.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXevie/Portfile =================================================================== --- trunk/dports/x11/xorg-libXevie/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXevie/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -38,28 +38,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXevie-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXevie.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - XEVIE_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - XEVIE_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libXext/Portfile =================================================================== --- trunk/dports/x11/xorg-libXext/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXext/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -32,21 +32,3 @@ patchfiles cad77b1d6d1a344f2cb31c16401076c003bb97dd.patch patch.args -p1 - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXext.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXfixes/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfixes/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXfixes/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,28 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXfixes-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXfixes.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - X_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - X_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libXfont/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfont/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXfont/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -52,22 +52,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXfont-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXfont.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXfontcache/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfontcache/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXfontcache/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -31,22 +31,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXfontcache-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXfontcache.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXi/Portfile =================================================================== --- trunk/dports/x11/xorg-libXi/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXi/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,21 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXi-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXi.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXinerama/Portfile =================================================================== --- trunk/dports/x11/xorg-libXinerama/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXinerama/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,22 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXinerama-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXinerama.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXmu/Portfile =================================================================== --- trunk/dports/x11/xorg-libXmu/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXmu/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -30,23 +30,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXmu-(\\d+(?:\\.\\d+)*) - - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXmu.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXp/Portfile =================================================================== --- trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -37,22 +37,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXp-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXp.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXrandr/Portfile =================================================================== --- trunk/dports/x11/xorg-libXrandr/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXrandr/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -32,22 +32,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXrandr-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXrandr.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXres/Portfile =================================================================== --- trunk/dports/x11/xorg-libXres/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXres/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,22 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXres-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXres.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXt/Portfile =================================================================== --- trunk/dports/x11/xorg-libXt/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXt/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -44,22 +44,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXt-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXt.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXtst/Portfile =================================================================== --- trunk/dports/x11/xorg-libXtst/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXtst/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -30,22 +30,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXtst-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXtst.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXv/Portfile =================================================================== --- trunk/dports/x11/xorg-libXv/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXv/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -28,22 +28,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXv-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXv.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXvMC/Portfile =================================================================== --- trunk/dports/x11/xorg-libXvMC/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXvMC/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -28,22 +28,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXvMC-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXvMC.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXxf86dga/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,28 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXxf86dga-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXxf86dga.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - XXF86DGA_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - XXF86DGA_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libXxf86misc/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86misc/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXxf86misc/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -32,22 +32,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXxf86misc-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXxf86misc.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libXxf86vm/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86vm/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libXxf86vm/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,22 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXxf86vm-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXxf86vm.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libdmx/Portfile =================================================================== --- trunk/dports/x11/xorg-libdmx/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libdmx/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -31,28 +31,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libdmx-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libdmx.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } else { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - DMX_CFLAGS="-I${prefix}/include -I${x11prefix}/include" \ - DMX_LIBS="-L${prefix}/lib -L${x11prefix}/lib -lXext -lX11" - } - } -} Modified: trunk/dports/x11/xorg-libfontenc/Portfile =================================================================== --- trunk/dports/x11/xorg-libfontenc/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libfontenc/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -26,22 +26,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libfontenc-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libfontenc.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libice/Portfile =================================================================== --- trunk/dports/x11/xorg-libice/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libice/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -28,21 +28,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libICE-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libICE.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-liblbxutil/Portfile =================================================================== --- trunk/dports/x11/xorg-liblbxutil/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-liblbxutil/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -38,22 +38,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex liblbxutil-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/liblbxutil.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_autoreconf no - use_configure no - } -} Modified: trunk/dports/x11/xorg-liboldX/Portfile =================================================================== --- trunk/dports/x11/xorg-liboldX/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-liboldX/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -26,22 +26,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex liboldX-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/liboldX.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libsm/Portfile =================================================================== --- trunk/dports/x11/xorg-libsm/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libsm/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -34,22 +34,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libSM-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libSM.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libxcb/Portfile =================================================================== --- trunk/dports/x11/xorg-libxcb/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libxcb/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -48,22 +48,3 @@ if {![variant_isset python25] && ![variant_isset python30]} { default_variants +python26 } - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libxcb.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - use_autoreconf no - } -} Modified: trunk/dports/x11/xorg-libxkbfile/Portfile =================================================================== --- trunk/dports/x11/xorg-libxkbfile/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libxkbfile/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,22 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libxkbfile-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libxkbfile.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-libxkbui/Portfile =================================================================== --- trunk/dports/x11/xorg-libxkbui/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-libxkbui/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -29,22 +29,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libxkbui-(\\d+(?:\\.\\d+)*) - - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libxkbui.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xorg-xcb-util/Portfile =================================================================== --- trunk/dports/x11/xorg-xcb-util/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xorg-xcb-util/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -26,21 +26,3 @@ livecheck.check regex livecheck.url ${master_sites}?C=M&O=D livecheck.regex xcb-util-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libxcb-render-util.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xpm/Portfile =================================================================== --- trunk/dports/x11/xpm/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xpm/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -27,21 +27,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXpm-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXpm.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} Modified: trunk/dports/x11/xrender/Portfile =================================================================== --- trunk/dports/x11/xrender/Portfile 2009-05-02 18:43:40 UTC (rev 50531) +++ trunk/dports/x11/xrender/Portfile 2009-05-02 18:51:35 UTC (rev 50532) @@ -46,21 +46,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex ${my_name}-(\\d+(?:\\.\\d+)*) - -variant system_x11 description {Install a stub package to use the system X11 libraries rather than MacPorts} { - if { [file exists ${x11prefix}/lib/libXrender.dylib] && ! [string equal ${prefix} ${x11prefix}] } { - depends_build - depends_lib - depends_run - fetch { } - checksum { } - extract { } - patch { } - build { } - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo ${long_description} > ${destroot}${prefix}/share/doc/${name}/README.txt" - } - use_configure no - } -} -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 11:53:03 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 11:53:03 -0700 (PDT) Subject: [50533] trunk/dports/PortIndex Message-ID: <20090502185305.1C7E916EFD96@beta.macosforge.org> Revision: 50533 http://trac.macports.org/changeset/50533 Author: portindex at macports.org Date: 2009-05-02 11:53:03 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5799 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 18:51:35 UTC (rev 50532) +++ trunk/dports/PortIndex 2009-05-02 18:53:03 UTC (rev 50533) @@ -3175,7 +3175,7 @@ podofo 705 depends_build port:cmake portdir graphics/podofo description {PoDoFo is a library to work with the PDF file format.} homepage http://podofo.sourceforge.net/ epoch 0 platforms darwin name podofo depends_lib {port:fontconfig port:freetype port:jpeg port:tiff port:zlib port:cppunit port:openssl port:lua} maintainers {devans openmaintainer} long_description {PoDoFo is a library to work with the PDF file format. The PoDoFo library is a free, portable C++ library which includes classes to parse PDF files and modify their contents into memory. The changes can be written back to disk easily. The parser can also be used to extract information from a PDF file.} categories graphics version 0.7.0 revision 1 poppler 479 -variants {quartz qt4 docs universal} depends_build port:pkgconfig portdir graphics/poppler description {Poppler is a PDF rendering library based on the xpdf-3.0 code base.} homepage http://poppler.freedesktop.org/ epoch 0 platforms darwin name poppler depends_lib {port:gtk2 port:openjpeg port:poppler-data} long_description {{Poppler is a PDF rendering library based on the xpdf-3.0 code base.}} maintainers {devans openmaintainer} categories graphics version 0.10.6 revision 0 +variants {universal quartz qt4 docs} depends_build port:pkgconfig portdir graphics/poppler description {Poppler is a PDF rendering library based on the xpdf-3.0 code base.} homepage http://poppler.freedesktop.org/ epoch 0 platforms darwin depends_lib {port:gtk2 port:openjpeg port:poppler-data} name poppler maintainers {devans openmaintainer} long_description {{Poppler is a PDF rendering library based on the xpdf-3.0 code base.}} categories graphics version 0.10.6 revision 0 poppler-data 265 portdir graphics/poppler-data description {Poppler encoding data.} homepage http://poppler.freedesktop.org/ epoch 0 platforms darwin name poppler-data maintainers nomaintainer long_description {{Poppler encoding data.}} version 0.2.1 categories graphics revision 0 potrace 755 -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Sat May 2 12:11:23 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Sat, 2 May 2009 12:11:23 -0700 (PDT) Subject: [50534] trunk/dports/x11 Message-ID: <20090502191123.933F716F04FD@beta.macosforge.org> Revision: 50534 http://trac.macports.org/changeset/50534 Author: jeremyhu at macports.org Date: 2009-05-02 12:11:22 -0700 (Sat, 02 May 2009) Log Message: ----------- xorg: Move proto deps to depends_lib instead of depends_build... see bug #19503 Modified Paths: -------------- trunk/dports/x11/Xft2/Portfile trunk/dports/x11/mesa/Portfile trunk/dports/x11/xorg-libAppleWM/Portfile trunk/dports/x11/xorg-libFS/Portfile trunk/dports/x11/xorg-libX11/Portfile trunk/dports/x11/xorg-libXScrnSaver/Portfile trunk/dports/x11/xorg-libXTrap/Portfile trunk/dports/x11/xorg-libXau/Portfile trunk/dports/x11/xorg-libXaw/Portfile trunk/dports/x11/xorg-libXcomposite/Portfile trunk/dports/x11/xorg-libXcursor/Portfile trunk/dports/x11/xorg-libXdamage/Portfile trunk/dports/x11/xorg-libXdmcp/Portfile trunk/dports/x11/xorg-libXevie/Portfile trunk/dports/x11/xorg-libXext/Portfile trunk/dports/x11/xorg-libXfixes/Portfile trunk/dports/x11/xorg-libXfont/Portfile trunk/dports/x11/xorg-libXfontcache/Portfile trunk/dports/x11/xorg-libXi/Portfile trunk/dports/x11/xorg-libXinerama/Portfile trunk/dports/x11/xorg-libXmu/Portfile trunk/dports/x11/xorg-libXp/Portfile trunk/dports/x11/xorg-libXrandr/Portfile trunk/dports/x11/xorg-libXres/Portfile trunk/dports/x11/xorg-libXt/Portfile trunk/dports/x11/xorg-libXtst/Portfile trunk/dports/x11/xorg-libXv/Portfile trunk/dports/x11/xorg-libXvMC/Portfile trunk/dports/x11/xorg-libXxf86dga/Portfile trunk/dports/x11/xorg-libXxf86misc/Portfile trunk/dports/x11/xorg-libXxf86vm/Portfile trunk/dports/x11/xorg-libdmx/Portfile trunk/dports/x11/xorg-libfontenc/Portfile trunk/dports/x11/xorg-libice/Portfile trunk/dports/x11/xorg-liblbxutil/Portfile trunk/dports/x11/xorg-libsm/Portfile trunk/dports/x11/xorg-libxcb/Portfile trunk/dports/x11/xorg-libxkbfile/Portfile trunk/dports/x11/xorg-xcb-util/Portfile trunk/dports/x11/xpm/Portfile trunk/dports/x11/xrender/Portfile Modified: trunk/dports/x11/Xft2/Portfile =================================================================== --- trunk/dports/x11/Xft2/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/Xft2/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -31,10 +31,10 @@ rmd160 f9cbfd6710a9999a12f49e2bb23b8061eee01e9e depends_build \ - port:pkgconfig \ - port:xorg-xproto + port:pkgconfig depends_lib \ + port:xorg-xproto \ port:zlib \ port:xrender \ port:freetype \ Modified: trunk/dports/x11/mesa/Portfile =================================================================== --- trunk/dports/x11/mesa/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/mesa/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -41,14 +41,14 @@ # glut port is here to "clean out" the glut port if it's installed to avoid conflict depends_build \ - port:xorg-glproto \ - port:xorg-dri2proto \ - port:xorg-libXfixes \ bin:makedepend:makedepend \ port:glut \ bin:tclsh8.5:tcl depends_lib \ + port:xorg-glproto \ + port:xorg-dri2proto \ + port:xorg-libXfixes \ port:xorg-libXi \ port:xorg-libXmu Modified: trunk/dports/x11/xorg-libAppleWM/Portfile =================================================================== --- trunk/dports/x11/xorg-libAppleWM/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libAppleWM/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -24,13 +24,11 @@ port:libtool \ port:autoconf \ port:automake \ - port:xorg-util-macros \ - port:xorg-applewmproto \ - port:xorg-xproto \ - port:xorg-xextproto + port:xorg-util-macros depends_lib port:xorg-libX11 \ - port:xorg-libXext + port:xorg-libXext \ + port:xorg-applewmproto use_autoreconf yes autoreconf.args -fvi Modified: trunk/dports/x11/xorg-libFS/Portfile =================================================================== --- trunk/dports/x11/xorg-libFS/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libFS/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,8 +20,9 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-fontsproto \ +depends_build port:pkgconfig + +depends_lib port:xorg-fontsproto \ port:xorg-xproto livecheck.check regex Modified: trunk/dports/x11/xorg-libX11/Portfile =================================================================== --- trunk/dports/x11/xorg-libX11/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libX11/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,16 +20,17 @@ use_parallel_build yes depends_build port:pkgconfig \ + port:xorg-xtrans + +depends_lib port:xorg-libXdmcp \ + port:xorg-libXau \ port:xorg-bigreqsproto \ port:xorg-xcmiscproto \ port:xorg-xproto \ - port:xorg-xtrans \ port:xorg-xextproto \ port:xorg-xf86bigfontproto \ port:xorg-inputproto \ port:xorg-kbproto -depends_lib port:xorg-libXdmcp \ - port:xorg-libXau configure.args --without-xcb variant x11_xcb description "use XCB for low-level protocol implementation" { Modified: trunk/dports/x11/xorg-libXScrnSaver/Portfile =================================================================== --- trunk/dports/x11/xorg-libXScrnSaver/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXScrnSaver/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,11 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-scrnsaverproto \ - port:xorg-xextproto -depends_lib port:xorg-libXext +depends_build port:pkgconfig +depends_lib port:xorg-libXext \ + port:xorg-scrnsaverproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXScrnSaver-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXTrap/Portfile =================================================================== --- trunk/dports/x11/xorg-libXTrap/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXTrap/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -21,13 +21,12 @@ rmd160 64be36fe42857079a6059895a24148edf0b4bfb2 depends_build \ - port:pkgconfig \ - port:xorg-trapproto \ - port:xorg-xextproto + port:pkgconfig depends_lib \ port:xorg-libXext \ - port:xorg-libXt + port:xorg-libXt \ + port:xorg-trapproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXau/Portfile =================================================================== --- trunk/dports/x11/xorg-libXau/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXau/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -19,9 +19,10 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xproto +depends_build port:pkgconfig +depends_lib port:xorg-xproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXau-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXaw/Portfile =================================================================== --- trunk/dports/x11/xorg-libXaw/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXaw/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -24,9 +24,6 @@ autoreconf.args -fvi depends_build port:pkgconfig \ - port:xorg-kbproto \ - port:xorg-xproto \ - port:xorg-xextproto \ port:xorg-util-macros \ port:autoconf \ port:automake \ Modified: trunk/dports/x11/xorg-libXcomposite/Portfile =================================================================== --- trunk/dports/x11/xorg-libXcomposite/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXcomposite/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,12 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-compositeproto \ - port:xorg-fixesproto \ - port:xorg-xextproto +depends_build port:pkgconfig + depends_lib port:xorg-libXfixes \ - port:xorg-libXext + port:xorg-libXext \ + port:xorg-compositeproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXcursor/Portfile =================================================================== --- trunk/dports/x11/xorg-libXcursor/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXcursor/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -21,12 +21,11 @@ use_parallel_build yes depends_build \ - port:pkgconfig \ - port:xorg-fixesproto \ - port:xorg-renderproto + port:pkgconfig + depends_lib \ port:xorg-libXfixes \ - port:xrender \ + port:xrender livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXdamage/Portfile =================================================================== --- trunk/dports/x11/xorg-libXdamage/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXdamage/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,12 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-damageproto \ - port:xorg-fixesproto \ - port:xorg-xextproto -depends_lib port:xorg-libXfixes +depends_build port:pkgconfig +depends_lib port:xorg-libXfixes \ + port:xorg-damageproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXdamage-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXdmcp/Portfile =================================================================== --- trunk/dports/x11/xorg-libXdmcp/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXdmcp/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -17,9 +17,10 @@ checksums sha1 0e2fd4a0d8e8b94a4b5af85f08a2fff27bf90238 use_bzip2 yes -depends_build port:pkgconfig \ - port:xorg-xproto +depends_build port:pkgconfig +depends_lib port:xorg-xproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXdmcp-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXevie/Portfile =================================================================== --- trunk/dports/x11/xorg-libXevie/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXevie/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -25,13 +25,11 @@ port:libtool \ port:autoconf \ port:automake \ - port:xorg-util-macros \ - port:xorg-xproto \ - port:xorg-xextproto \ + port:xorg-util-macros + +depends_lib port:xorg-libXext \ port:xorg-evieproto -depends_lib port:xorg-libXext - use_autoreconf yes autoreconf.args -fvi Modified: trunk/dports/x11/xorg-libXext/Portfile =================================================================== --- trunk/dports/x11/xorg-libXext/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXext/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -21,9 +21,8 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xproto \ - port:xorg-xextproto +depends_build port:pkgconfig + depends_lib port:xorg-libX11 livecheck.check regex Modified: trunk/dports/x11/xorg-libXfixes/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfixes/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXfixes/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,12 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-fixesproto \ - port:xorg-xproto \ - port:xorg-xextproto -depends_lib port:xorg-libX11 +depends_build port:pkgconfig +depends_lib port:xorg-libX11 \ + port:xorg-fixesproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXfixes-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXfont/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfont/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXfont/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -27,16 +27,15 @@ port:automake \ port:xorg-util-macros \ port:pkgconfig \ - port:xorg-fontcacheproto \ - port:xorg-fontsproto \ - port:xorg-xproto \ port:xorg-xtrans depends_lib \ port:freetype \ port:xorg-libfontenc \ port:bzip2 \ - port:zlib + port:zlib \ + port:xorg-fontcacheproto \ + port:xorg-fontsproto configure.args --with-bzip2 Modified: trunk/dports/x11/xorg-libXfontcache/Portfile =================================================================== --- trunk/dports/x11/xorg-libXfontcache/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXfontcache/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,13 +20,12 @@ use_parallel_build yes depends_build \ - port:pkgconfig \ - port:xorg-fontcacheproto \ - port:xorg-fontsproto \ - port:xorg-xextproto + port:pkgconfig depends_lib \ - port:xorg-libXext + port:xorg-libXext \ + port:xorg-fontcacheproto \ + port:xorg-fontsproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXi/Portfile =================================================================== --- trunk/dports/x11/xorg-libXi/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXi/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,10 +20,8 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xextproto \ - port:xorg-inputproto \ - port:xorg-xproto +depends_build port:pkgconfig + depends_lib port:xorg-libXext livecheck.check regex Modified: trunk/dports/x11/xorg-libXinerama/Portfile =================================================================== --- trunk/dports/x11/xorg-libXinerama/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXinerama/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -19,12 +19,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xineramaproto \ - port:xorg-xextproto +depends_build port:pkgconfig depends_lib port:xorg-libX11 \ - port:xorg-libXext + port:xorg-libXext \ + port:xorg-xineramaproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXmu/Portfile =================================================================== --- trunk/dports/x11/xorg-libXmu/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXmu/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,8 +20,7 @@ use_parallel_build yes depends_build \ - port:pkgconfig \ - port:xorg-xextproto + port:pkgconfig depends_lib \ port:xorg-libXext \ Modified: trunk/dports/x11/xorg-libXp/Portfile =================================================================== --- trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -25,11 +25,10 @@ port:autoconf \ port:automake \ port:libtool \ - port:xorg-util-macros \ - port:xorg-printproto \ - port:xorg-xproto \ - port:xorg-xextproto + port:xorg-util-macros + depends_lib port:xorg-libXext + port:xorg-printproto use_autoreconf yes autoreconf.args -fvi Modified: trunk/dports/x11/xorg-libXrandr/Portfile =================================================================== --- trunk/dports/x11/xorg-libXrandr/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXrandr/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -19,16 +19,14 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-randrproto \ - port:xorg-renderproto \ - port:xorg-xproto \ - port:xorg-xextproto +depends_build port:pkgconfig depends_lib port:xorg-libX11 \ port:xorg-libXext \ - port:xrender + port:xrender \ + port:xorg-randrproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXrandr-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXres/Portfile =================================================================== --- trunk/dports/x11/xorg-libXres/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXres/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,12 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xextproto \ +depends_build port:pkgconfig + +depends_lib port:xorg-libXext \ port:xorg-resourceproto -depends_lib port:xorg-libXext - livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXres-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXt/Portfile =================================================================== --- trunk/dports/x11/xorg-libXt/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXt/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -28,9 +28,7 @@ port:libtool \ port:autoconf \ port:automake \ - port:xorg-util-macros \ - port:xorg-kbproto \ - port:xorg-xproto + port:xorg-util-macros depends_lib port:xorg-libsm \ port:xorg-libX11 Modified: trunk/dports/x11/xorg-libXtst/Portfile =================================================================== --- trunk/dports/x11/xorg-libXtst/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXtst/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,12 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-inputproto \ - port:xorg-recordproto \ - port:xorg-xextproto +depends_build port:pkgconfig + depends_lib port:xorg-libXext \ - port:xorg-libXi + port:xorg-libXi \ + port:xorg-recordproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXv/Portfile =================================================================== --- trunk/dports/x11/xorg-libXv/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXv/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,11 +20,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-videoproto \ - port:xorg-xextproto -depends_lib port:xorg-libXext +depends_build port:pkgconfig +depends_lib port:xorg-libXext \ + port:xorg-videoproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXv-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-libXvMC/Portfile =================================================================== --- trunk/dports/x11/xorg-libXvMC/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXvMC/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,9 +20,8 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-videoproto \ - port:xorg-xextproto +depends_build port:pkgconfig + depends_lib port:xorg-libXv livecheck.check regex Modified: trunk/dports/x11/xorg-libXxf86dga/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,11 +20,10 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xf86dgaproto \ - port:xorg-xproto \ - port:xorg-xextproto +depends_build port:pkgconfig + depends_lib port:xorg-libXext + port:xorg-xf86dgaproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libXxf86misc/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86misc/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXxf86misc/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -21,12 +21,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xf86miscproto \ - port:xorg-xproto \ - port:xorg-xextproto -depends_lib port:xorg-libXext +depends_build port:pkgconfig +depends_lib port:xorg-libXext \ + port:xorg-xf86miscproto + configure.args --mandir=${prefix}/share/man livecheck.check regex Modified: trunk/dports/x11/xorg-libXxf86vm/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86vm/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libXxf86vm/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,11 +20,9 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-xf86vidmodeproto \ - port:xorg-xproto \ - port:xorg-xextproto -depends_lib port:xorg-libXext +depends_build port:pkgconfig +depends_lib port:xorg-libXext \ + port:xorg-xf86vidmodeproto livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D Modified: trunk/dports/x11/xorg-libdmx/Portfile =================================================================== --- trunk/dports/x11/xorg-libdmx/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libdmx/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -21,11 +21,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ - port:xorg-dmxproto \ - port:xorg-xextproto -depends_lib port:xorg-libXext +depends_build port:pkgconfig +depends_lib port:xorg-libXext \ + port:xorg-dmxproto + configure.args --mandir=${prefix}/share/man livecheck.check regex Modified: trunk/dports/x11/xorg-libfontenc/Portfile =================================================================== --- trunk/dports/x11/xorg-libfontenc/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libfontenc/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -17,10 +17,10 @@ use_bzip2 yes depends_build \ - port:pkgconfig \ - port:xorg-xproto + port:pkgconfig depends_lib \ + port:xorg-xproto \ port:zlib livecheck.check regex Modified: trunk/dports/x11/xorg-libice/Portfile =================================================================== --- trunk/dports/x11/xorg-libice/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libice/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -22,9 +22,10 @@ rmd160 4c08c4ef542eedd315a9b097bcec6779be01b2b7 depends_build port:pkgconfig \ - port:xorg-xproto \ port:xorg-xtrans +depends_lib port:xorg-xproto + livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libICE-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xorg-liblbxutil/Portfile =================================================================== --- trunk/dports/x11/xorg-liblbxutil/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-liblbxutil/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -25,11 +25,11 @@ port:automake \ port:libtool \ port:xorg-util-macros \ + +depends_lib port:zlib \ port:xorg-xproto \ port:xorg-xextproto -depends_lib port:zlib - configure.cflags-append -Wl,-undefined,dynamic_lookup use_autoreconf yes Modified: trunk/dports/x11/xorg-libsm/Portfile =================================================================== --- trunk/dports/x11/xorg-libsm/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libsm/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -23,7 +23,6 @@ depends_build \ port:pkgconfig \ - port:xorg-xproto \ port:xorg-xtrans depends_lib \ Modified: trunk/dports/x11/xorg-libxcb/Portfile =================================================================== --- trunk/dports/x11/xorg-libxcb/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libxcb/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,10 +20,11 @@ use_parallel_build yes depends_build port:pkgconfig \ - port:xorg-libpthread-stubs \ + port:xorg-libpthread-stubs + +depends_lib port:xorg-libXau \ + port:xorg-libXdmcp \ port:xorg-xcb-proto -depends_lib port:xorg-libXau \ - port:xorg-libXdmcp livecheck.check regex livecheck.url ${master_sites}?C=M&O=D Modified: trunk/dports/x11/xorg-libxkbfile/Portfile =================================================================== --- trunk/dports/x11/xorg-libxkbfile/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-libxkbfile/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -20,8 +20,7 @@ use_parallel_build yes depends_build \ - port:pkgconfig \ - port:xorg-kbproto + port:pkgconfig depends_lib \ port:xorg-libX11 Modified: trunk/dports/x11/xorg-xcb-util/Portfile =================================================================== --- trunk/dports/x11/xorg-xcb-util/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xorg-xcb-util/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -19,9 +19,9 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ +depends_build port:pkgconfig +depends_lib port:xorg-libxcb \ port:xorg-xproto -depends_lib port:xorg-libxcb livecheck.check regex livecheck.url ${master_sites}?C=M&O=D Modified: trunk/dports/x11/xpm/Portfile =================================================================== --- trunk/dports/x11/xpm/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xpm/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -19,11 +19,11 @@ use_bzip2 yes use_parallel_build yes -depends_build port:pkgconfig \ +depends_build port:pkgconfig + +depends_lib port:xorg-libX11 \ port:xorg-xproto -depends_lib port:xorg-libX11 - livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex libXpm-(\\d+(?:\\.\\d+)*) Modified: trunk/dports/x11/xrender/Portfile =================================================================== --- trunk/dports/x11/xrender/Portfile 2009-05-02 18:53:03 UTC (rev 50533) +++ trunk/dports/x11/xrender/Portfile 2009-05-02 19:11:22 UTC (rev 50534) @@ -24,14 +24,13 @@ rmd160 0d9249ffe7f8347946f1c4d701bd06d52a4ab40b depends_build \ - port:pkgconfig \ + port:pkgconfig + +depends_lib \ + port:xorg-libX11 \ port:xorg-xproto \ port:xorg-renderproto -# Change this to port:xorg-libX11 when other ports depend on this using lib: instead of port: -depends_lib \ - port:xorg-libX11 - use_parallel_build yes post-destroot { -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Sat May 2 12:17:23 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Sat, 2 May 2009 12:17:23 -0700 (PDT) Subject: [50535] trunk/dports/gnome/gst-plugins-bad Message-ID: <20090502191723.238B416F0DE1@beta.macosforge.org> Revision: 50535 http://trac.macports.org/changeset/50535 Author: jeremyhu at macports.org Date: 2009-05-02 12:17:22 -0700 (Sat, 02 May 2009) Log Message: ----------- gst-plugins-bad: Use libmodplug Modified Paths: -------------- trunk/dports/gnome/gst-plugins-bad/Portfile Added Paths: ----------- trunk/dports/gnome/gst-plugins-bad/files/ trunk/dports/gnome/gst-plugins-bad/files/modplug.patch Modified: trunk/dports/gnome/gst-plugins-bad/Portfile =================================================================== --- trunk/dports/gnome/gst-plugins-bad/Portfile 2009-05-02 19:11:22 UTC (rev 50534) +++ trunk/dports/gnome/gst-plugins-bad/Portfile 2009-05-02 19:17:22 UTC (rev 50535) @@ -5,7 +5,7 @@ name gst-plugins-bad version 0.10.11 -revision 1 +revision 2 description This is gst-plugins, a set of plug-ins for GStreamer. long_description ${description} maintainers nomaintainer @@ -28,6 +28,7 @@ port:jack \ port:libdca \ port:libmms \ + port:libmodplug \ port:libmpeg2 \ port:libsndfile \ port:faac \ @@ -48,7 +49,9 @@ configure.cppflags-append "-L${prefix}/lib" configure.cflags-append "-no-cpp-precomp -funroll-loops -fstrict-aliasing" -post-extract { +patchfiles modplug.patch + +post-patch { reinplace "s|-flat_namespace -undefined suppress|-undefined define_a_way|g" \ ${worksrcpath}/configure reinplace "s|libSoundTouch|soundtouch-1.0|g" \ Added: trunk/dports/gnome/gst-plugins-bad/files/modplug.patch =================================================================== --- trunk/dports/gnome/gst-plugins-bad/files/modplug.patch (rev 0) +++ trunk/dports/gnome/gst-plugins-bad/files/modplug.patch 2009-05-02 19:17:22 UTC (rev 50535) @@ -0,0 +1,10 @@ +--- ext/modplug/gstmodplug.h.orig 2009-04-19 14:37:08.000000000 -0700 ++++ ext/modplug/gstmodplug.h 2009-04-19 14:37:24.000000000 -0700 +@@ -22,6 +22,7 @@ + #define __GST_MODPLUG_H__ + + #include ++#include + + G_BEGIN_DECLS + -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Sat May 2 12:21:02 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Sat, 2 May 2009 12:21:02 -0700 (PDT) Subject: [50536] trunk/dports/graphics/enblend/Portfile Message-ID: <20090502192103.4892816F0EA0@beta.macosforge.org> Revision: 50536 http://trac.macports.org/changeset/50536 Author: jeremyhu at macports.org Date: 2009-05-02 12:21:02 -0700 (Sat, 02 May 2009) Log Message: ----------- enblend: Don't depend on mesa, since it's using glew which uses OpenGl.framework Modified Paths: -------------- trunk/dports/graphics/enblend/Portfile Modified: trunk/dports/graphics/enblend/Portfile =================================================================== --- trunk/dports/graphics/enblend/Portfile 2009-05-02 19:17:22 UTC (rev 50535) +++ trunk/dports/graphics/enblend/Portfile 2009-05-02 19:21:02 UTC (rev 50536) @@ -4,6 +4,7 @@ name enblend version 3.0 +revision 1 categories graphics maintainers nomaintainer description a tool to composite images @@ -20,11 +21,8 @@ port:boost \ port:lcms \ port:glew \ - port:libxmi \ - port:mesa + port:libxmi -configure.cppflags-append -I${x11prefix}/include -configure.ldflags-append -L${x11prefix}/lib configure.args --mandir=${prefix}/share/man patchfiles patch-src_gpu.cc.diff \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 12:52:54 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 12:52:54 -0700 (PDT) Subject: [50537] trunk/dports Message-ID: <20090502195255.A54E816F1651@beta.macosforge.org> Revision: 50537 http://trac.macports.org/changeset/50537 Author: portindex at macports.org Date: 2009-05-02 12:52:53 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5797 Ports failed: 2 Failed to parse file x11/xorg-libXp/Portfile: invalid command name "port:xorg-printproto" Failed to parse file x11/xorg-libXxf86dga/Portfile: invalid command name "port:xorg-xf86dgaproto" Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 19:21:02 UTC (rev 50536) +++ trunk/dports/PortIndex 2009-05-02 19:52:53 UTC (rev 50537) @@ -2640,8 +2640,8 @@ variants {no_ofx universal} portdir gnome/grisbi description {Easy Personnal Finance Manager for All.} homepage http://www.grisbi.org epoch 0 platforms darwin name grisbi depends_lib {lib:libgtk.2:gtk2 lib:libxml2.2.6.16:libxml2 lib:libofx.0:libofx} maintainers gerald at grisbi.org long_description {Grisbi is a personnal accounting application. Grisbi can manage multiple accounts, currencies and users. It manages third party, expenditure and receipt categories, as well as budgetary lines, financial years, and other informations that makes it quite adapted for associations (except those that require double entry accounting).} categories gnome version 0.5.9 revision 0 gst-ffmpeg 382 depends_build port:gmake portdir gnome/gst-ffmpeg description {This is gst-ffmpeg, a set of plug-ins for GStreamer.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gst-ffmpeg depends_lib {port:gstreamer port:gst-plugins-base} long_description {{This is gst-ffmpeg, a set of plug-ins for GStreamer.}} maintainers nomaintainer categories gnome version 0.10.7 revision 0 -gst-plugins-bad 598 -portdir gnome/gst-plugins-bad description {This is gst-plugins, a set of plug-ins for GStreamer.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gst-plugins-bad depends_lib {port:gstreamer port:gst-plugins-base port:XviD port:audiofile port:gnome-vfs port:jack port:libdca port:libmms port:libmpeg2 port:libsndfile port:faac port:faad2 port:libmusicbrainz port:neon port:libsdl port:libsoup port:soundtouch port:swfdec port:x264 port:xmms} long_description {{This is gst-plugins, a set of plug-ins for GStreamer.}} maintainers nomaintainer version 0.10.11 categories gnome revision 1 +gst-plugins-bad 614 +portdir gnome/gst-plugins-bad description {This is gst-plugins, a set of plug-ins for GStreamer.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gst-plugins-bad depends_lib {port:gstreamer port:gst-plugins-base port:XviD port:audiofile port:gnome-vfs port:jack port:libdca port:libmms port:libmodplug port:libmpeg2 port:libsndfile port:faac port:faad2 port:libmusicbrainz port:neon port:libsdl port:libsoup port:soundtouch port:swfdec port:x264 port:xmms} long_description {{This is gst-plugins, a set of plug-ins for GStreamer.}} maintainers nomaintainer version 0.10.11 categories gnome revision 2 gst-plugins-base 532 variants no_x11 depends_build {port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir gnome/gst-plugins-base description {This is gst-plugins, a set of plug-ins for GStreamer.} homepage http://www.gnome.org/ epoch 0 platforms darwin name gst-plugins-base depends_lib {port:gstreamer port:gnome-vfs port:liboil port:libogg port:libtheora port:libvorbis port:cdparanoia} maintainers nomaintainer long_description {{This is gst-plugins, a set of plug-ins for GStreamer.}} categories gnome version 0.10.22 revision 0 gst-plugins-good 507 @@ -2932,8 +2932,8 @@ variants universal portdir graphics/edje description {A library for graphical layout and animation.} homepage http://www.enlightenment.org epoch 0 platforms darwin name edje depends_lib {port:ecore port:embryo} maintainers nomaintainer long_description {A graphical layout and animation library for animated resizable, compressed and scalable themes.} categories {graphics x11} version 0.5.0.037 revision 0 electric 527 variants {motif qt3_mac qt3_x11 darwin universal} portdir graphics/electric description {CAD system for VLSI circuit design} homepage http://www.staticfreesoft.com/ epoch 0 platforms darwin name electric maintainers nomaintainer long_description {Electric designs MOS and bipolar integrated circuits, printed-circuit boards, or any type of circuit you choose. It has many editing styles including layout, schematics, artwork, and architectural specifications.} categories {graphics electronics science} version 7.00 revision 0 -enblend 427 -variants universal portdir graphics/enblend description {a tool to composite images} homepage http://enblend.sourceforge.net/ epoch 0 platforms darwin name enblend depends_lib {port:tiff port:boost port:lcms port:glew port:libxmi port:mesa} long_description {Enblend is a tool to composite overlapping images with invisible (or very difficult to see) seams.} maintainers nomaintainer categories graphics version 3.0 revision 0 +enblend 417 +variants universal portdir graphics/enblend description {a tool to composite images} homepage http://enblend.sourceforge.net/ epoch 0 platforms darwin name enblend depends_lib {port:tiff port:boost port:lcms port:glew port:libxmi} long_description {Enblend is a tool to composite overlapping images with invisible (or very difficult to see) seams.} maintainers nomaintainer categories graphics version 3.0 revision 1 epeg 570 variants universal portdir graphics/epeg description {An IMMENSELY FAST JPEG thumbnailer library API.} homepage http://www.enlightenment.org epoch 0 platforms darwin name epeg depends_lib lib:libjpeg:jpeg maintainers nomaintainer long_description {Its a convenience library API to using libjpeg to load JPEG images destined to be turned into thumbnails of the original, saving information with these thumbnails, retreiving it and managing to load the image ready for scaling with the minimum of fuss and CPU overhead.} categories {graphics x11} version 0.9.0 revision 0 esdl 488 @@ -10730,8 +10730,8 @@ depends_build {path:bin/xmkmf:imake path:bin/xmkmf:imake} portdir x11/Xaw3d description {The Three-D Athena Toolkit} homepage http://www.visi.com/~hawkeyd/xaw3d.html epoch 0 platforms darwin name Xaw3d depends_lib {port:xorg-libsm port:xorg-libXext port:xorg-libXmu port:xorg-libXp port:xpm port:xorg-libXt} maintainers nomaintainer long_description {This release of Xaw3d is based on X.Org's X11R6.3 Athena toolkit, with bits and pieces thrown in from other sources. It is intended to be a general-purpose replacement for the Athena (Xaw) toolkit. In general, you should be able to link almost any Athena-based application to this Xaw3d Athena toolkit, for a three-dimensional appearance on most of the widgets. On systems with shared libraries, you might be able replace your shared libXaw.* with libXaw3d.* to obtain the appearance without even relinking, but the odds of this working is slim, and not recommended.} categories x11 version 1.5E revision 4 XawM 442 variants universal portdir x11/XawM description {This is Ed Falk's XawM (M for Modern).} homepage http://siag.nu epoch 0 platforms darwin name XawM long_description {This is Ed Falk's XawM (M for Modern), hacked for use with Siag Officeand adapted for autoconf and libtool. This release is called 1.5u, 1.5 because it is based on Xaw3d 1.5, and u because Ulric messed with it.} maintainers nomaintainer categories x11 version 1.5u revision 0 -Xft2 773 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/Xft2 description {client-side font API for X applications} homepage http://fontconfig.org/ epoch 0 platforms darwin name Xft2 depends_lib {port:zlib port:xrender port:freetype port:fontconfig port:expat} long_description {The current version of Xft provides a client-side font API for X applications. It uses Fontconfig to select fonts and the X protocol for rendering them. When available, Xft uses the Render extension to accelerate text drawing. When Render is not available, Xft uses the core protocol to draw client-side glyphs. This provides completely compatible support of client-side fonts for all X servers.} maintainers jeremyhu categories x11 version 2.1.13 revision 1 +Xft2 758 +variants universal depends_build port:pkgconfig portdir x11/Xft2 description {client-side font API for X applications} homepage http://fontconfig.org/ epoch 0 platforms darwin name Xft2 depends_lib {port:xorg-xproto port:zlib port:xrender port:freetype port:fontconfig port:expat} long_description {The current version of Xft provides a client-side font API for X applications. It uses Fontconfig to select fonts and the X protocol for rendering them. When available, Xft uses the Render extension to accelerate text drawing. When Render is not available, Xft uses the core protocol to draw client-side glyphs. This provides completely compatible support of client-side fonts for all X servers.} maintainers jeremyhu categories x11 version 2.1.13 revision 1 abclock 484 variants universal portdir x11/abclock description {analog clock for X} homepage http://odur.let.rug.nl/~kleiweg/abclock/ epoch 0 platforms darwin name abclock depends_lib port:xorg-libX11 long_description {Analogue Bitmap Clock displays the current time with hours and minutes in an analogue fashion but unlike the traditional {clock;} unlike ordinary analogue clocks, this design is clear even in very small bitmaps.} maintainers nomaintainer categories x11 version 1.0d revision 2 advi 462 @@ -10954,8 +10954,8 @@ variants {lite imlib nls debug esound gnome1 gnome2 universal} portdir x11/icewm description {Lightweight window manager with a Windows or OS/2 look and feel} homepage http://www.icewm.org epoch 0 platforms darwin name icewm depends_lib {port:xorg-libice port:xorg-libsm port:xorg-libX11 port:xorg-libXau port:xorg-libXdmcp port:xorg-libXext port:Xft2 port:xorg-libXinerama port:xpm port:xorg-libXrandr port:xrender port:fontconfig port:freetype} long_description {Nice and fast window manager with the look and feel from Windows (95, 98) or OS/2 (Warp 3, Warp 4).} maintainers saispo at macports.org categories {x11 x11-wm} version 1.2.32 revision 1 ico 551 variants universal depends_build port:pkgconfig portdir x11/ico description {Animate an icosahedron or other polyhedron} homepage http://www.x.org/ epoch 0 platforms darwin name ico depends_lib port:xorg-libX11 long_description {Ico displays a wire-frame rotating polyhedron, with hidden lines removed, or a solid-fill polyhedron with hidden faces removed. There are a number of different polyhedra available. Adding a new polyhedron to the program is quite simple.} maintainers {blb openmaintainer} categories {x11 graphics} version 1.0.2 revision 1 -imake 399 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/imake description {{Discontinued imake build system.}} homepage http://xorg.freedesktop.org/ epoch 0 depends_run {port:xorg-cf-files path:bin/perl:perl5} platforms darwin name imake long_description {{{Discontinued imake build system.}}} maintainers mcalhoun categories {x11 devel} version 1.0.2 revision 0 +imake 386 +variants universal depends_build {port:pkgconfig port:xorg-xproto} portdir x11/imake description {{Discontinued imake build system.}} homepage http://xorg.freedesktop.org/ epoch 0 depends_run {port:xorg-cf-files path:bin/perl:perl5} platforms darwin name imake long_description {{{Discontinued imake build system.}}} maintainers mcalhoun categories {x11 devel} version 1.0.2 revision 0 ion3 496 variants universal portdir x11/ion3 description {A tiling window manager for keyboard users} homepage http://modeemi.cs.tut.fi/~tuomov/ion/ epoch 0 name ion3 maintainers nomaintainer long_description {Ion is a tiling tabbed window manager designed with keyboard users in mind. It tries to address the navigation problem by dividing the screen into mutually non-overlapping frames. As in PWM, the frames may have multiple clients attached.} categories {x11 x11-wm} version 3rc-20071109 revision 1 itk 394 @@ -10996,8 +10996,8 @@ variants {macosx universal} depends_build port:pkgconfig portdir x11/luit description {X.org luit} homepage http://www.x.org epoch 0 platforms darwin name luit depends_lib {port:xorg-libX11 port:xorg-libfontenc} long_description {Convert terminal i/o from legacy encodings to UTF-8} maintainers jeremyhu categories x11 version 1.0.3 revision 1 makedepend 694 variants universal depends_build port:pkgconfig portdir x11/makedepend description {Create dependencies in makefiles} homepage http://www.x.org/ epoch 0 platforms darwin name makedepend long_description {The makedepend program reads each sourcefile in sequence and parses it like a C-preprocessor, processing all #include, #define, #undef, #ifdef, #ifndef, #endif, #if, #elif and #else directives so that it can correctly tell which #include, directives would be used in a compilation. Any #include, directives can reference files having other #include directives, and parsing will occur in these files as well.} maintainers {blb openmaintainer} categories {x11 devel} version 1.0.1 revision 0 -mesa 600 -variants {universal hw_render darwin_8 system_x11} depends_build {port:xorg-glproto port:xorg-dri2proto port:xorg-libXfixes bin:makedepend:makedepend port:glut bin:tclsh8.5:tcl} portdir x11/mesa description {Mesa 3D Graphics Library} homepage http://mesa3d.sourceforge.net/ epoch 0 platforms {macosx darwin} name mesa depends_lib {port:xorg-libXi port:xorg-libXmu} long_description {Mesa is an open-source implementation of the OpenGL specification, a system for rendering interactive 3D graphics.} maintainers {jeremyhu andrea.damore openmaintainer} categories {x11 graphics} version 7.4 revision 1 +mesa 589 +variants {universal hw_render darwin_8} depends_build {bin:makedepend:makedepend port:glut bin:tclsh8.5:tcl} portdir x11/mesa description {Mesa 3D Graphics Library} homepage http://mesa3d.sourceforge.net/ epoch 0 platforms {macosx darwin} name mesa depends_lib {port:xorg-glproto port:xorg-dri2proto port:xorg-libXfixes port:xorg-libXi port:xorg-libXmu} long_description {Mesa is an open-source implementation of the OpenGL specification, a system for rendering interactive 3D graphics.} maintainers {jeremyhu andrea.damore openmaintainer} categories {x11 graphics} version 7.4 revision 1 mikachanfont 590 portdir x11/mikachanfont description {Mikachan-font is Japanese font written by Mikachan} homepage http://www001.upp.so-net.ne.jp/mikachan/ epoch 0 name mikachanfont depends_lib bin:mkfontdir:mkfontdir maintainers pelopor at nifty.com long_description {Mikachan-font is Japanese font. It was written by Mikachan,and scaned and used font making software. It is possible to display Hiragana, Katakana, Numbers, Alphabets, symbols, Kanji for education, Usual kanji, Kanji of person's name, JIS kanji Level 1, JIS kanji Level 2, IBM expantion kanji.} version 8.9 categories {x11 fonts} revision 0 mkfontdir 291 @@ -11276,86 +11276,82 @@ portdir x11/xorg-inputproto description {X.org inputproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-inputproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for the XInput extension to X11} version 1.5.0 categories {x11 devel} revision 0 xorg-kbproto 270 portdir x11/xorg-kbproto description {X.org kbproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-kbproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for Xkb extension to X11} version 1.0.3 categories {x11 devel} revision 0 -xorg-libAppleWM 523 -variants {system_x11 universal} depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros port:xorg-applewmproto port:xorg-xproto port:xorg-xextproto bin:autoreconf:autoconf} portdir x11/xorg-libAppleWM description {X.org libAppleWM} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libAppleWM depends_lib {port:xorg-libX11 port:xorg-libXext} long_description {{X.org libAppleWM}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.0 revision 0 -xorg-libFS 355 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-fontsproto port:xorg-xproto} portdir x11/xorg-libFS description {X.org libFS} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libFS long_description {X11 Font Server library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 -xorg-libX11 617 -variants {x11_xcb system_x11 universal} depends_build {port:pkgconfig port:xorg-bigreqsproto port:xorg-xcmiscproto port:xorg-xproto port:xorg-xtrans port:xorg-xextproto port:xorg-xf86bigfontproto port:xorg-inputproto port:xorg-kbproto} portdir x11/xorg-libX11 description {X.org libX11} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libX11 depends_lib {port:xorg-libXdmcp port:xorg-libXau} long_description {libX11 is the main library used by X Window System applications to communicate with the X server.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.1 revision 0 -xorg-libXScrnSaver 420 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-scrnsaverproto port:xorg-xextproto} portdir x11/xorg-libXScrnSaver description {X.org libXScrnSaver} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXScrnSaver depends_lib port:xorg-libXext long_description {MIT_SCREEN_SAVER extenstion} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.3 revision 0 -xorg-libXTrap 392 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-trapproto port:xorg-xextproto} portdir x11/xorg-libXTrap description {X.org libXTrap} homepage http://www.x.org/ epoch 0 platforms darwin name xorg-libXTrap depends_lib {port:xorg-libXext port:xorg-libXt} long_description {X Trap library} maintainers {blb openmaintainer} categories {x11 devel} version 1.0.0 revision 1 -xorg-libXau 346 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/xorg-libXau description {X.org libXau} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXau long_description {X Authorization Routines library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libXaw 527 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-kbproto port:xorg-xproto port:xorg-xextproto port:xorg-util-macros port:autoconf port:automake port:libtool} portdir x11/xorg-libXaw description {X.org libXaw} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXaw depends_lib {port:xorg-libsm port:xorg-libXext port:xorg-libXmu port:xpm port:xorg-libXt} long_description {Athena Widgets toolkit} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 0 -xorg-libXcomposite 455 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-compositeproto port:xorg-fixesproto port:xorg-xextproto} portdir x11/xorg-libXcomposite description {X.org libXcomposite} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXcomposite depends_lib {port:xorg-libXfixes port:xorg-libXext} long_description {Composite extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 0.4.0 revision 0 -xorg-libXcursor 417 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-fixesproto port:xorg-renderproto} portdir x11/xorg-libXcursor description {X.org libXcursor} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXcursor depends_lib {port:xorg-libXfixes port:xrender} long_description {{X.org libXcursor}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.9 revision 0 -xorg-libXdamage 420 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-damageproto port:xorg-fixesproto port:xorg-xextproto} portdir x11/xorg-libXdamage description {X.org libXdamage} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXdamage depends_lib port:xorg-libXfixes long_description {Damage extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.1 revision 0 -xorg-libXdmcp 363 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/xorg-libXdmcp description {X.org libXdmcp} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXdmcp long_description {X Display Manager Control Protocol routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 -xorg-libXevie 495 -variants {system_x11 universal} depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros port:xorg-xproto port:xorg-xextproto port:xorg-evieproto bin:autoreconf:autoconf} portdir x11/xorg-libXevie description {X.org llibXevie} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXevie depends_lib port:xorg-libXext long_description {{X.org llibXevie}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 1 -xorg-libXext 381 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXext description {X.org libXext} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXext depends_lib port:xorg-libX11 long_description {{X.org libXext}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 1 -xorg-libXfixes 410 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-fixesproto port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXfixes description {X.org libXfixes} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfixes depends_lib port:xorg-libX11 long_description {{X.org libXfixes}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 4.0.3 revision 0 -xorg-libXfont 588 -variants {system_x11 universal} depends_build {port:libtool port:autoconf port:automake port:xorg-util-macros port:pkgconfig port:xorg-fontcacheproto port:xorg-fontsproto port:xorg-xproto port:xorg-xtrans bin:autoreconf:autoconf} portdir x11/xorg-libXfont description {X.org libXfont} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfont depends_lib {port:freetype port:xorg-libfontenc port:bzip2 port:zlib} long_description {X font handling library for server and utilities} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.4.0 revision 1 -xorg-libXfontcache 460 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-fontcacheproto port:xorg-fontsproto port:xorg-xextproto} portdir x11/xorg-libXfontcache description {X.org libXfontcache} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfontcache depends_lib port:xorg-libXext long_description {X-TrueType font cache extension client library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libXi 401 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xextproto port:xorg-inputproto port:xorg-xproto} portdir x11/xorg-libXi description {X.org libXi} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXi depends_lib port:xorg-libXext long_description {X11 Input Extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.1 revision 0 -xorg-libXinerama 430 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xineramaproto port:xorg-xextproto} portdir x11/xorg-libXinerama description {X.org libXinerama} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXinerama depends_lib {port:xorg-libX11 port:xorg-libXext} long_description {Xinerama protocol library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 -xorg-libXmu 382 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xextproto} portdir x11/xorg-libXmu description {X.org libXmu} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXmu depends_lib {port:xorg-libXext port:xorg-libXt} long_description {X.org Xmu library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libXp 490 -variants {system_x11 universal} depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:xorg-util-macros port:xorg-printproto port:xorg-xproto port:xorg-xextproto bin:autoreconf:autoconf} portdir x11/xorg-libXp description {X.org libXp} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXp depends_lib port:xorg-libXext long_description {Xprint client library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.0 revision 2 -xorg-libXrandr 487 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-randrproto port:xorg-renderproto port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXrandr description {X.org libXrandr} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXrandr depends_lib {port:xorg-libX11 port:xorg-libXext port:xrender} long_description {X Resize and Rotate Extension C Library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.3.0 revision 0 -xorg-libXres 394 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xextproto port:xorg-resourceproto} portdir x11/xorg-libXres description {X.org libXres} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXres depends_lib port:xorg-libXext long_description {X Resource extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 -xorg-libXt 655 -variants {system_x11 universal} depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros port:xorg-kbproto port:xorg-xproto bin:autoreconf:autoconf} portdir x11/xorg-libXt description {X.org libXt} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXt depends_lib {port:xorg-libsm port:xorg-libX11} long_description {X Toolkit Intrinsics, an abstract widget library upon which other toolkits are based. Xt is the basis for many toolkits, including the Athena widgets, Xaw, and LessTif, a Motif implementation.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 2 -xorg-libXtst 431 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-inputproto port:xorg-recordproto port:xorg-xextproto} portdir x11/xorg-libXtst description {X.org libXt} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXtst depends_lib {port:xorg-libXext port:xorg-libXi} long_description {X.org libXtst library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 -xorg-libXv 389 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-videoproto port:xorg-xextproto} portdir x11/xorg-libXv description {X.org libXv} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXv depends_lib port:xorg-libXext long_description {Xvideo extension library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libXvMC 417 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-videoproto port:xorg-xextproto} portdir x11/xorg-libXvMC description {X.org libXvMC} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXvMC depends_lib port:xorg-libXv long_description {Xvideo extension library with Motion Compression} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libXxf86dga 421 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xf86dgaproto port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXxf86dga description {X.org libXxf86dga} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86dga depends_lib port:xorg-libXext long_description {{X.org libXxf86dga}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 -xorg-libXxf86misc 426 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xf86miscproto port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXxf86misc description {X.org libXxf86misc} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86misc depends_lib port:xorg-libXext long_description {{X.org libXxf86misc}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 1 -xorg-libXxf86vm 421 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xf86vidmodeproto port:xorg-xproto port:xorg-xextproto} portdir x11/xorg-libXxf86vm description {X.org libXxf86vm} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86vm depends_lib port:xorg-libXext long_description {{X.org libXxf86vm}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 -xorg-libdmx 387 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-dmxproto port:xorg-xextproto} portdir x11/xorg-libdmx description {X.org libdmx} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libdmx depends_lib port:xorg-libXext long_description {X.org libdmx library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 1 -xorg-libfontenc 369 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/xorg-libfontenc description {X.org libfontenc} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libfontenc depends_lib port:zlib long_description {Font encoding library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 -xorg-libice 356 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto port:xorg-xtrans} portdir x11/xorg-libice description {X.org libice} homepage http://www.x.org/ epoch 0 platforms {darwin macosx} name xorg-libice long_description {X Inter-Client Exchange Protocol} maintainers gmail.com:mvfranz categories {x11 devel} version 1.0.5 revision 0 -xorg-liblbxutil 475 -variants {system_x11 universal} depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:xorg-util-macros port:xorg-xproto port:xorg-xextproto bin:autoreconf:autoconf} portdir x11/xorg-liblbxutil description {X.org liblbxutil} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-liblbxutil depends_lib port:zlib long_description {LBX utility routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 -xorg-liboldX 352 -variants {system_x11 universal} depends_build port:pkgconfig portdir x11/xorg-liboldX description {X.org liboldX} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-liboldX depends_lib port:xorg-libX11 long_description {X10 compatability library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 +xorg-libAppleWM 473 +variants universal depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros bin:autoreconf:autoconf} portdir x11/xorg-libAppleWM description {X.org libAppleWM} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libAppleWM depends_lib {port:xorg-libX11 port:xorg-libXext port:xorg-applewmproto} long_description {{X.org libAppleWM}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.0 revision 0 +xorg-libFS 354 +variants universal depends_build port:pkgconfig portdir x11/xorg-libFS description {X.org libFS} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libFS depends_lib {port:xorg-fontsproto port:xorg-xproto} long_description {X11 Font Server library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 +xorg-libX11 606 +variants {x11_xcb universal} depends_build {port:pkgconfig port:xorg-xtrans} portdir x11/xorg-libX11 description {X.org libX11} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libX11 depends_lib {port:xorg-libXdmcp port:xorg-libXau port:xorg-bigreqsproto port:xorg-xcmiscproto port:xorg-xproto port:xorg-xextproto port:xorg-xf86bigfontproto port:xorg-inputproto port:xorg-kbproto} long_description {libX11 is the main library used by X Window System applications to communicate with the X server.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.1 revision 0 +xorg-libXScrnSaver 387 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXScrnSaver description {X.org libXScrnSaver} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXScrnSaver depends_lib {port:xorg-libXext port:xorg-scrnsaverproto} long_description {MIT_SCREEN_SAVER extenstion} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.3 revision 0 +xorg-libXTrap 357 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXTrap description {X.org libXTrap} homepage http://www.x.org/ epoch 0 platforms darwin name xorg-libXTrap depends_lib {port:xorg-libXext port:xorg-libXt port:xorg-trapproto} long_description {X Trap library} maintainers {blb openmaintainer} categories {x11 devel} version 1.0.0 revision 1 +xorg-libXau 343 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXau description {X.org libXau} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXau depends_lib port:xorg-xproto long_description {X Authorization Routines library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXaw 459 +variants universal depends_build {port:pkgconfig port:xorg-util-macros port:autoconf port:automake port:libtool} portdir x11/xorg-libXaw description {X.org libXaw} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXaw depends_lib {port:xorg-libsm port:xorg-libXext port:xorg-libXmu port:xpm port:xorg-libXt} long_description {Athena Widgets toolkit} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 0 +xorg-libXcomposite 399 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXcomposite description {X.org libXcomposite} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXcomposite depends_lib {port:xorg-libXfixes port:xorg-libXext port:xorg-compositeproto} long_description {Composite extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 0.4.0 revision 0 +xorg-libXcursor 359 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXcursor description {X.org libXcursor} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXcursor depends_lib {port:xorg-libXfixes port:xrender} long_description {{X.org libXcursor}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.9 revision 0 +xorg-libXdamage 366 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXdamage description {X.org libXdamage} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXdamage depends_lib {port:xorg-libXfixes port:xorg-damageproto} long_description {Damage extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.1.1 revision 0 +xorg-libXdmcp 360 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXdmcp description {X.org libXdmcp} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXdmcp depends_lib port:xorg-xproto long_description {X Display Manager Control Protocol routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 +xorg-libXevie 447 +variants universal depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros bin:autoreconf:autoconf} portdir x11/xorg-libXevie description {X.org llibXevie} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXevie depends_lib {port:xorg-libXext port:xorg-evieproto} long_description {{X.org llibXevie}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 1 +xorg-libXext 329 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXext description {X.org libXext} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXext depends_lib port:xorg-libX11 long_description {{X.org libXext}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 1 +xorg-libXfixes 360 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXfixes description {X.org libXfixes} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfixes depends_lib {port:xorg-libX11 port:xorg-fixesproto} long_description {{X.org libXfixes}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 4.0.3 revision 0 +xorg-libXfont 558 +variants universal depends_build {port:libtool port:autoconf port:automake port:xorg-util-macros port:pkgconfig port:xorg-xtrans bin:autoreconf:autoconf} portdir x11/xorg-libXfont description {X.org libXfont} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfont depends_lib {port:freetype port:xorg-libfontenc port:bzip2 port:zlib port:xorg-fontcacheproto port:xorg-fontsproto} long_description {X font handling library for server and utilities} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.4.0 revision 1 +xorg-libXfontcache 427 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXfontcache description {X.org libXfontcache} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXfontcache depends_lib {port:xorg-libXext port:xorg-fontcacheproto port:xorg-fontsproto} long_description {X-TrueType font cache extension client library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXi 328 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXi description {X.org libXi} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXi depends_lib port:xorg-libXext long_description {X11 Input Extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2.1 revision 0 +xorg-libXinerama 395 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXinerama description {X.org libXinerama} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXinerama depends_lib {port:xorg-libX11 port:xorg-libXext port:xorg-xineramaproto} long_description {Xinerama protocol library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 +xorg-libXmu 347 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXmu description {X.org libXmu} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXmu depends_lib {port:xorg-libXext port:xorg-libXt} long_description {X.org Xmu library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXrandr 413 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXrandr description {X.org libXrandr} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXrandr depends_lib {port:xorg-libX11 port:xorg-libXext port:xrender port:xorg-randrproto} long_description {X Resize and Rotate Extension C Library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.3.0 revision 0 +xorg-libXres 361 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXres description {X.org libXres} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXres depends_lib {port:xorg-libXext port:xorg-resourceproto} long_description {X Resource extension} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 +xorg-libXt 607 +variants universal depends_build {port:pkgconfig port:libtool port:autoconf port:automake port:xorg-util-macros bin:autoreconf:autoconf} portdir x11/xorg-libXt description {X.org libXt} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXt depends_lib {port:xorg-libsm port:xorg-libX11} long_description {X Toolkit Intrinsics, an abstract widget library upon which other toolkits are based. Xt is the basis for many toolkits, including the Athena widgets, Xaw, and LessTif, a Motif implementation.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 2 +xorg-libXtst 375 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXtst description {X.org libXt} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXtst depends_lib {port:xorg-libXext port:xorg-libXi port:xorg-recordproto} long_description {X.org libXtst library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 +xorg-libXv 356 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXv description {X.org libXv} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXv depends_lib {port:xorg-libXext port:xorg-videoproto} long_description {Xvideo extension library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXvMC 361 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXvMC description {X.org libXvMC} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXvMC depends_lib port:xorg-libXv long_description {Xvideo extension library with Motion Compression} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXxf86misc 376 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXxf86misc description {X.org libXxf86misc} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86misc depends_lib {port:xorg-libXext port:xorg-xf86miscproto} long_description {{X.org libXxf86misc}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 1 +xorg-libXxf86vm 371 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXxf86vm description {X.org libXxf86vm} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86vm depends_lib {port:xorg-libXext port:xorg-xf86vidmodeproto} long_description {{X.org libXxf86vm}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 +xorg-libdmx 354 +variants universal depends_build port:pkgconfig portdir x11/xorg-libdmx description {X.org libdmx} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libdmx depends_lib {port:xorg-libXext port:xorg-dmxproto} long_description {X.org libdmx library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 1 +xorg-libfontenc 356 +variants universal depends_build port:pkgconfig portdir x11/xorg-libfontenc description {X.org libfontenc} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libfontenc depends_lib {port:xorg-xproto port:zlib} long_description {Font encoding library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libice 355 +variants universal depends_build {port:pkgconfig port:xorg-xtrans} portdir x11/xorg-libice description {X.org libice} homepage http://www.x.org/ epoch 0 platforms {darwin macosx} name xorg-libice depends_lib port:xorg-xproto long_description {X Inter-Client Exchange Protocol} maintainers gmail.com:mvfranz categories {x11 devel} version 1.0.5 revision 0 +xorg-liblbxutil 464 +variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:xorg-util-macros bin:autoreconf:autoconf} portdir x11/xorg-liblbxutil description {X.org liblbxutil} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-liblbxutil depends_lib {port:zlib port:xorg-xproto port:xorg-xextproto} long_description {LBX utility routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 +xorg-liboldX 339 +variants universal depends_build port:pkgconfig portdir x11/xorg-liboldX description {X.org liboldX} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-liboldX depends_lib port:xorg-libX11 long_description {X10 compatability library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 0 xorg-libpthread-stubs 371 portdir x11/xorg-libpthread-stubs description {X.org/Xcb libpthread stubs} homepage http://xcb.freedesktop.org epoch 0 platforms {darwin macosx} name xorg-libpthread-stubs maintainers {jeremyhu openmaintainer} long_description {Library that provides pthread stubs that are missing from your platform libc. (used for libxcb)} version 0.1 categories {x11 devel} revision 0 xorg-libs 1090 portdir x11/xorg-libs description {X.org lib meta-package} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libs depends_lib {port:Xft2 port:mesa port:xorg-libAppleWM port:xorg-libFS port:xorg-libX11 port:xorg-libXScrnSaver port:xorg-libXTrap port:xorg-libXau port:xorg-libXaw port:xorg-libXcomposite port:xorg-libXcursor port:xorg-libXdamage port:xorg-libXdmcp port:xorg-libXevie port:xorg-libXext port:xorg-libXfixes port:xorg-libXfont port:xorg-libXfontcache port:xorg-libXi port:xorg-libXinerama port:xorg-libXmu port:xorg-libXp port:xorg-libXrandr port:xorg-libXres port:xorg-libXt port:xorg-libXtst port:xorg-libXv port:xorg-libXvMC port:xorg-libXxf86dga port:xorg-libXxf86misc port:xorg-libXxf86vm port:xorg-libdmx port:xorg-libfontenc port:xorg-libice port:xorg-liblbxutil port:xorg-liboldX port:xorg-libsm port:xorg-libxcb port:xorg-libxkbfile port:xorg-libxkbui port:xorg-xcb-util port:xpm port:xrender} maintainers {jeremyhu openmaintainer} long_description {This package builds all of the x.org libraries} version 20090224 categories {x11 devel} revision 0 -xorg-libsm 378 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto port:xorg-xtrans} portdir x11/xorg-libsm description {X.org libSM} homepage http://www.x.org/ epoch 0 platforms {darwin macosx} name xorg-libsm depends_lib port:xorg-libice long_description {X Session Management Library} maintainers gmail.com:mvfranz categories {x11 devel} version 1.1.0 revision 0 -xorg-libxcb 489 -variants {python25 python26 python30 system_x11 universal} depends_build {port:pkgconfig port:xorg-libpthread-stubs port:xorg-xcb-proto} portdir x11/xorg-libxcb description {X.org libxcb} homepage http://xcb.freedesktop.org/ depends_run port:python26 epoch 0 platforms {darwin macosx} name xorg-libxcb depends_lib {port:xorg-libXau port:xorg-libXdmcp} long_description {The X C Binding {\(XCB\)} library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2 revision 0 -xorg-libxkbfile 381 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-kbproto} portdir x11/xorg-libxkbfile description {X.org libxbfile} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libxkbfile depends_lib port:xorg-libX11 long_description {XKB file handling routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 0 -xorg-libxkbui 356 -variants {system_x11 universal} depends_build port:pkgconfig portdir x11/xorg-libxkbui description {X.org libxbui} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libxkbui depends_lib port:xorg-libxkbfile long_description {X.org libxkbui library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 +xorg-libsm 348 +variants universal depends_build {port:pkgconfig port:xorg-xtrans} portdir x11/xorg-libsm description {X.org libSM} homepage http://www.x.org/ epoch 0 platforms {darwin macosx} name xorg-libsm depends_lib port:xorg-libice long_description {X Session Management Library} maintainers gmail.com:mvfranz categories {x11 devel} version 1.1.0 revision 0 +xorg-libxcb 478 +variants {python25 python26 python30 universal} depends_build {port:pkgconfig port:xorg-libpthread-stubs} portdir x11/xorg-libxcb description {X.org libxcb} homepage http://xcb.freedesktop.org/ depends_run port:python26 epoch 0 platforms {darwin macosx} name xorg-libxcb depends_lib {port:xorg-libXau port:xorg-libXdmcp port:xorg-xcb-proto} long_description {The X C Binding {\(XCB\)} library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.2 revision 0 +xorg-libxkbfile 348 +variants universal depends_build port:pkgconfig portdir x11/xorg-libxkbfile description {X.org libxbfile} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libxkbfile depends_lib port:xorg-libX11 long_description {XKB file handling routines} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.5 revision 0 +xorg-libxkbui 343 +variants universal depends_build port:pkgconfig portdir x11/xorg-libxkbui description {X.org libxbui} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libxkbui depends_lib port:xorg-libxkbfile long_description {X.org libxkbui library.} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 xorg-printproto 271 portdir x11/xorg-printproto description {X.org printproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-printproto maintainers {jeremyhu openmaintainer} long_description {X.org PrintProto protocol headers.} version 1.0.4 categories {x11 devel} revision 0 xorg-proto 1009 @@ -11384,8 +11380,8 @@ portdir x11/xorg-videoproto description {X.org videoproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-videoproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for the XVideo extension to X11} version 2.2.2 categories {x11 devel} revision 0 xorg-xcb-proto 359 variants {python25 python26 python30} portdir x11/xorg-xcb-proto description {X.org xcb-proto} homepage http://xcb.freedesktop.org epoch 0 depends_run {port:libxml2 port:python26} platforms {darwin macosx} name xorg-xcb-proto long_description {XML-XCB protocol descriptions} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.4 revision 0 -xorg-xcb-util 385 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/xorg-xcb-util description {X.org xcb-util} homepage http://xcb.freedesktop.org/ epoch 0 platforms {darwin macosx} name xorg-xcb-util depends_lib port:xorg-libxcb long_description {Utility libraries for XCB} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 0.3.4 revision 0 +xorg-xcb-util 372 +variants universal depends_build port:pkgconfig portdir x11/xorg-xcb-util description {X.org xcb-util} homepage http://xcb.freedesktop.org/ epoch 0 platforms {darwin macosx} name xorg-xcb-util depends_lib {port:xorg-libxcb port:xorg-xproto} long_description {Utility libraries for XCB} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 0.3.4 revision 0 xorg-xcmiscproto 289 portdir x11/xorg-xcmiscproto description {X.org xcmiscproto} homepage http://www.x.org epoch 0 platforms darwin name xorg-xcmiscproto maintainers {jeremyhu openmaintainer} long_description {Prototype headers for the XCMisc extension to X11} version 1.1.2 categories {x11 devel} revision 0 xorg-xextproto 260 @@ -11412,8 +11408,8 @@ description {'ping' an Xserver} portdir x11/xping epoch 0 depends_lib port:xorg-libX11 name xping long_description {A simple tool to determine if an X11 server is running.} maintainers nomaintainer categories x11 version 1.9 revision 2 xplanet 674 variants {freetype gif pango aqua pnm universal} portdir x11/xplanet description {Render an image of a planet into an X window or file} homepage http://xplanet.sourceforge.net/ epoch 0 platforms darwin name xplanet depends_lib {port:xorg-libXScrnSaver port:fontconfig port:libpng port:jpeg port:tiff} long_description {Xplanet is similar to Xearth, where an image of the earth is rendered into an X window. All of the major planets and most satellites can be drawn. A number of different map projections are also supported, including azimuthal, Mercator, Mollweide, orthographic, and rectangular.} maintainers nomaintainer categories {x11 graphics} version 1.2.0 revision 3 -xpm 504 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto} portdir x11/xpm description {The X Pixmap Library} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xpm depends_lib port:xorg-libX11 long_description {XPM, X PixMap, is a format for storing/retrieving X pixmaps to/from files. It is used by a large number of common X applications and has become something of a de-facto standard.} maintainers jeremyhu categories {x11 devel graphics} version 3.5.7 revision 0 +xpm 491 +variants universal depends_build port:pkgconfig portdir x11/xpm description {The X Pixmap Library} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xpm depends_lib {port:xorg-libX11 port:xorg-xproto} long_description {XPM, X PixMap, is a format for storing/retrieving X pixmaps to/from files. It is used by a large number of common X applications and has become something of a de-facto standard.} maintainers jeremyhu categories {x11 devel graphics} version 3.5.7 revision 0 xpr 312 variants universal depends_build port:pkgconfig portdir x11/xpr description {Print an X11 window dump} homepage http://www.x.org/ epoch 0 platforms darwin name xpr depends_lib port:xorg-libXmu long_description {{Print an X11 window dump}} maintainers {blb openmaintainer} categories x11 version 1.0.2 revision 1 xprop 320 @@ -11424,8 +11420,8 @@ variants universal depends_build port:pkgconfig portdir x11/xrdb description {X11 server resource database utility} homepage http://www.x.org/ epoch 0 platforms darwin name xrdb depends_lib port:xorg-libXmu long_description {{X11 server resource database utility}} maintainers {blb openmaintainer} categories x11 version 1.0.5 revision 1 xrefresh 346 variants universal depends_build port:pkgconfig portdir x11/xrefresh description {Refresh all or part of an X11 screen} homepage http://www.x.org/ epoch 0 platforms darwin name xrefresh depends_lib port:xorg-libX11 long_description {{Refresh all or part of an X11 screen}} maintainers {blb openmaintainer} categories x11 version 1.0.2 revision 1 -xrender 383 -variants {system_x11 universal} depends_build {port:pkgconfig port:xorg-xproto port:xorg-renderproto} portdir x11/xrender description {X Render Extension library} homepage http://www.x.org/ epoch 0 platforms darwin name xrender depends_lib port:xorg-libX11 long_description {{X Render Extension library}} maintainers {jeremyhu openmaintainer} categories x11 version 0.9.4 revision 5 +xrender 370 +variants universal depends_build port:pkgconfig portdir x11/xrender description {X Render Extension library} homepage http://www.x.org/ epoch 0 platforms darwin name xrender depends_lib {port:xorg-libX11 port:xorg-xproto port:xorg-renderproto} long_description {{X Render Extension library}} maintainers {jeremyhu openmaintainer} categories x11 version 0.9.4 revision 5 xrmap 444 variants {darwin_8 universal} portdir x11/xrmap description {X11 client for the CIA World data bank} homepage http://frmas.free.fr/li_1.htm epoch 0 platforms darwin name xrmap depends_lib port:xorg-libs long_description {The Xrmap program provides a user-friendly X client for generating images of the Earth and manipulating the CIA World data bank II global vector information.} maintainers nomaintainer categories x11 version 2.33 revision 1 xroot 520 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Sat May 2 12:53:49 2009 From: toby at macports.org (toby at macports.org) Date: Sat, 2 May 2009 12:53:49 -0700 (PDT) Subject: [50538] trunk/dports/x11 Message-ID: <20090502195350.65DDF16F16C3@beta.macosforge.org> Revision: 50538 http://trac.macports.org/changeset/50538 Author: toby at macports.org Date: 2009-05-02 12:53:49 -0700 (Sat, 02 May 2009) Log Message: ----------- fail Modified Paths: -------------- trunk/dports/x11/xorg-libXp/Portfile trunk/dports/x11/xorg-libXxf86dga/Portfile Modified: trunk/dports/x11/xorg-libXp/Portfile =================================================================== --- trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 19:52:53 UTC (rev 50537) +++ trunk/dports/x11/xorg-libXp/Portfile 2009-05-02 19:53:49 UTC (rev 50538) @@ -27,7 +27,7 @@ port:libtool \ port:xorg-util-macros -depends_lib port:xorg-libXext +depends_lib port:xorg-libXext \ port:xorg-printproto use_autoreconf yes Modified: trunk/dports/x11/xorg-libXxf86dga/Portfile =================================================================== --- trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 19:52:53 UTC (rev 50537) +++ trunk/dports/x11/xorg-libXxf86dga/Portfile 2009-05-02 19:53:49 UTC (rev 50538) @@ -22,7 +22,7 @@ depends_build port:pkgconfig -depends_lib port:xorg-libXext +depends_lib port:xorg-libXext \ port:xorg-xf86dgaproto livecheck.check regex -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Sat May 2 13:13:34 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Sat, 2 May 2009 13:13:34 -0700 (PDT) Subject: [50539] trunk/dports/x11/winetricks Message-ID: <20090502201334.6370A16F1A40@beta.macosforge.org> Revision: 50539 http://trac.macports.org/changeset/50539 Author: jeremyhu at macports.org Date: 2009-05-02 13:13:33 -0700 (Sat, 02 May 2009) Log Message: ----------- winetricks: Use MP xmessage, nuke x11prefix Modified Paths: -------------- trunk/dports/x11/winetricks/Portfile Removed Paths: ------------- trunk/dports/x11/winetricks/files/ Modified: trunk/dports/x11/winetricks/Portfile =================================================================== --- trunk/dports/x11/winetricks/Portfile 2009-05-02 19:53:49 UTC (rev 50538) +++ trunk/dports/x11/winetricks/Portfile 2009-05-02 20:13:33 UTC (rev 50539) @@ -4,6 +4,7 @@ name winetricks version 20090227 +revision 1 categories x11 maintainers ryandesign homepage http://code.google.com/p/winezeug/ @@ -30,10 +31,8 @@ sha1 bd317f43898d59e42a60060a53dd5229f998e456 \ rmd160 ac09351772fffafdf8b3f8dbbd6c665777e613ef -patchfiles \ - patch-x11prefix.diff - depends_run \ + port:xmessage \ path:bin/wine:wine \ port:cabextract \ port:openssl \ @@ -43,10 +42,6 @@ copy ${distpath}/${name} ${worksrcpath} } -build { - reinplace "s%@X11PREFIX@%${x11prefix}%" ${worksrcpath}/${name} -} - destroot { xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/${name} } -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Sat May 2 13:23:00 2009 From: toby at macports.org (toby at macports.org) Date: Sat, 2 May 2009 13:23:00 -0700 (PDT) Subject: [50540] trunk/dports/sysutils/tmux/files/GNUmakefile.diff Message-ID: <20090502202300.66EE516F1C75@beta.macosforge.org> Revision: 50540 http://trac.macports.org/changeset/50540 Author: toby at macports.org Date: 2009-05-02 13:22:59 -0700 (Sat, 02 May 2009) Log Message: ----------- fix gcc check Modified Paths: -------------- trunk/dports/sysutils/tmux/files/GNUmakefile.diff Modified: trunk/dports/sysutils/tmux/files/GNUmakefile.diff =================================================================== --- trunk/dports/sysutils/tmux/files/GNUmakefile.diff 2009-05-02 20:13:33 UTC (rev 50539) +++ trunk/dports/sysutils/tmux/files/GNUmakefile.diff 2009-05-02 20:22:59 UTC (rev 50540) @@ -1,6 +1,6 @@ ---- GNUmakefile.orig 2008-09-25 23:45:25.000000000 -0700 -+++ GNUmakefile 2008-11-29 10:08:06.000000000 -0800 -@@ -46,9 +46,9 @@ +--- GNUmakefile.orig 2009-05-02 13:20:45.000000000 -0700 ++++ GNUmakefile 2009-05-02 13:21:54.000000000 -0700 +@@ -46,28 +46,28 @@ osdep-unknown.c osdep-openbsd.c osdep-freebsd.c osdep-linux.c \ osdep-darwin.c attributes.c @@ -13,7 +13,13 @@ ifdef FDEBUG CFLAGS+= -g -ggdb -DDEBUG LDFLAGS+= -rdynamic -@@ -61,13 +61,13 @@ + LIBS+= -ldl + endif +-ifeq (${CC},gcc) ++ifneq (,$(findstring gcc,${CC})) + CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 + CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations + CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align endif @@ -39,7 +45,7 @@ SRCS+= compat/strtonum.c compat/bsd-poll.c compat/vis.c CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE \ -DNO_QUEUE_H -DNO_TREE_H -DBROKEN_POLL -@@ -137,8 +137,8 @@ +@@ -137,8 +136,8 @@ install: $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin $(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) -------------- next part -------------- An HTML attachment was scrubbed... URL: From toby at macports.org Sat May 2 13:28:14 2009 From: toby at macports.org (toby at macports.org) Date: Sat, 2 May 2009 13:28:14 -0700 (PDT) Subject: [50541] trunk/dports/sysutils/tmux/files/GNUmakefile.diff Message-ID: <20090502202815.3C48C16F1CE3@beta.macosforge.org> Revision: 50541 http://trac.macports.org/changeset/50541 Author: toby at macports.org Date: 2009-05-02 13:28:14 -0700 (Sat, 02 May 2009) Log Message: ----------- actually, just enable the warning flags unconditionally; clang supports them too Modified Paths: -------------- trunk/dports/sysutils/tmux/files/GNUmakefile.diff Modified: trunk/dports/sysutils/tmux/files/GNUmakefile.diff =================================================================== --- trunk/dports/sysutils/tmux/files/GNUmakefile.diff 2009-05-02 20:22:59 UTC (rev 50540) +++ trunk/dports/sysutils/tmux/files/GNUmakefile.diff 2009-05-02 20:28:14 UTC (rev 50541) @@ -1,6 +1,6 @@ ---- GNUmakefile.orig 2009-05-02 13:20:45.000000000 -0700 -+++ GNUmakefile 2009-05-02 13:21:54.000000000 -0700 -@@ -46,28 +46,28 @@ +--- GNUmakefile.orig 2009-05-02 13:27:11.000000000 -0700 ++++ GNUmakefile 2009-05-02 13:27:24.000000000 -0700 +@@ -46,28 +46,26 @@ osdep-unknown.c osdep-openbsd.c osdep-freebsd.c osdep-linux.c \ osdep-darwin.c attributes.c @@ -16,12 +16,11 @@ LIBS+= -ldl endif -ifeq (${CC},gcc) -+ifneq (,$(findstring gcc,${CC})) CFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align - endif +-endif -LDFLAGS+= +LDFLAGS+= __LDFLAGS__ @@ -37,7 +36,7 @@ ifeq ($(shell uname),AIX) INCDIRS+= -I/usr/local/include/ncurses -Icompat -@@ -103,7 +103,6 @@ +@@ -103,7 +101,6 @@ endif ifeq ($(shell uname),Darwin) @@ -45,7 +44,7 @@ SRCS+= compat/strtonum.c compat/bsd-poll.c compat/vis.c CFLAGS+= -DNO_STRTONUM -DNO_SETRESUID -DNO_SETRESGID -DNO_SETPROCTITLE \ -DNO_QUEUE_H -DNO_TREE_H -DBROKEN_POLL -@@ -137,8 +136,8 @@ +@@ -137,8 +134,8 @@ install: $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin $(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 13:52:48 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 13:52:48 -0700 (PDT) Subject: [50542] trunk/dports Message-ID: <20090502205249.2CA1B16F2021@beta.macosforge.org> Revision: 50542 http://trac.macports.org/changeset/50542 Author: portindex at macports.org Date: 2009-05-02 13:52:47 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5799 Ports successfully parsed: 5799 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-02 20:28:14 UTC (rev 50541) +++ trunk/dports/PortIndex 2009-05-02 20:52:47 UTC (rev 50542) @@ -11114,8 +11114,8 @@ depends_build port:pkgconfig portdir x11/wine-crossover-games description {Wine Is Not an Emulator (1.1.12 with CodeWeavers Modifications)} homepage http://www.codeweavers.com/ epoch 0 platforms darwin name wine-crossover-games depends_lib {port:expat port:fontconfig port:freetype port:jpeg port:libiconv port:libxml2 port:libxslt port:ncurses port:openssl port:zlib port:xorg-libsm port:xorg-libXcursor port:xorg-libXi port:xorg-libXinerama port:xorg-libXrandr port:xorg-libXxf86vm port:mesa} maintainers {jeremyhu openmaintainer} long_description {Wine is an implementation of the Windows APIs on top of X11. This version contains the Codeweavers patches for Crossover Games} categories x11 version 7.2.0 revision 0 wine-devel 595 depends_build port:pkgconfig portdir x11/wine-devel description {Wine Is Not an Emulator} homepage http://www.winehq.com/ epoch 0 platforms darwin name wine-devel depends_lib {port:expat port:fontconfig port:freetype port:jpeg port:libiconv port:libxml2 port:libxslt port:ncurses port:openssl port:zlib port:xorg-libsm port:xorg-libXcursor port:xorg-libXi port:xorg-libXinerama port:xorg-libXrandr port:xorg-libXxf86vm port:mesa} maintainers {ryandesign jwa openmaintainer} long_description {Wine is an implementation of the Windows APIs on top of X11.} categories x11 version 1.1.20 revision 0 -winetricks 523 -portdir x11/winetricks description {downloads and installs various redistributable runtime libraries} homepage http://code.google.com/p/winezeug/ epoch 0 depends_run {path:bin/wine:wine port:cabextract port:openssl bin:curl:curl} platforms darwin name winetricks maintainers ryandesign long_description {winetricks can help you prepare your system for Windows applications that mistakenly assume all users' systems have all the needed redistributable runtime libraries or fonts.} version 20090227 categories x11 revision 0 +winetricks 537 +portdir x11/winetricks description {downloads and installs various redistributable runtime libraries} homepage http://code.google.com/p/winezeug/ epoch 0 depends_run {port:xmessage path:bin/wine:wine port:cabextract port:openssl bin:curl:curl} platforms darwin name winetricks maintainers ryandesign long_description {winetricks can help you prepare your system for Windows applications that mistakenly assume all users' systems have all the needed redistributable runtime libraries or fonts.} version 20090227 categories x11 revision 1 wm-extra 338 variants universal portdir x11/wm-extra description {Extra themes for WindowMaker} homepage {http://www.windowmaker.org/ / http://themes.freshmeat.net/browse/918/?topic_id=918} epoch 0 platforms darwin name wm-extra maintainers nomaintainer long_description {{Extra themes for WindowMaker}} categories {x11 x11-wm} version 0.1 revision 2 wmbinclock 407 @@ -11314,6 +11314,8 @@ variants universal depends_build port:pkgconfig portdir x11/xorg-libXinerama description {X.org libXinerama} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXinerama depends_lib {port:xorg-libX11 port:xorg-libXext port:xorg-xineramaproto} long_description {Xinerama protocol library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.3 revision 0 xorg-libXmu 347 variants universal depends_build port:pkgconfig portdir x11/xorg-libXmu description {X.org libXmu} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXmu depends_lib {port:xorg-libXext port:xorg-libXt} long_description {X.org Xmu library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXp 442 +variants universal depends_build {port:pkgconfig port:autoconf port:automake port:libtool port:xorg-util-macros bin:autoreconf:autoconf} portdir x11/xorg-libXp description {X.org libXp} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXp depends_lib {port:xorg-libXext port:xorg-printproto} long_description {Xprint client library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.0 revision 2 xorg-libXrandr 413 variants universal depends_build port:pkgconfig portdir x11/xorg-libXrandr description {X.org libXrandr} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXrandr depends_lib {port:xorg-libX11 port:xorg-libXext port:xrender port:xorg-randrproto} long_description {X Resize and Rotate Extension C Library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.3.0 revision 0 xorg-libXres 361 @@ -11326,6 +11328,8 @@ variants universal depends_build port:pkgconfig portdir x11/xorg-libXv description {X.org libXv} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXv depends_lib {port:xorg-libXext port:xorg-videoproto} long_description {Xvideo extension library} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 xorg-libXvMC 361 variants universal depends_build port:pkgconfig portdir x11/xorg-libXvMC description {X.org libXvMC} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXvMC depends_lib port:xorg-libXv long_description {Xvideo extension library with Motion Compression} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.4 revision 0 +xorg-libXxf86dga 371 +variants universal depends_build port:pkgconfig portdir x11/xorg-libXxf86dga description {X.org libXxf86dga} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86dga depends_lib {port:xorg-libXext port:xorg-xf86dgaproto} long_description {{X.org libXxf86dga}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.2 revision 0 xorg-libXxf86misc 376 variants universal depends_build port:pkgconfig portdir x11/xorg-libXxf86misc description {X.org libXxf86misc} homepage http://www.x.org epoch 0 platforms {darwin macosx} name xorg-libXxf86misc depends_lib {port:xorg-libXext port:xorg-xf86miscproto} long_description {{X.org libXxf86misc}} maintainers {jeremyhu openmaintainer} categories {x11 devel} version 1.0.1 revision 1 xorg-libXxf86vm 371 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Sat May 2 15:07:18 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Sat, 2 May 2009 15:07:18 -0700 (PDT) Subject: [50543] trunk/dports/tex/texlive_base/Portfile Message-ID: <20090502220718.EC2AA16F2828@beta.macosforge.org> Revision: 50543 http://trac.macports.org/changeset/50543 Author: mcalhoun at macports.org Date: 2009-05-02 15:07:18 -0700 (Sat, 02 May 2009) Log Message: ----------- texlive_base: When building program ftdump, X11 libraries are not found. Modified Paths: -------------- trunk/dports/tex/texlive_base/Portfile Modified: trunk/dports/tex/texlive_base/Portfile =================================================================== --- trunk/dports/tex/texlive_base/Portfile 2009-05-02 20:52:47 UTC (rev 50542) +++ trunk/dports/tex/texlive_base/Portfile 2009-05-02 22:07:18 UTC (rev 50543) @@ -49,6 +49,12 @@ --without-xdvipdfmx --without-texi2html \ --without-psutils --without-system-icu +if { ! [variant_isset no_x11] } { + configure.args-append \ + --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib +} + configure.cppflags-delete -I${prefix}/include configure.cppflags-append -isystem${prefix}/include -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Sat May 2 21:40:20 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Sat, 2 May 2009 21:40:20 -0700 (PDT) Subject: [50544] trunk/dports/net/pureftpd/Portfile Message-ID: <20090503044020.E499716F4A09@beta.macosforge.org> Revision: 50544 http://trac.macports.org/changeset/50544 Author: ryandesign at macports.org Date: 2009-05-02 21:40:19 -0700 (Sat, 02 May 2009) Log Message: ----------- pureftpd: get "/opt/local" out of the mysql5 dependency declaration Modified Paths: -------------- trunk/dports/net/pureftpd/Portfile Modified: trunk/dports/net/pureftpd/Portfile =================================================================== --- trunk/dports/net/pureftpd/Portfile 2009-05-02 22:07:18 UTC (rev 50543) +++ trunk/dports/net/pureftpd/Portfile 2009-05-03 04:40:19 UTC (rev 50544) @@ -97,7 +97,7 @@ variant traditional_chinese description "Use traditional Chinese language for server messages" { configure.args-append --with-language=traditional-chinese } variant mysql5 description "Use the native MySQL support for users database." { - depends_lib-append path:/opt/local/bin/mysql_config5:mysql5 + depends_lib-append path:bin/mysql_config5:mysql5 configure.args-append --with-mysql configure.cflags-append "-I${prefix}/include/mysql5/mysql" configure.ldflags-append "-L${prefix}/lib/mysql5/mysql" -------------- next part -------------- An HTML attachment was scrubbed... URL: From ryandesign at macports.org Sat May 2 21:42:02 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Sat, 2 May 2009 21:42:02 -0700 Subject: propchange - r50538 svn:log Message-ID: <20090503044202.7244E28085@relay13.apple.com> Author: ryandesign at macports.org (original author: toby at macports.org) Revision: 50538 Property Name: svn:log @@ -1 +1 @@ -fail +fix dependencies to add required backslashes From ryandesign at macports.org Sat May 2 23:13:31 2009 From: ryandesign at macports.org (ryandesign at macports.org) Date: Sat, 2 May 2009 23:13:31 -0700 (PDT) Subject: [50545] trunk/dports/lang/php4/Portfile Message-ID: <20090503061332.00FB816F58E5@beta.macosforge.org> Revision: 50545 http://trac.macports.org/changeset/50545 Author: ryandesign at macports.org Date: 2009-05-02 23:13:28 -0700 (Sat, 02 May 2009) Log Message: ----------- php4: back-port fastcgi variant from php5 port Modified Paths: -------------- trunk/dports/lang/php4/Portfile Modified: trunk/dports/lang/php4/Portfile =================================================================== --- trunk/dports/lang/php4/Portfile 2009-05-03 04:40:19 UTC (rev 50544) +++ trunk/dports/lang/php4/Portfile 2009-05-03 06:13:28 UTC (rev 50545) @@ -126,7 +126,7 @@ --with-iodbc=/usr } -variant no_web conflicts apache apache2 apache20 description {Don't include any web server support} {} +variant no_web conflicts apache apache2 apache20 fastcgi description {Don't include any web server support} {} variant apache conflicts apache2 apache20 no_web description {Add Apache 1 web server module} { if { ! [variant_isset macosx] } { @@ -162,6 +162,14 @@ --with-apxs2=${prefix}/apache20/bin/apxs } +variant fastcgi conflicts no_web description {Add FastCGI web server binary} { + if { ![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] } { + configure.args-append \ + --enable-fastcgi \ + --enable-force-cgi-redirect + } +} + variant mysql3 conflicts mysql4 mysql5 description {MySQL 3 functions} { depends_lib-append \ port:mysql3 @@ -253,7 +261,7 @@ --with-iconv-dir=${prefix} } -if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] && ![variant_isset no_web]} { +if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] && ![variant_isset fastcgi] && ![variant_isset no_web]} { default_variants +apache2 } @@ -300,6 +308,47 @@ xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extras-conf/mod_php.conf.sample } + if { [variant_isset fastcgi] } { + # If we've built an Apache module (any version) then the FastCGI binary + # will not have been built, so we need to run through the whole process + # again and build just the FastCGI binary. Keep the options here in sync + # with the options specified in the apache, apache2 and apache20 variants. + if { [variant_isset apache] } { + if { ![variant_isset macosx] } { + configure.args-delete \ + --with-apxs=${prefix}/sbin/apxs + } else { + configure.args-delete \ + --with-apxs=/usr/sbin/apxs + } + } + if { [variant_isset apache2] } { + configure.args-delete \ + --with-apxs2=${prefix}/apache2/bin/apxs + } + if { [variant_isset apache20] } { + configure.args-delete \ + --with-apxs2=${prefix}/apache20/bin/apxs + } + + # Run the build again to get the FastCGI binary. Keep the options here + # in sync with those in the fastcgi variant. + if { [variant_isset apache] || [variant_isset apache2] || [variant_isset apache20] } { + configure.args-append \ + --enable-fastcgi \ + --enable-force-cgi-redirect + ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi" + command_exec configure + ui_msg "$UI_PREFIX Building ${name} again for fastcgi" + command_exec build + ui_msg "$UI_PREFIX Staging ${name} fastcgi into destroot" + } + + # Copy the FastCGI binary to the bin dir under a new name so it doesn't + # conflict with the cli version. + xinstall -m 755 ${worksrcpath}/sapi/cgi/php ${destroot}${prefix}/bin/php-cgi${major} + } + file rename ${destroot}${prefix}/etc/php4/pear.conf ${destroot}${prefix}/etc/php4/pear.conf.sample #copy php.ini -------------- next part -------------- An HTML attachment was scrubbed... URL: From blair at macports.org Sat May 2 23:43:21 2009 From: blair at macports.org (blair at macports.org) Date: Sat, 2 May 2009 23:43:21 -0700 (PDT) Subject: [50546] trunk/dports/java Message-ID: <20090503064322.06F0616F5E3F@beta.macosforge.org> Revision: 50546 http://trac.macports.org/changeset/50546 Author: blair at macports.org Date: 2009-05-02 23:43:20 -0700 (Sat, 02 May 2009) Log Message: ----------- New port for MSV, the Sun Multi-Schema XML Validator. Added Paths: ----------- trunk/dports/java/msv/ trunk/dports/java/msv/Portfile Added: trunk/dports/java/msv/Portfile =================================================================== --- trunk/dports/java/msv/Portfile (rev 0) +++ trunk/dports/java/msv/Portfile 2009-05-03 06:43:20 UTC (rev 50546) @@ -0,0 +1,66 @@ +# $Id$ + +PortSystem 1.0 + +name msv +version 20081113 + +categories java +maintainers blair +platforms darwin + +description Sun Multi-Schema XML Validator (MSV) validates XML files +long_description The Sun Multi-Schema XML Validator (MSV) is a Java \ + technology tool to validate XML documents against \ + several kinds of XML schemata. It supports RELAX NG, \ + RELAX Namespace, RELAX Core, TREX, XML DTDs and a \ + subset of XML Schema Part 1. +homepage https://msv.dev.java.net/ + +master_sites https://msv.dev.java.net/files/documents/61/116917/ +distfiles ${name}.${version}.zip +fetch.ignore_sslcert yes +checksums md5 15e61067d38b7015601832e9f4555502 \ + sha1 f70186b2997469def7f0fb1a6a67212192c5ab62 \ + rmd160 cc80709d8a8a173fb954b26a57e4de1b43c82c1b + +use_zip yes + +depends_lib bin:java:kaffe + +use_configure no + +build.cmd true + +destroot { + # Ensure needed directories + xinstall -m 755 -d ${destroot}${prefix}/share/java \ + ${destroot}${prefix}/share/doc/${name} + + foreach f {isorelax.jar msv.jar} { + file copy ${worksrcpath}/${f} \ + ${destroot}${prefix}/share/java/${f} + } + + foreach f {Apache-LICENSE-1.1.txt + ChangeLog.txt + JARV.html + JARV_API.gif + JAXPmasquerading.html + README.txt + RNGDatatypeLibrary.html + SAXfilter.gif + acceptor.html + commandline.html + copyright.txt + developer.html + examples + license.txt + nativeAPI.html} { + file copy ${worksrcpath}/${f} \ + ${destroot}${prefix}/share/doc/${name}/ + } + + file copy ${worksrcpath}/javadoc \ + ${destroot}${prefix}/share/doc/${name}/api +} Property changes on: trunk/dports/java/msv/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sat May 2 23:52:59 2009 From: portindex at macports.org (portindex at macports.org) Date: Sat, 2 May 2009 23:52:59 -0700 (PDT) Subject: [50547] trunk/dports Message-ID: <20090503065300.8209016F6458@beta.macosforge.org> Revision: 50547 http://trac.macports.org/changeset/50547 Author: portindex at macports.org Date: 2009-05-02 23:52:59 -0700 (Sat, 02 May 2009) Log Message: ----------- Total number of ports parsed: 5800 Ports successfully parsed: 5800 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-03 06:43:20 UTC (rev 50546) +++ trunk/dports/PortIndex 2009-05-03 06:52:59 UTC (rev 50547) @@ -3502,6 +3502,8 @@ variants devel depends_build {bin:java:kaffe bin:ant:apache-ant} portdir java/maven description {A java-based build and project management environment.} homepage http://maven.apache.org/ epoch 0 platforms darwin name maven maintainers {jberry openmaintainer} long_description {Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM.} categories {java devel} version 1.0.2 revision 0 maven2 732 depends_build bin:java:kaffe portdir java/maven2 description {A java-based build and project management environment.} homepage http://maven.apache.org/ epoch 0 platforms darwin name maven2 maintainers gk5885 at kickstyle.net long_description {Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM. Maven 2.0 is a complete rewrite of Maven 1.0 and as such is better organized, faster and easier to use.} version 2.1.0 categories {java devel} revision 0 +msv 528 +depends_build bin:unzip:unzip portdir java/msv description {Sun Multi-Schema XML Validator (MSV) validates XML files} homepage https://msv.dev.java.net/ epoch 0 platforms darwin name msv depends_lib bin:java:kaffe maintainers blair long_description {The Sun Multi-Schema XML Validator (MSV) is a Java technology tool to validate XML documents against several kinds of XML schemata. It supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs and a subset of XML Schema Part 1.} categories java version 20081113 revision 0 mx4j 563 depends_build bin:ant:apache-ant portdir java/mx4j description {Open Source JMX for Enterprise Computing.} homepage http://mx4j.sourceforge.net/ epoch 0 platforms darwin name mx4j depends_lib {bin:java:kaffe port:junit port:jakarta-bcel port:jakarta-log4j port:commons-logging} maintainers {jberry openmaintainer} long_description {MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.} categories java version 3.0.1 revision 0 mysql-connector-java 862 @@ -4156,8 +4158,8 @@ variants {i386 universal} portdir lang/pfe description {Implementation of ANSI Forth} homepage http://pfe.sourceforge.net/ epoch 0 platforms darwin name pfe depends_lib port:ncurses long_description {The Forth-system is closely modeled along the new American National Standard for the programming language Forth. Every word of every word set mentioned in the dpANS-6 document of June 1993 has been implemented. Additionally it is compatible to Forth-83.} maintainers nomaintainer categories lang version 0.33.65 revision 0 php-mode.el 477 portdir lang/php-mode.el description {PHP mode for Emacs} homepage http://php-mode.sourceforge.net/ epoch 0 platforms darwin name php-mode.el depends_lib {{path:\${prefix}/bin/emacs:emacs}} maintainers gmail.com:billitch long_description {An Emacs major mode for editing PHP code. Features: Syntax coloring and {indenting;} Documentation browse and search {functions;} Support for Imenu and {SpeedBar;} Customization options} version 1.4.0 categories {lang editors} revision 0 -php4 748 -variants {darwin_6 darwin_7 macosx no_web apache apache2 apache20 mysql3 mysql4 mysql5 postgresql8 ldap gmp dbase imap pspell xslt readline t1lib universal} depends_build port:pkgconfig portdir lang/php4 description {PHP: Hypertext Preprocessor} homepage http://www.php.net/ epoch 0 platforms {darwin freebsd} name php4 depends_lib {port:libiconv port:expat port:gettext port:zlib port:openssl port:tiff port:libxml2 port:libtool port:mhash port:libmcrypt port:curl port:jpeg port:libpng port:freetype port:apache2} long_description {PHP is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML.} maintainers {jwa ryandesign} categories {lang php www} version 4.4.9 revision 6 +php4 756 +variants {darwin_6 darwin_7 macosx no_web apache apache2 apache20 fastcgi mysql3 mysql4 mysql5 postgresql8 ldap gmp dbase imap pspell xslt readline t1lib universal} depends_build port:pkgconfig portdir lang/php4 description {PHP: Hypertext Preprocessor} homepage http://www.php.net/ epoch 0 platforms {darwin freebsd} name php4 depends_lib {port:libiconv port:expat port:gettext port:zlib port:openssl port:tiff port:libxml2 port:libtool port:mhash port:libmcrypt port:curl port:jpeg port:libpng port:freetype port:apache2} long_description {PHP is a widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML.} maintainers {jwa ryandesign} categories {lang php www} version 4.4.9 revision 6 php5 953 variants {darwin_6 darwin_7 macosx no_web apache apache2 fastcgi gmp dbase imap pspell tidy mssql snmp macports_snmp mysql3 mysql4 mysql5 oracle postgresql82 postgresql83 sqlite ipc pcntl pear readline sockets t1lib universal} depends_build {port:pkgconfig port:autoconf213 bin:autoconf:autoconf} portdir lang/php5 description {PHP: Hypertext Preprocessor} homepage http://www.php.net/ epoch 1 platforms {darwin freebsd} name php5 depends_lib {path:bin/gsed:gsed port:libtool port:libxml2 port:libxslt port:openssl port:zlib port:bzip2 port:libiconv port:expat port:gettext port:tiff port:mhash port:libmcrypt port:curl port:pcre port:jpeg port:libpng port:freetype path:apache2/bin/apxs:apache2} long_description {PHP is a widely-used general-purpose scripting language that is especially suited for developing web sites, but can also be used for command-line scripting.} maintainers {ryandesign jwa} categories {lang php www} version 5.2.9 revision 2 php5-devel 958 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From blb at macports.org Sun May 3 01:10:49 2009 From: blb at macports.org (blb at macports.org) Date: Sun, 3 May 2009 01:10:49 -0700 (PDT) Subject: [50548] trunk/dports/gnome/gnucash Message-ID: <20090503081050.246EE16F7479@beta.macosforge.org> Revision: 50548 http://trac.macports.org/changeset/50548 Author: blb at macports.org Date: 2009-05-03 01:10:45 -0700 (Sun, 03 May 2009) Log Message: ----------- gnome/gnucash - switch to using DYLD_FALLBACK_LIBRARY_PATH since it's vastly preferred to DYLD_LIBRARY_PATH; set LTDL_LIBRARY_PATH as well now since gnucash uses guile's lib-loading which in turn uses libltdl and LTDL_LIBRARY_PATH lets it find necessary files Modified Paths: -------------- trunk/dports/gnome/gnucash/Portfile Added Paths: ----------- trunk/dports/gnome/gnucash/files/patch-src_bin_gnucash.in.diff Modified: trunk/dports/gnome/gnucash/Portfile =================================================================== --- trunk/dports/gnome/gnucash/Portfile 2009-05-03 06:52:59 UTC (rev 50547) +++ trunk/dports/gnome/gnucash/Portfile 2009-05-03 08:10:45 UTC (rev 50548) @@ -5,7 +5,7 @@ name gnucash version 2.2.9 -revision 1 +revision 2 categories gnome x11 maintainers nomaintainer platforms darwin @@ -52,11 +52,14 @@ configure.args --disable-glibtest \ --disable-dependency-tracking --enable-hbci --enable-ofx -patchfiles patch-configure.diff patch-lib_libc_libc-missing-noop.c.diff +patchfiles patch-configure.diff patch-lib_libc_libc-missing-noop.c.diff \ + patch-src_bin_gnucash.in.diff post-patch { - reinplace "/^DYLD_LIBRARY_PATH/s|=\"|=\"/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources at -PATH_SEPARATOR-@|" ${worksrcpath}/src/bin/gnucash.in - reinplace "/^DYLD_LIBRARY_PATH/s|=\"|=\"/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources at -PATH_SEPARATOR-@|" ${worksrcpath}/src/bin/overrides/gnucash-env.in + reinplace "s|DYLD_LIBRARY_PATH|DYLD_FALLBACK_LIBRARY_PATH|g" \ + ${worksrcpath}/configure ${worksrcpath}/src/bin/gnucash.in \ + ${worksrcpath}/src/bin/overrides/gnucash-env.in \ + ${worksrcpath}/src/gnc-test-env fs-traverse src_file ${worksrcpath}/src { if { [ file isfile ${src_file} ] } { reinplace "s|\\ From blb at macports.org Sun May 3 01:21:27 2009 From: blb at macports.org (blb at macports.org) Date: Sun, 3 May 2009 01:21:27 -0700 (PDT) Subject: [50549] trunk/dports/python/py-gdata/Portfile Message-ID: <20090503082127.BB11A16F76FC@beta.macosforge.org> Revision: 50549 http://trac.macports.org/changeset/50549 Author: blb at macports.org Date: 2009-05-03 01:21:26 -0700 (Sun, 03 May 2009) Log Message: ----------- python/py-gdata - version update to 1.3.1, ticket #19520 Modified Paths: -------------- trunk/dports/python/py-gdata/Portfile Modified: trunk/dports/python/py-gdata/Portfile =================================================================== --- trunk/dports/python/py-gdata/Portfile 2009-05-03 08:10:45 UTC (rev 50548) +++ trunk/dports/python/py-gdata/Portfile 2009-05-03 08:21:26 UTC (rev 50549) @@ -4,7 +4,7 @@ PortGroup python24 1.0 name py-gdata -version 1.2.1 +version 1.3.1 categories-append devel maintainers gmail.com:aecollins1 description Google Data API Python Client Library @@ -16,11 +16,11 @@ platforms darwin homepage http://code.google.com/p/gdata-python-client/ master_sites http://gdata-python-client.googlecode.com/files/ -distname gdata.py-${version} +distname gdata-${version} -checksums md5 19cd7fff94e2320b20d023492c33bf99 \ - sha1 5360ca69ae2a6d9524ffe1e5df1aa2e0a5377aa2 \ - rmd160 5ea51c0c56462c581d735edbfcc071384964ed11 +checksums md5 70d60cdb43f6f49fc5a596f154f9cfbe \ + sha1 5d6b835d598fe88b75987cee19b50cac3240581e \ + rmd160 f7e752b1aaa65d123965ca691d75ac17ebf6bc53 depends_lib port:py-setuptools \ port:py-elementtree @@ -28,7 +28,7 @@ post-destroot { eval reinplace \ - "s|/home/jhartmann/gdata-python-client2/src|${prefix}/lib/python2.4/site-packages|g" \ + "s|/usr/local/svn/gdata-python-client/src|${prefix}/lib/python2.4/site-packages|g" \ [glob ${worksrcpath}/pydocs/*.html] xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} @@ -37,7 +37,6 @@ eval reinplace "s|#!/usr/bin/python|#!${prefix}/bin/python2.4|g" \ [glob ${worksrcpath}/samples/*/*.py] - file copy ${worksrcpath}/samples \ ${destroot}${prefix}/share/doc/${name}/ } -------------- next part -------------- An HTML attachment was scrubbed... URL: From blb at macports.org Sun May 3 01:26:37 2009 From: blb at macports.org (blb at macports.org) Date: Sun, 3 May 2009 01:26:37 -0700 (PDT) Subject: [50550] trunk/dports/python/py25-gdata/Portfile Message-ID: <20090503082637.8524816F77AD@beta.macosforge.org> Revision: 50550 http://trac.macports.org/changeset/50550 Author: blb at macports.org Date: 2009-05-03 01:26:36 -0700 (Sun, 03 May 2009) Log Message: ----------- python/py25-gdata - version update to 1.3.1, ticket #19519 Modified Paths: -------------- trunk/dports/python/py25-gdata/Portfile Modified: trunk/dports/python/py25-gdata/Portfile =================================================================== --- trunk/dports/python/py25-gdata/Portfile 2009-05-03 08:21:26 UTC (rev 50549) +++ trunk/dports/python/py25-gdata/Portfile 2009-05-03 08:26:36 UTC (rev 50550) @@ -4,7 +4,7 @@ PortGroup python25 1.0 name py25-gdata -version 1.2.4 +version 1.3.1 categories-append devel maintainers gmail.com:aecollins1 description Google Data API Python Client Library @@ -16,11 +16,11 @@ platforms darwin homepage http://code.google.com/p/gdata-python-client/ master_sites http://gdata-python-client.googlecode.com/files/ -distname gdata.py-${version} +distname gdata-${version} -checksums md5 521f33a377d64f8a6505ba119415b787 \ - sha1 5b6804cfb3bced02c7e9f102fa2a714140f62fd8 \ - rmd160 4082397a7180198c1963fde726bb91c360f27e20 +checksums md5 70d60cdb43f6f49fc5a596f154f9cfbe \ + sha1 5d6b835d598fe88b75987cee19b50cac3240581e \ + rmd160 f7e752b1aaa65d123965ca691d75ac17ebf6bc53 depends_lib port:py25-setuptools \ port:py25-elementtree \ @@ -29,7 +29,7 @@ post-destroot { eval reinplace \ - "s|/home/jhartmann/gdata-python-client2/src|${prefix}/lib/python2.5/site-packages|g" \ + "s|/usr/local/svn/gdata-python-client/src|${prefix}/lib/python2.5/site-packages|g" \ [glob ${worksrcpath}/pydocs/*.html] xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} @@ -40,4 +40,5 @@ [glob ${worksrcpath}/samples/*/*.py] file copy ${worksrcpath}/samples \ ${destroot}${prefix}/share/doc/${name}/ + } -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sun May 3 01:53:02 2009 From: portindex at macports.org (portindex at macports.org) Date: Sun, 3 May 2009 01:53:02 -0700 (PDT) Subject: [50551] trunk/dports/PortIndex Message-ID: <20090503085303.C84BE16F7A1E@beta.macosforge.org> Revision: 50551 http://trac.macports.org/changeset/50551 Author: portindex at macports.org Date: 2009-05-03 01:53:00 -0700 (Sun, 03 May 2009) Log Message: ----------- Total number of ports parsed: 5800 Ports successfully parsed: 5800 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-03 08:26:36 UTC (rev 50550) +++ trunk/dports/PortIndex 2009-05-03 08:53:00 UTC (rev 50551) @@ -2619,7 +2619,7 @@ gnotime 558 variants universal portdir gnome/gnotime description {A GNOME project manager.} homepage http://gtt.sourceforge.net/ epoch 0 platforms darwin name gnotime depends_lib {bin:guile:guile lib:libgtkhtml-2:libgtkhtml} maintainers nomaintainer long_description {GnoTime is a combination stop-watch, diary, consultant billing system and project manager. You can measure the amount of time you spend on a task, associate a memo with it, set a billing rate, print an invoice, as well as track that status of other projects.} categories gnome version 2.1.7 revision 0 gnucash 1047 -variants {without_quotes without_hbci without_ofx no_x11 universal} depends_build {port:libtool bin:unlzma:lzmautils} portdir gnome/gnucash description {a personal and small-business financial-accounting software} homepage http://www.gnucash.org/ depends_run port:evince epoch 0 platforms darwin name gnucash depends_lib {port:p5-xml-parser path:lib/pkgconfig/glib-2.0.pc:glib2 port:gconf port:guile16 port:slib port:slib-guile16 port:popt port:libgnomeui port:libgnomeprintui port:libgtkhtml3 port:libgsf port:goffice port:aqbanking port:libofx port:p5-finance-quote} long_description {GnuCash is a personal and small-business financial-accounting software, freely licensed under the GNU GPL. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports.} maintainers nom aintainer categories {gnome x11} version 2.2.9 revision 1 +variants {without_quotes without_hbci without_ofx no_x11 universal} depends_build {port:libtool bin:unlzma:lzmautils} portdir gnome/gnucash description {a personal and small-business financial-accounting software} homepage http://www.gnucash.org/ depends_run port:evince epoch 0 platforms darwin name gnucash depends_lib {port:p5-xml-parser path:lib/pkgconfig/glib-2.0.pc:glib2 port:gconf port:guile16 port:slib port:slib-guile16 port:popt port:libgnomeui port:libgnomeprintui port:libgtkhtml3 port:libgsf port:goffice port:aqbanking port:libofx port:p5-finance-quote} long_description {GnuCash is a personal and small-business financial-accounting software, freely licensed under the GNU GPL. Designed to be easy to use, yet powerful and flexible, GnuCash allows you to track bank accounts, stocks, income and expenses. As quick and intuitive to use as a checkbook register, it is based on professional accounting principles to ensure balanced books and accurate reports.} maintainers nom aintainer categories {gnome x11} version 2.2.9 revision 2 gnucash-devel 1234 variants {without_hbci without_ofx without_quotes without_docs guile16 universal} depends_build {bin:glibtoolize:libtool port:automake bin:svn:subversion} portdir gnome/gnucash-devel description {financial-accounting software} homepage http://www.gnucash.org/ epoch 0 depends_run port:evince name gnucash-devel depends_lib {lib:XML/Parser.pm:p5-xml-parser path:lib/pkgconfig/glib-2.0.pc:glib2 port:gconf port:slib lib:libpopt:popt lib:libgnomeui:libgnomeui lib:libgnomeprintui:libgnomeprintui lib:libgtkhtml-3:libgtkhtml3 lib:libgsf:libgsf lib:libgoffice-0.3:goffice03 lib:aqbanking:aqbanking lib:libofx:libofx lib:Finance/Quote.pm:p5-finance-quote port:gnucash-docs port:guile16 port:slib-guile16} long_description {GnuCash is a personal and small-business financial-accounting software. -- gnucash-devel fetches the current developer version, then tries to build and install it. This may or may not work. It cannot be installed along the regular (stable) version. If you want to try it, it is recommended that you `port deactivate gnucash', then `port install gnucash-devel', so that you can go back to a working copy in case anything goes wrong.} maintainers nomaintainer categories {gnome x11} version 2.2.99.svn-16555 revision 0 gnucash-docs 941 @@ -7369,7 +7369,7 @@ py-gd 489 portdir python/py-gd description {py-gd is a python wrapper for the GD library} homepage http://newcenturycomputers.net/projects/gdmodule.html epoch 0 platforms darwin depends_lib {port:python24 port:gd2 port:giflib} name py-gd maintainers nomaintainer long_description {py-gd is a python wrapper for the graphics library GD so you can use python to create/manipulate images (png, jpeg) by drawing lines, text, doing flood-fills, etc.} categories {python graphics} version 0.56 revision 0 py-gdata 546 -portdir python/py-gdata description {Google Data API Python Client Library} homepage http://code.google.com/p/gdata-python-client/ epoch 0 platforms darwin depends_lib {port:py-setuptools port:py-elementtree} name py-gdata maintainers gmail.com:aecollins1 long_description {The Google Data Python Client Library provides a library that makes it easy to access data through the Google Data APIs. Many Google services (such as Google Calendar and Documents) support the Google Data API protocol.} categories {python devel} version 1.2.1 revision 0 +portdir python/py-gdata description {Google Data API Python Client Library} homepage http://code.google.com/p/gdata-python-client/ epoch 0 platforms darwin depends_lib {port:py-setuptools port:py-elementtree} name py-gdata maintainers gmail.com:aecollins1 long_description {The Google Data Python Client Library provides a library that makes it easy to access data through the Google Data APIs. Many Google services (such as Google Calendar and Documents) support the Google Data API protocol.} categories {python devel} version 1.3.1 revision 0 py-gdbm 347 portdir python/py-gdbm description {Python bindings to the GNU dbm library} homepage http://www.python.org/doc/current/lib/module-gdbm.html epoch 0 platforms darwin depends_lib {port:python24 port:gdbm} name py-gdbm maintainers mww long_description {{Python bindings to the GNU dbm library}} categories {python databases} version 2.4.6 revision 0 py-geoip 353 @@ -8051,7 +8051,7 @@ py25-gd 493 portdir python/py25-gd description {py-gd is a python wrapper for the GD library} homepage http://newcenturycomputers.net/projects/gdmodule.html epoch 0 platforms darwin depends_lib {port:python25 port:gd2 port:giflib} name py25-gd maintainers nomaintainer long_description {py-gd is a python wrapper for the graphics library GD so you can use python to create/manipulate images (png, jpeg) by drawing lines, text, doing flood-fills, etc.} categories {python graphics} version 0.56 revision 0 py25-gdata 575 -portdir python/py25-gdata description {Google Data API Python Client Library} homepage http://code.google.com/p/gdata-python-client/ epoch 0 platforms darwin depends_lib {port:py25-setuptools port:py25-elementtree port:py25-socket-ssl} name py25-gdata maintainers gmail.com:aecollins1 long_description {The Google Data Python Client Library provides a library that makes it easy to access data through the Google Data APIs. Many Google services (such as Google Calendar and Documents) support the Google Data API protocol.} categories {python devel} version 1.2.4 revision 0 +portdir python/py25-gdata description {Google Data API Python Client Library} homepage http://code.google.com/p/gdata-python-client/ epoch 0 platforms darwin depends_lib {port:py25-setuptools port:py25-elementtree port:py25-socket-ssl} name py25-gdata maintainers gmail.com:aecollins1 long_description {The Google Data Python Client Library provides a library that makes it easy to access data through the Google Data APIs. Many Google services (such as Google Calendar and Documents) support the Google Data API protocol.} categories {python devel} version 1.3.1 revision 0 py25-gdbm 351 portdir python/py25-gdbm description {Python bindings to the GNU dbm library} homepage http://www.python.org/doc/current/lib/module-gdbm.html epoch 0 platforms darwin depends_lib {port:python25 port:gdbm} name py25-gdbm maintainers mww long_description {{Python bindings to the GNU dbm library}} categories {python databases} version 2.5.4 revision 0 py25-genshi 476 -------------- next part -------------- An HTML attachment was scrubbed... URL: From macsforever2000 at macports.org Sun May 3 08:13:47 2009 From: macsforever2000 at macports.org (macsforever2000 at macports.org) Date: Sun, 3 May 2009 08:13:47 -0700 (PDT) Subject: [50552] trunk/dports/science/mcl/Portfile Message-ID: <20090503151347.A60AC16FB8B4@beta.macosforge.org> Revision: 50552 http://trac.macports.org/changeset/50552 Author: macsforever2000 at macports.org Date: 2009-05-03 08:13:45 -0700 (Sun, 03 May 2009) Log Message: ----------- Maintainer update to version 08-312. Update description. Obfuscate email address. (#19512) Modified Paths: -------------- trunk/dports/science/mcl/Portfile Modified: trunk/dports/science/mcl/Portfile =================================================================== --- trunk/dports/science/mcl/Portfile 2009-05-03 08:53:00 UTC (rev 50551) +++ trunk/dports/science/mcl/Portfile 2009-05-03 15:13:45 UTC (rev 50552) @@ -3,21 +3,16 @@ PortSystem 1.0 name mcl -version 08-157 -description TribeMCL is a method for clustering proteins into related \ - groups, which are termed 'protein families' +version 08-312 +description MCL - a cluster algorithm for graphs. long_description \ - TribeMCL is a method for clustering proteins into related groups, which are \ - termed 'protein families'. This clustering is achieved by analysing similarity \ - patterns between proteins in a given dataset, and using these patterns to \ - assign proteins into related groups. In many cases, proteins in the same protein \ - family will have similar functional properties. TribeMCL uses a novel clustering \ - method (Markov Clustering or MCL) which solves problems which normally hinder \ - protein sequence clustering. -maintainers mike.thon at gmail.com + The MCL algorithm is short for the Markov Cluster Algorithm, \ + a fast and scalable unsupervised cluster algorithm for graphs \ + based on simulation of (stochastic) flow in graphs. +maintainers gmail.com:mike.thon categories science platforms darwin homepage http://micans.org/mcl/ master_sites http://micans.org/mcl/src/ -checksums md5 98d7e7712fa356ebf4dd75ba37ee9077 +checksums md5 bad361f1d091eb89d565a3dbeb0e63a9 configure.args --enable-blast --mandir=${prefix}/share/man -------------- next part -------------- An HTML attachment was scrubbed... URL: From davidnichols at macports.org Sun May 3 08:39:51 2009 From: davidnichols at macports.org (davidnichols at macports.org) Date: Sun, 3 May 2009 08:39:51 -0700 (PDT) Subject: [50553] trunk/dports/lang Message-ID: <20090503153952.3C1FD16FBFA8@beta.macosforge.org> Revision: 50553 http://trac.macports.org/changeset/50553 Author: davidnichols at macports.org Date: 2009-05-03 08:39:49 -0700 (Sun, 03 May 2009) Log Message: ----------- added qore-oracle-module port Added Paths: ----------- trunk/dports/lang/qore-oracle-module/ trunk/dports/lang/qore-oracle-module/Portfile Added: trunk/dports/lang/qore-oracle-module/Portfile =================================================================== --- trunk/dports/lang/qore-oracle-module/Portfile (rev 0) +++ trunk/dports/lang/qore-oracle-module/Portfile 2009-05-03 15:39:49 UTC (rev 50553) @@ -0,0 +1,23 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 + +name qore-oracle-module +version 1.0.7 +categories lang +maintainers davidnichols +description Oracle module for Qore +long_description Module allowing communication with Oracle DBs from the Qore Programming Language +homepage http://qoretechnologies.com/qore +platforms darwin +master_sites sourceforge:qore + +checksums md5 f61b35ca9d442afe253e5aa2aba0914f \ + sha1 6c1e05f85d616e99597cccb26f8b62ba2cd62515 \ + rmd160 9161ea98b6d665be0f4704b4c052c6d5685fd15a + +depends_lib port:qore \ + port:oracle-instantclient + +configure.args --disable-debug Property changes on: trunk/dports/lang/qore-oracle-module/Portfile ___________________________________________________________________ Added: svn:keywords + Id Added: svn:eol-style + native -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sun May 3 08:52:56 2009 From: portindex at macports.org (portindex at macports.org) Date: Sun, 3 May 2009 08:52:56 -0700 (PDT) Subject: [50554] trunk/dports Message-ID: <20090503155257.5ECCE16FC109@beta.macosforge.org> Revision: 50554 http://trac.macports.org/changeset/50554 Author: portindex at macports.org Date: 2009-05-03 08:52:56 -0700 (Sun, 03 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-03 15:39:49 UTC (rev 50553) +++ trunk/dports/PortIndex 2009-05-03 15:52:56 UTC (rev 50554) @@ -4208,6 +4208,8 @@ variants universal depends_build {port:flex port:bison} portdir lang/qore description {dynamically-typed programming language} homepage http://qoretechnologies.com/qore epoch 0 platforms darwin name qore depends_lib {port:openssl port:pcre port:libxml2 port:zlib port:bzip2} long_description {Qore is a dynamically-typed, embeddabble programming language designed for SMP scalability} maintainers davidnichols categories lang version 0.7.3 revision 0 qore-mysql-module 377 variants universal portdir lang/qore-mysql-module description {MySQL module for Qore} homepage http://qoretechnologies.com/qore epoch 0 platforms darwin name qore-mysql-module depends_lib {port:qore port:mysql5} long_description {Module allowing communication with MySQL DBs from the Qore Programming Language} maintainers davidnichols categories lang version 1.0.4 revision 0 +qore-oracle-module 395 +variants universal portdir lang/qore-oracle-module description {Oracle module for Qore} homepage http://qoretechnologies.com/qore epoch 0 platforms darwin name qore-oracle-module depends_lib {port:qore port:oracle-instantclient} long_description {Module allowing communication with Oracle DBs from the Qore Programming Language} maintainers davidnichols categories lang version 1.0.7 revision 0 qore-pgsql-module 393 variants universal portdir lang/qore-pgsql-module description {PostgreSQL module for Qore} homepage http://qoretechnologies.com/qore epoch 0 platforms darwin name qore-pgsql-module depends_lib {port:qore port:postgresql83} long_description {Module allowing communication with PostgreSQL DBs from the Qore Programming Language} maintainers davidnichols categories lang version 1.0.3 revision 0 ragel 529 @@ -9202,8 +9204,8 @@ variants {darwin_9 universal} portdir science/maniview description {a Geomview module for viewing 3D manifolds} homepage http://www.geomview.org/ epoch 0 platforms darwin name maniview depends_lib {port:geomview port:xforms} long_description {This is maniview, a Geomview module for viewing 3D manifolds. emodules are kind of plugins which extend the functionality of Geomview (an interactive 3d viewing program).} maintainers raphael at ira.uka.de categories {science graphics x11} version 2.0.2 revision 0 mapm3 239 variants {large_datasets universal} portdir science/mapm3 description {cli tool for calculating Quantitative Trait Loci} epoch 0 platforms darwin name mapm3 maintainers {ryandesign openmaintainer} version 3.0 categories science revision 3 -mcl 815 -variants universal portdir science/mcl description {TribeMCL is a method for clustering proteins into related groups, which are termed 'protein families'} homepage http://micans.org/mcl/ epoch 0 platforms darwin name mcl long_description {TribeMCL is a method for clustering proteins into related groups, which are termed 'protein families'. This clustering is achieved by analysing similarity patterns between proteins in a given dataset, and using these patterns to assign proteins into related groups. In many cases, proteins in the same protein family will have similar functional properties. TribeMCL uses a novel clustering method (Markov Clustering or MCL) which solves problems which normally hinder protein sequence clustering.} maintainers mike.thon at gmail.com categories science version 08-157 revision 0 +mcl 428 +variants universal portdir science/mcl description {MCL - a cluster algorithm for graphs.} homepage http://micans.org/mcl/ epoch 0 platforms darwin name mcl long_description {The MCL algorithm is short for the Markov Cluster Algorithm, a fast and scalable unsupervised cluster algorithm for graphs based on simulation of (stochastic) flow in graphs.} maintainers gmail.com:mike.thon categories science version 08-312 revision 0 metaio 484 variants universal portdir science/metaio description {LIGO Light-Weight XML Library} homepage https://www.lsc-group.phys.uwm.edu/daswg/projects/metaio.html epoch 0 platforms darwin name metaio depends_lib port:zlib long_description {This code implements a simple recursive-descent parsing scheme for LIGO_LW files, based on the example in Chapter 2 of {Compilers: Principles, Techniques and Tools} by Aho, Sethi and Ullman.} maintainers ram categories science version 8.2 revision 0 minc 853 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From davidnichols at macports.org Sun May 3 09:57:50 2009 From: davidnichols at macports.org (davidnichols at macports.org) Date: Sun, 3 May 2009 09:57:50 -0700 (PDT) Subject: [50555] trunk/dports/lang/qore-oracle-module/Portfile Message-ID: <20090503165750.49DDE16FCC82@beta.macosforge.org> Revision: 50555 http://trac.macports.org/changeset/50555 Author: davidnichols at macports.org Date: 2009-05-03 09:57:49 -0700 (Sun, 03 May 2009) Log Message: ----------- fixed checksums for 2nd (fixed) release of source Modified Paths: -------------- trunk/dports/lang/qore-oracle-module/Portfile Modified: trunk/dports/lang/qore-oracle-module/Portfile =================================================================== --- trunk/dports/lang/qore-oracle-module/Portfile 2009-05-03 15:52:56 UTC (rev 50554) +++ trunk/dports/lang/qore-oracle-module/Portfile 2009-05-03 16:57:49 UTC (rev 50555) @@ -13,9 +13,9 @@ platforms darwin master_sites sourceforge:qore -checksums md5 f61b35ca9d442afe253e5aa2aba0914f \ - sha1 6c1e05f85d616e99597cccb26f8b62ba2cd62515 \ - rmd160 9161ea98b6d665be0f4704b4c052c6d5685fd15a +checksums md5 c674892ca77e1dd8aeae52102b92fed2 \ + sha1 5939b21115e567e51102862c03b2351396902b65 \ + rmd160 7764ec141c3e1e668d421745f213260c4dc367b4 depends_lib port:qore \ port:oracle-instantclient -------------- next part -------------- An HTML attachment was scrubbed... URL: From raimue at macports.org Sun May 3 12:47:10 2009 From: raimue at macports.org (raimue at macports.org) Date: Sun, 3 May 2009 12:47:10 -0700 (PDT) Subject: [50556] trunk/dports/python/py26-pyqt4/Portfile Message-ID: <20090503194710.EB5B017006EB@beta.macosforge.org> Revision: 50556 http://trac.macports.org/changeset/50556 Author: raimue at macports.org Date: 2009-05-03 12:47:09 -0700 (Sun, 03 May 2009) Log Message: ----------- python/py26-pyqt4: Add symlinks to ${prefix}/bin, closes #19449 (maintainer timeout) Modified Paths: -------------- trunk/dports/python/py26-pyqt4/Portfile Modified: trunk/dports/python/py26-pyqt4/Portfile =================================================================== --- trunk/dports/python/py26-pyqt4/Portfile 2009-05-03 16:57:49 UTC (rev 50555) +++ trunk/dports/python/py26-pyqt4/Portfile 2009-05-03 19:47:09 UTC (rev 50556) @@ -3,10 +3,10 @@ PortSystem 1.0 name py26-pyqt4 - version 4.4.4 +revision 1 +categories python devel platforms macosx -categories python devel maintainers saispo description PyQt4 is a set of Python bindings for the Qt4 toolkit long_description \ @@ -27,6 +27,7 @@ #patchfiles patch-configure.py +set pyversion 2.6 set qt_dir ${prefix}/libexec/qt4-mac pre-configure { @@ -51,6 +52,10 @@ test.cmd cd qt && ${prefix}/bin/python2.6 -c 'import PyQt4' post-destroot { + ln -s ${frameworks_dir}/Python.framework/Versions/${pyversion}/bin/pyrcc4 ${destroot}${prefix}/bin/pyrcc4-${pyversion} + ln -s ${frameworks_dir}/Python.framework/Versions/${pyversion}/bin/pyuic4 ${destroot}${prefix}/bin/pyuic4-${pyversion} + + xinstall -m 755 -d ${destroot}${prefix}/share/doc file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${name} file copy ${worksrcpath}/examples \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sun May 3 13:53:01 2009 From: portindex at macports.org (portindex at macports.org) Date: Sun, 3 May 2009 13:53:01 -0700 (PDT) Subject: [50557] trunk/dports/PortIndex Message-ID: <20090503205303.D92021701342@beta.macosforge.org> Revision: 50557 http://trac.macports.org/changeset/50557 Author: portindex at macports.org Date: 2009-05-03 13:53:00 -0700 (Sun, 03 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-03 19:47:09 UTC (rev 50556) +++ trunk/dports/PortIndex 2009-05-03 20:53:00 UTC (rev 50557) @@ -8639,7 +8639,7 @@ py26-pyprotocols 575 depends_build bin:unzip:unzip portdir python/py26-pyprotocols description {Protocol Definition, Declaration, and Adaptation} homepage http://www.turbogears.org/ epoch 0 platforms darwin depends_lib port:py26-decoratortools name py26-pyprotocols maintainers nomaintainer long_description {PyProtocols extends the PEP 246 adapt() function with a new {declaration API} that lets you easily define your own interfaces and adapters, and declare what adapters should be used to adapt what types, objects, or interfaces.} version 1.0a0dev-r2302 categories {python devel} revision 0 py26-pyqt4 587 -variants universal portdir python/py26-pyqt4 description {PyQt4 is a set of Python bindings for the Qt4 toolkit} homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro epoch 0 platforms macosx name py26-pyqt4 depends_lib {port:py26-sip port:qt4-mac} long_description {PyQt4 is a set of Python bindings for the Qt4 toolkit. The bindings are implemented as a set of Python modules: qt, qtcanvas, qtgl, qtnetwork, qtsql, qttable, qtui and qtxml, and contains 300 classes and over 5,750 functions and methods.} maintainers saispo categories {python devel} version 4.4.4 revision 0 +variants universal portdir python/py26-pyqt4 description {PyQt4 is a set of Python bindings for the Qt4 toolkit} homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro epoch 0 platforms macosx name py26-pyqt4 depends_lib {port:py26-sip port:qt4-mac} long_description {PyQt4 is a set of Python bindings for the Qt4 toolkit. The bindings are implemented as a set of Python modules: qt, qtcanvas, qtgl, qtnetwork, qtsql, qttable, qtui and qtxml, and contains 300 classes and over 5,750 functions and methods.} maintainers saispo categories {python devel} version 4.4.4 revision 1 py26-pyrex 454 portdir python/py26-pyrex description {A language for writing Python extension modules.} homepage http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ epoch 0 platforms darwin depends_lib port:python26 name py26-pyrex maintainers {ram openmaintainer} long_description {Pyrex lets you write code that mixes Python and C data types any way you want, and compiles it into a C extension for Python.} categories {python devel} version 0.9.8.5 revision 0 py26-pyrxp 332 -------------- next part -------------- An HTML attachment was scrubbed... URL: From blair at macports.org Sun May 3 14:55:00 2009 From: blair at macports.org (blair at macports.org) Date: Sun, 3 May 2009 14:55:00 -0700 (PDT) Subject: [50558] trunk/dports/java/msv/Portfile Message-ID: <20090503215500.F29AC1702042@beta.macosforge.org> Revision: 50558 http://trac.macports.org/changeset/50558 Author: blair at macports.org Date: 2009-05-03 14:55:00 -0700 (Sun, 03 May 2009) Log Message: ----------- Add relaxngDatatype.jar and xsdlib.jar to the list of jars to install. Modified Paths: -------------- trunk/dports/java/msv/Portfile Modified: trunk/dports/java/msv/Portfile =================================================================== --- trunk/dports/java/msv/Portfile 2009-05-03 20:53:00 UTC (rev 50557) +++ trunk/dports/java/msv/Portfile 2009-05-03 21:55:00 UTC (rev 50558) @@ -1,9 +1,10 @@ -# $Id$ +# $Id: Portfile 44975 2009-01-05 23:27:17Z blair at macports.org $ PortSystem 1.0 name msv version 20081113 +revision 1 categories java maintainers blair @@ -37,7 +38,7 @@ xinstall -m 755 -d ${destroot}${prefix}/share/java \ ${destroot}${prefix}/share/doc/${name} - foreach f {isorelax.jar msv.jar} { + foreach f {isorelax.jar msv.jar relaxngDatatype.jar xsdlib.jar} { file copy ${worksrcpath}/${f} \ ${destroot}${prefix}/share/java/${f} } -------------- next part -------------- An HTML attachment was scrubbed... URL: From blair at macports.org Sun May 3 15:19:01 2009 From: blair at macports.org (blair at macports.org) Date: Sun, 3 May 2009 15:19:01 -0700 (PDT) Subject: [50559] trunk/dports/java/msv/Portfile Message-ID: <20090503221902.3E0E1170228E@beta.macosforge.org> Revision: 50559 http://trac.macports.org/changeset/50559 Author: blair at macports.org Date: 2009-05-03 15:19:00 -0700 (Sun, 03 May 2009) Log Message: ----------- Fix 'git svn dcommit' that is messing up the $Id$ line. Modified Paths: -------------- trunk/dports/java/msv/Portfile Modified: trunk/dports/java/msv/Portfile =================================================================== --- trunk/dports/java/msv/Portfile 2009-05-03 21:55:00 UTC (rev 50558) +++ trunk/dports/java/msv/Portfile 2009-05-03 22:19:00 UTC (rev 50559) @@ -1,4 +1,4 @@ -# $Id: Portfile 44975 2009-01-05 23:27:17Z blair at macports.org $ +# $Id$ PortSystem 1.0 -------------- next part -------------- An HTML attachment was scrubbed... URL: From blair at macports.org Sun May 3 15:20:12 2009 From: blair at macports.org (blair at macports.org) Date: Sun, 3 May 2009 15:20:12 -0700 (PDT) Subject: [50560] trunk/dports/java/spring-framework/Portfile Message-ID: <20090503222013.28CCC1702336@beta.macosforge.org> Revision: 50560 http://trac.macports.org/changeset/50560 Author: blair at macports.org Date: 2009-05-03 15:20:12 -0700 (Sun, 03 May 2009) Log Message: ----------- Fix 'git svn dcommit' that is messing up the $Id$ line. Modified Paths: -------------- trunk/dports/java/spring-framework/Portfile Modified: trunk/dports/java/spring-framework/Portfile =================================================================== --- trunk/dports/java/spring-framework/Portfile 2009-05-03 22:19:00 UTC (rev 50559) +++ trunk/dports/java/spring-framework/Portfile 2009-05-03 22:20:12 UTC (rev 50560) @@ -1,4 +1,4 @@ -# $Id: Portfile 42503 2008-11-22 18:10:57Z blair at macports.org $ +# $Id$ PortSystem 1.0 -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Sun May 3 15:53:21 2009 From: portindex at macports.org (portindex at macports.org) Date: Sun, 3 May 2009 15:53:21 -0700 (PDT) Subject: [50561] trunk/dports/PortIndex Message-ID: <20090503225323.0FBC417027E2@beta.macosforge.org> Revision: 50561 http://trac.macports.org/changeset/50561 Author: portindex at macports.org Date: 2009-05-03 15:53:20 -0700 (Sun, 03 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-03 22:20:12 UTC (rev 50560) +++ trunk/dports/PortIndex 2009-05-03 22:53:20 UTC (rev 50561) @@ -3503,7 +3503,7 @@ maven2 732 depends_build bin:java:kaffe portdir java/maven2 description {A java-based build and project management environment.} homepage http://maven.apache.org/ epoch 0 platforms darwin name maven2 maintainers gk5885 at kickstyle.net long_description {Maven is a Java project management and project comprehension tool. Maven is based on the concept of a project object model (POM) in that all the artifacts produced by Maven are a result of consulting a well defined model for your project. Builds, documentation, source metrics, and source cross-references are all controlled by your POM. Maven 2.0 is a complete rewrite of Maven 1.0 and as such is better organized, faster and easier to use.} version 2.1.0 categories {java devel} revision 0 msv 528 -depends_build bin:unzip:unzip portdir java/msv description {Sun Multi-Schema XML Validator (MSV) validates XML files} homepage https://msv.dev.java.net/ epoch 0 platforms darwin name msv depends_lib bin:java:kaffe maintainers blair long_description {The Sun Multi-Schema XML Validator (MSV) is a Java technology tool to validate XML documents against several kinds of XML schemata. It supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs and a subset of XML Schema Part 1.} categories java version 20081113 revision 0 +depends_build bin:unzip:unzip portdir java/msv description {Sun Multi-Schema XML Validator (MSV) validates XML files} homepage https://msv.dev.java.net/ epoch 0 platforms darwin name msv depends_lib bin:java:kaffe maintainers blair long_description {The Sun Multi-Schema XML Validator (MSV) is a Java technology tool to validate XML documents against several kinds of XML schemata. It supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs and a subset of XML Schema Part 1.} categories java version 20081113 revision 1 mx4j 563 depends_build bin:ant:apache-ant portdir java/mx4j description {Open Source JMX for Enterprise Computing.} homepage http://mx4j.sourceforge.net/ epoch 0 platforms darwin name mx4j depends_lib {bin:java:kaffe port:junit port:jakarta-bcel port:jakarta-log4j port:commons-logging} maintainers {jberry openmaintainer} long_description {MX4J is a project to build an Open Source implementation of the Java(TM) Management Extensions (JMX) and of the JMX Remote API (JSR 160) specifications, and to build tools relating to JMX.} categories java version 3.0.1 revision 0 mysql-connector-java 862 -------------- next part -------------- An HTML attachment was scrubbed... URL: From blb at macports.org Sun May 3 21:15:03 2009 From: blb at macports.org (blb at macports.org) Date: Sun, 3 May 2009 21:15:03 -0700 (PDT) Subject: [50562] trunk/base/src Message-ID: <20090504041505.35C241706117@beta.macosforge.org> Revision: 50562 http://trac.macports.org/changeset/50562 Author: blb at macports.org Date: 2009-05-03 21:15:01 -0700 (Sun, 03 May 2009) Log Message: ----------- base/src - detab and remove space-at-end-of-line Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/port/port.tcl trunk/base/src/port1.0/portactivate.tcl trunk/base/src/port1.0/portbuild.tcl trunk/base/src/port1.0/portchecksum.tcl trunk/base/src/port1.0/portclean.tcl trunk/base/src/port1.0/portdepends.tcl trunk/base/src/port1.0/portdestroot.tcl trunk/base/src/port1.0/portdistcheck.tcl trunk/base/src/port1.0/portextract.tcl trunk/base/src/port1.0/portfetch.tcl trunk/base/src/port1.0/portlivecheck.tcl trunk/base/src/port1.0/portmirror.tcl trunk/base/src/port1.0/portpatch.tcl trunk/base/src/port1.0/portsubmit.tcl trunk/base/src/port1.0/porttest.tcl trunk/base/src/port1.0/porttrace.tcl trunk/base/src/port1.0/portutil.tcl Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/macports1.0/macports.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -2155,9 +2155,9 @@ global macports::portarchivemode array set options $optionslist - # Note $variationslist is left alone and so retains the original + # Note $variationslist is left alone and so retains the original # requested variations, which should be passed to recursive calls to - # upgrade; while variations gets existing variants and global variations + # upgrade; while variations gets existing variants and global variations # merged in later on, so it applies only to this port's upgrade array set variations $variationslist @@ -2206,22 +2206,22 @@ if {![info exists porturl]} { set porturl file://./ } - # Merge the global variations into the specified - foreach { variation value } $globalvarlist { - if { ![info exists variations($variation)] } { - set variations($variation) $value - } - } - - if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { + # Merge the global variations into the specified + foreach { variation value } $globalvarlist { + if { ![info exists variations($variation)] } { + set variations($variation) $value + } + } + + if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { global errorInfo ui_debug "$errorInfo" ui_error "Unable to open port: $result" return 1 } - # While we're at it, update the portinfo - array unset portinfo - array set portinfo [mportinfo $workername] + # While we're at it, update the portinfo + array unset portinfo + array set portinfo [mportinfo $workername] if {![_mportispresent $workername $dspec ] } { # upgrade its dependencies first @@ -2234,8 +2234,8 @@ return 1 } if {$result > 0} { - ui_error "Problem while installing $portname" - return $result + ui_error "Problem while installing $portname" + return $result } # we just installed it, so mark it done in the cache # and update ilist @@ -2299,65 +2299,65 @@ ui_debug "no version of $portname is active" } - # save existing variant for later use - if {$anyactive} { - set oldvariant $variant_active - } else { - set oldvariant $variant_installed - } + # save existing variant for later use + if {$anyactive} { + set oldvariant $variant_active + } else { + set oldvariant $variant_installed + } - # Before we do - # dependencies, we need to figure out the final variants, - # open the port, and update the portinfo. + # Before we do + # dependencies, we need to figure out the final variants, + # open the port, and update the portinfo. - set porturl $portinfo(porturl) - if {![info exists porturl]} { - set porturl file://./ - } + set porturl $portinfo(porturl) + if {![info exists porturl]} { + set porturl file://./ + } - # check if the variants is present in $version_in_tree - set variant [split $oldvariant +] - ui_debug "Merging existing variants $variant into variants" - if {[info exists portinfo(variants)]} { - set avariants $portinfo(variants) - } else { - set avariants {} - } - ui_debug "available variants are : $avariants" - foreach v $variant { - if {[lsearch $avariants $v] == -1} { - } else { - ui_debug "variant $v is present in $portname $version_in_tree" - if { ![info exists variations($v)]} { - set variations($v) "+" - } - } - } + # check if the variants is present in $version_in_tree + set variant [split $oldvariant +] + ui_debug "Merging existing variants $variant into variants" + if {[info exists portinfo(variants)]} { + set avariants $portinfo(variants) + } else { + set avariants {} + } + ui_debug "available variants are : $avariants" + foreach v $variant { + if {[lsearch $avariants $v] == -1} { + } else { + ui_debug "variant $v is present in $portname $version_in_tree" + if { ![info exists variations($v)]} { + set variations($v) "+" + } + } + } - # Now merge in the global (i.e. variants.conf) variations. - # We wait until now so that existing variants for this port - # override global variations - foreach { variation value } $globalvarlist { - if { ![info exists variations($variation)] } { - set variations($variation) $value - } - } + # Now merge in the global (i.e. variants.conf) variations. + # We wait until now so that existing variants for this port + # override global variations + foreach { variation value } $globalvarlist { + if { ![info exists variations($variation)] } { + set variations($variation) $value + } + } - ui_debug "new fully merged portvariants: [array get variations]" + ui_debug "new fully merged portvariants: [array get variations]" - if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { - global errorInfo - ui_debug "$errorInfo" - ui_error "Unable to open port: $result" - return 1 - } + if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { + global errorInfo + ui_debug "$errorInfo" + ui_error "Unable to open port: $result" + return 1 + } - array unset portinfo - array set portinfo [mportinfo $workername] - set portwasopened 1 - set version_in_tree "$portinfo(version)" - set revision_in_tree "$portinfo(revision)" - set epoch_in_tree "$portinfo(epoch)" + array unset portinfo + array set portinfo [mportinfo $workername] + set portwasopened 1 + set version_in_tree "$portinfo(version)" + set revision_in_tree "$portinfo(revision)" + set epoch_in_tree "$portinfo(epoch)" # first upgrade dependencies Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port/port.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -369,9 +369,9 @@ } uplevel 1 $block if {[file exists $savedir]} { - cd $savedir + cd $savedir } else { - cd ~ + cd ~ } } } @@ -1339,15 +1339,15 @@ return 0 } - if {[file exists $helpfile]} { - if {[catch {source $helpfile} err]} { - puts stderr "Error reading helpfile $helpfile: $err" - return 1 - } + if {[file exists $helpfile]} { + if {[catch {source $helpfile} err]} { + puts stderr "Error reading helpfile $helpfile: $err" + return 1 + } } else { - puts stderr "Unable to open help file $helpfile" - return 1 - } + puts stderr "Unable to open help file $helpfile" + return 1 + } foreach topic $portlist { if {![info exists porthelp($topic)]} { @@ -2083,14 +2083,14 @@ global errorInfo ui_debug "$errorInfo" - # start gsoc08-privileges - if { [string first "permission denied" $result] != -1 } { - set result "port requires root privileges for this action and needs you to execute 'sudo port uninstall $portname' to continue." - #ui_msg [exec sudo port uninstall $portname] - # The above line is what should be here to let the user simply enter his/her password to uninstall as root. - # However, for some as yet unknown reason, executing it here will not work. - } - # end gsoc08-privileges + # start gsoc08-privileges + if { [string first "permission denied" $result] != -1 } { + set result "port requires root privileges for this action and needs you to execute 'sudo port uninstall $portname' to continue." + #ui_msg [exec sudo port uninstall $portname] + # The above line is what should be here to let the user simply enter his/her password to uninstall as root. + # However, for some as yet unknown reason, executing it here will not work. + } + # end gsoc08-privileges break_softcontinue "port uninstall failed: $result" 1 status } @@ -2856,23 +2856,23 @@ mportclose $workername # start gsoc08-privileges - if { [geteuid] != 0 && $result == 2} { - # mportexec will return an error result code 2 if eval_targets fails due to insufficient privileges. + if { [geteuid] != 0 && $result == 2} { + # mportexec will return an error result code 2 if eval_targets fails due to insufficient privileges. - set portbinary "${macports::prefix}/bin/port" - - ui_info "Attempting port action with 'sudo port': 'sudo $portbinary $target $portname'." - set result 0 - if {[catch {set sudomsgs [exec sudo $portbinary $target $portname]} sudomsgs]} { - global errorInfo - ui_debug "$errorInfo" - break_softcontinue "Unable to execute port: $errorInfo" 1 status - } - - ui_msg $sudomsgs - ui_debug "'sudo $portbinary $target $portname' has completed." - } - # end gsoc08-privileges + set portbinary "${macports::prefix}/bin/port" + + ui_info "Attempting port action with 'sudo port': 'sudo $portbinary $target $portname'." + set result 0 + if {[catch {set sudomsgs [exec sudo $portbinary $target $portname]} sudomsgs]} { + global errorInfo + ui_debug "$errorInfo" + break_softcontinue "Unable to execute port: $errorInfo" 1 status + } + + ui_msg $sudomsgs + ui_debug "'sudo $portbinary $target $portname' has completed." + } + # end gsoc08-privileges # Process any error that wasn't thrown and handled already if {$result} { Modified: trunk/base/src/port1.0/portactivate.tcl =================================================================== --- trunk/base/src/port1.0/portactivate.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portactivate.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -41,9 +41,9 @@ target_state ${org.macports.activate} no target_provides ${org.macports.activate} activate if {[option portarchivemode] == "yes"} { - target_requires ${org.macports.activate} main unarchive fetch extract checksum patch configure build destroot archive install + target_requires ${org.macports.activate} main unarchive fetch extract checksum patch configure build destroot archive install } else { - target_requires ${org.macports.activate} main fetch extract checksum patch configure build destroot install + target_requires ${org.macports.activate} main fetch extract checksum patch configure build destroot install } namespace eval portactivate { @@ -52,8 +52,8 @@ set_ui_prefix proc portactivate::activate_main {args} { - global env portname portversion portrevision portvariants user_options portnotes - registry_activate $portname ${portversion}_${portrevision}${portvariants} [array get user_options] + global env portname portversion portrevision portvariants user_options portnotes + registry_activate $portname ${portversion}_${portrevision}${portvariants} [array get user_options] # Display notes at the end of the activation phase. if {[info exists portnotes] && $portnotes ne {}} { @@ -86,6 +86,6 @@ ui_msg \n$portnotes\n } } - + return 0 } Modified: trunk/base/src/port1.0/portbuild.tcl =================================================================== --- trunk/base/src/port1.0/portbuild.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portbuild.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -86,11 +86,11 @@ pbx { set pbxbuild "pbxbuild" set xcodebuild "xcodebuild" - + if {[option os.platform] != "darwin"} { return -code error "[format [msgcat::mc "This port requires 'pbxbuild/xcodebuild', which is not available on %s."] [option os.platform]]" } - + if {[catch {set xcodebuild [binaryInPath $xcodebuild]}] == 0} { return $xcodebuild } elseif {[catch {set pbxbuild [binaryInPath $pbxbuild]}] == 0} { @@ -141,16 +141,16 @@ proc portbuild::build_start {args} { global UI_PREFIX build.asroot - + ui_msg "$UI_PREFIX [format [msgcat::mc "Building %s"] [option portname]]" - + # start gsoc08-privileges if { [tbool build.asroot] } { - # if port is marked as needing root - elevateToRoot "build" - } - # end gsoc08-privileges - + # if port is marked as needing root + elevateToRoot "build" + } + # end gsoc08-privileges + } proc portbuild::build_main {args} { Modified: trunk/base/src/port1.0/portchecksum.tcl =================================================================== --- trunk/base/src/port1.0/portchecksum.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portchecksum.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -61,8 +61,8 @@ # global array checksums_array. # # There are two formats: -# type value [type value [type value]] for a single file -# file1 type value [type value [type value]] [file2 ...] for multiple files. +# type value [type value [type value]] for a single file +# file1 type value [type value [type value]] [file2 ...] for multiple files. # # Portfile is in format #1 if: # (1) There is only one distfile. @@ -72,77 +72,77 @@ # # return yes if the syntax was correct, no if there was a problem. proc portchecksum::parse_checksums {checksums_str} { - global checksums_array all_dist_files checksum_types checksum_types_count + global checksums_array all_dist_files checksum_types checksum_types_count - # Parse the string of checksums. - set nb_checksum [llength $checksums_str] + # Parse the string of checksums. + set nb_checksum [llength $checksums_str] - if {[llength $all_dist_files] == 1 - && [expr $nb_checksum % 2] == 0 - && [expr $nb_checksum / 2] <= $checksum_types_count - && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} { - # Convert to format #2 - set checksums_str [linsert $checksums_str 0 $all_dist_files] - # We increased the size. - incr nb_checksum - } - - # Create the array with the checksums. - array set checksums_array {} - - set result yes - - # Catch out of bounds errors (they're syntax errors). - if {[catch { - # Parse the string as if it was in format #2. - for {set ix_checksum 0} {$ix_checksum < $nb_checksum} {incr ix_checksum} { - # first word is the file. - set checksum_filename [lindex $checksums_str $ix_checksum] - - # retrieve the list of values we already know for this file. - set checksum_values {} - if {[info exists checksums_array($checksum_filename)]} { - set checksum_values $checksums_array($checksum_filename) - } - - # append the new value - incr ix_checksum - while {1} { - set checksum_type [lindex $checksums_str $ix_checksum] - if {[lsearch -exact $checksum_types $checksum_type] >= 0} { - # append the type and the value. - incr ix_checksum - set checksum_value [lindex $checksums_str $ix_checksum] - incr ix_checksum + if {[llength $all_dist_files] == 1 + && [expr $nb_checksum % 2] == 0 + && [expr $nb_checksum / 2] <= $checksum_types_count + && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} { + # Convert to format #2 + set checksums_str [linsert $checksums_str 0 $all_dist_files] + # We increased the size. + incr nb_checksum + } - lappend checksum_values $checksum_type - lappend checksum_values $checksum_value - } else { - # this wasn't a type but the next dist file. - incr ix_checksum -1 - break - } + # Create the array with the checksums. + array set checksums_array {} - # stop if we exhausted all the items in the list. - if {$ix_checksum == $nb_checksum} { - break - } - } - - # set the values in the array. - set checksums_array($checksum_filename) $checksum_values - } - } error]} { - # An error occurred. - global errorInfo - ui_debug "$errorInfo" - ui_error "Couldn't parse checksum line ($checksums_str) [$error]" - - # Something wrong happened. - set result no - } - - return $result + set result yes + + # Catch out of bounds errors (they're syntax errors). + if {[catch { + # Parse the string as if it was in format #2. + for {set ix_checksum 0} {$ix_checksum < $nb_checksum} {incr ix_checksum} { + # first word is the file. + set checksum_filename [lindex $checksums_str $ix_checksum] + + # retrieve the list of values we already know for this file. + set checksum_values {} + if {[info exists checksums_array($checksum_filename)]} { + set checksum_values $checksums_array($checksum_filename) + } + + # append the new value + incr ix_checksum + while {1} { + set checksum_type [lindex $checksums_str $ix_checksum] + if {[lsearch -exact $checksum_types $checksum_type] >= 0} { + # append the type and the value. + incr ix_checksum + set checksum_value [lindex $checksums_str $ix_checksum] + incr ix_checksum + + lappend checksum_values $checksum_type + lappend checksum_values $checksum_value + } else { + # this wasn't a type but the next dist file. + incr ix_checksum -1 + break + } + + # stop if we exhausted all the items in the list. + if {$ix_checksum == $nb_checksum} { + break + } + } + + # set the values in the array. + set checksums_array($checksum_filename) $checksum_values + } + } error]} { + # An error occurred. + global errorInfo + ui_debug "$errorInfo" + ui_error "Couldn't parse checksum line ($checksums_str) [$error]" + + # Something wrong happened. + set result no + } + + return $result } # calc_md5 @@ -151,7 +151,7 @@ # Return the checksum. # proc portchecksum::calc_md5 {file} { - return [md5 file $file] + return [md5 file $file] } # calc_sha1 @@ -160,7 +160,7 @@ # Return the checksum. # proc portchecksum::calc_sha1 {file} { - return [sha1 file $file] + return [sha1 file $file] } # calc_rmd160 @@ -169,7 +169,7 @@ # Return the checksum. # proc portchecksum::calc_rmd160 {file} { - return [rmd160 file $file] + return [rmd160 file $file] } # checksum_start @@ -177,9 +177,9 @@ # Target prerun procedure; simply prints a message about what we're doing. # proc portchecksum::checksum_start {args} { - global UI_PREFIX + global UI_PREFIX - ui_msg "$UI_PREFIX [format [msgcat::mc "Verifying checksum(s) for %s"] [option portname]]" + ui_msg "$UI_PREFIX [format [msgcat::mc "Verifying checksum(s) for %s"] [option portname]]" } # checksum_main @@ -187,89 +187,89 @@ # Target main procedure. Verifies the checksums of all distfiles. # proc portchecksum::checksum_main {args} { - global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip + global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip - # If no files have been downloaded, there is nothing to checksum. - if {![info exists all_dist_files]} { - return 0 - } - - # Completely bypass checksumming if checksum.skip=yes - # This should be considered an extreme measure - if {[tbool checksum.skip]} { - ui_info "$UI_PREFIX Skipping checksum phase" - return 0 - } + # If no files have been downloaded, there is nothing to checksum. + if {![info exists all_dist_files]} { + return 0 + } - # so far, everything went fine. - set fail no - - # Set the list of checksums as the option checksums. - set checksums_str [option checksums] - - # if everything is fine with the syntax, keep on and check the checksum of - # the distfiles. - if {[parse_checksums $checksums_str] == "yes"} { - set distpath [option distpath] - - foreach distfile $all_dist_files { - ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $distfile]" - - # get the full path of the distfile. - set fullpath [file join $distpath $distfile] - - # check that there is at least one checksum for the distfile. - if {![info exists checksums_array($distfile)]} { - ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]" - foreach type $checksum_types { - ui_info "[format [msgcat::mc "Distfile checksum: %s $type %s"] $distfile [calc_$type $fullpath]]" - } - set fail yes - } else { - # retrieve the list of types/values from the array. - set portfile_checksums $checksums_array($distfile) - - # iterate on this list to check the actual values. - foreach {type sum} $portfile_checksums { - set calculated_sum [calc_$type $fullpath] - if {[string equal $sum $calculated_sum]} { - ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]" - } else { - ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]" - ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" - ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]" - - # Raise the failure flag - set fail yes - } - } - } - - } - } else { - # Something went wrong with the syntax. - set fail yes - } + # Completely bypass checksumming if checksum.skip=yes + # This should be considered an extreme measure + if {[tbool checksum.skip]} { + ui_info "$UI_PREFIX Skipping checksum phase" + return 0 + } - if {[tbool fail]} { - - # Show the desired checksum line for easy cut-paste - set sums "" - foreach distfile $all_dist_files { - if {[llength $all_dist_files] > 1} { - lappend sums $distfile - } - - set fullpath [file join $distpath $distfile] - foreach type $checksum_types { - lappend sums [format "%-8s%s" $type [calc_$type $fullpath]] - } - } - ui_info "The correct checksum line may be:" - ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]] - - return -code error "[msgcat::mc "Unable to verify file checksums"]" - } + # so far, everything went fine. + set fail no - return 0 + # Set the list of checksums as the option checksums. + set checksums_str [option checksums] + + # if everything is fine with the syntax, keep on and check the checksum of + # the distfiles. + if {[parse_checksums $checksums_str] == "yes"} { + set distpath [option distpath] + + foreach distfile $all_dist_files { + ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $distfile]" + + # get the full path of the distfile. + set fullpath [file join $distpath $distfile] + + # check that there is at least one checksum for the distfile. + if {![info exists checksums_array($distfile)]} { + ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]" + foreach type $checksum_types { + ui_info "[format [msgcat::mc "Distfile checksum: %s $type %s"] $distfile [calc_$type $fullpath]]" + } + set fail yes + } else { + # retrieve the list of types/values from the array. + set portfile_checksums $checksums_array($distfile) + + # iterate on this list to check the actual values. + foreach {type sum} $portfile_checksums { + set calculated_sum [calc_$type $fullpath] + if {[string equal $sum $calculated_sum]} { + ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]" + } else { + ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]" + ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" + ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]" + + # Raise the failure flag + set fail yes + } + } + } + + } + } else { + # Something went wrong with the syntax. + set fail yes + } + + if {[tbool fail]} { + + # Show the desired checksum line for easy cut-paste + set sums "" + foreach distfile $all_dist_files { + if {[llength $all_dist_files] > 1} { + lappend sums $distfile + } + + set fullpath [file join $distpath $distfile] + foreach type $checksum_types { + lappend sums [format "%-8s%s" $type [calc_$type $fullpath]] + } + } + ui_info "The correct checksum line may be:" + ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]] + + return -code error "[msgcat::mc "Unable to verify file checksums"]" + } + + return 0 } Modified: trunk/base/src/port1.0/portclean.tcl =================================================================== --- trunk/base/src/port1.0/portclean.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portclean.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -51,59 +51,59 @@ proc portclean::clean_start {args} { global UI_PREFIX - + ui_msg "$UI_PREFIX [format [msgcat::mc "Cleaning %s"] [option portname]]" } proc portclean::clean_main {args} { global UI_PREFIX - global ports_clean_dist ports_clean_work ports_clean_archive - global ports_clean_all usealtworkpath + global ports_clean_dist ports_clean_work ports_clean_archive + global ports_clean_all usealtworkpath - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_dist] && $ports_clean_dist == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing distfiles for %s"] [option portname]]" - clean_dist - } - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_archive] && $ports_clean_archive == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing archives for %s"] [option portname]]" - clean_archive - } - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_work] && $ports_clean_work == "yes" || \ - (!([info exists ports_clean_dist] && $ports_clean_dist == "yes") && \ - !([info exists ports_clean_archive] && $ports_clean_archive == "yes"))} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing build directory for %s"] [option portname]]" - clean_work - } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_dist] && $ports_clean_dist == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing distfiles for %s"] [option portname]]" + clean_dist + } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_archive] && $ports_clean_archive == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing archives for %s"] [option portname]]" + clean_archive + } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_work] && $ports_clean_work == "yes" || \ + (!([info exists ports_clean_dist] && $ports_clean_dist == "yes") && \ + !([info exists ports_clean_archive] && $ports_clean_archive == "yes"))} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing build directory for %s"] [option portname]]" + clean_work + } - # start gsoc-08 privileges - if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing alt source directory for %s"] [option portname]]" - clean_altsource - } - # end gsoc-08 privileges - + # start gsoc-08 privileges + if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing alt source directory for %s"] [option portname]]" + clean_altsource + } + # end gsoc-08 privileges + return 0 } proc portclean::clean_altsource {args} { global usealtworkpath worksymlink - - set sourcepath [string map {"work" ""} $worksymlink] - if {[file isdirectory $sourcepath]} { - ui_debug "Removing directory: ${sourcepath}" - if {[catch {delete $sourcepath} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - } else { - ui_debug "No alt source directory found to remove." - } + set sourcepath [string map {"work" ""} $worksymlink] - return 0 + if {[file isdirectory $sourcepath]} { + ui_debug "Removing directory: ${sourcepath}" + if {[catch {delete $sourcepath} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + } else { + ui_debug "No alt source directory found to remove." + } + + return 0 } # @@ -111,142 +111,142 @@ # This is crude, but works. # proc portclean::clean_dist {args} { - global ports_force portname distpath dist_subdir distfiles + global ports_force portname distpath dist_subdir distfiles - # remove known distfiles for sure (if they exist) - set count 0 - foreach file $distfiles { - if {[info exist distpath] && [info exists dist_subdir]} { - set distfile [file join $distpath $dist_subdir $file] - } else { - set distfile [file join $distpath $file] - } - if {[file isfile $distfile]} { - ui_debug "Removing file: $distfile" - if {[catch {delete $distfile} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - if {$count > 0} { - ui_debug "$count distfile(s) removed." - } else { - ui_debug "No distfiles found to remove at $distpath" - } + # remove known distfiles for sure (if they exist) + set count 0 + foreach file $distfiles { + if {[info exist distpath] && [info exists dist_subdir]} { + set distfile [file join $distpath $dist_subdir $file] + } else { + set distfile [file join $distpath $file] + } + if {[file isfile $distfile]} { + ui_debug "Removing file: $distfile" + if {[catch {delete $distfile} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + if {$count > 0} { + ui_debug "$count distfile(s) removed." + } else { + ui_debug "No distfiles found to remove at $distpath" + } - # next remove dist_subdir if only needed for this port, - # or if user forces us to - set dirlist [list] - if {($dist_subdir != $portname)} { - if {[info exists dist_subdir]} { - set distfullpath [file join $distpath $dist_subdir] - if {!([info exists ports_force] && $ports_force == "yes") - && [file isdirectory $distfullpath] - && [llength [readdir $distfullpath]] > 0} { - ui_warn [format [msgcat::mc "Distfiles directory '%s' may contain distfiles needed for other ports, use the -f flag to force removal" ] [file join $distpath $dist_subdir]] - } else { - lappend dirlist $dist_subdir - lappend dirlist $portname - } - } else { - lappend dirlist $portname - } - } else { - lappend dirlist $portname - } - # loop through directories - set count 0 - foreach dir $dirlist { - set distdir [file join $distpath $dir] - if {[file isdirectory $distdir]} { - ui_debug "Removing directory: ${distdir}" - if {[catch {delete $distdir} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - if {$count > 0} { - ui_debug "$count distfile directory(s) removed." - } else { - ui_debug "No distfile directory found to remove." - } - return 0 + # next remove dist_subdir if only needed for this port, + # or if user forces us to + set dirlist [list] + if {($dist_subdir != $portname)} { + if {[info exists dist_subdir]} { + set distfullpath [file join $distpath $dist_subdir] + if {!([info exists ports_force] && $ports_force == "yes") + && [file isdirectory $distfullpath] + && [llength [readdir $distfullpath]] > 0} { + ui_warn [format [msgcat::mc "Distfiles directory '%s' may contain distfiles needed for other ports, use the -f flag to force removal" ] [file join $distpath $dist_subdir]] + } else { + lappend dirlist $dist_subdir + lappend dirlist $portname + } + } else { + lappend dirlist $portname + } + } else { + lappend dirlist $portname + } + # loop through directories + set count 0 + foreach dir $dirlist { + set distdir [file join $distpath $dir] + if {[file isdirectory $distdir]} { + ui_debug "Removing directory: ${distdir}" + if {[catch {delete $distdir} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + if {$count > 0} { + ui_debug "$count distfile directory(s) removed." + } else { + ui_debug "No distfile directory found to remove." + } + return 0 } proc portclean::clean_work {args} { global portbuildpath worksymlink - if {[file isdirectory $portbuildpath]} { - ui_debug "Removing directory: ${portbuildpath}" - if {[catch {delete $portbuildpath} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - } else { - ui_debug "No work directory found to remove at ${portbuildpath}" - } + if {[file isdirectory $portbuildpath]} { + ui_debug "Removing directory: ${portbuildpath}" + if {[catch {delete $portbuildpath} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + } else { + ui_debug "No work directory found to remove at ${portbuildpath}" + } - # Clean symlink, if necessary - if {![catch {file type $worksymlink} result] && $result eq "link"} { - ui_debug "Removing symlink: $worksymlink" - delete $worksymlink - } + # Clean symlink, if necessary + if {![catch {file type $worksymlink} result] && $result eq "link"} { + ui_debug "Removing symlink: $worksymlink" + delete $worksymlink + } - return 0 + return 0 } proc portclean::clean_archive {args} { - global workpath portarchivepath portname portversion ports_version_glob + global workpath portarchivepath portname portversion ports_version_glob - # Define archive destination directory and target filename - if {$portarchivepath ne $workpath && $portarchivepath ne ""} { - set archivepath [file join $portarchivepath [option os.platform] [option os.arch]] - } + # Define archive destination directory and target filename + if {$portarchivepath ne $workpath && $portarchivepath ne ""} { + set archivepath [file join $portarchivepath [option os.platform] [option os.arch]] + } - if {[info exists ports_version_glob]} { - # Match all possible archive variatns that match the version - # glob specified by the user for this OS. - set fileglob "$portname-[option ports_version_glob]*.[option os.arch].*" - } else { - # Match all possible archive variants for the current version on - # this OS. If you want to delete previous versions, use the - # version glob argument to clean. - # - # We do this because if we don't, then ports that match the - # first part of the name (e.g. trying to remove foo-*, it will - # pick up anything foo-bar-* as well, which is undesirable). - set fileglob "$portname-$portversion*.[option os.arch].*" - } + if {[info exists ports_version_glob]} { + # Match all possible archive variatns that match the version + # glob specified by the user for this OS. + set fileglob "$portname-[option ports_version_glob]*.[option os.arch].*" + } else { + # Match all possible archive variants for the current version on + # this OS. If you want to delete previous versions, use the + # version glob argument to clean. + # + # We do this because if we don't, then ports that match the + # first part of the name (e.g. trying to remove foo-*, it will + # pick up anything foo-bar-* as well, which is undesirable). + set fileglob "$portname-$portversion*.[option os.arch].*" + } - # Remove the archive files - set count 0 - if {![catch {set archivelist [glob [file join $archivepath $fileglob]]} result]} { - foreach path $archivelist { - set file [file tail $path] - # Make sure file is truly a port archive file, and not - # and accidental match with some other file that might exist. - if {[regexp "^$portname-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\][option os.arch]\[\.\]\[a-z\]+\$" $file]} { - if {[file isfile $path]} { - ui_debug "Removing archive: $path" - if {[catch {delete $path} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - } - } - if {$count > 0} { - ui_debug "$count archive(s) removed." - } else { - ui_debug "No archives found to remove at $archivepath" - } + # Remove the archive files + set count 0 + if {![catch {set archivelist [glob [file join $archivepath $fileglob]]} result]} { + foreach path $archivelist { + set file [file tail $path] + # Make sure file is truly a port archive file, and not + # and accidental match with some other file that might exist. + if {[regexp "^$portname-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\][option os.arch]\[\.\]\[a-z\]+\$" $file]} { + if {[file isfile $path]} { + ui_debug "Removing archive: $path" + if {[catch {delete $path} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + } + } + if {$count > 0} { + ui_debug "$count archive(s) removed." + } else { + ui_debug "No archives found to remove at $archivepath" + } - return 0 + return 0 } Modified: trunk/base/src/port1.0/portdepends.tcl =================================================================== --- trunk/base/src/port1.0/portdepends.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portdepends.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -53,16 +53,16 @@ proc portdepends::validate_depends_options {option action {value ""}} { global targets switch $action { - set { - foreach depspec $value { - # port syntax accepts colon-separated junk that we do not understand yet. - switch -regex $depspec { - ^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {} - ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {} - default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] } - } - } - } + set { + foreach depspec $value { + # port syntax accepts colon-separated junk that we do not understand yet. + switch -regex $depspec { + ^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {} + ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {} + default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] } + } + } + } } } Modified: trunk/base/src/port1.0/portdestroot.tcl =================================================================== --- trunk/base/src/port1.0/portdestroot.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portdestroot.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -91,43 +91,43 @@ global destroot.umask destroot.asroot macportsuser euid egid usealtworkpath altprefix global applications_dir frameworks_dir variable oldmask - + ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${portname}]" - # start gsoc08-privileges - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - ui_debug "Can't run destroot under sudo without elevated privileges (due to mtree)." - ui_debug "Run destroot without sudo to avoid root privileges." - ui_debug "Going to escalate privileges back to root." - setegid $egid - seteuid $euid - ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." - } - - if { [tbool destroot.asroot] && [getuid] != 0 } { - global errorisprivileges - set errorisprivileges yes - return -code error "You can not run this port without elevated privileges. You need to re-run with 'sudo port'."; - } - - if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { - # rewrite destroot.args - set argprefix "=[option prefix]" - set newargprefix "=${altprefix}[option prefix]" - set newdestrootargs [string map [list $argprefix $newargprefix] [option destroot.args]] - option destroot.args $newdestrootargs - } - - # end gsoc08-privileges + # start gsoc08-privileges + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + ui_debug "Can't run destroot under sudo without elevated privileges (due to mtree)." + ui_debug "Run destroot without sudo to avoid root privileges." + ui_debug "Going to escalate privileges back to root." + setegid $egid + seteuid $euid + ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." + } + if { [tbool destroot.asroot] && [getuid] != 0 } { + global errorisprivileges + set errorisprivileges yes + return -code error "You can not run this port without elevated privileges. You need to re-run with 'sudo port'."; + } + + if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { + # rewrite destroot.args + set argprefix "=[option prefix]" + set newargprefix "=${altprefix}[option prefix]" + set newdestrootargs [string map [list $argprefix $newargprefix] [option destroot.args]] + option destroot.args $newdestrootargs + } + + # end gsoc08-privileges + set oldmask [umask ${destroot.umask}] set mtree ${portutil::autoconf::mtree_path} - + if { ${destroot.clean} == "yes" } { delete "${destroot}" } - + file mkdir "${destroot}" if { ${os.platform} == "darwin" } { system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]" @@ -330,10 +330,10 @@ # Restore umask umask $oldmask - + # start gsoc08-privileges - chownAsRoot $destroot - # end gsoc08-privileges + chownAsRoot $destroot + # end gsoc08-privileges return 0 } Modified: trunk/base/src/port1.0/portdistcheck.tcl =================================================================== --- trunk/base/src/port1.0/portdistcheck.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portdistcheck.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -52,87 +52,87 @@ default distcheck.check moddate proc portdistcheck::distcheck_main {args} { - global distcheck.check - global fetch.type - global portname portpath - - set port_moddate [file mtime ${portpath}/Portfile] + global distcheck.check + global fetch.type + global portname portpath - ui_debug "Portfile modification date is [clock format $port_moddate]" + set port_moddate [file mtime ${portpath}/Portfile] - # Check the distfiles if it's a regular fetch phase. - if {"${distcheck.check}" != "none" - && "${fetch.type}" == "standard"} { - # portfetch 1.0::checkfiles sets fetch_urls list. - global fetch_urls - checkfiles - set totalsize 0 - - # Check all the files. - foreach {url_var distfile} $fetch_urls { - global portfetch::$url_var - if {![info exists $url_var]} { - ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] - set url_var master_sites - global portfetch::$url_var - } - if {${distcheck.check} == "moddate"} { - set count 0 - foreach site [set $url_var] { - ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] - set file_url [portfetch::assemble_url $site $distfile] - if {[catch {set urlnewer [curl isnewer $file_url $port_moddate]} error]} { - ui_warn "couldn't fetch $file_url for $portname ($error)" - } else { - if {$urlnewer} { - ui_warn "port $portname: $file_url is newer than portfile" - } - incr count - } - } - if {$count == 0} { - ui_error "no mirror had $distfile for $portname" - } - } elseif {${distcheck.check} == "filesize"} { - set count 0 - foreach site [set $url_var] { - ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] - set file_url [portfetch::assemble_url $site $distfile] - if {[catch {set urlsize [curl getsize $file_url]} error]} { - ui_warn "couldn't fetch $file_url for $portname ($error)" - } else { - incr count - if {$urlsize > 0} { - ui_info "port $portname: $distfile $urlsize bytes" - incr totalsize $urlsize - break - } - } - } - if {$count == 0} { - ui_error "no mirror had $distfile for $portname" - } - } else { - ui_error "unknown distcheck.check ${distcheck.check}" - break - } - } - - if {${distcheck.check} == "filesize" && $totalsize > 0} { - if {$totalsize < 1024} { - set size $totalsize - set humansize "${size}" - } elseif {$totalsize < 1024*1024} { - set size [expr $totalsize / 1024.0] - set humansize [format "%.1fK" $size] - } elseif {$totalsize < 1024*1024*1024} { - set size [expr $totalsize / (1024.0*1024.0)] - set humansize [format "%.1fM" $size] - } else { - set size [expr $totalsize / (1024.0*1024.0*1024.0)] - set humansize [format "%.1fG" $size] - } - ui_msg "$portname: $humansize" - } - } + ui_debug "Portfile modification date is [clock format $port_moddate]" + + # Check the distfiles if it's a regular fetch phase. + if {"${distcheck.check}" != "none" + && "${fetch.type}" == "standard"} { + # portfetch 1.0::checkfiles sets fetch_urls list. + global fetch_urls + checkfiles + set totalsize 0 + + # Check all the files. + foreach {url_var distfile} $fetch_urls { + global portfetch::$url_var + if {![info exists $url_var]} { + ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] + set url_var master_sites + global portfetch::$url_var + } + if {${distcheck.check} == "moddate"} { + set count 0 + foreach site [set $url_var] { + ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] + set file_url [portfetch::assemble_url $site $distfile] + if {[catch {set urlnewer [curl isnewer $file_url $port_moddate]} error]} { + ui_warn "couldn't fetch $file_url for $portname ($error)" + } else { + if {$urlnewer} { + ui_warn "port $portname: $file_url is newer than portfile" + } + incr count + } + } + if {$count == 0} { + ui_error "no mirror had $distfile for $portname" + } + } elseif {${distcheck.check} == "filesize"} { + set count 0 + foreach site [set $url_var] { + ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] + set file_url [portfetch::assemble_url $site $distfile] + if {[catch {set urlsize [curl getsize $file_url]} error]} { + ui_warn "couldn't fetch $file_url for $portname ($error)" + } else { + incr count + if {$urlsize > 0} { + ui_info "port $portname: $distfile $urlsize bytes" + incr totalsize $urlsize + break + } + } + } + if {$count == 0} { + ui_error "no mirror had $distfile for $portname" + } + } else { + ui_error "unknown distcheck.check ${distcheck.check}" + break + } + } + + if {${distcheck.check} == "filesize" && $totalsize > 0} { + if {$totalsize < 1024} { + set size $totalsize + set humansize "${size}" + } elseif {$totalsize < 1024*1024} { + set size [expr $totalsize / 1024.0] + set humansize [format "%.1fK" $size] + } elseif {$totalsize < 1024*1024*1024} { + set size [expr $totalsize / (1024.0*1024.0)] + set humansize [format "%.1fM" $size] + } else { + set size [expr $totalsize / (1024.0*1024.0*1024.0)] + set humansize [format "%.1fG" $size] + } + ui_msg "$portname: $humansize" + } + } } Modified: trunk/base/src/port1.0/portextract.tcl =================================================================== --- trunk/base/src/port1.0/portextract.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portextract.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -131,11 +131,11 @@ if {[catch {command_exec extract} result]} { return -code error "$result" } - - # start gsoc08-privileges - chownAsRoot ${extract.dir} - # end gsoc08-privileges - + + # start gsoc08-privileges + chownAsRoot ${extract.dir} + # end gsoc08-privileges + } return 0 } Modified: trunk/base/src/port1.0/portfetch.tcl =================================================================== --- trunk/base/src/port1.0/portfetch.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portfetch.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -54,12 +54,12 @@ # define options: distname master_sites options master_sites patch_sites extract.suffix distfiles patchfiles use_zip use_bzip2 use_lzma use_7z use_dmg dist_subdir \ - fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \ - master_sites.mirror_subdir patch_sites.mirror_subdir portname \ - cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.method \ - svn.url svn.tag svn.revision svn.method \ - git.url git.branch \ - hg.url hg.tag + fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \ + master_sites.mirror_subdir patch_sites.mirror_subdir portname \ + cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.method \ + svn.url svn.tag svn.revision svn.method \ + git.url git.branch \ + hg.url hg.tag # XXX we use the command framework to buy us some useful features, # but this is not a user-modifiable command @@ -182,12 +182,12 @@ proc portfetch::suffix {distname} { global extract.suffix fetch.type switch -- "${fetch.type}" { - cvs - - svn - - git - - hg { return "" } - standard - - default { return "${distname}${extract.suffix}" } + cvs - + svn - + git - + hg { return "" } + standard - + default { return "${distname}${extract.suffix}" } } } # XXX import suffix into the global namespace as it is currently used from @@ -221,15 +221,15 @@ } return {} } - + set ret [list] foreach element $portfetch::mirror_sites::sites($mirrors) { - - # here we have the chance to take a look at tags, that possibly - # have been assigned in mirror_sites.tcl - set splitlist [split $element :] - # every element is a URL, so we'll always have multiple elements. no need to check - set element "[lindex $splitlist 0]:[lindex $splitlist 1]" + + # here we have the chance to take a look at tags, that possibly + # have been assigned in mirror_sites.tcl + set splitlist [split $element :] + # every element is a URL, so we'll always have multiple elements. no need to check + set element "[lindex $splitlist 0]:[lindex $splitlist 1]" set mirror_tag "[lindex $splitlist 2]" set name_re {\$(?:name\y|\{name\})} @@ -238,28 +238,28 @@ if {[regexp $name_re $element]} { set mirror_tag "" } - - if {$mirror_tag == "mirror"} { - set thesubdir ${dist_subdir} - } elseif {$subdir == "" && $mirror_tag != "nosubdir"} { - set thesubdir ${portname} - } else { - set thesubdir ${subdir} - } - - # parse an embedded $name. if present, remove the subdir - if {[regsub $name_re $element $thesubdir element] > 0} { - set thesubdir "" - } - - if {"$tag" != ""} { - eval append element "${thesubdir}:${tag}" - } else { - eval append element "${thesubdir}" - } + + if {$mirror_tag == "mirror"} { + set thesubdir ${dist_subdir} + } elseif {$subdir == "" && $mirror_tag != "nosubdir"} { + set thesubdir ${portname} + } else { + set thesubdir ${subdir} + } + + # parse an embedded $name. if present, remove the subdir + if {[regsub $name_re $element $thesubdir element] > 0} { + set thesubdir "" + } + + if {"$tag" != ""} { + eval append element "${thesubdir}:${tag}" + } else { + eval append element "${thesubdir}" + } eval lappend ret $element } - + return $ret } @@ -271,15 +271,15 @@ proc portfetch::checksites {args} { global patch_sites master_sites master_sites.mirror_subdir \ patch_sites.mirror_subdir fallback_mirror_site global_mirror_site env - + append master_sites " ${global_mirror_site} ${fallback_mirror_site}" if {[info exists env(MASTER_SITE_LOCAL)]} { - set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites] + set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites] } - + append patch_sites " ${global_mirror_site} ${fallback_mirror_site}" if {[info exists env(PATCH_SITE_LOCAL)]} { - set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites] + set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites] } foreach list {master_sites patch_sites} { @@ -287,26 +287,26 @@ if {![info exists uplist]} { continue } - + set site_list [list] foreach site $uplist { if {[regexp {([a-zA-Z]+://.+)} $site match site]} { set site_list [concat $site_list $site] } else { - set splitlist [split $site :] - if {[llength $splitlist] > 3 || [llength $splitlist] <1} { + set splitlist [split $site :] + if {[llength $splitlist] > 3 || [llength $splitlist] <1} { ui_error [format [msgcat::mc "Unable to process mirror sites for: %s, ignoring."] $site] - } - set mirrors "[lindex $splitlist 0]" - set subdir "[lindex $splitlist 1]" - set tag "[lindex $splitlist 2]" + } + set mirrors "[lindex $splitlist 0]" + set subdir "[lindex $splitlist 1]" + set tag "[lindex $splitlist 2]" if {[info exists $list.mirror_subdir]} { append subdir "[set ${list}.mirror_subdir]" } set site_list [concat $site_list [mirror_sites $mirrors $tag $subdir]] } } - + # add in the global and fallback mirrors for each tag foreach site $site_list { if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { @@ -321,9 +321,9 @@ } } } - + foreach site $site_list { - if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { + if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { lappend portfetch::$tag $site } else { lappend portfetch::$list $site @@ -336,44 +336,44 @@ proc portfetch::checkpatchfiles {args} { global patchfiles all_dist_files patch_sites filespath variable fetch_urls - + if {[info exists patchfiles]} { - foreach file $patchfiles { - if {![file exists $filespath/$file]} { - set distsite [getdisttag $file] - set file [getdistname $file] - lappend all_dist_files $file - if {$distsite != ""} { - lappend fetch_urls $distsite $file - } elseif {[info exists patch_sites]} { - lappend fetch_urls patch_sites $file - } else { - lappend fetch_urls master_sites $file - } - } - } + foreach file $patchfiles { + if {![file exists $filespath/$file]} { + set distsite [getdisttag $file] + set file [getdistname $file] + lappend all_dist_files $file + if {$distsite != ""} { + lappend fetch_urls $distsite $file + } elseif {[info exists patch_sites]} { + lappend fetch_urls patch_sites $file + } else { + lappend fetch_urls master_sites $file + } + } } + } } # Checks dist files and their tags to assemble url lists for later fetching proc portfetch::checkdistfiles {args} { global distfiles all_dist_files master_sites filespath variable fetch_urls - + if {[info exists distfiles]} { foreach file $distfiles { - if {![file exists $filespath/$file]} { - set distsite [getdisttag $file] - set file [getdistname $file] - lappend all_dist_files $file - if {$distsite != ""} { - lappend fetch_urls $distsite $file - } else { - lappend fetch_urls master_sites $file - } - } + if {![file exists $filespath/$file]} { + set distsite [getdisttag $file] + set file [getdistname $file] + lappend all_dist_files $file + if {$distsite != ""} { + lappend fetch_urls $distsite $file + } else { + lappend fetch_urls master_sites $file + } } } + } } # sorts fetch_urls in order of ping time @@ -435,7 +435,7 @@ } ui_debug "$host ping time is $pingtimes($host)" } - + set pinglist {} foreach site $urllist { regexp $hostregex $site -> host @@ -454,56 +454,56 @@ # Perform the full checksites/checkpatchfiles/checkdistfiles sequence. # This method is used by distcheck target. proc portfetch::checkfiles {args} { - variable fetch_urls + variable fetch_urls - checksites - checkpatchfiles - checkdistfiles + checksites + checkpatchfiles + checkdistfiles } # Perform a CVS login and fetch, storing the CVS login # information in a custom .cvspass file proc portfetch::cvsfetch {args} { - global workpath cvs.env cvs.cmd cvs.args cvs.post_args + global workpath cvs.env cvs.cmd cvs.args cvs.post_args global cvs.root cvs.date cvs.tag cvs.method cvs.password global patch_sites patchfiles filespath set cvs.args "${cvs.method} ${cvs.args}" if {${cvs.method} == "export" && ![string length ${cvs.tag}] && ![string length ${cvs.date}]} { - set cvs.tag "HEAD" + set cvs.tag "HEAD" } if {[string length ${cvs.tag}]} { - set cvs.args "${cvs.args} -r ${cvs.tag}" + set cvs.args "${cvs.args} -r ${cvs.tag}" } if {[string length ${cvs.date}]} { - set cvs.args "${cvs.args} -D ${cvs.date}" + set cvs.args "${cvs.args} -D ${cvs.date}" } if {[regexp ^:pserver: ${cvs.root}]} { - set savecmd ${cvs.cmd} - set saveargs ${cvs.args} - set savepost_args ${cvs.post_args} - set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path" - set cvs.args login - set cvs.post_args "" - if {[catch {command_exec cvs -notty "" "2>&1"} result]} { - return -code error [msgcat::mc "CVS login failed"] - } - set cvs.cmd ${savecmd} - set cvs.args ${saveargs} - set cvs.post_args ${savepost_args} + set savecmd ${cvs.cmd} + set saveargs ${cvs.args} + set savepost_args ${cvs.post_args} + set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path" + set cvs.args login + set cvs.post_args "" + if {[catch {command_exec cvs -notty "" "2>&1"} result]} { + return -code error [msgcat::mc "CVS login failed"] + } + set cvs.cmd ${savecmd} + set cvs.args ${saveargs} + set cvs.post_args ${savepost_args} } else { - set env(CVS_RSH) ssh + set env(CVS_RSH) ssh } if {[catch {command_exec cvs "" "2>&1"} result]} { - return -code error [msgcat::mc "CVS check out failed"] + return -code error [msgcat::mc "CVS check out failed"] } if {[info exists patchfiles]} { - return [portfetch::fetchfiles] + return [portfetch::fetchfiles] } return 0 } @@ -512,33 +512,33 @@ proc portfetch::svnfetch {args} { global workpath prefix_frozen global svn.env svn.cmd svn.args svn.post_args svn.revision svn.url svn.method - + # Look for the svn command, either in the path or in the prefix set goodcmd 0 foreach svncmd "${svn.cmd} ${prefix_frozen}/bin/svn svn" { - if { [file executable ${svncmd}] } { - set svn.cmd $svncmd - set goodcmd 1 - break; - } + if { [file executable ${svncmd}] } { + set svn.cmd $svncmd + set goodcmd 1 + break; + } } if { !$goodcmd } { - ui_error "The subversion tool (svn) is required to fetch ${svn.url}." - ui_error "Please install the subversion port before proceeding." - return -code error [msgcat::mc "Subversion check out failed"] + ui_error "The subversion tool (svn) is required to fetch ${svn.url}." + ui_error "Please install the subversion port before proceeding." + return -code error [msgcat::mc "Subversion check out failed"] } - + set svn.args "${svn.method} ${svn.args}" if {[string length ${svn.revision}]} { - set svn.args "${svn.args} -r ${svn.revision}" + set svn.args "${svn.args} -r ${svn.revision}" } if {[catch {command_exec svn "" "2>&1"} result]} { - return -code error [msgcat::mc "Subversion check out failed"] + return -code error [msgcat::mc "Subversion check out failed"] } if {[info exists patchfiles]} { - return [portfetch::fetchfiles] + return [portfetch::fetchfiles] } return 0 @@ -548,7 +548,7 @@ proc portfetch::gitfetch {args} { global worksrcpath prefix_frozen global git.url git.branch git.sha1 - + # Look for the git command set git.cmd {} foreach gitcmd "$portutil::autoconf::git_path $prefix_frozen/bin/git git" { @@ -562,7 +562,7 @@ ui_error "Please install the git-core port before proceeding." return -code error [msgcat::mc "Git command not found"] } - + set options "-q" if {[string length ${git.branch}] == 0} { # if we're just using HEAD, we can make a shallow repo @@ -573,7 +573,7 @@ if {[catch {system $cmdstring} result]} { return -code error [msgcat::mc "Git clone failed"] } - + if {[string length ${git.branch}] > 0} { set env "GIT_DIR=${worksrcpath}/.git GIT_WORK_TREE=${worksrcpath}" set cmdstring "$env ${git.cmd} checkout -q ${git.branch} 2>&1" @@ -582,11 +582,11 @@ return -code error [msgcat::mc "Git checkout failed"] } } - + if {[info exists patchfiles]} { return [portfetch::fetchfiles] } - + return 0 } @@ -625,120 +625,120 @@ # Perform a standard fetch, assembling fetch urls from # the listed url variable and associated distfile proc portfetch::fetchfiles {args} { - global distpath all_dist_files UI_PREFIX - global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time - global distfile site - global portverbose + global distpath all_dist_files UI_PREFIX + global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time + global distfile site + global portverbose variable fetch_urls - if {![file isdirectory $distpath]} { - if {[catch {file mkdir $distpath} result]} { - return -code error [format [msgcat::mc "Unable to create distribution files path: %s"] $result] - } - } - - set fetch_options {} - if {[string length ${fetch.user}] || [string length ${fetch.password}]} { - lappend fetch_options -u - lappend fetch_options "${fetch.user}:${fetch.password}" - } - if {${fetch.use_epsv} != "yes"} { - lappend fetch_options "--disable-epsv" - } - if {${fetch.ignore_sslcert} != "no"} { - lappend fetch_options "--ignore-ssl-cert" - } - if {${fetch.remote_time} != "no"} { - lappend fetch_options "--remote-time" - } - if {$portverbose == "yes"} { - lappend fetch_options "-v" - } - set sorted no - - foreach {url_var distfile} $fetch_urls { - if {![file isfile $distpath/$distfile]} { - ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" - if {![file writable $distpath]} { - return -code error [format [msgcat::mc "%s must be writable"] $distpath] - } - if {!$sorted} { - sortsites - set sorted yes - } - variable portfetch::$url_var - if {![info exists $url_var]} { - ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] - set url_var master_sites - variable portfetch::$url_var - } - unset -nocomplain fetched - foreach site [set $url_var] { - ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]" - set file_url [portfetch::assemble_url $site $distfile] - set effectiveURL "" - if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] && - ![catch {file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"} result]} { + if {![file isdirectory $distpath]} { + if {[catch {file mkdir $distpath} result]} { + return -code error [format [msgcat::mc "Unable to create distribution files path: %s"] $result] + } + } - # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure - if {![string equal $effectiveURL $file_url] && - [string match "*sourceforge*" $file_url] && - [string match "*failedmirror*" $effectiveURL]} { - - # *SourceForge hackage in effect* - # The url seen by curl seems to have been a redirect to the sourceforge mirror page - ui_debug "[msgcat::mc "Fetching from sourceforge mirror failed"]" - file delete -force "${distpath}/${distfile}.TMP" - - # Continue on to try the next mirror, if any - } else { - - # Successful fetch - set fetched 1 - break - - } + set fetch_options {} + if {[string length ${fetch.user}] || [string length ${fetch.password}]} { + lappend fetch_options -u + lappend fetch_options "${fetch.user}:${fetch.password}" + } + if {${fetch.use_epsv} != "yes"} { + lappend fetch_options "--disable-epsv" + } + if {${fetch.ignore_sslcert} != "no"} { + lappend fetch_options "--ignore-ssl-cert" + } + if {${fetch.remote_time} != "no"} { + lappend fetch_options "--remote-time" + } + if {$portverbose == "yes"} { + lappend fetch_options "-v" + } + set sorted no - } else { - ui_debug "[msgcat::mc "Fetching failed:"]: $result" - file delete -force "${distpath}/${distfile}.TMP" - } - } - if {![info exists fetched]} { - return -code error [msgcat::mc "fetch failed"] - } - } - } + foreach {url_var distfile} $fetch_urls { + if {![file isfile $distpath/$distfile]} { + ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" + if {![file writable $distpath]} { + return -code error [format [msgcat::mc "%s must be writable"] $distpath] + } + if {!$sorted} { + sortsites + set sorted yes + } + variable portfetch::$url_var + if {![info exists $url_var]} { + ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] + set url_var master_sites + variable portfetch::$url_var + } + unset -nocomplain fetched + foreach site [set $url_var] { + ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]" + set file_url [portfetch::assemble_url $site $distfile] + set effectiveURL "" + if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] && + ![catch {file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"} result]} { + + # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure + if {![string equal $effectiveURL $file_url] && + [string match "*sourceforge*" $file_url] && + [string match "*failedmirror*" $effectiveURL]} { + + # *SourceForge hackage in effect* + # The url seen by curl seems to have been a redirect to the sourceforge mirror page + ui_debug "[msgcat::mc "Fetching from sourceforge mirror failed"]" + file delete -force "${distpath}/${distfile}.TMP" + + # Continue on to try the next mirror, if any + } else { + + # Successful fetch + set fetched 1 + break + + } + + } else { + ui_debug "[msgcat::mc "Fetching failed:"]: $result" + file delete -force "${distpath}/${distfile}.TMP" + } + } + if {![info exists fetched]} { + return -code error [msgcat::mc "fetch failed"] + } + } + } return 0 } # Utility function to delete fetched files. proc portfetch::fetch_deletefiles {args} { - global distpath + global distpath variable fetch_urls - foreach {url_var distfile} $fetch_urls { - if {[file isfile $distpath/$distfile]} { - file delete -force "${distpath}/${distfile}" - } - } + foreach {url_var distfile} $fetch_urls { + if {[file isfile $distpath/$distfile]} { + file delete -force "${distpath}/${distfile}" + } + } } # Utility function to add files to a list of fetched files. proc portfetch::fetch_addfilestomap {filemapname} { - global distpath $filemapname + global distpath $filemapname variable fetch_urls - foreach {url_var distfile} $fetch_urls { - if {[file isfile $distpath/$distfile]} { - filemap set $filemapname $distpath/$distfile 1 - } - } + foreach {url_var distfile} $fetch_urls { + if {[file isfile $distpath/$distfile]} { + filemap set $filemapname $distpath/$distfile 1 + } + } } # Initialize fetch target and call checkfiles. proc portfetch::fetch_init {args} { global distfiles distname distpath all_dist_files dist_subdir fetch.type fetch_init_done global altprefix usealtworkpath - + if {[info exists distpath] && [info exists dist_subdir] && ![info exists fetch_init_done]} { # start gsoc08-privileges @@ -757,7 +757,7 @@ proc portfetch::fetch_start {args} { global UI_PREFIX portname - + ui_msg "$UI_PREFIX [format [msgcat::mc "Fetching %s"] $portname]" } @@ -772,14 +772,14 @@ if {![info exists all_dist_files] && "${fetch.type}" == "standard"} { return 0 } - + # Fetch the files switch -- "${fetch.type}" { - cvs { return [cvsfetch] } - svn { return [svnfetch] } - git { return [gitfetch] } - hg { return [hgfetch] } - standard - - default { return [portfetch::fetchfiles] } + cvs { return [cvsfetch] } + svn { return [svnfetch] } + git { return [gitfetch] } + hg { return [hgfetch] } + standard - + default { return [portfetch::fetchfiles] } } } Modified: trunk/base/src/port1.0/portlivecheck.tcl =================================================================== --- trunk/base/src/port1.0/portlivecheck.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portlivecheck.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -62,7 +62,7 @@ global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert global homepage portname portpath workpath global master_sites name distfiles - + set updated 0 set updated_version "unknown" set has_master_sites [info exists master_sites] @@ -111,16 +111,16 @@ # Copied over from portfetch in parts set fetch_options {} - if {[string length ${fetch.user}] || [string length ${fetch.password}]} { - lappend fetch_options -u - lappend fetch_options "${fetch.user}:${fetch.password}" - } - if {${fetch.use_epsv} != "yes"} { - lappend fetch_options "--disable-epsv" - } - if {${fetch.ignore_sslcert} != "no"} { - lappend fetch_options "--ignore-ssl-cert" - } + if {[string length ${fetch.user}] || [string length ${fetch.password}]} { + lappend fetch_options -u + lappend fetch_options "${fetch.user}:${fetch.password}" + } + if {${fetch.use_epsv} != "yes"} { + lappend fetch_options "--disable-epsv" + } + if {${fetch.ignore_sslcert} != "no"} { + lappend fetch_options "--ignore-ssl-cert" + } # Perform the check depending on the type. switch ${livecheck.check} { @@ -170,10 +170,10 @@ set livecheck.check "regex" } } - + # de-escape livecheck.url set livecheck.url [join ${livecheck.url}] - + switch ${livecheck.check} { "regex" - "regexm" { Modified: trunk/base/src/port1.0/portmirror.tcl =================================================================== --- trunk/base/src/port1.0/portmirror.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portmirror.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -52,37 +52,37 @@ # It also records the path in a database. proc portmirror::mirror_main {args} { - global fetch.type portname mirror_filemap ports_mirror_new portdbpath - - set mirror_filemap_path [file join $portdbpath distfiles_mirror.db] - if {![info exists mirror_filemap] - && [info exists ports_mirror_new] - && $ports_mirror_new == "yes" - && [file exists $mirror_filemap_path]} { - # Trash the map file if it existed. - file delete -force $mirror_filemap_path - } - - filemap open mirror_filemap $mirror_filemap_path + global fetch.type portname mirror_filemap ports_mirror_new portdbpath - # Check the distfiles if it's a regular fetch phase. - if {"${fetch.type}" == "standard"} { - # fetch the files. - portfetch::fetch_init $args - #fetch_start - portfetch::fetch_main $args + set mirror_filemap_path [file join $portdbpath distfiles_mirror.db] + if {![info exists mirror_filemap] + && [info exists ports_mirror_new] + && $ports_mirror_new == "yes" + && [file exists $mirror_filemap_path]} { + # Trash the map file if it existed. + file delete -force $mirror_filemap_path + } - # checksum the files. - #checksum_start - if {[catch {portchecksum::checksum_main $args}]} { - # delete the files. - portfetch::fetch_deletefiles $args - } else { - # add the list of files. - portfetch::fetch_addfilestomap mirror_filemap - } - } + filemap open mirror_filemap $mirror_filemap_path - # close the filemap. - filemap close mirror_filemap + # Check the distfiles if it's a regular fetch phase. + if {"${fetch.type}" == "standard"} { + # fetch the files. + portfetch::fetch_init $args + #fetch_start + portfetch::fetch_main $args + + # checksum the files. + #checksum_start + if {[catch {portchecksum::checksum_main $args}]} { + # delete the files. + portfetch::fetch_deletefiles $args + } else { + # add the list of files. + portfetch::fetch_addfilestomap mirror_filemap + } + } + + # close the filemap. + filemap close mirror_filemap } Modified: trunk/base/src/port1.0/portpatch.tcl =================================================================== --- trunk/base/src/port1.0/portpatch.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portpatch.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -35,7 +35,7 @@ set org.macports.patch [target_new org.macports.patch portpatch::patch_main] target_provides ${org.macports.patch} patch -target_requires ${org.macports.patch} main fetch checksum extract +target_requires ${org.macports.patch} main fetch checksum extract namespace eval portpatch { } @@ -54,48 +54,48 @@ proc portpatch::patch_main {args} { global UI_PREFIX - + # First make sure that patchfiles exists and isn't stubbed out. if {![exists patchfiles]} { - return 0 + return 0 } - - ui_msg "$UI_PREFIX [format [msgcat::mc "Applying patches to %s"] [option portname]]" - - # start gsoc08-privileges + + ui_msg "$UI_PREFIX [format [msgcat::mc "Applying patches to %s"] [option portname]]" + + # start gsoc08-privileges if { [tbool patch.asroot] } { - # if port is marked as needing root - elevateToRoot "patch" - } - # end gsoc08-privileges + # if port is marked as needing root + elevateToRoot "patch" + } + # end gsoc08-privileges foreach patch [option patchfiles] { set patch_file [getdistname $patch] - if {[file exists [option filespath]/$patch_file]} { - lappend patchlist [option filespath]/$patch_file - } elseif {[file exists [option distpath]/$patch_file]} { - lappend patchlist [option distpath]/$patch_file - } else { - return -code error [format [msgcat::mc "Patch file %s is missing"] $patch] - } + if {[file exists [option filespath]/$patch_file]} { + lappend patchlist [option filespath]/$patch_file + } elseif {[file exists [option distpath]/$patch_file]} { + lappend patchlist [option distpath]/$patch_file + } else { + return -code error [format [msgcat::mc "Patch file %s is missing"] $patch] } + } if {![info exists patchlist]} { - return -code error [msgcat::mc "Patch files missing"] + return -code error [msgcat::mc "Patch files missing"] } _cd [option worksrcpath] foreach patch $patchlist { - ui_info "$UI_PREFIX [format [msgcat::mc "Applying %s"] $patch]" - if {[option os.platform] == "linux"} { - set gzcat "zcat" - } else { - set gzcat "gzcat" - } - switch -glob -- [file tail $patch] { - *.Z - - *.gz {command_exec patch "$gzcat \"$patch\" | (" ")"} - *.bz2 {command_exec patch "bzcat \"$patch\" | (" ")"} - default {command_exec patch "" "< '$patch'"} - } + ui_info "$UI_PREFIX [format [msgcat::mc "Applying %s"] $patch]" + if {[option os.platform] == "linux"} { + set gzcat "zcat" + } else { + set gzcat "gzcat" } + switch -glob -- [file tail $patch] { + *.Z - + *.gz {command_exec patch "$gzcat \"$patch\" | (" ")"} + *.bz2 {command_exec patch "bzcat \"$patch\" | (" ")"} + default {command_exec patch "" "< '$patch'"} + } + } return 0 } Modified: trunk/base/src/port1.0/portsubmit.tcl =================================================================== --- trunk/base/src/port1.0/portsubmit.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portsubmit.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,7 +36,7 @@ set org.macports.submit [target_new org.macports.submit portsubmit::submit_main] target_runtype ${org.macports.submit} always -target_provides ${org.macports.submit} submit +target_provides ${org.macports.submit} submit target_requires ${org.macports.submit} portpkg namespace eval portsubmit { @@ -47,32 +47,32 @@ # escape quotes, and things that make the shell cry proc portsubmit::shell_escape {str} { - regsub -all -- {\\} $str {\\\\} str - regsub -all -- {"} $str {\"} str - regsub -all -- {'} $str {\'} str - return $str + regsub -all -- {\\} $str {\\\\} str + regsub -all -- {"} $str {\"} str + regsub -all -- {'} $str {\'} str + return $str } proc portsubmit::submit_main {args} { global mp_remote_submit_url portname portversion portverbose prefix UI_PREFIX workpath portpath - + set submiturl $mp_remote_submit_url - + # Preconditions for submit if {$submitter_email == ""} { - return -code error [format [msgcat::mc "Submitter email is required to submit a port"]] + return -code error [format [msgcat::mc "Submitter email is required to submit a port"]] } # Make sure we have a work directory file mkdir ${workpath} - - # Create portpkg.xar in the work directory - set pkgpath "${workpath}/${portname}.portpkg" - - # TODO: If a private key was provided, create a signed digest of the submission - - # Submit to the submit url + + # Create portpkg.xar in the work directory + set pkgpath "${workpath}/${portname}.portpkg" + + # TODO: If a private key was provided, create a signed digest of the submission + + # Submit to the submit url set args "curl" lappend args "--silent" lappend args "--url ${submiturl}" @@ -83,47 +83,47 @@ set cmd [join $args] if {[tbool portverbose]} { - ui_msg "Submitting portpkg $pkgpath for $portname to $submiturl" + ui_msg "Submitting portpkg $pkgpath for $portname to $submiturl" } - - # Invoke curl to do the submit + + # Invoke curl to do the submit ui_debug $cmd if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failure during submit of port %s"] $portname] + return -code error [format [msgcat::mc "Failure during submit of port %s"] $portname] } - # Parse the result - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - if {0 != [regexp -- {^([^:]+):\s*(.*)$} $line unused key value]} { - set result($key) $value - } - } - close $fd - - # Interpret and act on the result - if {[info exists result(MESSAGE)] && [tbool portverbose]} { - ui_msg $result(MESSAGE) - } - if {[info exists result(STATUS)]} { - if { $result(STATUS) == 0 } { - ui_msg "Submitted portpkg for $portname" - if {[info exists result(DOWNLOAD_URL)]} { - ui_msg " download URL => $result(DOWNLOAD_URL)" - } - if {[info exists result(HUMAN_URL)]} { - ui_msg " human readable URL => $result(HUMAN_URL)" - } - } else { - return -code error [format [msgcat::mc "Status %d reported during submit of port %s"] $result(STATUS) $portname] - } - } else { - return -code error [format [msgcat::mc "Status not received during submit of port %s"] $portname] - } + # Parse the result + set fd [open ${workpath}/.portsubmit.out r] + array set result [list] + while {[gets $fd line] != -1} { + if {0 != [regexp -- {^([^:]+):\s*(.*)$} $line unused key value]} { + set result($key) $value + } + } + close $fd + # Interpret and act on the result + if {[info exists result(MESSAGE)] && [tbool portverbose]} { + ui_msg $result(MESSAGE) + } + if {[info exists result(STATUS)]} { + if { $result(STATUS) == 0 } { + ui_msg "Submitted portpkg for $portname" + if {[info exists result(DOWNLOAD_URL)]} { + ui_msg " download URL => $result(DOWNLOAD_URL)" + } + if {[info exists result(HUMAN_URL)]} { + ui_msg " human readable URL => $result(HUMAN_URL)" + } + } else { + return -code error [format [msgcat::mc "Status %d reported during submit of port %s"] $result(STATUS) $portname] + } + } else { + return -code error [format [msgcat::mc "Status not received during submit of port %s"] $portname] + } + return - + # REMNANTS OF KEVIN'S CODE # start with the Portfile, and add the files directory if it exists. @@ -136,29 +136,29 @@ } if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to archive port : %s"] $portname] + return -code error [format [msgcat::mc "Failed to archive port : %s"] $portname] } - set portsource "" - set base_rev "" - if {![catch {set fd [open ".mports_source" r]}]} { - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - switch -- $key { - source { set portsource $value } - revision { set base_rev $value } - } - } - close $fd - } - if {$portsource == ""} { - ui_msg "$UI_PREFIX Submitting $portname-$portversion" - puts -nonewline "URL: " - flush stdout - gets stdin portsource - } + set portsource "" + set base_rev "" + if {![catch {set fd [open ".mports_source" r]}]} { + while {[gets $fd line] != -1} { + regexp -- {^(.*): (.*)$} $line unused key value + switch -- $key { + source { set portsource $value } + revision { set base_rev $value } + } + } + close $fd + } + if {$portsource == ""} { + ui_msg "$UI_PREFIX Submitting $portname-$portversion" + puts -nonewline "URL: " + flush stdout + gets stdin portsource + } - ui_msg "$UI_PREFIX Submitting $portname-$portversion to $portsource" + ui_msg "$UI_PREFIX Submitting $portname-$portversion to $portsource" puts -nonewline "Username: " flush stdout @@ -169,13 +169,13 @@ gets stdin password puts "" exec stty echo - + set vars {portname portversion maintainers categories description \ - long_description master_sites} - eval "global $vars" - foreach var $vars { - if {![info exists $var]} { set $var {} } - } + long_description master_sites} + eval "global $vars" + foreach var $vars { + if {![info exists $var]} { set $var {} } + } set cmd "curl " append cmd "--silent " @@ -196,68 +196,68 @@ ui_debug $cmd if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to submit port : %s"] $portname] + return -code error [format [msgcat::mc "Failed to submit port : %s"] $portname] } - # - # Parse the result from the remote index - # if ERROR: print the error message - # if OK: store the revision info - # if CONFLICT: attempt to merge the conflict - # - - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - set result($key) $value - } - close $fd + # + # Parse the result from the remote index + # if ERROR: print the error message + # if OK: store the revision info + # if CONFLICT: attempt to merge the conflict + # - if {[info exists result(OK)]} { - set fd [open ".mports_source" w] - puts $fd "source: $portsource" - puts $fd "port: $portname" - puts $fd "version: $portversion" - puts $fd "revision: $result(revision)" - close $fd - - ui_msg "$portname-$portversion submitted successfully." - ui_msg "New revision: $result(revision)" - } elseif {[info exists result(ERROR)]} { - return -code error $result(ERROR) - } elseif {[info exists result(CONFLICT)]} { - # Fetch the newer revision from the index. - # XXX: many gross hacks here regarding paths, urls, etc. - set tmpdir [mktemp "/tmp/mports.XXXXXXXX"] - file mkdir $tmpdir/new - file mkdir $tmpdir/old - set worker [mport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]] - if {$base_rev != ""} { - set worker2 [mport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]] - catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$portname-$portversion/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - mport_close $worker2 - } else { - catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - } - mport_close $worker - catch {delete "${tmpdir}"} + set fd [open ${workpath}/.portsubmit.out r] + array set result [list] + while {[gets $fd line] != -1} { + regexp -- {^(.*): (.*)$} $line unused key value + set result($key) $value + } + close $fd - set fd [open [file join "$portpath" ".mports_source"] w] - puts $fd "source: $portsource" - puts $fd "port: $portname" - puts $fd "version: $portversion" - puts $fd "revision: $result(revision)" - close $fd - - ui_error "A newer revision of this port has already been submitted." - ui_error "Portfile: $portname-$portversion" - ui_error "Base revision: $base_rev" - ui_error "Current revision: $result(revision)" - ui_error "Please edit the Portfile to resolve any conflicts and resubmit." - } + if {[info exists result(OK)]} { + set fd [open ".mports_source" w] + puts $fd "source: $portsource" + puts $fd "port: $portname" + puts $fd "version: $portversion" + puts $fd "revision: $result(revision)" + close $fd + ui_msg "$portname-$portversion submitted successfully." + ui_msg "New revision: $result(revision)" + } elseif {[info exists result(ERROR)]} { + return -code error $result(ERROR) + } elseif {[info exists result(CONFLICT)]} { + # Fetch the newer revision from the index. + # XXX: many gross hacks here regarding paths, urls, etc. + set tmpdir [mktemp "/tmp/mports.XXXXXXXX"] + file mkdir $tmpdir/new + file mkdir $tmpdir/old + set worker [mport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]] + if {$base_rev != ""} { + set worker2 [mport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]] + catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$portname-$portversion/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} + file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" + mport_close $worker2 + } else { + catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} + file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" + } + mport_close $worker + catch {delete "${tmpdir}"} + + set fd [open [file join "$portpath" ".mports_source"] w] + puts $fd "source: $portsource" + puts $fd "port: $portname" + puts $fd "version: $portversion" + puts $fd "revision: $result(revision)" + close $fd + + ui_error "A newer revision of this port has already been submitted." + ui_error "Portfile: $portname-$portversion" + ui_error "Base revision: $base_rev" + ui_error "Current revision: $result(revision)" + ui_error "Please edit the Portfile to resolve any conflicts and resubmit." + } + return 0 } Modified: trunk/base/src/port1.0/porttest.tcl =================================================================== --- trunk/base/src/port1.0/porttest.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/porttest.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -14,7 +14,7 @@ } # define options -options test.run test.target +options test.run test.target commands test # Set defaults @@ -33,9 +33,9 @@ proc porttest::test_main {args} { global portname test.run if {[tbool test.run]} { - command_exec test + command_exec test } else { - return -code error [format [msgcat::mc "%s has no tests turned on. see 'test.run' in portfile(7)"] $portname] + return -code error [format [msgcat::mc "%s has no tests turned on. see 'test.run' in portfile(7)"] $portname] } return 0 } Modified: trunk/base/src/port1.0/porttrace.tcl =================================================================== --- trunk/base/src/port1.0/porttrace.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/porttrace.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -39,72 +39,72 @@ } proc porttrace::trace_start {workpath} { - global os.platform - if {${os.platform} == "darwin"} { - if {[catch {package require Thread} error]} { - ui_warn "trace requires Tcl Thread package ($error)" - } else { - global env trace_fifo trace_sandboxbounds portpath - # Create a fifo. - # path in unix socket limited to 109 chars - # # set trace_fifo "$workpath/trace_fifo" - set trace_fifo "/tmp/macports/[pid]_[expr {int(rand()*1000)}]" - file mkdir "/tmp/macports" - file delete -force $trace_fifo - - # Create the thread/process. - create_slave $workpath $trace_fifo - - # Launch darwintrace.dylib. - - set tracelib_path [file join ${portutil::autoconf::prefix} share macports Tcl darwintrace1.0 darwintrace.dylib] + global os.platform + if {${os.platform} == "darwin"} { + if {[catch {package require Thread} error]} { + ui_warn "trace requires Tcl Thread package ($error)" + } else { + global env trace_fifo trace_sandboxbounds portpath + # Create a fifo. + # path in unix socket limited to 109 chars + # # set trace_fifo "$workpath/trace_fifo" + set trace_fifo "/tmp/macports/[pid]_[expr {int(rand()*1000)}]" + file mkdir "/tmp/macports" + file delete -force $trace_fifo - if {[info exists env(DYLD_INSERT_LIBRARIES)] && [string length "$env(DYLD_INSERT_LIBRARIES)"] > 0} { - set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}" - } else { - set env(DYLD_INSERT_LIBRARIES) ${tracelib_path} - } - set env(DYLD_FORCE_FLAT_NAMESPACE) 1 - set env(DARWINTRACE_LOG) "$trace_fifo" - # The sandbox is limited to: - # workpath - # /tmp - # /private/tmp - # /var/tmp - # /private/var/tmp - # $TMPDIR - # /dev/null - # /dev/tty - # /Library/Caches/com.apple.Xcode - # $CCACHE_DIR - # $HOMEDIR/.ccache - set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:$portpath" - if {[info exists env(TMPDIR)]} { - set trace_sandboxbounds "${trace_sandboxbounds}:$env(TMPDIR)" - } - if {[info exists env(CCACHE_DIR)]} { - set trace_sandboxbounds "${trace_sandboxbounds}:$env(CCACHE_DIR)" - } - tracelib setsandbox $trace_sandboxbounds - } - } + # Create the thread/process. + create_slave $workpath $trace_fifo + + # Launch darwintrace.dylib. + + set tracelib_path [file join ${portutil::autoconf::prefix} share macports Tcl darwintrace1.0 darwintrace.dylib] + + if {[info exists env(DYLD_INSERT_LIBRARIES)] && [string length "$env(DYLD_INSERT_LIBRARIES)"] > 0} { + set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}" + } else { + set env(DYLD_INSERT_LIBRARIES) ${tracelib_path} + } + set env(DYLD_FORCE_FLAT_NAMESPACE) 1 + set env(DARWINTRACE_LOG) "$trace_fifo" + # The sandbox is limited to: + # workpath + # /tmp + # /private/tmp + # /var/tmp + # /private/var/tmp + # $TMPDIR + # /dev/null + # /dev/tty + # /Library/Caches/com.apple.Xcode + # $CCACHE_DIR + # $HOMEDIR/.ccache + set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:$portpath" + if {[info exists env(TMPDIR)]} { + set trace_sandboxbounds "${trace_sandboxbounds}:$env(TMPDIR)" + } + if {[info exists env(CCACHE_DIR)]} { + set trace_sandboxbounds "${trace_sandboxbounds}:$env(CCACHE_DIR)" + } + tracelib setsandbox $trace_sandboxbounds + } + } } # Enable the fence. # Only done for targets that should only happen in the sandbox. proc porttrace::trace_enable_fence {} { - global env trace_sandboxbounds - set env(DARWINTRACE_SANDBOX_BOUNDS) $trace_sandboxbounds - tracelib enablefence + global env trace_sandboxbounds + set env(DARWINTRACE_SANDBOX_BOUNDS) $trace_sandboxbounds + tracelib enablefence } # Disable the fence. # Unused yet. proc porttrace::trace_disable_fence {} { - global env - if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { - unset env(DARWINTRACE_SANDBOX_BOUNDS) - } + global env + if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { + unset env(DARWINTRACE_SANDBOX_BOUNDS) + } } # Check the list of ports. @@ -112,204 +112,204 @@ # that isn't included in portslist # This method must be called after trace_start proc porttrace::trace_check_deps {target portslist} { - # Get the list of ports. - set ports [slave_send porttrace::slave_get_ports] - - # Compare with portslist - set portslist [lsort $portslist] - foreach port $ports { - if {[lsearch -sorted -exact $portslist $port] == -1} { - ui_warn "Target $target has an undeclared dependency on $port" - } - } - foreach port $portslist { - if {[lsearch -sorted -exact $ports $port] == -1} { - ui_debug "Target $target has no traceable dependency on $port" - } - } + # Get the list of ports. + set ports [slave_send porttrace::slave_get_ports] + + # Compare with portslist + set portslist [lsort $portslist] + foreach port $ports { + if {[lsearch -sorted -exact $portslist $port] == -1} { + ui_warn "Target $target has an undeclared dependency on $port" + } + } + foreach port $portslist { + if {[lsearch -sorted -exact $ports $port] == -1} { + ui_debug "Target $target has no traceable dependency on $port" + } + } } # Check that no violation happened. # Output a warning for every sandbox violation the trace revealed. # This method must be called after trace_start proc porttrace::trace_check_violations {} { - # Get the list of violations. - set violations [slave_send porttrace::slave_get_sandbox_violations] - - foreach violation [lsort $violations] { - ui_warn "An activity was attempted outside sandbox: $violation" - } + # Get the list of violations. + set violations [slave_send porttrace::slave_get_sandbox_violations] + + foreach violation [lsort $violations] { + ui_warn "An activity was attempted outside sandbox: $violation" + } } # Stop the trace and return the list of ports the port depends on. # This method must be called after trace_start proc porttrace::trace_stop {} { - global os.platform - if {${os.platform} == "darwin"} { - global env trace_fifo - unset env(DYLD_INSERT_LIBRARIES) - unset env(DYLD_FORCE_FLAT_NAMESPACE) - unset env(DARWINTRACE_LOG) - if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { - unset env(DARWINTRACE_SANDBOX_BOUNDS) - } - - #kill socket - tracelib clean + global os.platform + if {${os.platform} == "darwin"} { + global env trace_fifo + unset env(DYLD_INSERT_LIBRARIES) + unset env(DYLD_FORCE_FLAT_NAMESPACE) + unset env(DARWINTRACE_LOG) + if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { + unset env(DARWINTRACE_SANDBOX_BOUNDS) + } - # Clean up. - slave_send porttrace::slave_stop + #kill socket + tracelib clean - # Delete the slave. - delete_slave + # Clean up. + slave_send porttrace::slave_stop - file delete -force $trace_fifo - } + # Delete the slave. + delete_slave + + file delete -force $trace_fifo + } } # Private # Create the slave thread. proc porttrace::create_slave {workpath trace_fifo} { - global trace_thread - # Create the thread. - set trace_thread [macports_create_thread] - - # The slave thread requires the registry package. - thread::send -async $trace_thread "package require registry 1.0" - # and this file as well. - thread::send -async $trace_thread "package require porttrace 1.0" + global trace_thread + # Create the thread. + set trace_thread [macports_create_thread] - # Start the slave work. - thread::send -async $trace_thread "porttrace::slave_start $trace_fifo $workpath" + # The slave thread requires the registry package. + thread::send -async $trace_thread "package require registry 1.0" + # and this file as well. + thread::send -async $trace_thread "package require porttrace 1.0" + + # Start the slave work. + thread::send -async $trace_thread "porttrace::slave_start $trace_fifo $workpath" } # Private # Send a command to the thread without waiting for the result. proc porttrace::slave_send_async {command} { - global trace_thread + global trace_thread - thread::send -async $trace_thread "$command" + thread::send -async $trace_thread "$command" } # Private # Send a command to the thread. proc porttrace::slave_send {command} { - global trace_thread + global trace_thread - # ui_warn "slave send $command ?" + # ui_warn "slave send $command ?" - thread::send $trace_thread "$command" result - return $result + thread::send $trace_thread "$command" result + return $result } # Private # Destroy the thread. proc porttrace::delete_slave {} { - global trace_thread + global trace_thread - # Destroy the thread. - thread::release $trace_thread + # Destroy the thread. + thread::release $trace_thread } # Private. # Slave method to read a line from the trace. proc porttrace::lave_read_line {chan} { - global ports_list trace_filemap sandbox_violation_list workpath - global env + global ports_list trace_filemap sandbox_violation_list workpath + global env - while 1 { - # We should never get EOF, actually. - if {[eof $chan]} { - break - } - - # The line is of the form: verb\tpath - # Get the path by chopping it. - set theline [gets $chan] - - if {[fblocked $chan]} { - # Exit the loop. - break - } + while 1 { + # We should never get EOF, actually. + if {[eof $chan]} { + break + } - set line_length [string length $theline] - - # Skip empty lines. - if {$line_length > 0} { - set path_start [expr [string first "\t" $theline] + 1] - set op [string range $theline 0 [expr $path_start - 2]] - set path [string range $theline $path_start [expr $line_length - 1]] - - # open/execve - if {$op == "open" || $op == "execve"} { - # Only work on files. - if {[file isfile $path]} { - # Did we process the file yet? - if {![filemap exists trace_filemap $path]} { - # Obtain information about this file. - set port [registry::file_registered $path] - if { $port != 0 } { - # Add the port to the list. - if {[lsearch -sorted -exact $ports_list $port] == -1} { - lappend ports_list $port - set ports_list [lsort $ports_list] - # Maybe fill trace_filemap for efficiency? - } - } - - # Add the file to the tree with port information. - # Ignore errors. Errors can occur if a directory was - # created where a file once lived. - # This doesn't affect existing ports and we just - # add this information to speed up port detection. - catch {filemap set trace_filemap $path $port} - } - } - } elseif {$op == "sandbox_violation"} { - lappend sandbox_violation_list $path - } - } - } + # The line is of the form: verb\tpath + # Get the path by chopping it. + set theline [gets $chan] + + if {[fblocked $chan]} { + # Exit the loop. + break + } + + set line_length [string length $theline] + + # Skip empty lines. + if {$line_length > 0} { + set path_start [expr [string first "\t" $theline] + 1] + set op [string range $theline 0 [expr $path_start - 2]] + set path [string range $theline $path_start [expr $line_length - 1]] + + # open/execve + if {$op == "open" || $op == "execve"} { + # Only work on files. + if {[file isfile $path]} { + # Did we process the file yet? + if {![filemap exists trace_filemap $path]} { + # Obtain information about this file. + set port [registry::file_registered $path] + if { $port != 0 } { + # Add the port to the list. + if {[lsearch -sorted -exact $ports_list $port] == -1} { + lappend ports_list $port + set ports_list [lsort $ports_list] + # Maybe fill trace_filemap for efficiency? + } + } + + # Add the file to the tree with port information. + # Ignore errors. Errors can occur if a directory was + # created where a file once lived. + # This doesn't affect existing ports and we just + # add this information to speed up port detection. + catch {filemap set trace_filemap $path $port} + } + } + } elseif {$op == "sandbox_violation"} { + lappend sandbox_violation_list $path + } + } + } } # Private. # Slave init method. proc porttrace::slave_start {fifo p_workpath} { - global ports_list trace_filemap sandbox_violation_list - # Save the workpath. - set workpath $p_workpath - # Create a virtual filemap. - filemap create trace_filemap - set ports_list {} - set sandbox_violation_list {} - tracelib setname $fifo - tracelib run + global ports_list trace_filemap sandbox_violation_list + # Save the workpath. + set workpath $p_workpath + # Create a virtual filemap. + filemap create trace_filemap + set ports_list {} + set sandbox_violation_list {} + tracelib setname $fifo + tracelib run } # Private. # Slave cleanup method. proc porttrace::slave_stop {} { - global trace_filemap trace_fifo_r_chan trace_fifo_w_chan - # Close the virtual filemap. - filemap close trace_filemap - # Close the pipe (both ends). + global trace_filemap trace_fifo_r_chan trace_fifo_w_chan + # Close the virtual filemap. + filemap close trace_filemap + # Close the pipe (both ends). } # Private. # Slave ports export method. proc porttrace::slave_get_ports {} { - global ports_list - return $ports_list + global ports_list + return $ports_list } # Private. # Slave sandbox violations export method. proc porttrace::slave_get_sandbox_violations {} { - global sandbox_violation_list - return $sandbox_violation_list + global sandbox_violation_list + return $sandbox_violation_list } proc porttrace::slave_add_sandbox_violation {path} { - global sandbox_violation_list - lappend sandbox_violation_list $path + global sandbox_violation_list + lappend sandbox_violation_list $path } Modified: trunk/base/src/port1.0/portutil.tcl =================================================================== --- trunk/base/src/port1.0/portutil.tcl 2009-05-03 22:53:20 UTC (rev 50561) +++ trunk/base/src/port1.0/portutil.tcl 2009-05-04 04:15:01 UTC (rev 50562) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -283,11 +283,11 @@ # composed of the command options. proc command_string {command} { global ${command}.dir ${command}.pre_args ${command}.args ${command}.post_args ${command}.cmd - + if {[info exists ${command}.dir]} { append cmdstring "cd \"[set ${command}.dir]\" &&" } - + if {[info exists ${command}.cmd]} { foreach string [set ${command}.cmd] { append cmdstring " $string" @@ -332,7 +332,7 @@ } } } - + # Set the environment. # If the array doesn't exist, we create it with the value # coming from ${command}.env @@ -344,13 +344,13 @@ if {[option macosx_deployment_target] ne ""} { set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] } - + # Debug that. ui_debug "Environment: [environment_array_to_string ${command}.env_array]" # Get the command string. set cmdstring [command_string ${command}] - + # Call this command. # TODO: move that to the system native call? # Save the environment. @@ -366,13 +366,13 @@ } # Unset the command array until next time. array unset ${command}.env_array - + # Restore the environment. array unset env * unsetenv * array set env [array get saved_env] - # Return as if system had been called directly. + # Return as if system had been called directly. return -code $code $result } @@ -452,9 +452,9 @@ set len [llength $args] set code [lindex $args end] set args [lrange $args 0 [expr $len - 2]] - + set ditem [variant_new "temp-variant"] - + # mode indicates what the arg is interpreted as. # possible mode keywords are: requires, conflicts, provides # The default mode is provides. Arguments are added to the @@ -466,7 +466,7 @@ provides - requires - conflicts { set mode $arg } - default { ditem_append $ditem $mode $arg } + default { ditem_append $ditem $mode $arg } } } ditem_key $ditem name "[join [ditem_key $ditem provides] -]" @@ -474,7 +474,7 @@ # make a user procedure named variant-blah-blah # we will call this procedure during variant-run makeuserproc "variant-[ditem_key $ditem name]" \{$code\} - + # Export provided variant to PortInfo # (don't list it twice if the variant was already defined, which can happen # with universal or group code). @@ -488,7 +488,7 @@ set vinfo($variant_provides) {} } array set variant $vinfo($variant_provides) - + # Set conflicts. set vconflicts [join [lsort [ditem_key $ditem conflicts]]] if {$vconflicts ne ""} { @@ -530,7 +530,7 @@ # Returns 1 if variant name selected, otherwise 0 proc variant_isset {name} { global variations - + if {[info exists variations($name)] && $variations($name) == "+"} { return 1 } @@ -555,7 +555,7 @@ set all_variants [lreplace $all_variants $item_index $item_index] break } - + incr item_index } } @@ -631,20 +631,20 @@ } } -# platform [] [] +# platform [] [] # Portfile level procedure to provide support for declaring platform-specifics # Basically, just wrap 'variant', so that Portfiles' platform declarations can # be more readable, and support arch and version specifics proc platform {args} { global all_variants PortInfo os.platform os.arch os.version os.major - + set len [llength $args] set code [lindex $args end] set os [lindex $args 0] set args [lrange $args 1 [expr $len - 2]] - + set ditem [variant_new "temp-variant"] - + foreach arg $args { if {[regexp {(^[0-9]+$)} $arg match result]} { set release $result @@ -652,30 +652,30 @@ set arch $result } } - + # Add the variant for this platform set platform $os if {[info exists release]} { set platform ${platform}_${release} } if {[info exists arch]} { set platform ${platform}_${arch} } - + # Pick up a unique name. if {[variant_exists $platform]} { set suffix 1 while {[variant_exists "$platform-$suffix"]} { incr suffix } - + set platform "$platform-$suffix" } variant $platform $code - + # Set the variant if this platform matches the platform we're on set matches 1 - if {[info exists os.platform] && ${os.platform} == $os} { + if {[info exists os.platform] && ${os.platform} == $os} { set sel_platform $os if {[info exists os.major] && [info exists release]} { - if {${os.major} == $release } { - set sel_platform ${sel_platform}_${release} + if {${os.major} == $release } { + set sel_platform ${sel_platform}_${release} } else { set matches 0 } @@ -703,7 +703,7 @@ if {[info exists ${command}.env]} { # Flatten the environment string. set the_environment [join [set ${command}.env]] - + while {[regexp "^(?: *)(\[^= \]+)=(\"|'|)(\[^\"'\]*?)\\2(?: +|$)(.*)$" ${the_environment} matchVar key delimiter value remaining]} { set the_environment ${remaining} set ${command}.env_array(${key}) ${value} @@ -747,7 +747,7 @@ # Remark: this method is only used for debugging purposes. proc environment_array_to_string {environment_array} { upvar 1 ${environment_array} env_array - + set theString "" foreach {key value} [array get env_array] { if {$theString == ""} { @@ -756,7 +756,7 @@ set theString "${theString} $key='$value'" } } - + return $theString } @@ -809,7 +809,7 @@ # reinplace # Provides "sed in place" functionality proc reinplace {args} { - global euid macportsuser + global euid macportsuser set extended 0 while 1 { @@ -836,7 +836,7 @@ } set pattern [lindex $args 0] set files [lrange $args 1 end] - + foreach file $files { if {[catch {set tmpfile [mkstemp "/tmp/[file tail $file].sed.XXXXXXXX"]} error]} { global errorInfo @@ -849,7 +849,7 @@ # Set tmpfile to only the file name set tmpfile [join [lrange $tmpfile 1 end]] } - + set cmdline $portutil::autoconf::sed_command if {$extended} { if {$portutil::autoconf::sed_ext_flag == "N/A"} { @@ -867,13 +867,13 @@ close $tmpfd return -code error "reinplace sed(1) failed" } - + close $tmpfd - - # start gsoc08-privileges - chownAsRoot $file - # end gsoc08-privileges - + + # start gsoc08-privileges + chownAsRoot $file + # end gsoc08-privileges + set attributes [file attributes $file] # We need to overwrite this file if {[catch {file attributes $file -permissions u+w} error]} { @@ -883,7 +883,7 @@ file delete "$tmpfile" return -code error "reinplace permissions failed" } - + if {[catch {file copy -force $tmpfile $file} error]} { global errorInfo ui_debug "$errorInfo" @@ -891,9 +891,9 @@ file delete "$tmpfile" return -code error "reinplace copy failed" } - + eval file attributes {$file} $attributes - + file delete "$tmpfile" } return @@ -934,7 +934,7 @@ default {return -code error "touch: illegal option -- $arg"} } } - + # parse the r/t options if {[info exists options(rt)]} { if {[string equal $options(rt) r]} { @@ -977,14 +977,14 @@ set atime [clock seconds] set mtime [clock seconds] } - + # do we have any files to process? if {[llength $args] == 0} { # print usage ui_msg {usage: touch [-a] [-c] [-m] [-r file] [-t [[CC]YY]MMDDhhmm[.SS]] file ...} return } - + foreach file $args { if {![file exists $file]} { if {[info exists options(c)]} { @@ -993,7 +993,7 @@ close [open $file w] } } - + if {[info exists options(a)] || ![info exists options(m)]} { file atime $file $atime } @@ -1037,7 +1037,7 @@ default {return -code error "ln: illegal option -- $arg"} } } - + if {[llength $args] == 0} { ui_msg {usage: ln [-f] [-h] [-s] [-v] source_file [target_file]} ui_msg { ln [-f] [-h] [-s] [-v] file ... directory} @@ -1049,18 +1049,18 @@ set files [lrange $args 0 [expr [llength $args] - 2]] set target [lindex $args end] } - + foreach file $files { if {[file isdirectory $file] && ![info exists options(s)]} { return -code error "ln: $file: Is a directory" } - + if {[file isdirectory $target] && ([file type $target] ne "link" || ![info exists options(h)])} { set linktarget [file join $target [file tail $file]] } else { set linktarget $target } - + if {![catch {file type $linktarget}]} { if {[info exists options(f)]} { file delete $linktarget @@ -1068,7 +1068,7 @@ return -code error "ln: $linktarget: File exists" } } - + if {[llength $files] > 2} { if {![file exists $linktarget]} { return -code error "ln: $linktarget: No such file or directory" @@ -1077,7 +1077,7 @@ return -code error "ln: $target: Not a directory" } } - + if {[info exists options(v)]} { ui_msg "ln: $linktarget -> $file" } @@ -1094,7 +1094,7 @@ # Provides searching of the standard path for included files proc filefindbypath {fname} { global distpath filesdir worksrcdir portpath - + if {[file readable $portpath/$fname]} { return $portpath/$fname } elseif {[file readable $portpath/$filesdir/$fname]} { @@ -1170,7 +1170,7 @@ foreach m $list { if {[string first "@" $m] < 0} { if {[string first ":" $m] >= 0} { - set m [regsub -- "(.*):(.*)" $m "\\2@\\1"] + set m [regsub -- "(.*):(.*)" $m "\\2@\\1"] } else { set m "$m at macports.org" } @@ -1192,18 +1192,18 @@ set result 0 set skipped 0 set procedure [ditem_key $ditem procedure] - + if {[ditem_key $ditem state] != "no"} { set target_state_fd [open_statefile] } - + if {$procedure != ""} { set name [ditem_key $ditem name] - + if {[ditem_contains $ditem init]} { set result [catch {[ditem_key $ditem init] $name} errstr] } - + if {$result == 0} { # Skip the step if required and explain why through ui_debug. # check if the step was already done (as mentioned in the state file) @@ -1212,7 +1212,7 @@ ui_debug "Skipping completed $name ($portname)" set skipped 1 } - + # Of course, if this is a dry run, don't do the task: if {[info exists ports_dryrun] && $ports_dryrun == "yes"} { # only one message per portname @@ -1224,18 +1224,18 @@ } set skipped 1 } - + # otherwise execute the task. if {$skipped == 0} { set target [ditem_key $ditem provides] - + # Execute pre-run procedure if {[ditem_contains $ditem prerun]} { set result [catch {[ditem_key $ditem prerun] $name} errstr] } - + #start tracelib - if {($result ==0 + if {($result ==0 && [info exists ports_trace] && $ports_trace == "yes" && $target != "clean")} { @@ -1249,20 +1249,20 @@ && $target != "install"} { porttrace::trace_enable_fence } - + # collect deps - + # Don't check dependencies for extract (they're not honored # anyway). This avoids warnings about bzip2. if {$target != "extract"} { set depends {} set deptypes {} - + # Determine deptypes to look for based on target switch $target { configure - build { set deptypes "depends_lib depends_build" } - + test - destroot - install - @@ -1278,7 +1278,7 @@ activate - "" { set deptypes "depends_lib depends_build depends_run" } } - + # Gather the dependencies for deptypes foreach deptype $deptypes { # Add to the list of dependencies if the option exists and isn't empty. @@ -1286,7 +1286,7 @@ set depends [concat $depends $PortInfo($deptype)] } } - + # Dependencies are in the form verb:[param:]port set depsPorts {} foreach depspec $depends { @@ -1299,16 +1299,16 @@ if {$target == "destroot"} { lappend depsPorts "gzip" } - + set portlist $depsPorts foreach depName $depsPorts { set portlist [recursive_collect_deps $depName $deptypes $portlist] } - + if {[llength $deptypes] > 0} {tracelib setdeps $portlist} } } - + if {$result == 0} { foreach pre [ditem_key $ditem pre] { ui_debug "Executing $pre" @@ -1316,12 +1316,12 @@ if {$result != 0} { break } } } - + if {$result == 0} { ui_debug "Executing $name ($portname)" set result [catch {$procedure $name} errstr] } - + if {$result == 0} { foreach post [ditem_key $ditem post] { ui_debug "Executing $post" @@ -1340,11 +1340,11 @@ if {[info exists ports_trace] && $ports_trace == "yes" && $target!="clean"} { - + tracelib closesocket - + porttrace::trace_check_violations - + # End of trace. porttrace::trace_stop } @@ -1361,21 +1361,21 @@ write_statefile target $name $target_state_fd } } else { - if {$errorisprivileges != "yes"} { + if {$errorisprivileges != "yes"} { global errorInfo - ui_error "Target $name returned: $errstr" + ui_error "Target $name returned: $errstr" ui_debug "Backtrace: $errorInfo" } else { - ui_msg "Target $name returned: $errstr" + ui_msg "Target $name returned: $errstr" } set result 1 } - + } else { ui_info "Warning: $name does not have a registered procedure" set result 1 } - + if {[ditem_key $ditem state] != "no"} { close $target_state_fd } @@ -1407,7 +1407,7 @@ foreach depspec $depends \ { set portname [lindex [split $depspec :] end] - if {[lsearch -exact $portdeps $portname] == -1} { + if {[lsearch -exact $portdeps $portname] == -1} { lappend portdeps $portname set portdeps [recursive_collect_deps $portname $deptypes $portdeps] } @@ -1420,7 +1420,7 @@ global targets target_state_fd portname portversion portrevision portvariants ports_dryrun user_options errorisprivileges set dlist $targets set errorisprivileges "no" - + # the statefile will likely be autocleaned away after install, # so special-case ignore already-completed install and activate if {[registry_exists $portname $portversion $portrevision $portvariants]} { @@ -1443,11 +1443,11 @@ return 0 } } - + # Select the subset of targets under $target if {$target != ""} { set matches [dlist_search $dlist provides $target] - + if {[llength $matches] > 0} { set dlist [dlist_append_dependents $dlist [lindex $matches 0] [list]] # Special-case 'all' @@ -1456,9 +1456,9 @@ return 1 } } - + set dlist [dlist_eval $dlist "" target_run] - + if {[llength $dlist] > 0} { # somebody broke! set errstring "Warning: the following items did not execute (for $portname):" @@ -1470,13 +1470,13 @@ } else { set result 0 } - + # start gsoc08-privileges if { $result == 1 && $errorisprivileges == "yes" } { - set result 2 + set result 2 } # end gsoc08-privileges - + return $result } @@ -1485,79 +1485,79 @@ proc open_statefile {args} { global workpath worksymlink place_worksymlink portname portpath ports_ignore_older global altprefix usealtworkpath env applications_dir portbuildpath distpath - - # start gsoc08-privileges - # de-escalate privileges - only run if MacPorts was started with sudo - dropPrivileges - + # start gsoc08-privileges + + # de-escalate privileges - only run if MacPorts was started with sudo + dropPrivileges + if { ![file exists $workpath] } { if {[catch {set result [file mkdir $workpath]} result]} { global errorInfo ui_debug "mkdir $workpath: $errorInfo" } } - - # if unable to write to workpath, implies running without either root privileges + + # if unable to write to workpath, implies running without either root privileges # or a shared directory owned by the group so use ~/.macports if { ![file writable $workpath] } { - - set userid [getuid] - set username [uid_to_name $userid] - if { $userid !=0 } { - ui_msg "MacPorts running without privileges.\ - You may be prompted for your sudo password in order to complete certain actions (eg install)." - } - - # set global variable indicating to other functions to use ~/.macports as well - set usealtworkpath yes - - # do tilde expansion manually - tcl won't expand tildes automatically for curl, etc. - if {[info exists env(HOME)]} { - # HOME environment var is set, use it. - set userhome "$env(HOME)" - } else { - # the environment var isn't set, expand ~user instead - set userhome [file normalize "~${username}"] - } - - # set alternative prefix global variables - set altprefix "$userhome/.macports" - - # get alternative paths - set newworkpath "$altprefix$workpath" - set newworksymlink "$altprefix$worksymlink" - set newportbuildpath "$altprefix$portbuildpath" - set newdistpath "$altprefix$distpath" - - set sourcepath [string map {"work" ""} $worksymlink] - set newsourcepath "$altprefix/[ string range $sourcepath 1 end ]" + set userid [getuid] + set username [uid_to_name $userid] - # copy Portfile (and patch files) if not there already - # note to maintainers/devs: the original portfile in /opt/local is ALWAYS the one that will be - # read by macports. The copying of the portfile is done to preserve the symlink provided - # historically by macports from the portfile directory to the work directory. - # It is NOT read by MacPorts. - if {![file exists ${newsourcepath}Portfile] } { - file mkdir $newsourcepath - ui_debug "$newsourcepath created" - ui_debug "Going to copy: ${sourcepath}Portfile" - file copy ${sourcepath}Portfile $newsourcepath - if {[file exists ${sourcepath}files] } { - ui_debug "Going to copy: ${sourcepath}files" - file copy ${sourcepath}files $newsourcepath - } - } - - set workpath $newworkpath - set worksymlink $newworksymlink - set portbuildpath $newportbuildpath - set distpath $newdistpath - - ui_debug "Going to use $newworkpath for statefile." + if { $userid !=0 } { + ui_msg "MacPorts running without privileges.\ + You may be prompted for your sudo password in order to complete certain actions (eg install)." + } + + # set global variable indicating to other functions to use ~/.macports as well + set usealtworkpath yes + + # do tilde expansion manually - tcl won't expand tildes automatically for curl, etc. + if {[info exists env(HOME)]} { + # HOME environment var is set, use it. + set userhome "$env(HOME)" + } else { + # the environment var isn't set, expand ~user instead + set userhome [file normalize "~${username}"] + } + + # set alternative prefix global variables + set altprefix "$userhome/.macports" + + # get alternative paths + set newworkpath "$altprefix$workpath" + set newworksymlink "$altprefix$worksymlink" + set newportbuildpath "$altprefix$portbuildpath" + set newdistpath "$altprefix$distpath" + + set sourcepath [string map {"work" ""} $worksymlink] + set newsourcepath "$altprefix/[ string range $sourcepath 1 end ]" + + # copy Portfile (and patch files) if not there already + # note to maintainers/devs: the original portfile in /opt/local is ALWAYS the one that will be + # read by macports. The copying of the portfile is done to preserve the symlink provided + # historically by macports from the portfile directory to the work directory. + # It is NOT read by MacPorts. + if {![file exists ${newsourcepath}Portfile] } { + file mkdir $newsourcepath + ui_debug "$newsourcepath created" + ui_debug "Going to copy: ${sourcepath}Portfile" + file copy ${sourcepath}Portfile $newsourcepath + if {[file exists ${sourcepath}files] } { + ui_debug "Going to copy: ${sourcepath}files" + file copy ${sourcepath}files $newsourcepath + } + } + + set workpath $newworkpath + set worksymlink $newworksymlink + set portbuildpath $newportbuildpath + set distpath $newdistpath + + ui_debug "Going to use $newworkpath for statefile." } else { - set usealtworkpath no + set usealtworkpath no } # end gsoc08-privileges @@ -1578,12 +1578,12 @@ } } - # Create a symlink to the workpath for port authors + # Create a symlink to the workpath for port authors if {[tbool place_worksymlink] && ![file isdirectory $worksymlink]} { ui_debug "Attempting ln -sf $workpath $worksymlink" ln -sf $workpath $worksymlink } - + set fd [open $statefile a+] if {[catch {flock $fd -exclusive -noblock} result]} { if {"$result" == "EAGAIN"} { @@ -1626,14 +1626,14 @@ # Check that recorded selection of variants match the current selection proc check_statefile_variants {variations fd} { upvar $variations upvariations - + seek $fd 0 while {[gets $fd line] >= 0} { if {[regexp "variant: (.*)" $line match name]} { set oldvariations([string range $name 1 end]) [string range $name 0 0] } } - + set mismatch 0 if {[array size oldvariations] > 0} { if {[array size oldvariations] != [array size upvariations]} { @@ -1647,7 +1647,7 @@ } } } - + return $mismatch } @@ -1657,9 +1657,9 @@ # will be chosen. Returns a list of the selected variants. proc choose_variants {dlist variations} { upvar $variations upvariations - + set selected [list] - + foreach ditem $dlist { # Enumerate through the provides, tallying the pros and cons. set pros 0 @@ -1676,9 +1676,9 @@ incr ignored } } - + if {$cons > 0} { continue } - + if {$pros > 0 && $ignored == 0} { lappend selected $ditem } @@ -1689,7 +1689,7 @@ proc variant_run {ditem} { set name [ditem_key $ditem name] ui_debug "Executing variant $name provides [ditem_key $ditem provides]" - + # test for conflicting variants foreach v [ditem_key $ditem conflicts] { if {[variant_isset $v]} { @@ -1697,7 +1697,7 @@ return 1 } } - + # execute proc with same name as variant. if {[catch "variant-${name}" result]} { global errorInfo @@ -1709,7 +1709,7 @@ } # Given a list of variant specifications, return a canonical string form -# for the registry. +# for the registry. # The strategy is as follows: regardless of how some collection of variants # was turned on or off, a particular instance of the port is uniquely # characterized by the set of variants that are *on*. Thus, record those @@ -1739,11 +1739,11 @@ set chosen [choose_variants $dlist upvariations] set portname $PortInfo(name) - # Check to make sure the requested variations are available with this - # port, if one is not, warn the user and remove the variant from the + # Check to make sure the requested variations are available with this + # port, if one is not, warn the user and remove the variant from the # array. foreach key [array names upvariations *] { - if {![info exists PortInfo(variants)] || + if {![info exists PortInfo(variants)] || [lsearch $PortInfo(variants) $key] == -1} { ui_debug "Requested variant $key is not provided by port $portname." array unset upvariations $key @@ -1755,12 +1755,12 @@ #foreach obj $dlist { # $obj set provides [list [join [$obj get provides] -]] #} - + set newlist [list] foreach variant $chosen { set newlist [dlist_append_dependents $dlist $variant $newlist] } - + set dlist [dlist_eval $newlist "" variant_run] if {[llength $dlist] > 0} { return 1 @@ -1812,7 +1812,7 @@ upvar $variations upvariations set result 0 set portname $PortInfo(name) - + # Make sure the variations match those stored in the statefile. # If they don't match, print an error indicating a 'port clean' # should be performed. @@ -1832,9 +1832,9 @@ } if { $statereq && !([info exists ports_force] && $ports_force == "yes")} { - + set state_fd [open_statefile] - + if {[check_statefile_variants upvariations $state_fd]} { ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option." set result 1 @@ -1844,15 +1844,15 @@ write_statefile variant $upvariations($key)$key $state_fd } } - + close $state_fd } - + return $result } proc default_universal_variant_allowed {args} { - + if {[variant_exists universal]} { ui_debug "universal variant already exists, so not adding the default one" return no @@ -1898,12 +1898,12 @@ proc target_new {name procedure} { global targets set ditem [ditem_create] - + ditem_key $ditem name $name ditem_key $ditem procedure $procedure - + lappend targets $ditem - + return $ditem } @@ -2055,13 +2055,13 @@ } else { set options(workpath) ${newworkpath} } - + set res [mport_lookup $portname] if {[llength $res] < 2} { ui_error "Dependency $portname not found" return -1 } - + array set portinfo [lindex $res 1] set porturl $portinfo(porturl) if {[catch {set worker [mport_open $porturl [array get options] $variations]} result]} { @@ -2078,7 +2078,7 @@ return -1 } mport_close $worker - + return 0 } @@ -2096,17 +2096,17 @@ set realname ${name} set home /dev/null set shell /dev/null - + foreach arg $args { if {[regexp {([a-z]*)=(.*)} $arg match key val]} { set $key $val } } - + if {[existsuser ${name}] != 0 || [existsuser ${uid}] != 0} { return } - + if {${os.platform} eq "darwin"} { exec dscl . -create /Users/${name} Password ${passwd} exec dscl . -create /Users/${name} UniqueID ${uid} @@ -2127,17 +2127,17 @@ set realname ${name} set passwd {*} set users "" - + foreach arg $args { if {[regexp {([a-z]*)=(.*)} $arg match key val]} { set $key $val } } - + if {[existsgroup ${name}] != 0 || [existsgroup ${gid}] != 0} { return } - + if {${os.platform} eq "darwin"} { exec dscl . -create /Groups/${name} Password ${passwd} exec dscl . -create /Groups/${name} RealName ${realname} @@ -2173,12 +2173,12 @@ # returns an error code if it can not be found proc binaryInPath {binary} { global env - foreach dir [split $env(PATH) :] { + foreach dir [split $env(PATH) :] { if {[file executable [file join $dir $binary]]} { return [file join $dir $binary] } } - + return -code error [format [msgcat::mc "Failed to locate '%s' in path: '%s'"] $binary $env(PATH)]; } @@ -2298,7 +2298,7 @@ # private function # merge_file base-path target-path relative-path architectures # e.g. 'merge_file ${workpath}/pre-dest ${destroot} ${prefix}/share/man/man1/port.1 i386 ppc -# will test equivalence of files and copy them if they are the same (for the different architectures) +# will test equivalence of files and copy them if they are the same (for the different architectures) proc merge_file {base target file archs} { set basearch [lindex ${archs} 0] ui_debug "ba: '${basearch}' ('${archs}')" @@ -2379,14 +2379,14 @@ # @param path the file/directory to be chowned # @param user the user to chown file to proc chown {path user} { - lchown $path $user - + lchown $path $user + if {[file isdirectory $path]} { - fs-traverse myfile ${path} { - lchown $myfile $user - } + fs-traverse myfile ${path} { + lchown $myfile $user + } } - + } ## @@ -2396,18 +2396,18 @@ proc chownAsRoot {path} { global euid macportsuser - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - seteuid $euid - ui_debug "euid changed to: [geteuid]" - chown ${path} ${macportsuser} - ui_debug "chowned $path to $macportsuser" - seteuid [name_to_uid "$macportsuser"] - ui_debug "euid changed to: [geteuid]" - } elseif { [getuid] == 0 } { - # if started with sudo but have elevated back to root already - chown ${path} ${macportsuser} - } + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + seteuid $euid + ui_debug "euid changed to: [geteuid]" + chown ${path} ${macportsuser} + ui_debug "chowned $path to $macportsuser" + seteuid [name_to_uid "$macportsuser"] + ui_debug "euid changed to: [geteuid]" + } elseif { [getuid] == 0 } { + # if started with sudo but have elevated back to root already + chown ${path} ${macportsuser} + } } ## @@ -2415,51 +2415,51 @@ # # @param action the action for which privileges are being elevated proc elevateToRoot {action} { - global euid egid macportsuser errorisprivileges - - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root." - setegid $egid - seteuid $euid - ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." - } - - if { [getuid] != 0 } { - set errorisprivileges yes - return -code error "port requires root privileges for this action and needs you to type your password for sudo."; - } + global euid egid macportsuser errorisprivileges + + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root." + setegid $egid + seteuid $euid + ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." + } + + if { [getuid] != 0 } { + set errorisprivileges yes + return -code error "port requires root privileges for this action and needs you to type your password for sudo."; + } } ## # de-escalate privileges from root to those of $macportsuser. # proc dropPrivileges {} { - global euid egid macportsuser workpath - if { [geteuid] == 0 } { - if { [catch { - set euid [geteuid] - set egid [getegid] - ui_debug "changing euid/egid - current euid: $euid - current egid: $egid" - - #seteuid [name_to_uid [file attributes $workpath -owner]] - #setegid [name_to_gid [file attributes $workpath -group]] - - setegid [name_to_gid "$macportsuser"] - seteuid [name_to_uid "$macportsuser"] - ui_debug "egid changed to: [getegid]" - ui_debug "euid changed to: [geteuid]" - - if {![file writable $workpath]} { - ui_debug "Privileges successfully de-escalated. Unable to write to default workpath." - } - }] - } { - ui_debug "$::errorInfo" - ui_error "Failed to de-escalate privileges." - } - } else { - ui_debug "Privilege de-escalation not attempted as not running as root." - } + global euid egid macportsuser workpath + if { [geteuid] == 0 } { + if { [catch { + set euid [geteuid] + set egid [getegid] + ui_debug "changing euid/egid - current euid: $euid - current egid: $egid" + + #seteuid [name_to_uid [file attributes $workpath -owner]] + #setegid [name_to_gid [file attributes $workpath -group]] + + setegid [name_to_gid "$macportsuser"] + seteuid [name_to_uid "$macportsuser"] + ui_debug "egid changed to: [getegid]" + ui_debug "euid changed to: [geteuid]" + + if {![file writable $workpath]} { + ui_debug "Privileges successfully de-escalated. Unable to write to default workpath." + } + }] + } { + ui_debug "$::errorInfo" + ui_error "Failed to de-escalate privileges." + } + } else { + ui_debug "Privilege de-escalation not attempted as not running as root." + } } -------------- next part -------------- An HTML attachment was scrubbed... URL: From blb at macports.org Sun May 3 23:22:28 2009 From: blb at macports.org (blb at macports.org) Date: Sun, 3 May 2009 23:22:28 -0700 (PDT) Subject: [50563] branches/images-and-archives/base Message-ID: <20090504062229.44854170839C@beta.macosforge.org> Revision: 50563 http://trac.macports.org/changeset/50563 Author: blb at macports.org Date: 2009-05-03 23:22:25 -0700 (Sun, 03 May 2009) Log Message: ----------- Merge from trunk Modified Paths: -------------- branches/images-and-archives/base/portmgr/bots/trac.rb branches/images-and-archives/base/src/macports1.0/macports.tcl branches/images-and-archives/base/src/package1.0/portarchive.tcl branches/images-and-archives/base/src/package1.0/portmpkg.tcl branches/images-and-archives/base/src/package1.0/portunarchive.tcl branches/images-and-archives/base/src/port/port.tcl branches/images-and-archives/base/src/port1.0/portbuild.tcl branches/images-and-archives/base/src/port1.0/portchecksum.tcl branches/images-and-archives/base/src/port1.0/portclean.tcl branches/images-and-archives/base/src/port1.0/portconfigure.tcl branches/images-and-archives/base/src/port1.0/portdepends.tcl branches/images-and-archives/base/src/port1.0/portdestroot.tcl branches/images-and-archives/base/src/port1.0/portdistcheck.tcl branches/images-and-archives/base/src/port1.0/portextract.tcl branches/images-and-archives/base/src/port1.0/portfetch.tcl branches/images-and-archives/base/src/port1.0/portlivecheck.tcl branches/images-and-archives/base/src/port1.0/portmirror.tcl branches/images-and-archives/base/src/port1.0/portpatch.tcl branches/images-and-archives/base/src/port1.0/portsubmit.tcl branches/images-and-archives/base/src/port1.0/porttest.tcl branches/images-and-archives/base/src/port1.0/porttrace.tcl branches/images-and-archives/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/images-and-archives/base/ Property changes on: branches/images-and-archives/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:50249-50379 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:50249-50562 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: branches/images-and-archives/base/portmgr/bots/trac.rb =================================================================== --- branches/images-and-archives/base/portmgr/bots/trac.rb 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/portmgr/bots/trac.rb 2009-05-04 06:22:25 UTC (rev 50563) @@ -48,9 +48,14 @@ end end + def team(m, params) + m.reply "http://trac.macports.org/wiki/MacPortsDevelopers" + end + end plugin = TracPlugin.new plugin.map 'ticket :number', :action => 'ticket' -plugin.map 'faq :parm', :action => 'faq' -plugin.map 'guide :parm', :action => 'guide' \ No newline at end of file +plugin.map 'faq :parm', :action => 'faq', :defaults => {:parm => ""} +plugin.map 'guide :parm', :action => 'guide', :defaults => {:parm => ""} +plugin.map 'team', :action => 'team' \ No newline at end of file Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl =================================================================== --- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -2108,9 +2108,9 @@ proc macports::upgrade {portname dspec globalvarlist variationslist optionslist {depscachename ""}} { array set options $optionslist - # Note $variationslist is left alone and so retains the original + # Note $variationslist is left alone and so retains the original # requested variations, which should be passed to recursive calls to - # upgrade; while variations gets existing variants and global variations + # upgrade; while variations gets existing variants and global variations # merged in later on, so it applies only to this port's upgrade array set variations $variationslist @@ -2118,8 +2118,6 @@ upvar $depscachename depscache } - # set to 1 if epoch overrides version - set epoch_override 0 # Is this a dry run? set is_dryrun no if {[info exists options(ports_dryrun)] && $options(ports_dryrun) eq "yes"} { @@ -2161,22 +2159,22 @@ if {![info exists porturl]} { set porturl file://./ } - # Merge the global variations into the specified - foreach { variation value } $globalvarlist { - if { ![info exists variations($variation)] } { - set variations($variation) $value - } - } - - if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { + # Merge the global variations into the specified + foreach { variation value } $globalvarlist { + if { ![info exists variations($variation)] } { + set variations($variation) $value + } + } + + if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { global errorInfo ui_debug "$errorInfo" ui_error "Unable to open port: $result" return 1 } - # While we're at it, update the portinfo - array unset portinfo - array set portinfo [mportinfo $workername] + # While we're at it, update the portinfo + array unset portinfo + array set portinfo [mportinfo $workername] if {![_mportispresent $workername $dspec ] } { # upgrade its dependencies first @@ -2189,8 +2187,8 @@ return 1 } if {$result > 0} { - ui_error "Problem while installing $portname" - return $result + ui_error "Problem while installing $portname" + return $result } # we just installed it, so mark it done in the cache # and update ilist @@ -2254,65 +2252,65 @@ ui_debug "no version of $portname is active" } - # save existing variant for later use - if {$anyactive} { - set oldvariant $variant_active - } else { - set oldvariant $variant_installed - } + # save existing variant for later use + if {$anyactive} { + set oldvariant $variant_active + } else { + set oldvariant $variant_installed + } - # Before we do - # dependencies, we need to figure out the final variants, - # open the port, and update the portinfo. + # Before we do + # dependencies, we need to figure out the final variants, + # open the port, and update the portinfo. - set porturl $portinfo(porturl) - if {![info exists porturl]} { - set porturl file://./ - } + set porturl $portinfo(porturl) + if {![info exists porturl]} { + set porturl file://./ + } - # check if the variants is present in $version_in_tree - set variant [split $oldvariant +] - ui_debug "Merging existing variants $variant into variants" - if {[info exists portinfo(variants)]} { - set avariants $portinfo(variants) - } else { - set avariants {} - } - ui_debug "available variants are : $avariants" - foreach v $variant { - if {[lsearch $avariants $v] == -1} { - } else { - ui_debug "variant $v is present in $portname $version_in_tree" - if { ![info exists variations($v)]} { - set variations($v) "+" - } - } - } + # check if the variants is present in $version_in_tree + set variant [split $oldvariant +] + ui_debug "Merging existing variants $variant into variants" + if {[info exists portinfo(variants)]} { + set avariants $portinfo(variants) + } else { + set avariants {} + } + ui_debug "available variants are : $avariants" + foreach v $variant { + if {[lsearch $avariants $v] == -1} { + } else { + ui_debug "variant $v is present in $portname $version_in_tree" + if { ![info exists variations($v)]} { + set variations($v) "+" + } + } + } - # Now merge in the global (i.e. variants.conf) variations. - # We wait until now so that existing variants for this port - # override global variations - foreach { variation value } $globalvarlist { - if { ![info exists variations($variation)] } { - set variations($variation) $value - } - } + # Now merge in the global (i.e. variants.conf) variations. + # We wait until now so that existing variants for this port + # override global variations + foreach { variation value } $globalvarlist { + if { ![info exists variations($variation)] } { + set variations($variation) $value + } + } - ui_debug "new fully merged portvariants: [array get variations]" + ui_debug "new fully merged portvariants: [array get variations]" - if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { - global errorInfo - ui_debug "$errorInfo" - ui_error "Unable to open port: $result" - return 1 - } + if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result]} { + global errorInfo + ui_debug "$errorInfo" + ui_error "Unable to open port: $result" + return 1 + } - array unset portinfo - array set portinfo [mportinfo $workername] - set portwasopened 1 - set version_in_tree "$portinfo(version)" - set revision_in_tree "$portinfo(revision)" - set epoch_in_tree "$portinfo(epoch)" + array unset portinfo + array set portinfo [mportinfo $workername] + set portwasopened 1 + set version_in_tree "$portinfo(version)" + set revision_in_tree "$portinfo(revision)" + set epoch_in_tree "$portinfo(epoch)" # first upgrade dependencies @@ -2322,6 +2320,7 @@ ui_debug "Not following dependencies" } + set epoch_override 0 # check installed version against version in ports if { ( [rpm-vercomp $version_installed $version_in_tree] > 0 || ([rpm-vercomp $version_installed $version_in_tree] == 0 @@ -2353,25 +2352,28 @@ return 0 } else { + set epoch_override 1 ui_debug "epoch override ... upgrading!" - set epoch_override 1 } } - # install version_in_tree + # build or unarchive version_in_tree set upgrade_action "archive" - if {[catch {set result [mportexec $workername $upgrade_action]} result] || $result != 0} { - global errorInfo - ui_debug "$errorInfo" - ui_error "Unable to upgrade port: $result" - return 1 + # avoid building again unnecessarily + if {[info exists options(ports_force)] || $epoch_override == 1 + || ![registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { + if {[catch {set result [mportexec $workername $upgrade_action]} result] || $result != 0} { + global errorInfo + ui_debug "$errorInfo" + ui_error "Unable to upgrade port: $result" + return 1 + } } # are we installing an existing version due to force or epoch override? - if {([info exists options(ports_force)] || $epoch_override == 1) - && [registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { + if {[registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} { ui_debug "Uninstalling $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants)" # we have to force the uninstall in case of dependents set force_cur [info exists options(ports_force)] Modified: branches/images-and-archives/base/src/package1.0/portarchive.tcl =================================================================== --- branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/package1.0/portarchive.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -37,7 +37,7 @@ set org.macports.archive [target_new org.macports.archive portarchive::archive_main] target_init ${org.macports.archive} portarchive::archive_init target_provides ${org.macports.archive} archive -target_requires ${org.macports.archive} main fetch extract checksum patch configure build destroot +target_requires ${org.macports.archive} main unarchive fetch extract checksum patch configure build destroot target_prerun ${org.macports.archive} portarchive::archive_start target_postrun ${org.macports.archive} portarchive::archive_finish @@ -102,15 +102,24 @@ set skipped 1 } else { set unsupported 0 + set any_missing no foreach archive.type [option portarchivetype] { if {[catch {archiveTypeIsSupported ${archive.type}} errmsg] == 0} { set archive.file "${portname}-${portversion}_${portrevision}${portvariants}.[option os.arch].${archive.type}" set archive.path "[file join ${archive.fulldestpath} ${archive.file}]" + if {![file exists ${archive.path}]} { + set any_missing yes + } } else { ui_debug "Skipping [string toupper ${archive.type}] archive: $errmsg" set unsupported [expr $unsupported + 1] } } + if {!$any_missing} { + # might be nice to allow forcing, but let's fix #16061 first + ui_debug "Skipping archive ($portname) since archive(s) already exist" + set skipped 1 + } if {${archive.type} == "xpkg"} { set archive.meta true } Modified: branches/images-and-archives/base/src/package1.0/portmpkg.tcl =================================================================== --- branches/images-and-archives/base/src/package1.0/portmpkg.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/package1.0/portmpkg.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -60,7 +60,7 @@ if {[catch {set res [mport_lookup $portname]} error]} { global errorInfo ui_debug "$errorInfo" - ui_error "port search failed: $error" + ui_error "port lookup failed: $error" return 1 } foreach {name array} $res { @@ -94,7 +94,7 @@ if {[catch {set res [mport_lookup $portname]} result]} { global errorInfo ui_debug "$errorInfo" - ui_error "port search failed: $result" + ui_error "port lookup failed: $result" return 1 } foreach {name array} $res { Modified: branches/images-and-archives/base/src/package1.0/portunarchive.tcl =================================================================== --- branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/package1.0/portunarchive.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -303,9 +303,6 @@ # Update the state from unpacked archive version set target_state_fd [open_statefile] - - # Archive unpacked, skip archive target - write_statefile target "org.macports.archive" $target_state_fd # Cleanup all control files when finished set control_files [glob -nocomplain -types f [file join $destpath +*]] Modified: branches/images-and-archives/base/src/port/port.tcl =================================================================== --- branches/images-and-archives/base/src/port/port.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port/port.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -369,9 +369,9 @@ } uplevel 1 $block if {[file exists $savedir]} { - cd $savedir + cd $savedir } else { - cd ~ + cd ~ } } } @@ -1336,15 +1336,15 @@ return 0 } - if {[file exists $helpfile]} { - if {[catch {source $helpfile} err]} { - puts stderr "Error reading helpfile $helpfile: $err" - return 1 - } + if {[file exists $helpfile]} { + if {[catch {source $helpfile} err]} { + puts stderr "Error reading helpfile $helpfile: $err" + return 1 + } } else { - puts stderr "Unable to open help file $helpfile" - return 1 - } + puts stderr "Unable to open help file $helpfile" + return 1 + } foreach topic $portlist { if {![info exists porthelp($topic)]} { @@ -2076,14 +2076,14 @@ global errorInfo ui_debug "$errorInfo" - # start gsoc08-privileges - if { [string first "permission denied" $result] != -1 } { - set result "port requires root privileges for this action and needs you to execute 'sudo port uninstall $portname' to continue." - #ui_msg [exec sudo port uninstall $portname] - # The above line is what should be here to let the user simply enter his/her password to uninstall as root. - # However, for some as yet unknown reason, executing it here will not work. - } - # end gsoc08-privileges + # start gsoc08-privileges + if { [string first "permission denied" $result] != -1 } { + set result "port requires root privileges for this action and needs you to execute 'sudo port uninstall $portname' to continue." + #ui_msg [exec sudo port uninstall $portname] + # The above line is what should be here to let the user simply enter his/her password to uninstall as root. + # However, for some as yet unknown reason, executing it here will not work. + } + # end gsoc08-privileges break_softcontinue "port uninstall failed: $result" 1 status } @@ -2846,23 +2846,23 @@ mportclose $workername # start gsoc08-privileges - if { [geteuid] != 0 && $result == 2} { - # mportexec will return an error result code 2 if eval_targets fails due to insufficient privileges. + if { [geteuid] != 0 && $result == 2} { + # mportexec will return an error result code 2 if eval_targets fails due to insufficient privileges. - set portbinary "${macports::prefix}/bin/port" - - ui_info "Attempting port action with 'sudo port': 'sudo $portbinary $target $portname'." - set result 0 - if {[catch {set sudomsgs [exec sudo $portbinary $target $portname]} sudomsgs]} { - global errorInfo - ui_debug "$errorInfo" - break_softcontinue "Unable to execute port: $errorInfo" 1 status - } - - ui_msg $sudomsgs - ui_debug "'sudo $portbinary $target $portname' has completed." - } - # end gsoc08-privileges + set portbinary "${macports::prefix}/bin/port" + + ui_info "Attempting port action with 'sudo port': 'sudo $portbinary $target $portname'." + set result 0 + if {[catch {set sudomsgs [exec sudo $portbinary $target $portname]} sudomsgs]} { + global errorInfo + ui_debug "$errorInfo" + break_softcontinue "Unable to execute port: $errorInfo" 1 status + } + + ui_msg $sudomsgs + ui_debug "'sudo $portbinary $target $portname' has completed." + } + # end gsoc08-privileges # Process any error that wasn't thrown and handled already if {$result} { Modified: branches/images-and-archives/base/src/port1.0/portbuild.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portbuild.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portbuild.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -86,11 +86,11 @@ pbx { set pbxbuild "pbxbuild" set xcodebuild "xcodebuild" - + if {[option os.platform] != "darwin"} { return -code error "[format [msgcat::mc "This port requires 'pbxbuild/xcodebuild', which is not available on %s."] [option os.platform]]" } - + if {[catch {set xcodebuild [binaryInPath $xcodebuild]}] == 0} { return $xcodebuild } elseif {[catch {set pbxbuild [binaryInPath $pbxbuild]}] == 0} { @@ -141,16 +141,16 @@ proc portbuild::build_start {args} { global UI_PREFIX build.asroot - + ui_msg "$UI_PREFIX [format [msgcat::mc "Building %s"] [option portname]]" - + # start gsoc08-privileges if { [tbool build.asroot] } { - # if port is marked as needing root - elevateToRoot "build" - } - # end gsoc08-privileges - + # if port is marked as needing root + elevateToRoot "build" + } + # end gsoc08-privileges + } proc portbuild::build_main {args} { Modified: branches/images-and-archives/base/src/port1.0/portchecksum.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portchecksum.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portchecksum.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -61,8 +61,8 @@ # global array checksums_array. # # There are two formats: -# type value [type value [type value]] for a single file -# file1 type value [type value [type value]] [file2 ...] for multiple files. +# type value [type value [type value]] for a single file +# file1 type value [type value [type value]] [file2 ...] for multiple files. # # Portfile is in format #1 if: # (1) There is only one distfile. @@ -72,77 +72,77 @@ # # return yes if the syntax was correct, no if there was a problem. proc portchecksum::parse_checksums {checksums_str} { - global checksums_array all_dist_files checksum_types checksum_types_count + global checksums_array all_dist_files checksum_types checksum_types_count - # Parse the string of checksums. - set nb_checksum [llength $checksums_str] + # Parse the string of checksums. + set nb_checksum [llength $checksums_str] - if {[llength $all_dist_files] == 1 - && [expr $nb_checksum % 2] == 0 - && [expr $nb_checksum / 2] <= $checksum_types_count - && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} { - # Convert to format #2 - set checksums_str [linsert $checksums_str 0 $all_dist_files] - # We increased the size. - incr nb_checksum - } - - # Create the array with the checksums. - array set checksums_array {} - - set result yes - - # Catch out of bounds errors (they're syntax errors). - if {[catch { - # Parse the string as if it was in format #2. - for {set ix_checksum 0} {$ix_checksum < $nb_checksum} {incr ix_checksum} { - # first word is the file. - set checksum_filename [lindex $checksums_str $ix_checksum] - - # retrieve the list of values we already know for this file. - set checksum_values {} - if {[info exists checksums_array($checksum_filename)]} { - set checksum_values $checksums_array($checksum_filename) - } - - # append the new value - incr ix_checksum - while {1} { - set checksum_type [lindex $checksums_str $ix_checksum] - if {[lsearch -exact $checksum_types $checksum_type] >= 0} { - # append the type and the value. - incr ix_checksum - set checksum_value [lindex $checksums_str $ix_checksum] - incr ix_checksum + if {[llength $all_dist_files] == 1 + && [expr $nb_checksum % 2] == 0 + && [expr $nb_checksum / 2] <= $checksum_types_count + && [lsearch -exact $checksum_types [lindex $checksums_str 0]] >= 0} { + # Convert to format #2 + set checksums_str [linsert $checksums_str 0 $all_dist_files] + # We increased the size. + incr nb_checksum + } - lappend checksum_values $checksum_type - lappend checksum_values $checksum_value - } else { - # this wasn't a type but the next dist file. - incr ix_checksum -1 - break - } + # Create the array with the checksums. + array set checksums_array {} - # stop if we exhausted all the items in the list. - if {$ix_checksum == $nb_checksum} { - break - } - } - - # set the values in the array. - set checksums_array($checksum_filename) $checksum_values - } - } error]} { - # An error occurred. - global errorInfo - ui_debug "$errorInfo" - ui_error "Couldn't parse checksum line ($checksums_str) [$error]" - - # Something wrong happened. - set result no - } - - return $result + set result yes + + # Catch out of bounds errors (they're syntax errors). + if {[catch { + # Parse the string as if it was in format #2. + for {set ix_checksum 0} {$ix_checksum < $nb_checksum} {incr ix_checksum} { + # first word is the file. + set checksum_filename [lindex $checksums_str $ix_checksum] + + # retrieve the list of values we already know for this file. + set checksum_values {} + if {[info exists checksums_array($checksum_filename)]} { + set checksum_values $checksums_array($checksum_filename) + } + + # append the new value + incr ix_checksum + while {1} { + set checksum_type [lindex $checksums_str $ix_checksum] + if {[lsearch -exact $checksum_types $checksum_type] >= 0} { + # append the type and the value. + incr ix_checksum + set checksum_value [lindex $checksums_str $ix_checksum] + incr ix_checksum + + lappend checksum_values $checksum_type + lappend checksum_values $checksum_value + } else { + # this wasn't a type but the next dist file. + incr ix_checksum -1 + break + } + + # stop if we exhausted all the items in the list. + if {$ix_checksum == $nb_checksum} { + break + } + } + + # set the values in the array. + set checksums_array($checksum_filename) $checksum_values + } + } error]} { + # An error occurred. + global errorInfo + ui_debug "$errorInfo" + ui_error "Couldn't parse checksum line ($checksums_str) [$error]" + + # Something wrong happened. + set result no + } + + return $result } # calc_md5 @@ -151,7 +151,7 @@ # Return the checksum. # proc portchecksum::calc_md5 {file} { - return [md5 file $file] + return [md5 file $file] } # calc_sha1 @@ -160,7 +160,7 @@ # Return the checksum. # proc portchecksum::calc_sha1 {file} { - return [sha1 file $file] + return [sha1 file $file] } # calc_rmd160 @@ -169,7 +169,7 @@ # Return the checksum. # proc portchecksum::calc_rmd160 {file} { - return [rmd160 file $file] + return [rmd160 file $file] } # checksum_start @@ -177,9 +177,9 @@ # Target prerun procedure; simply prints a message about what we're doing. # proc portchecksum::checksum_start {args} { - global UI_PREFIX + global UI_PREFIX - ui_msg "$UI_PREFIX [format [msgcat::mc "Verifying checksum(s) for %s"] [option portname]]" + ui_msg "$UI_PREFIX [format [msgcat::mc "Verifying checksum(s) for %s"] [option portname]]" } # checksum_main @@ -187,89 +187,89 @@ # Target main procedure. Verifies the checksums of all distfiles. # proc portchecksum::checksum_main {args} { - global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip + global UI_PREFIX all_dist_files checksum_types checksums_array portverbose checksum.skip - # If no files have been downloaded, there is nothing to checksum. - if {![info exists all_dist_files]} { - return 0 - } - - # Completely bypass checksumming if checksum.skip=yes - # This should be considered an extreme measure - if {[tbool checksum.skip]} { - ui_info "$UI_PREFIX Skipping checksum phase" - return 0 - } + # If no files have been downloaded, there is nothing to checksum. + if {![info exists all_dist_files]} { + return 0 + } - # so far, everything went fine. - set fail no - - # Set the list of checksums as the option checksums. - set checksums_str [option checksums] - - # if everything is fine with the syntax, keep on and check the checksum of - # the distfiles. - if {[parse_checksums $checksums_str] == "yes"} { - set distpath [option distpath] - - foreach distfile $all_dist_files { - ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $distfile]" - - # get the full path of the distfile. - set fullpath [file join $distpath $distfile] - - # check that there is at least one checksum for the distfile. - if {![info exists checksums_array($distfile)]} { - ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]" - foreach type $checksum_types { - ui_info "[format [msgcat::mc "Distfile checksum: %s $type %s"] $distfile [calc_$type $fullpath]]" - } - set fail yes - } else { - # retrieve the list of types/values from the array. - set portfile_checksums $checksums_array($distfile) - - # iterate on this list to check the actual values. - foreach {type sum} $portfile_checksums { - set calculated_sum [calc_$type $fullpath] - if {[string equal $sum $calculated_sum]} { - ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]" - } else { - ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]" - ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" - ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]" - - # Raise the failure flag - set fail yes - } - } - } - - } - } else { - # Something went wrong with the syntax. - set fail yes - } + # Completely bypass checksumming if checksum.skip=yes + # This should be considered an extreme measure + if {[tbool checksum.skip]} { + ui_info "$UI_PREFIX Skipping checksum phase" + return 0 + } - if {[tbool fail]} { - - # Show the desired checksum line for easy cut-paste - set sums "" - foreach distfile $all_dist_files { - if {[llength $all_dist_files] > 1} { - lappend sums $distfile - } - - set fullpath [file join $distpath $distfile] - foreach type $checksum_types { - lappend sums [format "%-8s%s" $type [calc_$type $fullpath]] - } - } - ui_info "The correct checksum line may be:" - ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]] - - return -code error "[msgcat::mc "Unable to verify file checksums"]" - } + # so far, everything went fine. + set fail no - return 0 + # Set the list of checksums as the option checksums. + set checksums_str [option checksums] + + # if everything is fine with the syntax, keep on and check the checksum of + # the distfiles. + if {[parse_checksums $checksums_str] == "yes"} { + set distpath [option distpath] + + foreach distfile $all_dist_files { + ui_info "$UI_PREFIX [format [msgcat::mc "Checksumming %s"] $distfile]" + + # get the full path of the distfile. + set fullpath [file join $distpath $distfile] + + # check that there is at least one checksum for the distfile. + if {![info exists checksums_array($distfile)]} { + ui_error "[format [msgcat::mc "No checksum set for %s"] $distfile]" + foreach type $checksum_types { + ui_info "[format [msgcat::mc "Distfile checksum: %s $type %s"] $distfile [calc_$type $fullpath]]" + } + set fail yes + } else { + # retrieve the list of types/values from the array. + set portfile_checksums $checksums_array($distfile) + + # iterate on this list to check the actual values. + foreach {type sum} $portfile_checksums { + set calculated_sum [calc_$type $fullpath] + if {[string equal $sum $calculated_sum]} { + ui_debug "[format [msgcat::mc "Correct (%s) checksum for %s"] $type $distfile]" + } else { + ui_error "[format [msgcat::mc "Checksum (%s) mismatch for %s"] $type $distfile]" + ui_info "[format [msgcat::mc "Portfile checksum: %s %s %s"] $distfile $type $sum]" + ui_info "[format [msgcat::mc "Distfile checksum: %s %s %s"] $distfile $type $calculated_sum]" + + # Raise the failure flag + set fail yes + } + } + } + + } + } else { + # Something went wrong with the syntax. + set fail yes + } + + if {[tbool fail]} { + + # Show the desired checksum line for easy cut-paste + set sums "" + foreach distfile $all_dist_files { + if {[llength $all_dist_files] > 1} { + lappend sums $distfile + } + + set fullpath [file join $distpath $distfile] + foreach type $checksum_types { + lappend sums [format "%-8s%s" $type [calc_$type $fullpath]] + } + } + ui_info "The correct checksum line may be:" + ui_info [format "%-20s%s" "checksums" [join $sums [format " \\\n%-20s" ""]]] + + return -code error "[msgcat::mc "Unable to verify file checksums"]" + } + + return 0 } Modified: branches/images-and-archives/base/src/port1.0/portclean.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portclean.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portclean.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -51,59 +51,59 @@ proc portclean::clean_start {args} { global UI_PREFIX - + ui_msg "$UI_PREFIX [format [msgcat::mc "Cleaning %s"] [option portname]]" } proc portclean::clean_main {args} { global UI_PREFIX - global ports_clean_dist ports_clean_work ports_clean_archive - global ports_clean_all usealtworkpath + global ports_clean_dist ports_clean_work ports_clean_archive + global ports_clean_all usealtworkpath - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_dist] && $ports_clean_dist == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing distfiles for %s"] [option portname]]" - clean_dist - } - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_archive] && $ports_clean_archive == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing archives for %s"] [option portname]]" - clean_archive - } - if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ - [info exists ports_clean_work] && $ports_clean_work == "yes" || \ - (!([info exists ports_clean_dist] && $ports_clean_dist == "yes") && \ - !([info exists ports_clean_archive] && $ports_clean_archive == "yes"))} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing build directory for %s"] [option portname]]" - clean_work - } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_dist] && $ports_clean_dist == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing distfiles for %s"] [option portname]]" + clean_dist + } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_archive] && $ports_clean_archive == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing archives for %s"] [option portname]]" + clean_archive + } + if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \ + [info exists ports_clean_work] && $ports_clean_work == "yes" || \ + (!([info exists ports_clean_dist] && $ports_clean_dist == "yes") && \ + !([info exists ports_clean_archive] && $ports_clean_archive == "yes"))} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing build directory for %s"] [option portname]]" + clean_work + } - # start gsoc-08 privileges - if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { - ui_info "$UI_PREFIX [format [msgcat::mc "Removing alt source directory for %s"] [option portname]]" - clean_altsource - } - # end gsoc-08 privileges - + # start gsoc-08 privileges + if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { + ui_info "$UI_PREFIX [format [msgcat::mc "Removing alt source directory for %s"] [option portname]]" + clean_altsource + } + # end gsoc-08 privileges + return 0 } proc portclean::clean_altsource {args} { global usealtworkpath worksymlink - - set sourcepath [string map {"work" ""} $worksymlink] - if {[file isdirectory $sourcepath]} { - ui_debug "Removing directory: ${sourcepath}" - if {[catch {delete $sourcepath} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - } else { - ui_debug "No alt source directory found to remove." - } + set sourcepath [string map {"work" ""} $worksymlink] - return 0 + if {[file isdirectory $sourcepath]} { + ui_debug "Removing directory: ${sourcepath}" + if {[catch {delete $sourcepath} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + } else { + ui_debug "No alt source directory found to remove." + } + + return 0 } # @@ -111,142 +111,142 @@ # This is crude, but works. # proc portclean::clean_dist {args} { - global ports_force portname distpath dist_subdir distfiles + global ports_force portname distpath dist_subdir distfiles - # remove known distfiles for sure (if they exist) - set count 0 - foreach file $distfiles { - if {[info exist distpath] && [info exists dist_subdir]} { - set distfile [file join $distpath $dist_subdir $file] - } else { - set distfile [file join $distpath $file] - } - if {[file isfile $distfile]} { - ui_debug "Removing file: $distfile" - if {[catch {delete $distfile} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - if {$count > 0} { - ui_debug "$count distfile(s) removed." - } else { - ui_debug "No distfiles found to remove at $distpath" - } + # remove known distfiles for sure (if they exist) + set count 0 + foreach file $distfiles { + if {[info exist distpath] && [info exists dist_subdir]} { + set distfile [file join $distpath $dist_subdir $file] + } else { + set distfile [file join $distpath $file] + } + if {[file isfile $distfile]} { + ui_debug "Removing file: $distfile" + if {[catch {delete $distfile} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + if {$count > 0} { + ui_debug "$count distfile(s) removed." + } else { + ui_debug "No distfiles found to remove at $distpath" + } - # next remove dist_subdir if only needed for this port, - # or if user forces us to - set dirlist [list] - if {($dist_subdir != $portname)} { - if {[info exists dist_subdir]} { - set distfullpath [file join $distpath $dist_subdir] - if {!([info exists ports_force] && $ports_force == "yes") - && [file isdirectory $distfullpath] - && [llength [readdir $distfullpath]] > 0} { - ui_warn [format [msgcat::mc "Distfiles directory '%s' may contain distfiles needed for other ports, use the -f flag to force removal" ] [file join $distpath $dist_subdir]] - } else { - lappend dirlist $dist_subdir - lappend dirlist $portname - } - } else { - lappend dirlist $portname - } - } else { - lappend dirlist $portname - } - # loop through directories - set count 0 - foreach dir $dirlist { - set distdir [file join $distpath $dir] - if {[file isdirectory $distdir]} { - ui_debug "Removing directory: ${distdir}" - if {[catch {delete $distdir} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - if {$count > 0} { - ui_debug "$count distfile directory(s) removed." - } else { - ui_debug "No distfile directory found to remove." - } - return 0 + # next remove dist_subdir if only needed for this port, + # or if user forces us to + set dirlist [list] + if {($dist_subdir != $portname)} { + if {[info exists dist_subdir]} { + set distfullpath [file join $distpath $dist_subdir] + if {!([info exists ports_force] && $ports_force == "yes") + && [file isdirectory $distfullpath] + && [llength [readdir $distfullpath]] > 0} { + ui_warn [format [msgcat::mc "Distfiles directory '%s' may contain distfiles needed for other ports, use the -f flag to force removal" ] [file join $distpath $dist_subdir]] + } else { + lappend dirlist $dist_subdir + lappend dirlist $portname + } + } else { + lappend dirlist $portname + } + } else { + lappend dirlist $portname + } + # loop through directories + set count 0 + foreach dir $dirlist { + set distdir [file join $distpath $dir] + if {[file isdirectory $distdir]} { + ui_debug "Removing directory: ${distdir}" + if {[catch {delete $distdir} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + if {$count > 0} { + ui_debug "$count distfile directory(s) removed." + } else { + ui_debug "No distfile directory found to remove." + } + return 0 } proc portclean::clean_work {args} { global portbuildpath worksymlink - if {[file isdirectory $portbuildpath]} { - ui_debug "Removing directory: ${portbuildpath}" - if {[catch {delete $portbuildpath} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - } else { - ui_debug "No work directory found to remove at ${portbuildpath}" - } + if {[file isdirectory $portbuildpath]} { + ui_debug "Removing directory: ${portbuildpath}" + if {[catch {delete $portbuildpath} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + } else { + ui_debug "No work directory found to remove at ${portbuildpath}" + } - # Clean symlink, if necessary - if {![catch {file type $worksymlink} result] && $result eq "link"} { - ui_debug "Removing symlink: $worksymlink" - delete $worksymlink - } + # Clean symlink, if necessary + if {![catch {file type $worksymlink} result] && $result eq "link"} { + ui_debug "Removing symlink: $worksymlink" + delete $worksymlink + } - return 0 + return 0 } proc portclean::clean_archive {args} { - global workpath portarchivepath portname portversion ports_version_glob + global workpath portarchivepath portname portversion ports_version_glob - # Define archive destination directory and target filename - if {$portarchivepath ne $workpath && $portarchivepath ne ""} { - set archivepath [file join $portarchivepath [option os.platform] [option os.arch]] - } + # Define archive destination directory and target filename + if {$portarchivepath ne $workpath && $portarchivepath ne ""} { + set archivepath [file join $portarchivepath [option os.platform] [option os.arch]] + } - if {[info exists ports_version_glob]} { - # Match all possible archive variatns that match the version - # glob specified by the user for this OS. - set fileglob "$portname-[option ports_version_glob]*.[option os.arch].*" - } else { - # Match all possible archive variants for the current version on - # this OS. If you want to delete previous versions, use the - # version glob argument to clean. - # - # We do this because if we don't, then ports that match the - # first part of the name (e.g. trying to remove foo-*, it will - # pick up anything foo-bar-* as well, which is undesirable). - set fileglob "$portname-$portversion*.[option os.arch].*" - } + if {[info exists ports_version_glob]} { + # Match all possible archive variatns that match the version + # glob specified by the user for this OS. + set fileglob "$portname-[option ports_version_glob]*.[option os.arch].*" + } else { + # Match all possible archive variants for the current version on + # this OS. If you want to delete previous versions, use the + # version glob argument to clean. + # + # We do this because if we don't, then ports that match the + # first part of the name (e.g. trying to remove foo-*, it will + # pick up anything foo-bar-* as well, which is undesirable). + set fileglob "$portname-$portversion*.[option os.arch].*" + } - # Remove the archive files - set count 0 - if {![catch {set archivelist [glob [file join $archivepath $fileglob]]} result]} { - foreach path $archivelist { - set file [file tail $path] - # Make sure file is truly a port archive file, and not - # and accidental match with some other file that might exist. - if {[regexp "^$portname-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\][option os.arch]\[\.\]\[a-z\]+\$" $file]} { - if {[file isfile $path]} { - ui_debug "Removing archive: $path" - if {[catch {delete $path} result]} { - ui_debug "$::errorInfo" - ui_error "$result" - } - set count [expr $count + 1] - } - } - } - } - if {$count > 0} { - ui_debug "$count archive(s) removed." - } else { - ui_debug "No archives found to remove at $archivepath" - } + # Remove the archive files + set count 0 + if {![catch {set archivelist [glob [file join $archivepath $fileglob]]} result]} { + foreach path $archivelist { + set file [file tail $path] + # Make sure file is truly a port archive file, and not + # and accidental match with some other file that might exist. + if {[regexp "^$portname-\[-_a-zA-Z0-9\.\]+_\[0-9\]*\[+-_a-zA-Z0-9\]*\[\.\][option os.arch]\[\.\]\[a-z\]+\$" $file]} { + if {[file isfile $path]} { + ui_debug "Removing archive: $path" + if {[catch {delete $path} result]} { + ui_debug "$::errorInfo" + ui_error "$result" + } + set count [expr $count + 1] + } + } + } + } + if {$count > 0} { + ui_debug "$count archive(s) removed." + } else { + ui_debug "No archives found to remove at $archivepath" + } - return 0 + return 0 } Modified: branches/images-and-archives/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -181,6 +181,7 @@ gcc-4.0 { set name "Mac OS X gcc 4.0" } gcc-4.2 { set name "Mac OS X gcc 4.2" } llvm-gcc-4.2 { set name "Mac OS X llvm-gcc 4.2" } + clang { set name "Mac OS X clang" } apple-gcc-3.3 { set name "MacPorts Apple gcc 3.3" } apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" } apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" } @@ -191,7 +192,6 @@ macports-gcc-4.2 { set name "MacPorts gcc 4.2" } macports-gcc-4.3 { set name "MacPorts gcc 4.3" } macports-gcc-4.4 { set name "MacPorts gcc 4.4" } - ccc { set name "clang ccc" } default { return -code error "Invalid value for configure.compiler" } } ui_debug "Using compiler '$name'" @@ -342,6 +342,12 @@ cpp { set ret /Developer/usr/llvm-gcc-4.2/bin/llvm-cpp-4.2 } } } + clang { + switch -exact ${type} { + cc { set ret /usr/bin/clang } + objc { set ret /usr/bin/clang } + } + } apple-gcc-3.3 { switch -exact ${type} { cc { set ret ${prefix}/bin/gcc-apple-3.3 } @@ -431,12 +437,6 @@ f90 { set ret ${prefix}/bin/gfortran-mp-4.4 } } } - ccc { - switch -exact ${type} { - cc { set ret /Developer/usr/bin/ccc } - objc { set ret /Developer/usr/bin/ccc } - } - } } return $ret } Modified: branches/images-and-archives/base/src/port1.0/portdepends.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portdepends.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portdepends.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -53,16 +53,16 @@ proc portdepends::validate_depends_options {option action {value ""}} { global targets switch $action { - set { - foreach depspec $value { - # port syntax accepts colon-separated junk that we do not understand yet. - switch -regex $depspec { - ^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {} - ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {} - default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] } - } - } - } + set { + foreach depspec $value { + # port syntax accepts colon-separated junk that we do not understand yet. + switch -regex $depspec { + ^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {} + ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {} + default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] } + } + } + } } } Modified: branches/images-and-archives/base/src/port1.0/portdestroot.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portdestroot.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portdestroot.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -17,7 +17,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -91,43 +91,43 @@ global destroot.umask destroot.asroot macportsuser euid egid usealtworkpath altprefix global applications_dir frameworks_dir variable oldmask - + ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${portname}]" - # start gsoc08-privileges - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - ui_debug "Can't run destroot under sudo without elevated privileges (due to mtree)." - ui_debug "Run destroot without sudo to avoid root privileges." - ui_debug "Going to escalate privileges back to root." - setegid $egid - seteuid $euid - ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." - } - - if { [tbool destroot.asroot] && [getuid] != 0 } { - global errorisprivileges - set errorisprivileges yes - return -code error "You can not run this port without elevated privileges. You need to re-run with 'sudo port'."; - } - - if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { - # rewrite destroot.args - set argprefix "=[option prefix]" - set newargprefix "=${altprefix}[option prefix]" - set newdestrootargs [string map [list $argprefix $newargprefix] [option destroot.args]] - option destroot.args $newdestrootargs - } - - # end gsoc08-privileges + # start gsoc08-privileges + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + ui_debug "Can't run destroot under sudo without elevated privileges (due to mtree)." + ui_debug "Run destroot without sudo to avoid root privileges." + ui_debug "Going to escalate privileges back to root." + setegid $egid + seteuid $euid + ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." + } + if { [tbool destroot.asroot] && [getuid] != 0 } { + global errorisprivileges + set errorisprivileges yes + return -code error "You can not run this port without elevated privileges. You need to re-run with 'sudo port'."; + } + + if {[info exists usealtworkpath] && $usealtworkpath == "yes"} { + # rewrite destroot.args + set argprefix "=[option prefix]" + set newargprefix "=${altprefix}[option prefix]" + set newdestrootargs [string map [list $argprefix $newargprefix] [option destroot.args]] + option destroot.args $newdestrootargs + } + + # end gsoc08-privileges + set oldmask [umask ${destroot.umask}] set mtree ${portutil::autoconf::mtree_path} - + if { ${destroot.clean} == "yes" } { delete "${destroot}" } - + file mkdir "${destroot}" if { ${os.platform} == "darwin" } { system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]" @@ -330,10 +330,10 @@ # Restore umask umask $oldmask - + # start gsoc08-privileges - chownAsRoot $destroot - # end gsoc08-privileges + chownAsRoot $destroot + # end gsoc08-privileges return 0 } Modified: branches/images-and-archives/base/src/port1.0/portdistcheck.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portdistcheck.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portdistcheck.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -52,87 +52,87 @@ default distcheck.check moddate proc portdistcheck::distcheck_main {args} { - global distcheck.check - global fetch.type - global portname portpath - - set port_moddate [file mtime ${portpath}/Portfile] + global distcheck.check + global fetch.type + global portname portpath - ui_debug "Portfile modification date is [clock format $port_moddate]" + set port_moddate [file mtime ${portpath}/Portfile] - # Check the distfiles if it's a regular fetch phase. - if {"${distcheck.check}" != "none" - && "${fetch.type}" == "standard"} { - # portfetch 1.0::checkfiles sets fetch_urls list. - global fetch_urls - checkfiles - set totalsize 0 - - # Check all the files. - foreach {url_var distfile} $fetch_urls { - global portfetch::$url_var - if {![info exists $url_var]} { - ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] - set url_var master_sites - global portfetch::$url_var - } - if {${distcheck.check} == "moddate"} { - set count 0 - foreach site [set $url_var] { - ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] - set file_url [portfetch::assemble_url $site $distfile] - if {[catch {set urlnewer [curl isnewer $file_url $port_moddate]} error]} { - ui_warn "couldn't fetch $file_url for $portname ($error)" - } else { - if {$urlnewer} { - ui_warn "port $portname: $file_url is newer than portfile" - } - incr count - } - } - if {$count == 0} { - ui_error "no mirror had $distfile for $portname" - } - } elseif {${distcheck.check} == "filesize"} { - set count 0 - foreach site [set $url_var] { - ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] - set file_url [portfetch::assemble_url $site $distfile] - if {[catch {set urlsize [curl getsize $file_url]} error]} { - ui_warn "couldn't fetch $file_url for $portname ($error)" - } else { - incr count - if {$urlsize > 0} { - ui_info "port $portname: $distfile $urlsize bytes" - incr totalsize $urlsize - break - } - } - } - if {$count == 0} { - ui_error "no mirror had $distfile for $portname" - } - } else { - ui_error "unknown distcheck.check ${distcheck.check}" - break - } - } - - if {${distcheck.check} == "filesize" && $totalsize > 0} { - if {$totalsize < 1024} { - set size $totalsize - set humansize "${size}" - } elseif {$totalsize < 1024*1024} { - set size [expr $totalsize / 1024.0] - set humansize [format "%.1fK" $size] - } elseif {$totalsize < 1024*1024*1024} { - set size [expr $totalsize / (1024.0*1024.0)] - set humansize [format "%.1fM" $size] - } else { - set size [expr $totalsize / (1024.0*1024.0*1024.0)] - set humansize [format "%.1fG" $size] - } - ui_msg "$portname: $humansize" - } - } + ui_debug "Portfile modification date is [clock format $port_moddate]" + + # Check the distfiles if it's a regular fetch phase. + if {"${distcheck.check}" != "none" + && "${fetch.type}" == "standard"} { + # portfetch 1.0::checkfiles sets fetch_urls list. + global fetch_urls + checkfiles + set totalsize 0 + + # Check all the files. + foreach {url_var distfile} $fetch_urls { + global portfetch::$url_var + if {![info exists $url_var]} { + ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] + set url_var master_sites + global portfetch::$url_var + } + if {${distcheck.check} == "moddate"} { + set count 0 + foreach site [set $url_var] { + ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] + set file_url [portfetch::assemble_url $site $distfile] + if {[catch {set urlnewer [curl isnewer $file_url $port_moddate]} error]} { + ui_warn "couldn't fetch $file_url for $portname ($error)" + } else { + if {$urlnewer} { + ui_warn "port $portname: $file_url is newer than portfile" + } + incr count + } + } + if {$count == 0} { + ui_error "no mirror had $distfile for $portname" + } + } elseif {${distcheck.check} == "filesize"} { + set count 0 + foreach site [set $url_var] { + ui_debug [format [msgcat::mc "Checking %s from %s"] $distfile $site] + set file_url [portfetch::assemble_url $site $distfile] + if {[catch {set urlsize [curl getsize $file_url]} error]} { + ui_warn "couldn't fetch $file_url for $portname ($error)" + } else { + incr count + if {$urlsize > 0} { + ui_info "port $portname: $distfile $urlsize bytes" + incr totalsize $urlsize + break + } + } + } + if {$count == 0} { + ui_error "no mirror had $distfile for $portname" + } + } else { + ui_error "unknown distcheck.check ${distcheck.check}" + break + } + } + + if {${distcheck.check} == "filesize" && $totalsize > 0} { + if {$totalsize < 1024} { + set size $totalsize + set humansize "${size}" + } elseif {$totalsize < 1024*1024} { + set size [expr $totalsize / 1024.0] + set humansize [format "%.1fK" $size] + } elseif {$totalsize < 1024*1024*1024} { + set size [expr $totalsize / (1024.0*1024.0)] + set humansize [format "%.1fM" $size] + } else { + set size [expr $totalsize / (1024.0*1024.0*1024.0)] + set humansize [format "%.1fG" $size] + } + ui_msg "$portname: $humansize" + } + } } Modified: branches/images-and-archives/base/src/port1.0/portextract.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portextract.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portextract.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -131,11 +131,11 @@ if {[catch {command_exec extract} result]} { return -code error "$result" } - - # start gsoc08-privileges - chownAsRoot ${extract.dir} - # end gsoc08-privileges - + + # start gsoc08-privileges + chownAsRoot ${extract.dir} + # end gsoc08-privileges + } return 0 } Modified: branches/images-and-archives/base/src/port1.0/portfetch.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portfetch.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -54,12 +54,12 @@ # define options: distname master_sites options master_sites patch_sites extract.suffix distfiles patchfiles use_zip use_bzip2 use_lzma use_7z use_dmg dist_subdir \ - fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \ - master_sites.mirror_subdir patch_sites.mirror_subdir portname \ - cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.method \ - svn.url svn.tag svn.revision svn.method \ - git.url git.branch \ - hg.url hg.tag + fetch.type fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert \ + master_sites.mirror_subdir patch_sites.mirror_subdir portname \ + cvs.module cvs.root cvs.password cvs.date cvs.tag cvs.method \ + svn.url svn.tag svn.revision svn.method \ + git.url git.branch \ + hg.url hg.tag # XXX we use the command framework to buy us some useful features, # but this is not a user-modifiable command @@ -182,12 +182,12 @@ proc portfetch::suffix {distname} { global extract.suffix fetch.type switch -- "${fetch.type}" { - cvs - - svn - - git - - hg { return "" } - standard - - default { return "${distname}${extract.suffix}" } + cvs - + svn - + git - + hg { return "" } + standard - + default { return "${distname}${extract.suffix}" } } } # XXX import suffix into the global namespace as it is currently used from @@ -221,15 +221,15 @@ } return {} } - + set ret [list] foreach element $portfetch::mirror_sites::sites($mirrors) { - - # here we have the chance to take a look at tags, that possibly - # have been assigned in mirror_sites.tcl - set splitlist [split $element :] - # every element is a URL, so we'll always have multiple elements. no need to check - set element "[lindex $splitlist 0]:[lindex $splitlist 1]" + + # here we have the chance to take a look at tags, that possibly + # have been assigned in mirror_sites.tcl + set splitlist [split $element :] + # every element is a URL, so we'll always have multiple elements. no need to check + set element "[lindex $splitlist 0]:[lindex $splitlist 1]" set mirror_tag "[lindex $splitlist 2]" set name_re {\$(?:name\y|\{name\})} @@ -238,28 +238,28 @@ if {[regexp $name_re $element]} { set mirror_tag "" } - - if {$mirror_tag == "mirror"} { - set thesubdir ${dist_subdir} - } elseif {$subdir == "" && $mirror_tag != "nosubdir"} { - set thesubdir ${portname} - } else { - set thesubdir ${subdir} - } - - # parse an embedded $name. if present, remove the subdir - if {[regsub $name_re $element $thesubdir element] > 0} { - set thesubdir "" - } - - if {"$tag" != ""} { - eval append element "${thesubdir}:${tag}" - } else { - eval append element "${thesubdir}" - } + + if {$mirror_tag == "mirror"} { + set thesubdir ${dist_subdir} + } elseif {$subdir == "" && $mirror_tag != "nosubdir"} { + set thesubdir ${portname} + } else { + set thesubdir ${subdir} + } + + # parse an embedded $name. if present, remove the subdir + if {[regsub $name_re $element $thesubdir element] > 0} { + set thesubdir "" + } + + if {"$tag" != ""} { + eval append element "${thesubdir}:${tag}" + } else { + eval append element "${thesubdir}" + } eval lappend ret $element } - + return $ret } @@ -271,15 +271,15 @@ proc portfetch::checksites {args} { global patch_sites master_sites master_sites.mirror_subdir \ patch_sites.mirror_subdir fallback_mirror_site global_mirror_site env - + append master_sites " ${global_mirror_site} ${fallback_mirror_site}" if {[info exists env(MASTER_SITE_LOCAL)]} { - set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites] + set master_sites [concat $env(MASTER_SITE_LOCAL) $master_sites] } - + append patch_sites " ${global_mirror_site} ${fallback_mirror_site}" if {[info exists env(PATCH_SITE_LOCAL)]} { - set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites] + set patch_sites [concat $env(PATCH_SITE_LOCAL) $patch_sites] } foreach list {master_sites patch_sites} { @@ -287,26 +287,26 @@ if {![info exists uplist]} { continue } - + set site_list [list] foreach site $uplist { if {[regexp {([a-zA-Z]+://.+)} $site match site]} { set site_list [concat $site_list $site] } else { - set splitlist [split $site :] - if {[llength $splitlist] > 3 || [llength $splitlist] <1} { + set splitlist [split $site :] + if {[llength $splitlist] > 3 || [llength $splitlist] <1} { ui_error [format [msgcat::mc "Unable to process mirror sites for: %s, ignoring."] $site] - } - set mirrors "[lindex $splitlist 0]" - set subdir "[lindex $splitlist 1]" - set tag "[lindex $splitlist 2]" + } + set mirrors "[lindex $splitlist 0]" + set subdir "[lindex $splitlist 1]" + set tag "[lindex $splitlist 2]" if {[info exists $list.mirror_subdir]} { append subdir "[set ${list}.mirror_subdir]" } set site_list [concat $site_list [mirror_sites $mirrors $tag $subdir]] } } - + # add in the global and fallback mirrors for each tag foreach site $site_list { if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { @@ -321,9 +321,9 @@ } } } - + foreach site $site_list { - if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { + if {[regexp {([a-zA-Z]+://.+/?):([0-9A-Za-z_-]+)$} $site match site tag]} { lappend portfetch::$tag $site } else { lappend portfetch::$list $site @@ -336,44 +336,44 @@ proc portfetch::checkpatchfiles {args} { global patchfiles all_dist_files patch_sites filespath variable fetch_urls - + if {[info exists patchfiles]} { - foreach file $patchfiles { - if {![file exists $filespath/$file]} { - set distsite [getdisttag $file] - set file [getdistname $file] - lappend all_dist_files $file - if {$distsite != ""} { - lappend fetch_urls $distsite $file - } elseif {[info exists patch_sites]} { - lappend fetch_urls patch_sites $file - } else { - lappend fetch_urls master_sites $file - } - } - } + foreach file $patchfiles { + if {![file exists $filespath/$file]} { + set distsite [getdisttag $file] + set file [getdistname $file] + lappend all_dist_files $file + if {$distsite != ""} { + lappend fetch_urls $distsite $file + } elseif {[info exists patch_sites]} { + lappend fetch_urls patch_sites $file + } else { + lappend fetch_urls master_sites $file + } + } } + } } # Checks dist files and their tags to assemble url lists for later fetching proc portfetch::checkdistfiles {args} { global distfiles all_dist_files master_sites filespath variable fetch_urls - + if {[info exists distfiles]} { foreach file $distfiles { - if {![file exists $filespath/$file]} { - set distsite [getdisttag $file] - set file [getdistname $file] - lappend all_dist_files $file - if {$distsite != ""} { - lappend fetch_urls $distsite $file - } else { - lappend fetch_urls master_sites $file - } - } + if {![file exists $filespath/$file]} { + set distsite [getdisttag $file] + set file [getdistname $file] + lappend all_dist_files $file + if {$distsite != ""} { + lappend fetch_urls $distsite $file + } else { + lappend fetch_urls master_sites $file + } } } + } } # sorts fetch_urls in order of ping time @@ -435,7 +435,7 @@ } ui_debug "$host ping time is $pingtimes($host)" } - + set pinglist {} foreach site $urllist { regexp $hostregex $site -> host @@ -454,56 +454,56 @@ # Perform the full checksites/checkpatchfiles/checkdistfiles sequence. # This method is used by distcheck target. proc portfetch::checkfiles {args} { - variable fetch_urls + variable fetch_urls - checksites - checkpatchfiles - checkdistfiles + checksites + checkpatchfiles + checkdistfiles } # Perform a CVS login and fetch, storing the CVS login # information in a custom .cvspass file proc portfetch::cvsfetch {args} { - global workpath cvs.env cvs.cmd cvs.args cvs.post_args + global workpath cvs.env cvs.cmd cvs.args cvs.post_args global cvs.root cvs.date cvs.tag cvs.method cvs.password global patch_sites patchfiles filespath set cvs.args "${cvs.method} ${cvs.args}" if {${cvs.method} == "export" && ![string length ${cvs.tag}] && ![string length ${cvs.date}]} { - set cvs.tag "HEAD" + set cvs.tag "HEAD" } if {[string length ${cvs.tag}]} { - set cvs.args "${cvs.args} -r ${cvs.tag}" + set cvs.args "${cvs.args} -r ${cvs.tag}" } if {[string length ${cvs.date}]} { - set cvs.args "${cvs.args} -D ${cvs.date}" + set cvs.args "${cvs.args} -D ${cvs.date}" } if {[regexp ^:pserver: ${cvs.root}]} { - set savecmd ${cvs.cmd} - set saveargs ${cvs.args} - set savepost_args ${cvs.post_args} - set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path" - set cvs.args login - set cvs.post_args "" - if {[catch {command_exec cvs -notty "" "2>&1"} result]} { - return -code error [msgcat::mc "CVS login failed"] - } - set cvs.cmd ${savecmd} - set cvs.args ${saveargs} - set cvs.post_args ${savepost_args} + set savecmd ${cvs.cmd} + set saveargs ${cvs.args} + set savepost_args ${cvs.post_args} + set cvs.cmd "echo ${cvs.password} | $portutil::autoconf::cvs_path" + set cvs.args login + set cvs.post_args "" + if {[catch {command_exec cvs -notty "" "2>&1"} result]} { + return -code error [msgcat::mc "CVS login failed"] + } + set cvs.cmd ${savecmd} + set cvs.args ${saveargs} + set cvs.post_args ${savepost_args} } else { - set env(CVS_RSH) ssh + set env(CVS_RSH) ssh } if {[catch {command_exec cvs "" "2>&1"} result]} { - return -code error [msgcat::mc "CVS check out failed"] + return -code error [msgcat::mc "CVS check out failed"] } if {[info exists patchfiles]} { - return [portfetch::fetchfiles] + return [portfetch::fetchfiles] } return 0 } @@ -512,33 +512,33 @@ proc portfetch::svnfetch {args} { global workpath prefix_frozen global svn.env svn.cmd svn.args svn.post_args svn.revision svn.url svn.method - + # Look for the svn command, either in the path or in the prefix set goodcmd 0 foreach svncmd "${svn.cmd} ${prefix_frozen}/bin/svn svn" { - if { [file executable ${svncmd}] } { - set svn.cmd $svncmd - set goodcmd 1 - break; - } + if { [file executable ${svncmd}] } { + set svn.cmd $svncmd + set goodcmd 1 + break; + } } if { !$goodcmd } { - ui_error "The subversion tool (svn) is required to fetch ${svn.url}." - ui_error "Please install the subversion port before proceeding." - return -code error [msgcat::mc "Subversion check out failed"] + ui_error "The subversion tool (svn) is required to fetch ${svn.url}." + ui_error "Please install the subversion port before proceeding." + return -code error [msgcat::mc "Subversion check out failed"] } - + set svn.args "${svn.method} ${svn.args}" if {[string length ${svn.revision}]} { - set svn.args "${svn.args} -r ${svn.revision}" + set svn.args "${svn.args} -r ${svn.revision}" } if {[catch {command_exec svn "" "2>&1"} result]} { - return -code error [msgcat::mc "Subversion check out failed"] + return -code error [msgcat::mc "Subversion check out failed"] } if {[info exists patchfiles]} { - return [portfetch::fetchfiles] + return [portfetch::fetchfiles] } return 0 @@ -548,7 +548,7 @@ proc portfetch::gitfetch {args} { global worksrcpath prefix_frozen global git.url git.branch git.sha1 - + # Look for the git command set git.cmd {} foreach gitcmd "$portutil::autoconf::git_path $prefix_frozen/bin/git git" { @@ -562,7 +562,7 @@ ui_error "Please install the git-core port before proceeding." return -code error [msgcat::mc "Git command not found"] } - + set options "-q" if {[string length ${git.branch}] == 0} { # if we're just using HEAD, we can make a shallow repo @@ -573,7 +573,7 @@ if {[catch {system $cmdstring} result]} { return -code error [msgcat::mc "Git clone failed"] } - + if {[string length ${git.branch}] > 0} { set env "GIT_DIR=${worksrcpath}/.git GIT_WORK_TREE=${worksrcpath}" set cmdstring "$env ${git.cmd} checkout -q ${git.branch} 2>&1" @@ -582,11 +582,11 @@ return -code error [msgcat::mc "Git checkout failed"] } } - + if {[info exists patchfiles]} { return [portfetch::fetchfiles] } - + return 0 } @@ -625,120 +625,120 @@ # Perform a standard fetch, assembling fetch urls from # the listed url variable and associated distfile proc portfetch::fetchfiles {args} { - global distpath all_dist_files UI_PREFIX - global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time - global distfile site - global portverbose + global distpath all_dist_files UI_PREFIX + global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert fetch.remote_time + global distfile site + global portverbose variable fetch_urls - if {![file isdirectory $distpath]} { - if {[catch {file mkdir $distpath} result]} { - return -code error [format [msgcat::mc "Unable to create distribution files path: %s"] $result] - } - } - - set fetch_options {} - if {[string length ${fetch.user}] || [string length ${fetch.password}]} { - lappend fetch_options -u - lappend fetch_options "${fetch.user}:${fetch.password}" - } - if {${fetch.use_epsv} != "yes"} { - lappend fetch_options "--disable-epsv" - } - if {${fetch.ignore_sslcert} != "no"} { - lappend fetch_options "--ignore-ssl-cert" - } - if {${fetch.remote_time} != "no"} { - lappend fetch_options "--remote-time" - } - if {$portverbose == "yes"} { - lappend fetch_options "-v" - } - set sorted no - - foreach {url_var distfile} $fetch_urls { - if {![file isfile $distpath/$distfile]} { - ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" - if {![file writable $distpath]} { - return -code error [format [msgcat::mc "%s must be writable"] $distpath] - } - if {!$sorted} { - sortsites - set sorted yes - } - variable portfetch::$url_var - if {![info exists $url_var]} { - ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] - set url_var master_sites - variable portfetch::$url_var - } - unset -nocomplain fetched - foreach site [set $url_var] { - ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]" - set file_url [portfetch::assemble_url $site $distfile] - set effectiveURL "" - if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] && - ![catch {file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"} result]} { + if {![file isdirectory $distpath]} { + if {[catch {file mkdir $distpath} result]} { + return -code error [format [msgcat::mc "Unable to create distribution files path: %s"] $result] + } + } - # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure - if {![string equal $effectiveURL $file_url] && - [string match "*sourceforge*" $file_url] && - [string match "*failedmirror*" $effectiveURL]} { - - # *SourceForge hackage in effect* - # The url seen by curl seems to have been a redirect to the sourceforge mirror page - ui_debug "[msgcat::mc "Fetching from sourceforge mirror failed"]" - file delete -force "${distpath}/${distfile}.TMP" - - # Continue on to try the next mirror, if any - } else { - - # Successful fetch - set fetched 1 - break - - } + set fetch_options {} + if {[string length ${fetch.user}] || [string length ${fetch.password}]} { + lappend fetch_options -u + lappend fetch_options "${fetch.user}:${fetch.password}" + } + if {${fetch.use_epsv} != "yes"} { + lappend fetch_options "--disable-epsv" + } + if {${fetch.ignore_sslcert} != "no"} { + lappend fetch_options "--ignore-ssl-cert" + } + if {${fetch.remote_time} != "no"} { + lappend fetch_options "--remote-time" + } + if {$portverbose == "yes"} { + lappend fetch_options "-v" + } + set sorted no - } else { - ui_debug "[msgcat::mc "Fetching failed:"]: $result" - file delete -force "${distpath}/${distfile}.TMP" - } - } - if {![info exists fetched]} { - return -code error [msgcat::mc "fetch failed"] - } - } - } + foreach {url_var distfile} $fetch_urls { + if {![file isfile $distpath/$distfile]} { + ui_info "$UI_PREFIX [format [msgcat::mc "%s doesn't seem to exist in %s"] $distfile $distpath]" + if {![file writable $distpath]} { + return -code error [format [msgcat::mc "%s must be writable"] $distpath] + } + if {!$sorted} { + sortsites + set sorted yes + } + variable portfetch::$url_var + if {![info exists $url_var]} { + ui_error [format [msgcat::mc "No defined site for tag: %s, using master_sites"] $url_var] + set url_var master_sites + variable portfetch::$url_var + } + unset -nocomplain fetched + foreach site [set $url_var] { + ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]" + set file_url [portfetch::assemble_url $site $distfile] + set effectiveURL "" + if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] && + ![catch {file rename -force "${distpath}/${distfile}.TMP" "${distpath}/${distfile}"} result]} { + + # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure + if {![string equal $effectiveURL $file_url] && + [string match "*sourceforge*" $file_url] && + [string match "*failedmirror*" $effectiveURL]} { + + # *SourceForge hackage in effect* + # The url seen by curl seems to have been a redirect to the sourceforge mirror page + ui_debug "[msgcat::mc "Fetching from sourceforge mirror failed"]" + file delete -force "${distpath}/${distfile}.TMP" + + # Continue on to try the next mirror, if any + } else { + + # Successful fetch + set fetched 1 + break + + } + + } else { + ui_debug "[msgcat::mc "Fetching failed:"]: $result" + file delete -force "${distpath}/${distfile}.TMP" + } + } + if {![info exists fetched]} { + return -code error [msgcat::mc "fetch failed"] + } + } + } return 0 } # Utility function to delete fetched files. proc portfetch::fetch_deletefiles {args} { - global distpath + global distpath variable fetch_urls - foreach {url_var distfile} $fetch_urls { - if {[file isfile $distpath/$distfile]} { - file delete -force "${distpath}/${distfile}" - } - } + foreach {url_var distfile} $fetch_urls { + if {[file isfile $distpath/$distfile]} { + file delete -force "${distpath}/${distfile}" + } + } } # Utility function to add files to a list of fetched files. proc portfetch::fetch_addfilestomap {filemapname} { - global distpath $filemapname + global distpath $filemapname variable fetch_urls - foreach {url_var distfile} $fetch_urls { - if {[file isfile $distpath/$distfile]} { - filemap set $filemapname $distpath/$distfile 1 - } - } + foreach {url_var distfile} $fetch_urls { + if {[file isfile $distpath/$distfile]} { + filemap set $filemapname $distpath/$distfile 1 + } + } } # Initialize fetch target and call checkfiles. proc portfetch::fetch_init {args} { global distfiles distname distpath all_dist_files dist_subdir fetch.type fetch_init_done global altprefix usealtworkpath - + if {[info exists distpath] && [info exists dist_subdir] && ![info exists fetch_init_done]} { # start gsoc08-privileges @@ -757,7 +757,7 @@ proc portfetch::fetch_start {args} { global UI_PREFIX portname - + ui_msg "$UI_PREFIX [format [msgcat::mc "Fetching %s"] $portname]" } @@ -772,14 +772,14 @@ if {![info exists all_dist_files] && "${fetch.type}" == "standard"} { return 0 } - + # Fetch the files switch -- "${fetch.type}" { - cvs { return [cvsfetch] } - svn { return [svnfetch] } - git { return [gitfetch] } - hg { return [hgfetch] } - standard - - default { return [portfetch::fetchfiles] } + cvs { return [cvsfetch] } + svn { return [svnfetch] } + git { return [gitfetch] } + hg { return [hgfetch] } + standard - + default { return [portfetch::fetchfiles] } } } Modified: branches/images-and-archives/base/src/port1.0/portlivecheck.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -62,7 +62,7 @@ global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert global homepage portname portpath workpath global master_sites name distfiles - + set updated 0 set updated_version "unknown" set has_master_sites [info exists master_sites] @@ -111,16 +111,16 @@ # Copied over from portfetch in parts set fetch_options {} - if {[string length ${fetch.user}] || [string length ${fetch.password}]} { - lappend fetch_options -u - lappend fetch_options "${fetch.user}:${fetch.password}" - } - if {${fetch.use_epsv} != "yes"} { - lappend fetch_options "--disable-epsv" - } - if {${fetch.ignore_sslcert} != "no"} { - lappend fetch_options "--ignore-ssl-cert" - } + if {[string length ${fetch.user}] || [string length ${fetch.password}]} { + lappend fetch_options -u + lappend fetch_options "${fetch.user}:${fetch.password}" + } + if {${fetch.use_epsv} != "yes"} { + lappend fetch_options "--disable-epsv" + } + if {${fetch.ignore_sslcert} != "no"} { + lappend fetch_options "--ignore-ssl-cert" + } # Perform the check depending on the type. switch ${livecheck.check} { @@ -170,10 +170,10 @@ set livecheck.check "regex" } } - + # de-escape livecheck.url set livecheck.url [join ${livecheck.url}] - + switch ${livecheck.check} { "regex" - "regexm" { Modified: branches/images-and-archives/base/src/port1.0/portmirror.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portmirror.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portmirror.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -52,37 +52,37 @@ # It also records the path in a database. proc portmirror::mirror_main {args} { - global fetch.type portname mirror_filemap ports_mirror_new portdbpath - - set mirror_filemap_path [file join $portdbpath distfiles_mirror.db] - if {![info exists mirror_filemap] - && [info exists ports_mirror_new] - && $ports_mirror_new == "yes" - && [file exists $mirror_filemap_path]} { - # Trash the map file if it existed. - file delete -force $mirror_filemap_path - } - - filemap open mirror_filemap $mirror_filemap_path + global fetch.type portname mirror_filemap ports_mirror_new portdbpath - # Check the distfiles if it's a regular fetch phase. - if {"${fetch.type}" == "standard"} { - # fetch the files. - portfetch::fetch_init $args - #fetch_start - portfetch::fetch_main $args + set mirror_filemap_path [file join $portdbpath distfiles_mirror.db] + if {![info exists mirror_filemap] + && [info exists ports_mirror_new] + && $ports_mirror_new == "yes" + && [file exists $mirror_filemap_path]} { + # Trash the map file if it existed. + file delete -force $mirror_filemap_path + } - # checksum the files. - #checksum_start - if {[catch {portchecksum::checksum_main $args}]} { - # delete the files. - portfetch::fetch_deletefiles $args - } else { - # add the list of files. - portfetch::fetch_addfilestomap mirror_filemap - } - } + filemap open mirror_filemap $mirror_filemap_path - # close the filemap. - filemap close mirror_filemap + # Check the distfiles if it's a regular fetch phase. + if {"${fetch.type}" == "standard"} { + # fetch the files. + portfetch::fetch_init $args + #fetch_start + portfetch::fetch_main $args + + # checksum the files. + #checksum_start + if {[catch {portchecksum::checksum_main $args}]} { + # delete the files. + portfetch::fetch_deletefiles $args + } else { + # add the list of files. + portfetch::fetch_addfilestomap mirror_filemap + } + } + + # close the filemap. + filemap close mirror_filemap } Modified: branches/images-and-archives/base/src/port1.0/portpatch.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portpatch.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portpatch.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -35,7 +35,7 @@ set org.macports.patch [target_new org.macports.patch portpatch::patch_main] target_provides ${org.macports.patch} patch -target_requires ${org.macports.patch} main fetch checksum extract +target_requires ${org.macports.patch} main fetch checksum extract namespace eval portpatch { } @@ -54,48 +54,48 @@ proc portpatch::patch_main {args} { global UI_PREFIX - + # First make sure that patchfiles exists and isn't stubbed out. if {![exists patchfiles]} { - return 0 + return 0 } - - ui_msg "$UI_PREFIX [format [msgcat::mc "Applying patches to %s"] [option portname]]" - - # start gsoc08-privileges + + ui_msg "$UI_PREFIX [format [msgcat::mc "Applying patches to %s"] [option portname]]" + + # start gsoc08-privileges if { [tbool patch.asroot] } { - # if port is marked as needing root - elevateToRoot "patch" - } - # end gsoc08-privileges + # if port is marked as needing root + elevateToRoot "patch" + } + # end gsoc08-privileges foreach patch [option patchfiles] { set patch_file [getdistname $patch] - if {[file exists [option filespath]/$patch_file]} { - lappend patchlist [option filespath]/$patch_file - } elseif {[file exists [option distpath]/$patch_file]} { - lappend patchlist [option distpath]/$patch_file - } else { - return -code error [format [msgcat::mc "Patch file %s is missing"] $patch] - } + if {[file exists [option filespath]/$patch_file]} { + lappend patchlist [option filespath]/$patch_file + } elseif {[file exists [option distpath]/$patch_file]} { + lappend patchlist [option distpath]/$patch_file + } else { + return -code error [format [msgcat::mc "Patch file %s is missing"] $patch] } + } if {![info exists patchlist]} { - return -code error [msgcat::mc "Patch files missing"] + return -code error [msgcat::mc "Patch files missing"] } _cd [option worksrcpath] foreach patch $patchlist { - ui_info "$UI_PREFIX [format [msgcat::mc "Applying %s"] $patch]" - if {[option os.platform] == "linux"} { - set gzcat "zcat" - } else { - set gzcat "gzcat" - } - switch -glob -- [file tail $patch] { - *.Z - - *.gz {command_exec patch "$gzcat \"$patch\" | (" ")"} - *.bz2 {command_exec patch "bzcat \"$patch\" | (" ")"} - default {command_exec patch "" "< '$patch'"} - } + ui_info "$UI_PREFIX [format [msgcat::mc "Applying %s"] $patch]" + if {[option os.platform] == "linux"} { + set gzcat "zcat" + } else { + set gzcat "gzcat" } + switch -glob -- [file tail $patch] { + *.Z - + *.gz {command_exec patch "$gzcat \"$patch\" | (" ")"} + *.bz2 {command_exec patch "bzcat \"$patch\" | (" ")"} + default {command_exec patch "" "< '$patch'"} + } + } return 0 } Modified: branches/images-and-archives/base/src/port1.0/portsubmit.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portsubmit.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portsubmit.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -16,7 +16,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,7 +36,7 @@ set org.macports.submit [target_new org.macports.submit portsubmit::submit_main] target_runtype ${org.macports.submit} always -target_provides ${org.macports.submit} submit +target_provides ${org.macports.submit} submit target_requires ${org.macports.submit} portpkg namespace eval portsubmit { @@ -47,32 +47,32 @@ # escape quotes, and things that make the shell cry proc portsubmit::shell_escape {str} { - regsub -all -- {\\} $str {\\\\} str - regsub -all -- {"} $str {\"} str - regsub -all -- {'} $str {\'} str - return $str + regsub -all -- {\\} $str {\\\\} str + regsub -all -- {"} $str {\"} str + regsub -all -- {'} $str {\'} str + return $str } proc portsubmit::submit_main {args} { global mp_remote_submit_url portname portversion portverbose prefix UI_PREFIX workpath portpath - + set submiturl $mp_remote_submit_url - + # Preconditions for submit if {$submitter_email == ""} { - return -code error [format [msgcat::mc "Submitter email is required to submit a port"]] + return -code error [format [msgcat::mc "Submitter email is required to submit a port"]] } # Make sure we have a work directory file mkdir ${workpath} - - # Create portpkg.xar in the work directory - set pkgpath "${workpath}/${portname}.portpkg" - - # TODO: If a private key was provided, create a signed digest of the submission - - # Submit to the submit url + + # Create portpkg.xar in the work directory + set pkgpath "${workpath}/${portname}.portpkg" + + # TODO: If a private key was provided, create a signed digest of the submission + + # Submit to the submit url set args "curl" lappend args "--silent" lappend args "--url ${submiturl}" @@ -83,47 +83,47 @@ set cmd [join $args] if {[tbool portverbose]} { - ui_msg "Submitting portpkg $pkgpath for $portname to $submiturl" + ui_msg "Submitting portpkg $pkgpath for $portname to $submiturl" } - - # Invoke curl to do the submit + + # Invoke curl to do the submit ui_debug $cmd if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failure during submit of port %s"] $portname] + return -code error [format [msgcat::mc "Failure during submit of port %s"] $portname] } - # Parse the result - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - if {0 != [regexp -- {^([^:]+):\s*(.*)$} $line unused key value]} { - set result($key) $value - } - } - close $fd - - # Interpret and act on the result - if {[info exists result(MESSAGE)] && [tbool portverbose]} { - ui_msg $result(MESSAGE) - } - if {[info exists result(STATUS)]} { - if { $result(STATUS) == 0 } { - ui_msg "Submitted portpkg for $portname" - if {[info exists result(DOWNLOAD_URL)]} { - ui_msg " download URL => $result(DOWNLOAD_URL)" - } - if {[info exists result(HUMAN_URL)]} { - ui_msg " human readable URL => $result(HUMAN_URL)" - } - } else { - return -code error [format [msgcat::mc "Status %d reported during submit of port %s"] $result(STATUS) $portname] - } - } else { - return -code error [format [msgcat::mc "Status not received during submit of port %s"] $portname] - } + # Parse the result + set fd [open ${workpath}/.portsubmit.out r] + array set result [list] + while {[gets $fd line] != -1} { + if {0 != [regexp -- {^([^:]+):\s*(.*)$} $line unused key value]} { + set result($key) $value + } + } + close $fd + # Interpret and act on the result + if {[info exists result(MESSAGE)] && [tbool portverbose]} { + ui_msg $result(MESSAGE) + } + if {[info exists result(STATUS)]} { + if { $result(STATUS) == 0 } { + ui_msg "Submitted portpkg for $portname" + if {[info exists result(DOWNLOAD_URL)]} { + ui_msg " download URL => $result(DOWNLOAD_URL)" + } + if {[info exists result(HUMAN_URL)]} { + ui_msg " human readable URL => $result(HUMAN_URL)" + } + } else { + return -code error [format [msgcat::mc "Status %d reported during submit of port %s"] $result(STATUS) $portname] + } + } else { + return -code error [format [msgcat::mc "Status not received during submit of port %s"] $portname] + } + return - + # REMNANTS OF KEVIN'S CODE # start with the Portfile, and add the files directory if it exists. @@ -136,29 +136,29 @@ } if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to archive port : %s"] $portname] + return -code error [format [msgcat::mc "Failed to archive port : %s"] $portname] } - set portsource "" - set base_rev "" - if {![catch {set fd [open ".mports_source" r]}]} { - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - switch -- $key { - source { set portsource $value } - revision { set base_rev $value } - } - } - close $fd - } - if {$portsource == ""} { - ui_msg "$UI_PREFIX Submitting $portname-$portversion" - puts -nonewline "URL: " - flush stdout - gets stdin portsource - } + set portsource "" + set base_rev "" + if {![catch {set fd [open ".mports_source" r]}]} { + while {[gets $fd line] != -1} { + regexp -- {^(.*): (.*)$} $line unused key value + switch -- $key { + source { set portsource $value } + revision { set base_rev $value } + } + } + close $fd + } + if {$portsource == ""} { + ui_msg "$UI_PREFIX Submitting $portname-$portversion" + puts -nonewline "URL: " + flush stdout + gets stdin portsource + } - ui_msg "$UI_PREFIX Submitting $portname-$portversion to $portsource" + ui_msg "$UI_PREFIX Submitting $portname-$portversion to $portsource" puts -nonewline "Username: " flush stdout @@ -169,13 +169,13 @@ gets stdin password puts "" exec stty echo - + set vars {portname portversion maintainers categories description \ - long_description master_sites} - eval "global $vars" - foreach var $vars { - if {![info exists $var]} { set $var {} } - } + long_description master_sites} + eval "global $vars" + foreach var $vars { + if {![info exists $var]} { set $var {} } + } set cmd "curl " append cmd "--silent " @@ -196,68 +196,68 @@ ui_debug $cmd if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to submit port : %s"] $portname] + return -code error [format [msgcat::mc "Failed to submit port : %s"] $portname] } - # - # Parse the result from the remote index - # if ERROR: print the error message - # if OK: store the revision info - # if CONFLICT: attempt to merge the conflict - # - - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - set result($key) $value - } - close $fd + # + # Parse the result from the remote index + # if ERROR: print the error message + # if OK: store the revision info + # if CONFLICT: attempt to merge the conflict + # - if {[info exists result(OK)]} { - set fd [open ".mports_source" w] - puts $fd "source: $portsource" - puts $fd "port: $portname" - puts $fd "version: $portversion" - puts $fd "revision: $result(revision)" - close $fd - - ui_msg "$portname-$portversion submitted successfully." - ui_msg "New revision: $result(revision)" - } elseif {[info exists result(ERROR)]} { - return -code error $result(ERROR) - } elseif {[info exists result(CONFLICT)]} { - # Fetch the newer revision from the index. - # XXX: many gross hacks here regarding paths, urls, etc. - set tmpdir [mktemp "/tmp/mports.XXXXXXXX"] - file mkdir $tmpdir/new - file mkdir $tmpdir/old - set worker [mport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]] - if {$base_rev != ""} { - set worker2 [mport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]] - catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$portname-$portversion/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - mport_close $worker2 - } else { - catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - } - mport_close $worker - catch {delete "${tmpdir}"} + set fd [open ${workpath}/.portsubmit.out r] + array set result [list] + while {[gets $fd line] != -1} { + regexp -- {^(.*): (.*)$} $line unused key value + set result($key) $value + } + close $fd - set fd [open [file join "$portpath" ".mports_source"] w] - puts $fd "source: $portsource" - puts $fd "port: $portname" - puts $fd "version: $portversion" - puts $fd "revision: $result(revision)" - close $fd - - ui_error "A newer revision of this port has already been submitted." - ui_error "Portfile: $portname-$portversion" - ui_error "Base revision: $base_rev" - ui_error "Current revision: $result(revision)" - ui_error "Please edit the Portfile to resolve any conflicts and resubmit." - } + if {[info exists result(OK)]} { + set fd [open ".mports_source" w] + puts $fd "source: $portsource" + puts $fd "port: $portname" + puts $fd "version: $portversion" + puts $fd "revision: $result(revision)" + close $fd + ui_msg "$portname-$portversion submitted successfully." + ui_msg "New revision: $result(revision)" + } elseif {[info exists result(ERROR)]} { + return -code error $result(ERROR) + } elseif {[info exists result(CONFLICT)]} { + # Fetch the newer revision from the index. + # XXX: many gross hacks here regarding paths, urls, etc. + set tmpdir [mktemp "/tmp/mports.XXXXXXXX"] + file mkdir $tmpdir/new + file mkdir $tmpdir/old + set worker [mport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]] + if {$base_rev != ""} { + set worker2 [mport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]] + catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$portname-$portversion/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} + file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" + mport_close $worker2 + } else { + catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"} + file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" + } + mport_close $worker + catch {delete "${tmpdir}"} + + set fd [open [file join "$portpath" ".mports_source"] w] + puts $fd "source: $portsource" + puts $fd "port: $portname" + puts $fd "version: $portversion" + puts $fd "revision: $result(revision)" + close $fd + + ui_error "A newer revision of this port has already been submitted." + ui_error "Portfile: $portname-$portversion" + ui_error "Base revision: $base_rev" + ui_error "Current revision: $result(revision)" + ui_error "Please edit the Portfile to resolve any conflicts and resubmit." + } + return 0 } Modified: branches/images-and-archives/base/src/port1.0/porttest.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/porttest.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/porttest.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -14,7 +14,7 @@ } # define options -options test.run test.target +options test.run test.target commands test # Set defaults @@ -33,9 +33,9 @@ proc porttest::test_main {args} { global portname test.run if {[tbool test.run]} { - command_exec test + command_exec test } else { - return -code error [format [msgcat::mc "%s has no tests turned on. see 'test.run' in portfile(7)"] $portname] + return -code error [format [msgcat::mc "%s has no tests turned on. see 'test.run' in portfile(7)"] $portname] } return 0 } Modified: branches/images-and-archives/base/src/port1.0/porttrace.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/porttrace.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/porttrace.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -39,72 +39,72 @@ } proc porttrace::trace_start {workpath} { - global os.platform - if {${os.platform} == "darwin"} { - if {[catch {package require Thread} error]} { - ui_warn "trace requires Tcl Thread package ($error)" - } else { - global env trace_fifo trace_sandboxbounds portpath - # Create a fifo. - # path in unix socket limited to 109 chars - # # set trace_fifo "$workpath/trace_fifo" - set trace_fifo "/tmp/macports/[pid]_[expr {int(rand()*1000)}]" - file mkdir "/tmp/macports" - file delete -force $trace_fifo - - # Create the thread/process. - create_slave $workpath $trace_fifo - - # Launch darwintrace.dylib. - - set tracelib_path [file join ${portutil::autoconf::prefix} share macports Tcl darwintrace1.0 darwintrace.dylib] + global os.platform + if {${os.platform} == "darwin"} { + if {[catch {package require Thread} error]} { + ui_warn "trace requires Tcl Thread package ($error)" + } else { + global env trace_fifo trace_sandboxbounds portpath + # Create a fifo. + # path in unix socket limited to 109 chars + # # set trace_fifo "$workpath/trace_fifo" + set trace_fifo "/tmp/macports/[pid]_[expr {int(rand()*1000)}]" + file mkdir "/tmp/macports" + file delete -force $trace_fifo - if {[info exists env(DYLD_INSERT_LIBRARIES)] && [string length "$env(DYLD_INSERT_LIBRARIES)"] > 0} { - set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}" - } else { - set env(DYLD_INSERT_LIBRARIES) ${tracelib_path} - } - set env(DYLD_FORCE_FLAT_NAMESPACE) 1 - set env(DARWINTRACE_LOG) "$trace_fifo" - # The sandbox is limited to: - # workpath - # /tmp - # /private/tmp - # /var/tmp - # /private/var/tmp - # $TMPDIR - # /dev/null - # /dev/tty - # /Library/Caches/com.apple.Xcode - # $CCACHE_DIR - # $HOMEDIR/.ccache - set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:$portpath" - if {[info exists env(TMPDIR)]} { - set trace_sandboxbounds "${trace_sandboxbounds}:$env(TMPDIR)" - } - if {[info exists env(CCACHE_DIR)]} { - set trace_sandboxbounds "${trace_sandboxbounds}:$env(CCACHE_DIR)" - } - tracelib setsandbox $trace_sandboxbounds - } - } + # Create the thread/process. + create_slave $workpath $trace_fifo + + # Launch darwintrace.dylib. + + set tracelib_path [file join ${portutil::autoconf::prefix} share macports Tcl darwintrace1.0 darwintrace.dylib] + + if {[info exists env(DYLD_INSERT_LIBRARIES)] && [string length "$env(DYLD_INSERT_LIBRARIES)"] > 0} { + set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}" + } else { + set env(DYLD_INSERT_LIBRARIES) ${tracelib_path} + } + set env(DYLD_FORCE_FLAT_NAMESPACE) 1 + set env(DARWINTRACE_LOG) "$trace_fifo" + # The sandbox is limited to: + # workpath + # /tmp + # /private/tmp + # /var/tmp + # /private/var/tmp + # $TMPDIR + # /dev/null + # /dev/tty + # /Library/Caches/com.apple.Xcode + # $CCACHE_DIR + # $HOMEDIR/.ccache + set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:$portpath" + if {[info exists env(TMPDIR)]} { + set trace_sandboxbounds "${trace_sandboxbounds}:$env(TMPDIR)" + } + if {[info exists env(CCACHE_DIR)]} { + set trace_sandboxbounds "${trace_sandboxbounds}:$env(CCACHE_DIR)" + } + tracelib setsandbox $trace_sandboxbounds + } + } } # Enable the fence. # Only done for targets that should only happen in the sandbox. proc porttrace::trace_enable_fence {} { - global env trace_sandboxbounds - set env(DARWINTRACE_SANDBOX_BOUNDS) $trace_sandboxbounds - tracelib enablefence + global env trace_sandboxbounds + set env(DARWINTRACE_SANDBOX_BOUNDS) $trace_sandboxbounds + tracelib enablefence } # Disable the fence. # Unused yet. proc porttrace::trace_disable_fence {} { - global env - if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { - unset env(DARWINTRACE_SANDBOX_BOUNDS) - } + global env + if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { + unset env(DARWINTRACE_SANDBOX_BOUNDS) + } } # Check the list of ports. @@ -112,204 +112,204 @@ # that isn't included in portslist # This method must be called after trace_start proc porttrace::trace_check_deps {target portslist} { - # Get the list of ports. - set ports [slave_send porttrace::slave_get_ports] - - # Compare with portslist - set portslist [lsort $portslist] - foreach port $ports { - if {[lsearch -sorted -exact $portslist $port] == -1} { - ui_warn "Target $target has an undeclared dependency on $port" - } - } - foreach port $portslist { - if {[lsearch -sorted -exact $ports $port] == -1} { - ui_debug "Target $target has no traceable dependency on $port" - } - } + # Get the list of ports. + set ports [slave_send porttrace::slave_get_ports] + + # Compare with portslist + set portslist [lsort $portslist] + foreach port $ports { + if {[lsearch -sorted -exact $portslist $port] == -1} { + ui_warn "Target $target has an undeclared dependency on $port" + } + } + foreach port $portslist { + if {[lsearch -sorted -exact $ports $port] == -1} { + ui_debug "Target $target has no traceable dependency on $port" + } + } } # Check that no violation happened. # Output a warning for every sandbox violation the trace revealed. # This method must be called after trace_start proc porttrace::trace_check_violations {} { - # Get the list of violations. - set violations [slave_send porttrace::slave_get_sandbox_violations] - - foreach violation [lsort $violations] { - ui_warn "An activity was attempted outside sandbox: $violation" - } + # Get the list of violations. + set violations [slave_send porttrace::slave_get_sandbox_violations] + + foreach violation [lsort $violations] { + ui_warn "An activity was attempted outside sandbox: $violation" + } } # Stop the trace and return the list of ports the port depends on. # This method must be called after trace_start proc porttrace::trace_stop {} { - global os.platform - if {${os.platform} == "darwin"} { - global env trace_fifo - unset env(DYLD_INSERT_LIBRARIES) - unset env(DYLD_FORCE_FLAT_NAMESPACE) - unset env(DARWINTRACE_LOG) - if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { - unset env(DARWINTRACE_SANDBOX_BOUNDS) - } - - #kill socket - tracelib clean + global os.platform + if {${os.platform} == "darwin"} { + global env trace_fifo + unset env(DYLD_INSERT_LIBRARIES) + unset env(DYLD_FORCE_FLAT_NAMESPACE) + unset env(DARWINTRACE_LOG) + if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] { + unset env(DARWINTRACE_SANDBOX_BOUNDS) + } - # Clean up. - slave_send porttrace::slave_stop + #kill socket + tracelib clean - # Delete the slave. - delete_slave + # Clean up. + slave_send porttrace::slave_stop - file delete -force $trace_fifo - } + # Delete the slave. + delete_slave + + file delete -force $trace_fifo + } } # Private # Create the slave thread. proc porttrace::create_slave {workpath trace_fifo} { - global trace_thread - # Create the thread. - set trace_thread [macports_create_thread] - - # The slave thread requires the registry package. - thread::send -async $trace_thread "package require registry 1.0" - # and this file as well. - thread::send -async $trace_thread "package require porttrace 1.0" + global trace_thread + # Create the thread. + set trace_thread [macports_create_thread] - # Start the slave work. - thread::send -async $trace_thread "porttrace::slave_start $trace_fifo $workpath" + # The slave thread requires the registry package. + thread::send -async $trace_thread "package require registry 1.0" + # and this file as well. + thread::send -async $trace_thread "package require porttrace 1.0" + + # Start the slave work. + thread::send -async $trace_thread "porttrace::slave_start $trace_fifo $workpath" } # Private # Send a command to the thread without waiting for the result. proc porttrace::slave_send_async {command} { - global trace_thread + global trace_thread - thread::send -async $trace_thread "$command" + thread::send -async $trace_thread "$command" } # Private # Send a command to the thread. proc porttrace::slave_send {command} { - global trace_thread + global trace_thread - # ui_warn "slave send $command ?" + # ui_warn "slave send $command ?" - thread::send $trace_thread "$command" result - return $result + thread::send $trace_thread "$command" result + return $result } # Private # Destroy the thread. proc porttrace::delete_slave {} { - global trace_thread + global trace_thread - # Destroy the thread. - thread::release $trace_thread + # Destroy the thread. + thread::release $trace_thread } # Private. # Slave method to read a line from the trace. proc porttrace::lave_read_line {chan} { - global ports_list trace_filemap sandbox_violation_list workpath - global env + global ports_list trace_filemap sandbox_violation_list workpath + global env - while 1 { - # We should never get EOF, actually. - if {[eof $chan]} { - break - } - - # The line is of the form: verb\tpath - # Get the path by chopping it. - set theline [gets $chan] - - if {[fblocked $chan]} { - # Exit the loop. - break - } + while 1 { + # We should never get EOF, actually. + if {[eof $chan]} { + break + } - set line_length [string length $theline] - - # Skip empty lines. - if {$line_length > 0} { - set path_start [expr [string first "\t" $theline] + 1] - set op [string range $theline 0 [expr $path_start - 2]] - set path [string range $theline $path_start [expr $line_length - 1]] - - # open/execve - if {$op == "open" || $op == "execve"} { - # Only work on files. - if {[file isfile $path]} { - # Did we process the file yet? - if {![filemap exists trace_filemap $path]} { - # Obtain information about this file. - set port [registry::file_registered $path] - if { $port != 0 } { - # Add the port to the list. - if {[lsearch -sorted -exact $ports_list $port] == -1} { - lappend ports_list $port - set ports_list [lsort $ports_list] - # Maybe fill trace_filemap for efficiency? - } - } - - # Add the file to the tree with port information. - # Ignore errors. Errors can occur if a directory was - # created where a file once lived. - # This doesn't affect existing ports and we just - # add this information to speed up port detection. - catch {filemap set trace_filemap $path $port} - } - } - } elseif {$op == "sandbox_violation"} { - lappend sandbox_violation_list $path - } - } - } + # The line is of the form: verb\tpath + # Get the path by chopping it. + set theline [gets $chan] + + if {[fblocked $chan]} { + # Exit the loop. + break + } + + set line_length [string length $theline] + + # Skip empty lines. + if {$line_length > 0} { + set path_start [expr [string first "\t" $theline] + 1] + set op [string range $theline 0 [expr $path_start - 2]] + set path [string range $theline $path_start [expr $line_length - 1]] + + # open/execve + if {$op == "open" || $op == "execve"} { + # Only work on files. + if {[file isfile $path]} { + # Did we process the file yet? + if {![filemap exists trace_filemap $path]} { + # Obtain information about this file. + set port [registry::file_registered $path] + if { $port != 0 } { + # Add the port to the list. + if {[lsearch -sorted -exact $ports_list $port] == -1} { + lappend ports_list $port + set ports_list [lsort $ports_list] + # Maybe fill trace_filemap for efficiency? + } + } + + # Add the file to the tree with port information. + # Ignore errors. Errors can occur if a directory was + # created where a file once lived. + # This doesn't affect existing ports and we just + # add this information to speed up port detection. + catch {filemap set trace_filemap $path $port} + } + } + } elseif {$op == "sandbox_violation"} { + lappend sandbox_violation_list $path + } + } + } } # Private. # Slave init method. proc porttrace::slave_start {fifo p_workpath} { - global ports_list trace_filemap sandbox_violation_list - # Save the workpath. - set workpath $p_workpath - # Create a virtual filemap. - filemap create trace_filemap - set ports_list {} - set sandbox_violation_list {} - tracelib setname $fifo - tracelib run + global ports_list trace_filemap sandbox_violation_list + # Save the workpath. + set workpath $p_workpath + # Create a virtual filemap. + filemap create trace_filemap + set ports_list {} + set sandbox_violation_list {} + tracelib setname $fifo + tracelib run } # Private. # Slave cleanup method. proc porttrace::slave_stop {} { - global trace_filemap trace_fifo_r_chan trace_fifo_w_chan - # Close the virtual filemap. - filemap close trace_filemap - # Close the pipe (both ends). + global trace_filemap trace_fifo_r_chan trace_fifo_w_chan + # Close the virtual filemap. + filemap close trace_filemap + # Close the pipe (both ends). } # Private. # Slave ports export method. proc porttrace::slave_get_ports {} { - global ports_list - return $ports_list + global ports_list + return $ports_list } # Private. # Slave sandbox violations export method. proc porttrace::slave_get_sandbox_violations {} { - global sandbox_violation_list - return $sandbox_violation_list + global sandbox_violation_list + return $sandbox_violation_list } proc porttrace::slave_add_sandbox_violation {path} { - global sandbox_violation_list - lappend sandbox_violation_list $path + global sandbox_violation_list + lappend sandbox_violation_list $path } Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl =================================================================== --- branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-05-04 04:15:01 UTC (rev 50562) +++ branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-05-04 06:22:25 UTC (rev 50563) @@ -18,7 +18,7 @@ # 3. Neither the name of Apple Computer, Inc. nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -283,11 +283,11 @@ # composed of the command options. proc command_string {command} { global ${command}.dir ${command}.pre_args ${command}.args ${command}.post_args ${command}.cmd - + if {[info exists ${command}.dir]} { append cmdstring "cd \"[set ${command}.dir]\" &&" } - + if {[info exists ${command}.cmd]} { foreach string [set ${command}.cmd] { append cmdstring " $string" @@ -332,7 +332,7 @@ } } } - + # Set the environment. # If the array doesn't exist, we create it with the value # coming from ${command}.env @@ -344,13 +344,13 @@ if {[option macosx_deployment_target] ne ""} { set ${command}.env_array(MACOSX_DEPLOYMENT_TARGET) [option macosx_deployment_target] } - + # Debug that. ui_debug "Environment: [environment_array_to_string ${command}.env_array]" # Get the command string. set cmdstring [command_string ${command}] - + # Call this command. # TODO: move that to the system native call? # Save the environment. @@ -366,13 +366,13 @@ } # Unset the command array until next time. array unset ${command}.env_array - + # Restore the environment. array unset env * unsetenv * array set env [array get saved_env] - # Return as if system had been called directly. + # Return as if system had been called directly. return -code $code $result } @@ -452,9 +452,9 @@ set len [llength $args] set code [lindex $args end] set args [lrange $args 0 [expr $len - 2]] - + set ditem [variant_new "temp-variant"] - + # mode indicates what the arg is interpreted as. # possible mode keywords are: requires, conflicts, provides # The default mode is provides. Arguments are added to the @@ -466,7 +466,7 @@ provides - requires - conflicts { set mode $arg } - default { ditem_append $ditem $mode $arg } + default { ditem_append $ditem $mode $arg } } } ditem_key $ditem name "[join [ditem_key $ditem provides] -]" @@ -474,7 +474,7 @@ # make a user procedure named variant-blah-blah # we will call this procedure during variant-run makeuserproc "variant-[ditem_key $ditem name]" \{$code\} - + # Export provided variant to PortInfo # (don't list it twice if the variant was already defined, which can happen # with universal or group code). @@ -488,7 +488,7 @@ set vinfo($variant_provides) {} } array set variant $vinfo($variant_provides) - + # Set conflicts. set vconflicts [join [lsort [ditem_key $ditem conflicts]]] if {$vconflicts ne ""} { @@ -530,7 +530,7 @@ # Returns 1 if variant name selected, otherwise 0 proc variant_isset {name} { global variations - + if {[info exists variations($name)] && $variations($name) == "+"} { return 1 } @@ -555,7 +555,7 @@ set all_variants [lreplace $all_variants $item_index $item_index] break } - + incr item_index } } @@ -631,20 +631,20 @@ } } -# platform [] [] +# platform [] [] # Portfile level procedure to provide support for declaring platform-specifics # Basically, just wrap 'variant', so that Portfiles' platform declarations can # be more readable, and support arch and version specifics proc platform {args} { global all_variants PortInfo os.platform os.arch os.version os.major - + set len [llength $args] set code [lindex $args end] set os [lindex $args 0] set args [lrange $args 1 [expr $len - 2]] - + set ditem [variant_new "temp-variant"] - + foreach arg $args { if {[regexp {(^[0-9]+$)} $arg match result]} { set release $result @@ -652,30 +652,30 @@ set arch $result } } - + # Add the variant for this platform set platform $os if {[info exists release]} { set platform ${platform}_${release} } if {[info exists arch]} { set platform ${platform}_${arch} } - + # Pick up a unique name. if {[variant_exists $platform]} { set suffix 1 while {[variant_exists "$platform-$suffix"]} { incr suffix } - + set platform "$platform-$suffix" } variant $platform $code - + # Set the variant if this platform matches the platform we're on set matches 1 - if {[info exists os.platform] && ${os.platform} == $os} { + if {[info exists os.platform] && ${os.platform} == $os} { set sel_platform $os if {[info exists os.major] && [info exists release]} { - if {${os.major} == $release } { - set sel_platform ${sel_platform}_${release} + if {${os.major} == $release } { + set sel_platform ${sel_platform}_${release} } else { set matches 0 } @@ -703,7 +703,7 @@ if {[info exists ${command}.env]} { # Flatten the environment string. set the_environment [join [set ${command}.env]] - + while {[regexp "^(?: *)(\[^= \]+)=(\"|'|)(\[^\"'\]*?)\\2(?: +|$)(.*)$" ${the_environment} matchVar key delimiter value remaining]} { set the_environment ${remaining} set ${command}.env_array(${key}) ${value} @@ -747,7 +747,7 @@ # Remark: this method is only used for debugging purposes. proc environment_array_to_string {environment_array} { upvar 1 ${environment_array} env_array - + set theString "" foreach {key value} [array get env_array] { if {$theString == ""} { @@ -756,7 +756,7 @@ set theString "${theString} $key='$value'" } } - + return $theString } @@ -809,7 +809,7 @@ # reinplace # Provides "sed in place" functionality proc reinplace {args} { - global euid macportsuser + global euid macportsuser set extended 0 while 1 { @@ -836,7 +836,7 @@ } set pattern [lindex $args 0] set files [lrange $args 1 end] - + foreach file $files { if {[catch {set tmpfile [mkstemp "/tmp/[file tail $file].sed.XXXXXXXX"]} error]} { global errorInfo @@ -849,7 +849,7 @@ # Set tmpfile to only the file name set tmpfile [join [lrange $tmpfile 1 end]] } - + set cmdline $portutil::autoconf::sed_command if {$extended} { if {$portutil::autoconf::sed_ext_flag == "N/A"} { @@ -867,13 +867,13 @@ close $tmpfd return -code error "reinplace sed(1) failed" } - + close $tmpfd - - # start gsoc08-privileges - chownAsRoot $file - # end gsoc08-privileges - + + # start gsoc08-privileges + chownAsRoot $file + # end gsoc08-privileges + set attributes [file attributes $file] # We need to overwrite this file if {[catch {file attributes $file -permissions u+w} error]} { @@ -883,7 +883,7 @@ file delete "$tmpfile" return -code error "reinplace permissions failed" } - + if {[catch {file copy -force $tmpfile $file} error]} { global errorInfo ui_debug "$errorInfo" @@ -891,9 +891,9 @@ file delete "$tmpfile" return -code error "reinplace copy failed" } - + eval file attributes {$file} $attributes - + file delete "$tmpfile" } return @@ -934,7 +934,7 @@ default {return -code error "touch: illegal option -- $arg"} } } - + # parse the r/t options if {[info exists options(rt)]} { if {[string equal $options(rt) r]} { @@ -977,14 +977,14 @@ set atime [clock seconds] set mtime [clock seconds] } - + # do we have any files to process? if {[llength $args] == 0} { # print usage ui_msg {usage: touch [-a] [-c] [-m] [-r file] [-t [[CC]YY]MMDDhhmm[.SS]] file ...} return } - + foreach file $args { if {![file exists $file]} { if {[info exists options(c)]} { @@ -993,7 +993,7 @@ close [open $file w] } } - + if {[info exists options(a)] || ![info exists options(m)]} { file atime $file $atime } @@ -1037,7 +1037,7 @@ default {return -code error "ln: illegal option -- $arg"} } } - + if {[llength $args] == 0} { ui_msg {usage: ln [-f] [-h] [-s] [-v] source_file [target_file]} ui_msg { ln [-f] [-h] [-s] [-v] file ... directory} @@ -1049,18 +1049,18 @@ set files [lrange $args 0 [expr [llength $args] - 2]] set target [lindex $args end] } - + foreach file $files { if {[file isdirectory $file] && ![info exists options(s)]} { return -code error "ln: $file: Is a directory" } - + if {[file isdirectory $target] && ([file type $target] ne "link" || ![info exists options(h)])} { set linktarget [file join $target [file tail $file]] } else { set linktarget $target } - + if {![catch {file type $linktarget}]} { if {[info exists options(f)]} { file delete $linktarget @@ -1068,7 +1068,7 @@ return -code error "ln: $linktarget: File exists" } } - + if {[llength $files] > 2} { if {![file exists $linktarget]} { return -code error "ln: $linktarget: No such file or directory" @@ -1077,7 +1077,7 @@ return -code error "ln: $target: Not a directory" } } - + if {[info exists options(v)]} { ui_msg "ln: $linktarget -> $file" } @@ -1094,7 +1094,7 @@ # Provides searching of the standard path for included files proc filefindbypath {fname} { global distpath filesdir worksrcdir portpath - + if {[file readable $portpath/$fname]} { return $portpath/$fname } elseif {[file readable $portpath/$filesdir/$fname]} { @@ -1170,7 +1170,7 @@ foreach m $list { if {[string first "@" $m] < 0} { if {[string first ":" $m] >= 0} { - set m [regsub -- "(.*):(.*)" $m "\\2@\\1"] + set m [regsub -- "(.*):(.*)" $m "\\2@\\1"] } else { set m "$m at macports.org" } @@ -1188,70 +1188,31 @@ set ports_dry_last_skipped "" proc target_run {ditem} { - global target_state_fd portpath portname portversion portrevision portvariants ports_force variations workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped errorisprivileges + global target_state_fd portname workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped errorisprivileges set result 0 set skipped 0 set procedure [ditem_key $ditem procedure] - + if {[ditem_key $ditem state] != "no"} { set target_state_fd [open_statefile] } - + if {$procedure != ""} { set name [ditem_key $ditem name] - + if {[ditem_contains $ditem init]} { set result [catch {[ditem_key $ditem init] $name} errstr] } - + if {$result == 0} { # Skip the step if required and explain why through ui_debug. - # 1st case: the step was already done (as mentioned in the state file) + # check if the step was already done (as mentioned in the state file) if {[ditem_key $ditem state] != "no" && [check_statefile target $name $target_state_fd]} { ui_debug "Skipping completed $name ($portname)" set skipped 1 - # 2nd case: the step is not to always be performed - # and this exact port/version/revision/variants is already installed - # and user didn't mention -f - # and portfile didn't change since installation. - } elseif {[ditem_key $ditem runtype] != "always" - && [registry_exists $portname $portversion $portrevision $portvariants] - && !([info exists ports_force] && $ports_force == "yes")} { - - # Did the Portfile change since installation? - set regref [registry_open $portname $portversion $portrevision $portvariants] - - set installdate [registry_prop_retr $regref date] - if { $installdate != 0 - && $installdate < [file mtime ${portpath}/Portfile]} { - ui_debug "Portfile changed since installation" - } else { - # Say we're skipping. - set skipped 1 - - ui_debug "Skipping $name ($portname) since this port is already installed" - } - - # Something to close the registry entry may be called here, if it existed. - # 3rd case: the same port/version/revision/Variants is already active - # and user didn't mention -f - } elseif {$name == "org.macports.activate" - && [registry_exists $portname $portversion $portrevision $portvariants] - && !([info exists ports_force] && $ports_force == "yes")} { - - # Is port active? - set regref [registry_open $portname $portversion $portrevision $portvariants] - - if { [registry_prop_retr $regref active] != 0 } { - # Say we're skipping. - set skipped 1 - - ui_msg "Skipping $name ($portname $portvariants) since this port is already active" - } - } - + # Of course, if this is a dry run, don't do the task: if {[info exists ports_dryrun] && $ports_dryrun == "yes"} { # only one message per portname @@ -1263,18 +1224,18 @@ } set skipped 1 } - + # otherwise execute the task. if {$skipped == 0} { set target [ditem_key $ditem provides] - + # Execute pre-run procedure if {[ditem_contains $ditem prerun]} { set result [catch {[ditem_key $ditem prerun] $name} errstr] } - + #start tracelib - if {($result ==0 + if {($result ==0 && [info exists ports_trace] && $ports_trace == "yes" && $target != "clean")} { @@ -1288,20 +1249,20 @@ && $target != "install"} { porttrace::trace_enable_fence } - + # collect deps - + # Don't check dependencies for extract (they're not honored # anyway). This avoids warnings about bzip2. if {$target != "extract"} { set depends {} set deptypes {} - + # Determine deptypes to look for based on target switch $target { configure - build { set deptypes "depends_lib depends_build" } - + test - destroot - install - @@ -1317,7 +1278,7 @@ activate - "" { set deptypes "depends_lib depends_build depends_run" } } - + # Gather the dependencies for deptypes foreach deptype $deptypes { # Add to the list of dependencies if the option exists and isn't empty. @@ -1325,7 +1286,7 @@ set depends [concat $depends $PortInfo($deptype)] } } - + # Dependencies are in the form verb:[param:]port set depsPorts {} foreach depspec $depends { @@ -1338,16 +1299,16 @@ if {$target == "destroot"} { lappend depsPorts "gzip" } - + set portlist $depsPorts foreach depName $depsPorts { set portlist [recursive_collect_deps $depName $deptypes $portlist] } - + if {[llength $deptypes] > 0} {tracelib setdeps $portlist} } } - + if {$result == 0} { foreach pre [ditem_key $ditem pre] { ui_debug "Executing $pre" @@ -1355,12 +1316,12 @@ if {$result != 0} { break } } } - + if {$result == 0} { ui_debug "Executing $name ($portname)" set result [catch {$procedure $name} errstr] } - + if {$result == 0} { foreach post [ditem_key $ditem post] { ui_debug "Executing $post" @@ -1379,11 +1340,11 @@ if {[info exists ports_trace] && $ports_trace == "yes" && $target!="clean"} { - + tracelib closesocket - + porttrace::trace_check_violations - + # End of trace. porttrace::trace_stop } @@ -1400,21 +1361,21 @@ write_statefile target $name $target_state_fd } } else { - if {$errorisprivileges != "yes"} { + if {$errorisprivileges != "yes"} { global errorInfo - ui_error "Target $name returned: $errstr" + ui_error "Target $name returned: $errstr" ui_debug "Backtrace: $errorInfo" } else { - ui_msg "Target $name returned: $errstr" + ui_msg "Target $name returned: $errstr" } set result 1 } - + } else { ui_info "Warning: $name does not have a registered procedure" set result 1 } - + if {[ditem_key $ditem state] != "no"} { close $target_state_fd } @@ -1446,7 +1407,7 @@ foreach depspec $depends \ { set portname [lindex [split $depspec :] end] - if {[lsearch -exact $portdeps $portname] == -1} { + if {[lsearch -exact $portdeps $portname] == -1} { lappend portdeps $portname set portdeps [recursive_collect_deps $portname $deptypes $portdeps] } @@ -1456,14 +1417,37 @@ proc eval_targets {target} { - global targets target_state_fd portname errorisprivileges + global targets target_state_fd portname portversion portrevision portvariants ports_dryrun user_options errorisprivileges set dlist $targets set errorisprivileges "no" - + + # the statefile will likely be autocleaned away after install, + # so special-case ignore already-completed install and activate + if {[registry_exists $portname $portversion $portrevision $portvariants]} { + if {$target == "install"} { + ui_debug "Skipping $target ($portname) since this port is already installed" + return 0 + } elseif {$target == "activate"} { + set regref [registry_open $portname $portversion $portrevision $portvariants] + if {[registry_prop_retr $regref active] != 0} { + # Something to close the registry entry may be called here, if it existed. + ui_debug "Skipping $target ($portname @${portversion}_${portrevision}${portvariants}) since this port is already active" + } else { + # do the activate here since target_run doesn't know how to selectively ignore the preceding steps + if {[info exists ports_dryrun] && $ports_dryrun == "yes"} { + ui_msg "For $portname: skipping $target (dry run)" + } else { + registry_activate $portname ${portversion}_${portrevision}${portvariants} [array get user_options] + } + } + return 0 + } + } + # Select the subset of targets under $target if {$target != ""} { set matches [dlist_search $dlist provides $target] - + if {[llength $matches] > 0} { set dlist [dlist_append_dependents $dlist [lindex $matches 0] [list]] # Special-case 'all' @@ -1472,9 +1456,9 @@ return 1 } } - + set dlist [dlist_eval $dlist "" target_run] - + if {[llength $dlist] > 0} { # somebody broke! set errstring "Warning: the following items did not execute (for $portname):" @@ -1486,13 +1470,13 @@ } else { set result 0 } - + # start gsoc08-privileges if { $result == 1 && $errorisprivileges == "yes" } { - set result 2 + set result 2 } # end gsoc08-privileges - + return $result } @@ -1501,79 +1485,79 @@ proc open_statefile {args} { global workpath worksymlink place_worksymlink portname portpath ports_ignore_older global altprefix usealtworkpath env applications_dir portbuildpath distpath - - # start gsoc08-privileges - # de-escalate privileges - only run if MacPorts was started with sudo - dropPrivileges - + # start gsoc08-privileges + + # de-escalate privileges - only run if MacPorts was started with sudo + dropPrivileges + if { ![file exists $workpath] } { if {[catch {set result [file mkdir $workpath]} result]} { global errorInfo ui_debug "mkdir $workpath: $errorInfo" } } - - # if unable to write to workpath, implies running without either root privileges + + # if unable to write to workpath, implies running without either root privileges # or a shared directory owned by the group so use ~/.macports if { ![file writable $workpath] } { - - set userid [getuid] - set username [uid_to_name $userid] - if { $userid !=0 } { - ui_msg "MacPorts running without privileges.\ - You may be prompted for your sudo password in order to complete certain actions (eg install)." - } - - # set global variable indicating to other functions to use ~/.macports as well - set usealtworkpath yes - - # do tilde expansion manually - tcl won't expand tildes automatically for curl, etc. - if {[info exists env(HOME)]} { - # HOME environment var is set, use it. - set userhome "$env(HOME)" - } else { - # the environment var isn't set, expand ~user instead - set userhome [file normalize "~${username}"] - } - - # set alternative prefix global variables - set altprefix "$userhome/.macports" - - # get alternative paths - set newworkpath "$altprefix$workpath" - set newworksymlink "$altprefix$worksymlink" - set newportbuildpath "$altprefix$portbuildpath" - set newdistpath "$altprefix$distpath" - - set sourcepath [string map {"work" ""} $worksymlink] - set newsourcepath "$altprefix/[ string range $sourcepath 1 end ]" + set userid [getuid] + set username [uid_to_name $userid] - # copy Portfile (and patch files) if not there already - # note to maintainers/devs: the original portfile in /opt/local is ALWAYS the one that will be - # read by macports. The copying of the portfile is done to preserve the symlink provided - # historically by macports from the portfile directory to the work directory. - # It is NOT read by MacPorts. - if {![file exists ${newsourcepath}Portfile] } { - file mkdir $newsourcepath - ui_debug "$newsourcepath created" - ui_debug "Going to copy: ${sourcepath}Portfile" - file copy ${sourcepath}Portfile $newsourcepath - if {[file exists ${sourcepath}files] } { - ui_debug "Going to copy: ${sourcepath}files" - file copy ${sourcepath}files $newsourcepath - } - } - - set workpath $newworkpath - set worksymlink $newworksymlink - set portbuildpath $newportbuildpath - set distpath $newdistpath - - ui_debug "Going to use $newworkpath for statefile." + if { $userid !=0 } { + ui_msg "MacPorts running without privileges.\ + You may be prompted for your sudo password in order to complete certain actions (eg install)." + } + + # set global variable indicating to other functions to use ~/.macports as well + set usealtworkpath yes + + # do tilde expansion manually - tcl won't expand tildes automatically for curl, etc. + if {[info exists env(HOME)]} { + # HOME environment var is set, use it. + set userhome "$env(HOME)" + } else { + # the environment var isn't set, expand ~user instead + set userhome [file normalize "~${username}"] + } + + # set alternative prefix global variables + set altprefix "$userhome/.macports" + + # get alternative paths + set newworkpath "$altprefix$workpath" + set newworksymlink "$altprefix$worksymlink" + set newportbuildpath "$altprefix$portbuildpath" + set newdistpath "$altprefix$distpath" + + set sourcepath [string map {"work" ""} $worksymlink] + set newsourcepath "$altprefix/[ string range $sourcepath 1 end ]" + + # copy Portfile (and patch files) if not there already + # note to maintainers/devs: the original portfile in /opt/local is ALWAYS the one that will be + # read by macports. The copying of the portfile is done to preserve the symlink provided + # historically by macports from the portfile directory to the work directory. + # It is NOT read by MacPorts. + if {![file exists ${newsourcepath}Portfile] } { + file mkdir $newsourcepath + ui_debug "$newsourcepath created" + ui_debug "Going to copy: ${sourcepath}Portfile" + file copy ${sourcepath}Portfile $newsourcepath + if {[file exists ${sourcepath}files] } { + ui_debug "Going to copy: ${sourcepath}files" + file copy ${sourcepath}files $newsourcepath + } + } + + set workpath $newworkpath + set worksymlink $newworksymlink + set portbuildpath $newportbuildpath + set distpath $newdistpath + + ui_debug "Going to use $newworkpath for statefile." } else { - set usealtworkpath no + set usealtworkpath no } # end gsoc08-privileges @@ -1594,12 +1578,12 @@ } } - # Create a symlink to the workpath for port authors + # Create a symlink to the workpath for port authors if {[tbool place_worksymlink] && ![file isdirectory $worksymlink]} { ui_debug "Attempting ln -sf $workpath $worksymlink" ln -sf $workpath $worksymlink } - + set fd [open $statefile a+] if {[catch {flock $fd -exclusive -noblock} result]} { if {"$result" == "EAGAIN"} { @@ -1642,14 +1626,14 @@ # Check that recorded selection of variants match the current selection proc check_statefile_variants {variations fd} { upvar $variations upvariations - + seek $fd 0 while {[gets $fd line] >= 0} { if {[regexp "variant: (.*)" $line match name]} { set oldvariations([string range $name 1 end]) [string range $name 0 0] } } - + set mismatch 0 if {[array size oldvariations] > 0} { if {[array size oldvariations] != [array size upvariations]} { @@ -1663,7 +1647,7 @@ } } } - + return $mismatch } @@ -1673,9 +1657,9 @@ # will be chosen. Returns a list of the selected variants. proc choose_variants {dlist variations} { upvar $variations upvariations - + set selected [list] - + foreach ditem $dlist { # Enumerate through the provides, tallying the pros and cons. set pros 0 @@ -1692,9 +1676,9 @@ incr ignored } } - + if {$cons > 0} { continue } - + if {$pros > 0 && $ignored == 0} { lappend selected $ditem } @@ -1705,7 +1689,7 @@ proc variant_run {ditem} { set name [ditem_key $ditem name] ui_debug "Executing variant $name provides [ditem_key $ditem provides]" - + # test for conflicting variants foreach v [ditem_key $ditem conflicts] { if {[variant_isset $v]} { @@ -1713,7 +1697,7 @@ return 1 } } - + # execute proc with same name as variant. if {[catch "variant-${name}" result]} { global errorInfo @@ -1725,7 +1709,7 @@ } # Given a list of variant specifications, return a canonical string form -# for the registry. +# for the registry. # The strategy is as follows: regardless of how some collection of variants # was turned on or off, a particular instance of the port is uniquely # characterized by the set of variants that are *on*. Thus, record those @@ -1755,11 +1739,11 @@ set chosen [choose_variants $dlist upvariations] set portname $PortInfo(name) - # Check to make sure the requested variations are available with this - # port, if one is not, warn the user and remove the variant from the + # Check to make sure the requested variations are available with this + # port, if one is not, warn the user and remove the variant from the # array. foreach key [array names upvariations *] { - if {![info exists PortInfo(variants)] || + if {![info exists PortInfo(variants)] || [lsearch $PortInfo(variants) $key] == -1} { ui_debug "Requested variant $key is not provided by port $portname." array unset upvariations $key @@ -1771,12 +1755,12 @@ #foreach obj $dlist { # $obj set provides [list [join [$obj get provides] -]] #} - + set newlist [list] foreach variant $chosen { set newlist [dlist_append_dependents $dlist $variant $newlist] } - + set dlist [dlist_eval $newlist "" variant_run] if {[llength $dlist] > 0} { return 1 @@ -1828,7 +1812,7 @@ upvar $variations upvariations set result 0 set portname $PortInfo(name) - + # Make sure the variations match those stored in the statefile. # If they don't match, print an error indicating a 'port clean' # should be performed. @@ -1848,9 +1832,9 @@ } if { $statereq && !([info exists ports_force] && $ports_force == "yes")} { - + set state_fd [open_statefile] - + if {[check_statefile_variants upvariations $state_fd]} { ui_error "Requested variants do not match original selection.\nPlease perform 'port clean $portname' or specify the force option." set result 1 @@ -1860,15 +1844,15 @@ write_statefile variant $upvariations($key)$key $state_fd } } - + close $state_fd } - + return $result } proc default_universal_variant_allowed {args} { - + if {[variant_exists universal]} { ui_debug "universal variant already exists, so not adding the default one" return no @@ -1914,12 +1898,12 @@ proc target_new {name procedure} { global targets set ditem [ditem_create] - + ditem_key $ditem name $name ditem_key $ditem procedure $procedure - + lappend targets $ditem - + return $ditem } @@ -2071,13 +2055,13 @@ } else { set options(workpath) ${newworkpath} } - + set res [mport_lookup $portname] if {[llength $res] < 2} { ui_error "Dependency $portname not found" return -1 } - + array set portinfo [lindex $res 1] set porturl $portinfo(porturl) if {[catch {set worker [mport_open $porturl [array get options] $variations]} result]} { @@ -2094,7 +2078,7 @@ return -1 } mport_close $worker - + return 0 } @@ -2112,17 +2096,17 @@ set realname ${name} set home /dev/null set shell /dev/null - + foreach arg $args { if {[regexp {([a-z]*)=(.*)} $arg match key val]} { set $key $val } } - + if {[existsuser ${name}] != 0 || [existsuser ${uid}] != 0} { return } - + if {${os.platform} eq "darwin"} { exec dscl . -create /Users/${name} Password ${passwd} exec dscl . -create /Users/${name} UniqueID ${uid} @@ -2143,17 +2127,17 @@ set realname ${name} set passwd {*} set users "" - + foreach arg $args { if {[regexp {([a-z]*)=(.*)} $arg match key val]} { set $key $val } } - + if {[existsgroup ${name}] != 0 || [existsgroup ${gid}] != 0} { return } - + if {${os.platform} eq "darwin"} { exec dscl . -create /Groups/${name} Password ${passwd} exec dscl . -create /Groups/${name} RealName ${realname} @@ -2189,12 +2173,12 @@ # returns an error code if it can not be found proc binaryInPath {binary} { global env - foreach dir [split $env(PATH) :] { + foreach dir [split $env(PATH) :] { if {[file executable [file join $dir $binary]]} { return [file join $dir $binary] } } - + return -code error [format [msgcat::mc "Failed to locate '%s' in path: '%s'"] $binary $env(PATH)]; } @@ -2314,7 +2298,7 @@ # private function # merge_file base-path target-path relative-path architectures # e.g. 'merge_file ${workpath}/pre-dest ${destroot} ${prefix}/share/man/man1/port.1 i386 ppc -# will test equivalence of files and copy them if they are the same (for the different architectures) +# will test equivalence of files and copy them if they are the same (for the different architectures) proc merge_file {base target file archs} { set basearch [lindex ${archs} 0] ui_debug "ba: '${basearch}' ('${archs}')" @@ -2395,14 +2379,14 @@ # @param path the file/directory to be chowned # @param user the user to chown file to proc chown {path user} { - lchown $path $user - + lchown $path $user + if {[file isdirectory $path]} { - fs-traverse myfile ${path} { - lchown $myfile $user - } + fs-traverse myfile ${path} { + lchown $myfile $user + } } - + } ## @@ -2412,18 +2396,18 @@ proc chownAsRoot {path} { global euid macportsuser - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - seteuid $euid - ui_debug "euid changed to: [geteuid]" - chown ${path} ${macportsuser} - ui_debug "chowned $path to $macportsuser" - seteuid [name_to_uid "$macportsuser"] - ui_debug "euid changed to: [geteuid]" - } elseif { [getuid] == 0 } { - # if started with sudo but have elevated back to root already - chown ${path} ${macportsuser} - } + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + seteuid $euid + ui_debug "euid changed to: [geteuid]" + chown ${path} ${macportsuser} + ui_debug "chowned $path to $macportsuser" + seteuid [name_to_uid "$macportsuser"] + ui_debug "euid changed to: [geteuid]" + } elseif { [getuid] == 0 } { + # if started with sudo but have elevated back to root already + chown ${path} ${macportsuser} + } } ## @@ -2431,51 +2415,51 @@ # # @param action the action for which privileges are being elevated proc elevateToRoot {action} { - global euid egid macportsuser errorisprivileges - - if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { - # if started with sudo but have dropped the privileges - ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root." - setegid $egid - seteuid $euid - ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." - } - - if { [getuid] != 0 } { - set errorisprivileges yes - return -code error "port requires root privileges for this action and needs you to type your password for sudo."; - } + global euid egid macportsuser errorisprivileges + + if { [getuid] == 0 && [geteuid] == [name_to_uid "$macportsuser"] } { + # if started with sudo but have dropped the privileges + ui_debug "Can't run $action on this port without elevated privileges. Escalating privileges back to root." + setegid $egid + seteuid $euid + ui_debug "euid changed to: [geteuid]. egid changed to: [getegid]." + } + + if { [getuid] != 0 } { + set errorisprivileges yes + return -code error "port requires root privileges for this action and needs you to type your password for sudo."; + } } ## # de-escalate privileges from root to those of $macportsuser. # proc dropPrivileges {} { - global euid egid macportsuser workpath - if { [geteuid] == 0 } { - if { [catch { - set euid [geteuid] - set egid [getegid] - ui_debug "changing euid/egid - current euid: $euid - current egid: $egid" - - #seteuid [name_to_uid [file attributes $workpath -owner]] - #setegid [name_to_gid [file attributes $workpath -group]] - - setegid [name_to_gid "$macportsuser"] - seteuid [name_to_uid "$macportsuser"] - ui_debug "egid changed to: [getegid]" - ui_debug "euid changed to: [geteuid]" - - if {![file writable $workpath]} { - ui_debug "Privileges successfully de-escalated. Unable to write to default workpath." - } - }] - } { - ui_debug "$::errorInfo" - ui_error "Failed to de-escalate privileges." - } - } else { - ui_debug "Privilege de-escalation not attempted as not running as root." - } + global euid egid macportsuser workpath + if { [geteuid] == 0 } { + if { [catch { + set euid [geteuid] + set egid [getegid] + ui_debug "changing euid/egid - current euid: $euid - current egid: $egid" + + #seteuid [name_to_uid [file attributes $workpath -owner]] + #setegid [name_to_gid [file attributes $workpath -group]] + + setegid [name_to_gid "$macportsuser"] + seteuid [name_to_uid "$macportsuser"] + ui_debug "egid changed to: [getegid]" + ui_debug "euid changed to: [geteuid]" + + if {![file writable $workpath]} { + ui_debug "Privileges successfully de-escalated. Unable to write to default workpath." + } + }] + } { + ui_debug "$::errorInfo" + ui_error "Failed to de-escalate privileges." + } + } else { + ui_debug "Privilege de-escalation not attempted as not running as root." + } } -------------- next part -------------- An HTML attachment was scrubbed... URL: From simon at macports.org Mon May 4 07:15:24 2009 From: simon at macports.org (simon at macports.org) Date: Mon, 4 May 2009 07:15:24 -0700 (PDT) Subject: [50564] trunk/dports/x11/homebank Message-ID: <20090504141525.541981711103@beta.macosforge.org> Revision: 50564 http://trac.macports.org/changeset/50564 Author: simon at macports.org Date: 2009-05-04 07:15:23 -0700 (Mon, 04 May 2009) Log Message: ----------- x11/homebank: Update to 4.0.3, closes #19497. Also fixed livecheck. Modified Paths: -------------- trunk/dports/x11/homebank/Portfile Removed Paths: ------------- trunk/dports/x11/homebank/files/patch-gnomedeprecations.diff Modified: trunk/dports/x11/homebank/Portfile =================================================================== --- trunk/dports/x11/homebank/Portfile 2009-05-04 06:22:25 UTC (rev 50563) +++ trunk/dports/x11/homebank/Portfile 2009-05-04 14:15:23 UTC (rev 50564) @@ -3,8 +3,7 @@ PortSystem 1.0 name homebank -version 3.8 -revision 1 +version 4.0.3 categories x11 platforms darwin maintainers simon openmaintainer @@ -20,16 +19,14 @@ homepage http://homebank.free.fr/ master_sites ${homepage}public/ -checksums md5 a4abe0d0bd7f5fbd8b92fd596bf7da4f \ - sha1 df8f2f096ac55f636a8d53ed5512b76022e8bf69 \ - rmd160 4584e907c5517549ec31416b9bafea0c83251bf5 +checksums md5 8ff3dde0a594f34d086148e4bae2d624 \ + sha1 6ac0dfebabacdca3f3dc4b9369b1ff5a6f2e1a03 \ + rmd160 e3101069dcafe59a93ff960e0150f139e3893821 depends_lib port:gtk2 \ port:libofx \ port:librsvg \ port:p5-xml-parser -patchfiles patch-gnomedeprecations.diff - livecheck.check regex -livecheck.regex "Homebank (\\d+(?:\\.\\d+)*) released" +livecheck.regex "HomeBank (\\d+(?:\\.\\d+)*) released" Deleted: trunk/dports/x11/homebank/files/patch-gnomedeprecations.diff =================================================================== --- trunk/dports/x11/homebank/files/patch-gnomedeprecations.diff 2009-05-04 06:22:25 UTC (rev 50563) +++ trunk/dports/x11/homebank/files/patch-gnomedeprecations.diff 2009-05-04 14:15:23 UTC (rev 50564) @@ -1,41 +0,0 @@ ---- src/gtkdateentry.h.orig 2008-03-31 05:40:23.000000000 -0600 -+++ src/gtkdateentry.h 2008-11-10 14:56:41.000000000 -0700 -@@ -68,7 +68,7 @@ - void (*_gtk_reserved4) (void); - }; - --GtkType gtk_dateentry_get_type(void); -+GType gtk_dateentry_get_type(void); - - GtkWidget *gtk_dateentry_new(void); - ---- src/gtkchart.h.orig 2008-03-31 05:40:23.000000000 -0600 -+++ src/gtkchart.h 2008-11-10 14:56:37.000000000 -0700 -@@ -127,7 +127,7 @@ - void (*_gtk_reserved4) (void); - }; - --GtkType gtk_chart_get_type (void); -+GType gtk_chart_get_type (void); - - /* public function */ - GtkWidget *gtk_chart_new(gint type); ---- src/gtkdateentry.c.orig 2008-03-31 05:40:23.000000000 -0600 -+++ src/gtkdateentry.c 2008-11-10 14:56:31.000000000 -0700 -@@ -209,13 +209,13 @@ - gtk_widget_show (dateentry->arrow); - - g_signal_connect (GTK_OBJECT (dateentry->arrow), "toggled", -- (GtkSignalFunc) gtk_dateentry_arrow_press, dateentry); -+ G_CALLBACK (gtk_dateentry_arrow_press), dateentry); - - g_signal_connect (GTK_OBJECT (dateentry->entry), "activate", -- (GtkSignalFunc) gtk_dateentry_entry_new, dateentry); -+ G_CALLBACK (gtk_dateentry_entry_new), dateentry); - - g_signal_connect (GTK_OBJECT (dateentry->entry), "focus-out-event", -- (GtkSignalFunc) gtk_dateentry_focus, dateentry); -+ G_CALLBACK (gtk_dateentry_focus), dateentry); - - - g_signal_connect (GTK_OBJECT (dateentry->entry), "key_press_event", -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Mon May 4 07:53:08 2009 From: portindex at macports.org (portindex at macports.org) Date: Mon, 4 May 2009 07:53:08 -0700 (PDT) Subject: [50565] trunk/dports Message-ID: <20090504145310.6774317119D6@beta.macosforge.org> Revision: 50565 http://trac.macports.org/changeset/50565 Author: portindex at macports.org Date: 2009-05-04 07:53:06 -0700 (Mon, 04 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-04 14:15:23 UTC (rev 50564) +++ trunk/dports/PortIndex 2009-05-04 14:53:06 UTC (rev 50565) @@ -10950,8 +10950,8 @@ variants universal depends_build {port:pkgconfig port:gtk-doc} portdir x11/gtkspell2 description {Library for highlighting and replacement of misspelled words} homepage http://gtkspell.sourceforge.net epoch 0 platforms darwin name gtkspell2 depends_lib {port:enchant port:gtk2} long_description {GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget. Right-clicking a misspelled word pops up a menu of suggested replacements.} maintainers nomaintainer categories {x11 gnome textproc} version 2.0.15 revision 0 gxmessage 523 variants universal portdir x11/gxmessage description {a GTK-based xmessage clone.} homepage http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage epoch 0 platforms darwin name gxmessage depends_lib lib:libgtk.2:gtk2 maintainers nomaintainer long_description {gxmessage opens a window to display a message obtained from the command line, from a file, or from stdin. The window includes a row of buttons, each of which causes the program to exit with a different return code.} categories x11 version 2.4.4 revision 0 -homebank 680 -variants universal portdir x11/homebank description {Software to manage personal accounts, light and simple.} homepage http://homebank.free.fr/ epoch 0 platforms darwin name homebank depends_lib {port:gtk2 port:libofx port:librsvg port:p5-xml-parser} long_description {HomeBank is the free software you have always wanted to manage your personal accounts at home. The main concept is to be light, simple and very easy to use. It brings you many features that allow you to analyze your finances in a detailed way instantly and dynamically with powerful report tools based on filtering and graphical charts.} maintainers {simon openmaintainer} categories x11 version 3.8 revision 1 +homebank 682 +variants universal portdir x11/homebank description {Software to manage personal accounts, light and simple.} homepage http://homebank.free.fr/ epoch 0 platforms darwin name homebank depends_lib {port:gtk2 port:libofx port:librsvg port:p5-xml-parser} long_description {HomeBank is the free software you have always wanted to manage your personal accounts at home. The main concept is to be light, simple and very easy to use. It brings you many features that allow you to analyze your finances in a detailed way instantly and dynamically with powerful report tools based on filtering and graphical charts.} maintainers {simon openmaintainer} categories x11 version 4.0.3 revision 0 iceauth 587 variants universal depends_build port:pkgconfig portdir x11/iceauth description {ICE authority file utility} homepage http://www.x.org/ epoch 0 platforms darwin name iceauth depends_lib port:xorg-libice long_description {The iceauth program is used to edit and display the authorization information used in connecting with ICE. This program is usually used to extract authorization records from one machine and merge them in on another (as is the case when using remote logins or granting access to other users).} maintainers {blb openmaintainer} categories x11 version 1.0.2 revision 1 icewm 648 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at macports.org Mon May 4 09:25:47 2009 From: noreply at macports.org (MacPorts) Date: Mon, 04 May 2009 16:25:47 -0000 Subject: [MacPorts] InstallingMacPorts modified Message-ID: <20090504162547.B9AF828088@relay14.apple.com> Changed page "InstallingMacPorts" by and.damore at macports.org from 93.44.97.199* Page URL: Diff URL: Revision 40 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: InstallingMacPorts ========================================================================= --- InstallingMacPorts (version: 39) +++ InstallingMacPorts (version: 40) @@ -1,3 +1,5 @@ +[[PageOutline(1-2,Table of Contents,inline)]] + = 1. Install Xcode Tools = 1. Download and install the latest version of [http://developer.apple.com/tools/xcode/ Xcode Tools] ?do not install an older version from the OS X 10.4 install disk or some ports may fail to install. 2. Run the binary installer. @@ -97,7 +99,7 @@ = 4. Install MacPorts = -=== Install MacPorts using the binary installer (to /opt/local/ only) === +== Install MacPorts using the binary installer (to /opt/local/ only) == 1. Download the latest MacPorts .dmg disk image, currently [http://svn.macports.org/repository/macports/downloads/MacPorts-1.7.1/ version 1.7.1]. 2. Run the binary installer. 3. Perform the default ?easy? install. @@ -105,7 +107,7 @@ '''Note:''' * A MacPorts' selfupdate (see below) will automatically update to the latest release if the binary .dmg image is behind the latest released tarball. -=== Install MacPorts from source (to any path except /usr/local/) === +== Install MacPorts from source (to any path except /usr/local/) == 1. Download and unzip the latest MacPorts tarball from the [http://svn.macports.org/repository/macports/downloads/ MacPorts download area]. 2. Perform these commands in a terminal window. {{{ @@ -118,7 +120,7 @@ '''Note:''' * To see why /usr/local is not a viable install location for MacPorts, see the [http://trac.macosforge.org/projects/macports/wiki/FAQ MacPorts FAQ] -=== Install MacPorts from source as an unprivileged (non-root) user === +== Install MacPorts from source as an unprivileged (non-root) user == If you don't have root on your machine, or if you just prefer to install packages without becoming root, the following steps will install MacPorts into ~/macports (tested on Leopard and Tiger). @@ -157,7 +159,7 @@ Most ports install just fine unless they try to add themselves to the LaunchD (e.g. most services, but you'd need root for most of them anyhow). If you do run into a required port that tries to add itself as a startup item, you can edit the Portfile (e.g. {{{port edit }}}) and change {{{startupitem.create yes}}} to {{{startupitem.create no}}} -=== Install MacPorts from a developer release === +== Install MacPorts from a developer release == Under construction. '''Note:''' Developer releases contain untested code and may have bugs. Use at your own risk. -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on InstallingMacPorts. If it was not you, please report to . From mcalhoun at macports.org Mon May 4 10:45:06 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Mon, 4 May 2009 10:45:06 -0700 (PDT) Subject: [50566] trunk/dports/devel/gmp Message-ID: <20090504174507.2856817136DE@beta.macosforge.org> Revision: 50566 http://trac.macports.org/changeset/50566 Author: mcalhoun at macports.org Date: 2009-05-04 10:45:02 -0700 (Mon, 04 May 2009) Log Message: ----------- gmp: Update version 4.2.4 -> 4.3.0. Turn off inlining when using Apple GCC version 4.0 in C99 mode. Fixes #16634. Modified Paths: -------------- trunk/dports/devel/gmp/Portfile Added Paths: ----------- trunk/dports/devel/gmp/files/ Modified: trunk/dports/devel/gmp/Portfile =================================================================== --- trunk/dports/devel/gmp/Portfile 2009-05-04 14:53:06 UTC (rev 50565) +++ trunk/dports/devel/gmp/Portfile 2009-05-04 17:45:02 UTC (rev 50566) @@ -5,8 +5,7 @@ PortGroup muniversal 1.0 name gmp -version 4.2.4 -revision 3 +version 4.3.0 categories devel math maintainers mcalhoun openmaintainer platforms darwin @@ -25,13 +24,16 @@ homepage http://gmplib.org/ master_sites gnu -checksums md5 fc1e3b3a2a5038d4d74138d0b9cf8dbe \ - sha1 bb721f94fbeeb8c609104540b408da6707c370ec \ - rmd160 15c6c40c377088a3bcf9d432bcc27c777991cb12 +checksums md5 9687383f0def0cc48dfc19afa36f1eb5 \ + sha1 86dbd8a6b2fbb4c75760a80009227c9a11b801a9 \ + rmd160 db53caaf856a54d2a2c0d60961a7c4b820bcebce use_bzip2 yes use_parallel_build yes +# See http://trac.macports.org/ticket/16634 +patchfiles gmp-h.in.diff + configure.args --infodir=${prefix}/share/info \ --enable-cxx -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Mon May 4 10:45:35 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Mon, 4 May 2009 10:45:35 -0700 (PDT) Subject: [50567] trunk/dports/devel/gmp/files/gmp-h.in.diff Message-ID: <20090504174536.780141713751@beta.macosforge.org> Revision: 50567 http://trac.macports.org/changeset/50567 Author: mcalhoun at macports.org Date: 2009-05-04 10:45:35 -0700 (Mon, 04 May 2009) Log Message: ----------- Add patch for r50566. Added Paths: ----------- trunk/dports/devel/gmp/files/gmp-h.in.diff Added: trunk/dports/devel/gmp/files/gmp-h.in.diff =================================================================== --- trunk/dports/devel/gmp/files/gmp-h.in.diff (rev 0) +++ trunk/dports/devel/gmp/files/gmp-h.in.diff 2009-05-04 17:45:35 UTC (rev 50567) @@ -0,0 +1,20 @@ +--- gmp-h.in.orig 2009-04-14 05:36:30.000000000 -0700 ++++ gmp-h.in 2009-05-04 08:45:33.000000000 -0700 +@@ -421,12 +421,13 @@ + GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99 + inline semantics, unless -fgnu89-inline is used. */ + #ifdef __GNUC__ +-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2) ++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) + #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__)) +-#else ++#define __GMP_INLINE_PROTOTYPES 1 ++#elif !(defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && __STDC_VERSION__ >= 199901L) + #define __GMP_EXTERN_INLINE extern __inline__ +-#endif + #define __GMP_INLINE_PROTOTYPES 1 + #endif ++#endif + + /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1 + strict ANSI mode. Inlining is done even when not optimizing (ie. -O0 \ No newline at end of file -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Mon May 4 10:52:25 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Mon, 4 May 2009 10:52:25 -0700 Subject: propchange - r50566 svn:log Message-ID: <20090504175225.7BF872807B@relay11.apple.com> Author: mcalhoun at macports.org (original author: mcalhoun at macports.org) Revision: 50566 Property Name: svn:log @@ -1,3 +1,5 @@ gmp: Update version 4.2.4 -> 4.3.0. Turn off inlining when using Apple GCC version 4.0 in C99 mode. Fixes #16634. + +Patch file was added in r50567. From portindex at macports.org Mon May 4 10:52:54 2009 From: portindex at macports.org (portindex at macports.org) Date: Mon, 4 May 2009 10:52:54 -0700 (PDT) Subject: [50568] trunk/dports/PortIndex Message-ID: <20090504175256.277DC17138A4@beta.macosforge.org> Revision: 50568 http://trac.macports.org/changeset/50568 Author: portindex at macports.org Date: 2009-05-04 10:52:54 -0700 (Mon, 04 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-04 17:45:35 UTC (rev 50567) +++ trunk/dports/PortIndex 2009-05-04 17:52:54 UTC (rev 50568) @@ -1205,7 +1205,7 @@ gmake 713 variants universal portdir devel/gmake description {GNU Make} homepage http://www.gnu.org/software/make/make.html epoch 0 platforms darwin name gmake depends_lib {port:gettext port:libiconv} long_description {Make is a tool which controls the generation of executables and other non-source files of a program from the program's source files. Make gets its knowledge of how to build your program from a file called the makefile, which lists each of the non-source files and how to compute it from other files. When you write a program, you should write a makefile for it, so that it is possible to use Make to build and install the program.} maintainers waqar at macports.org categories devel version 3.81 revision 0 gmp 820 -variants universal portdir devel/gmp description {GNU multiple precision arithmetic library} homepage http://gmplib.org/ epoch 0 platforms darwin name gmp maintainers {mcalhoun openmaintainer} long_description {GNU MP is a library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. It has a rich set of functions, and the functions have a regular interface. GNU MP is designed to be as fast as possible, both for small operands and for huge operands. The speed is achieved by using fullwords as the basic arithmetic type, by using fast algorithms, by carefully optimized assembly code for the most common inner loops for a lots of CPUs, and by a general emphasis on speed (instead of simplicity or elegance).} categories {devel math} version 4.2.4 revision 3 +variants universal portdir devel/gmp description {GNU multiple precision arithmetic library} homepage http://gmplib.org/ epoch 0 platforms darwin name gmp maintainers {mcalhoun openmaintainer} long_description {GNU MP is a library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. It has a rich set of functions, and the functions have a regular interface. GNU MP is designed to be as fast as possible, both for small operands and for huge operands. The speed is achieved by using fullwords as the basic arithmetic type, by using fast algorithms, by carefully optimized assembly code for the most common inner loops for a lots of CPUs, and by a general emphasis on speed (instead of simplicity or elegance).} categories {devel math} version 4.3.0 revision 0 gmp-cxx-wrappers 495 variants {darwin_i386 universal} portdir devel/gmp-cxx-wrappers description {C++ wrappers for the GNU multiple precision arithmetic library} homepage http://www.swox.com/gmp/ epoch 0 depends_run port:gmp platforms {darwin freebsd} name gmp-cxx-wrappers long_description {The C++ wrappers for gmp. To build them requires that gmp be installed, hence this portfile, which rebuilds gmp, but only installs the C++ wrappers.} maintainers nomaintainer categories {devel math} version 4.2.1 revision 2 gmsl 454 -------------- next part -------------- An HTML attachment was scrubbed... URL: From wsiegrist at apple.com Mon May 4 11:14:51 2009 From: wsiegrist at apple.com (wsiegrist at apple.com) Date: Mon, 4 May 2009 11:14:51 -0700 (PDT) Subject: [50569] trunk/dports/devel/monotone/Portfile Message-ID: <20090504181451.6C8501714335@beta.macosforge.org> Revision: 50569 http://trac.macports.org/changeset/50569 Author: wsiegrist at apple.com Date: 2009-05-04 11:14:51 -0700 (Mon, 04 May 2009) Log Message: ----------- monotone: Adding libidn as a dependency Modified Paths: -------------- trunk/dports/devel/monotone/Portfile Modified: trunk/dports/devel/monotone/Portfile =================================================================== --- trunk/dports/devel/monotone/Portfile 2009-05-04 17:52:54 UTC (rev 50568) +++ trunk/dports/devel/monotone/Portfile 2009-05-04 18:14:51 UTC (rev 50569) @@ -22,6 +22,7 @@ depends_lib port:zlib \ port:libiconv \ + port:libidn \ port:gettext \ port:boost \ port:lua \ -------------- next part -------------- An HTML attachment was scrubbed... URL: From mcalhoun at macports.org Mon May 4 11:22:14 2009 From: mcalhoun at macports.org (mcalhoun at macports.org) Date: Mon, 4 May 2009 11:22:14 -0700 (PDT) Subject: [50570] trunk/dports/graphics/gd2 Message-ID: <20090504182215.3424F17144DA@beta.macosforge.org> Revision: 50570 http://trac.macports.org/changeset/50570 Author: mcalhoun at macports.org Date: 2009-05-04 11:22:14 -0700 (Mon, 04 May 2009) Log Message: ----------- gd2: * Two of the patchfiles were added in r34193 because of #14216. gdlib-config seems to have changed so that they are no longer needed. * Manually setting hardcode_direct was added in r13017. It no longer seems to be needed. * Use muniversal PortGroup to build universal binaries. Fixes #19391 (maintainer timeout). Modified Paths: -------------- trunk/dports/graphics/gd2/Portfile Removed Paths: ------------- trunk/dports/graphics/gd2/files/patch-Makefile.in.diff trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff Modified: trunk/dports/graphics/gd2/Portfile =================================================================== --- trunk/dports/graphics/gd2/Portfile 2009-05-04 18:14:51 UTC (rev 50569) +++ trunk/dports/graphics/gd2/Portfile 2009-05-04 18:22:14 UTC (rev 50570) @@ -1,10 +1,11 @@ # $Id$ PortSystem 1.0 +PortGroup muniversal 1.0 name gd2 version 2.0.35 -revision 4 +revision 5 categories graphics maintainers ryandesign homepage http://www.libgd.org/ @@ -54,9 +55,7 @@ port:xpm patchfiles \ - patch-gdft.c.diff \ - patch-Makefile.in.diff \ - patch-config-gdlib-config.in.diff + patch-gdft.c.diff post-patch { if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} { @@ -68,10 +67,14 @@ use_autoreconf yes -post-destroot { +post-build { if {[variant_isset universal]} { - reinplace "s|${configure.universal_ldflags}||" \ - ${destroot}${prefix}/bin/gdlib-config + foreach arch ${universal_archs_to_use} { + reinplace "s| ${configure.universal_ldflags}||" \ + ${worksrcpath}-${arch}/config/gdlib-config + reinplace "s| [muniversal_get_arch_flag ${arch}]||" \ + ${worksrcpath}-${arch}/config/gdlib-config + } } } @@ -79,17 +82,16 @@ depends_lib lib:libdl:dlcompat } -platform darwin { - post-configure { - reinplace "s/^\\(hardcode_direct=\\)yes/\\1no/" ${worksrcpath}/libtool - } +if { ! [variant_isset no_x11] } { + configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib } variant no_x11 { depends_lib-delete \ port:xpm configure.args-append \ - --without-x + --without-x \ + --without-xpm } livecheck.check regex Deleted: trunk/dports/graphics/gd2/files/patch-Makefile.in.diff =================================================================== --- trunk/dports/graphics/gd2/files/patch-Makefile.in.diff 2009-05-04 18:14:51 UTC (rev 50569) +++ trunk/dports/graphics/gd2/files/patch-Makefile.in.diff 2009-05-04 18:22:14 UTC (rev 50570) @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2007-04-23 07:57:51.000000000 -0700 -+++ Makefile.in 2008-02-06 21:20:20.000000000 -0800 -@@ -347,7 +347,7 @@ - libgd_la_SOURCES = gd.c gdfx.c gd_security.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_gif_in.c gd_gif_out.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h - libgd_la_LDFLAGS = -version-info 2:0:0 $(XTRA_LDFLAGS) - libgd_la_LIBADD = $(LTLIBICONV) --LDADD = ./libgd.la $(LIBICONV) -+LDADD = ./libgd.la $(LTLIBICONV) - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - Deleted: trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff =================================================================== --- trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff 2009-05-04 18:14:51 UTC (rev 50569) +++ trunk/dports/graphics/gd2/files/patch-config-gdlib-config.in.diff 2009-05-04 18:22:14 UTC (rev 50570) @@ -1,20 +0,0 @@ ---- config/gdlib-config.in.orig 2006-10-11 02:46:22.000000000 -0700 -+++ config/gdlib-config.in 2008-02-06 21:35:40.000000000 -0800 -@@ -71,7 +71,7 @@ - echo @LDFLAGS@ - ;; - --libs) -- echo @LIBS@ @LIBICONV@ -+ echo @LIBS@ @LTLIBICONV@ - ;; - --cflags|--includes) - echo -I at includedir@ -@@ -84,7 +84,7 @@ - echo "includedir: $includedir" - echo "cflags: -I at includedir@" - echo "ldflags: @LDFLAGS@" -- echo "libs: @LIBS@ @LIBICONV@" -+ echo "libs: @LIBS@ @LTLIBICONV@" - echo "libdir: $libdir" - echo "features: @FEATURES@" - ;; -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Mon May 4 11:52:58 2009 From: portindex at macports.org (portindex at macports.org) Date: Mon, 4 May 2009 11:52:58 -0700 (PDT) Subject: [50571] trunk/dports Message-ID: <20090504185300.DDC4C17147E1@beta.macosforge.org> Revision: 50571 http://trac.macports.org/changeset/50571 Author: portindex at macports.org Date: 2009-05-04 11:52:57 -0700 (Mon, 04 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5801 Ports failed: 0 Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-04 18:22:14 UTC (rev 50570) +++ trunk/dports/PortIndex 2009-05-04 18:52:57 UTC (rev 50571) @@ -1640,8 +1640,8 @@ variants darwin_9 depends_build {port:pkgconfig port:gawk} portdir devel/mono description {Implementation of the .NET Development Framework} homepage http://www.go-mono.com/ epoch 0 platforms darwin name mono depends_lib {port:gettext port:glib2 port:libiconv port:zlib port:libgdiplus port:xorg-libs} long_description {Mono is an effort to create an open source implementation of the .NET Development Framework including a C# compiler.} maintainers mww categories {devel lang mono} version 2.4 revision 0 mono-addins 811 variants universal depends_build port:pkgconfig portdir devel/mono-addins description {Mono.Addins is a framework for creating extensible applications} homepage http://www.mono-project.com/Mono.Addins epoch 0 platforms darwin name mono-addins depends_lib {port:mono port:gtk-sharp2} long_description {Mono.Addins is a framework for creating extensible applications, and for creating libraries which extend those applications. Mono.Addins has been designed to be easy to use and useful for a wide range of applications: from simple applications with small extensibility needs, to complex applications which need support for large add-in structures. This new framework intends to set an standard for building extensible applications and add-ins in Mono.} maintainers nox categories devel version 0.3.1 revision 0 -monotone 680 -variants universal portdir devel/monotone description {A distributed version control system} homepage http://monotone.ca/ epoch 0 platforms darwin name monotone depends_lib {port:zlib port:libiconv port:gettext port:boost port:lua port:pcre port:sqlite3 port:botan} long_description {monotone is a free distributed version control system. It provides a simple, single-file transactional version store, with fully disconnected operation and an efficient peer-to-peer synchronization protocol. It understands history-sensitive merging, lightweight branches, integrated code review and 3rd party testing.} maintainers {tommyd openmaintainer} categories devel version 0.43 revision 0 +monotone 692 +variants universal portdir devel/monotone description {A distributed version control system} homepage http://monotone.ca/ epoch 0 platforms darwin name monotone depends_lib {port:zlib port:libiconv port:libidn port:gettext port:boost port:lua port:pcre port:sqlite3 port:botan} long_description {monotone is a free distributed version control system. It provides a simple, single-file transactional version store, with fully disconnected operation and an efficient peer-to-peer synchronization protocol. It understands history-sensitive merging, lightweight branches, integrated code review and 3rd party testing.} maintainers {tommyd openmaintainer} categories devel version 0.43 revision 0 mpfr 670 variants universal depends_build bin:unlzma:lzmautils portdir devel/mpfr description {C library for multiple-precision floating-point computations} homepage http://www.mpfr.org/ epoch 0 platforms darwin depends_lib port:gmp name mpfr long_description {MPFR is a portable C library for arbitrary-precision binary floating-point computation with correct rounding, based on the GMP multiple-precision library. The computation is both efficient and has a well-defined semantics. It copies the good ideas from the ANSI/IEEE-754 standard for fixed-precision floating-point arithmetic.} maintainers vincent-opdarw at vinc17.org categories {devel math} version 2.4.1-p4 revision 1 mtn-browse 668 @@ -2962,8 +2962,8 @@ variants {universal darwin_9} depends_build bin:unzip:unzip portdir graphics/freeimage description {Library for FreeImage, a dependency-less graphics library} homepage http://freeimage.sourceforge.net/ epoch 0 platforms macosx name freeimage long_description {FreeImage is a library for developers who would like to support most popular graphics image formats. Some highlights are: extremely simple in use, not limited to the local PC (unique FreeImageIO) and Plugin driven!} maintainers ryand-ruby at zenspider.com categories graphics version 3.10.0 revision 0 ftgl 438 variants universal depends_build bin:doxygen:doxygen portdir graphics/ftgl description {Freetype / OpenGL bridge} homepage http://ftgl.wiki.sourceforge.net/ epoch 0 platforms darwin name ftgl depends_lib lib:freetype:freetype long_description {FTGL takes freetype fonts, decodes them, and generate an OpenGL object out of it. It supports a lot of rendering modes} maintainers krugazor at free.fr categories graphics version 2.1.2 revision 1 -gd2 975 -variants {darwin_6 darwin no_x11 universal} depends_build {port:autoconf port:automake port:libtool port:gettext bin:autoreconf:autoconf} portdir graphics/gd2 description {GD creates PNG and JPEG images, among other formats} homepage http://www.libgd.org/ epoch 0 platforms darwin name gd2 depends_lib {port:zlib port:libpng port:jpeg port:freetype port:fontconfig port:libiconv port:expat port:xpm} long_description {gd is a graphics library. It allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from other images, and flood fills, and write out the result as a .PNG file. This is particularly useful in World Wide Web applications, where .PNG is the format used for inline images. gd is not a paint program. If you are looking for a paint program, you are looking in the wrong place. If you are not a programmer, you are looking in the wrong place.} maintainers ryandesign categories graphics version 2.0.35 revision 4 +gd2 968 +variants {universal darwin_6 no_x11} depends_build {port:autoconf port:automake port:libtool port:gettext bin:autoreconf:autoconf} portdir graphics/gd2 description {GD creates PNG and JPEG images, among other formats} homepage http://www.libgd.org/ epoch 0 platforms darwin depends_lib {port:zlib port:libpng port:jpeg port:freetype port:fontconfig port:libiconv port:expat port:xpm} name gd2 maintainers ryandesign long_description {gd is a graphics library. It allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from other images, and flood fills, and write out the result as a .PNG file. This is particularly useful in World Wide Web applications, where .PNG is the format used for inline images. gd is not a paint program. If you are looking for a paint program, you are looking in the wrong place. If you are not a programmer, you are looking in the wrong place.} categories graphics version 2.0.35 revision 5 gdchart 384 portdir graphics/gdchart description {Easy to use C API, high performance library.} homepage http://www.fred.net/brv/chart/ epoch 0 platforms darwin name gdchart depends_lib {port:libpng port:zlib port:gd2 port:jpeg port:freetype} maintainers ucla.edu:jameskyle long_description {Create charts and graphs in PNG, GIF and WBMP format.} version 0.11.5dev categories graphics revision 0 gdk-pixbuf 553 Modified: trunk/dports/PortIndex.quick =================================================================== (Binary files differ) -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Mon May 4 12:19:10 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Mon, 4 May 2009 12:19:10 -0700 (PDT) Subject: [50572] trunk/dports Message-ID: <20090504191918.43E731714F61@beta.macosforge.org> Revision: 50572 http://trac.macports.org/changeset/50572 Author: jeremyhu at macports.org Date: 2009-05-04 12:19:09 -0700 (Mon, 04 May 2009) Log Message: ----------- All ports: Remove reference to $x11prefix Now that the X11 libs are provided by MacPorts and the +system_x11 compatability variant is gone, there is no need to use the system X11 libs and headers. Users can still use the system X11 server (or any server for that matter). Some ports have received revision bumps becasue they were previously referring to x11prefix even when the users were not using +system_x11. The revision bump fixes the reference and forces a rebuild. Other ports have NOT received revision bumps because they should be identical to what would've been installed by default (-system_x11) before this patch. Modified Paths: -------------- trunk/dports/aqua/osx2x/Portfile trunk/dports/audio/easytag/Portfile trunk/dports/audio/easytag-devel/Portfile trunk/dports/devel/evas/Portfile trunk/dports/devel/gtkglext/Portfile trunk/dports/devel/hat/Portfile trunk/dports/devel/inventor/Portfile trunk/dports/devel/libast/Portfile trunk/dports/devel/libgdiplus/Portfile trunk/dports/devel/mono/Portfile trunk/dports/devel/pkgconfig/Portfile trunk/dports/devel/xulrunner/Portfile trunk/dports/editors/elvis/Portfile trunk/dports/editors/emacs/Portfile trunk/dports/games/gnubg/Portfile trunk/dports/games/jnethack/Portfile trunk/dports/gnome/at-spi/Portfile trunk/dports/gnustep/gnustep-make/Portfile trunk/dports/graphics/SimGear/Portfile trunk/dports/graphics/antigraingeometry/Portfile trunk/dports/graphics/cairo/Portfile trunk/dports/graphics/cairo-devel/Portfile trunk/dports/graphics/jasper/Portfile trunk/dports/graphics/libguichan/Portfile trunk/dports/graphics/magicpoint/Portfile trunk/dports/graphics/openvrml/Portfile trunk/dports/graphics/pgplot/Portfile trunk/dports/graphics/vtk/Portfile trunk/dports/graphics/vtk5/Portfile trunk/dports/graphics/xaos/Portfile trunk/dports/graphics/xpdf/Portfile trunk/dports/lang/otcl/Portfile trunk/dports/lang/swi-prolog/Portfile trunk/dports/lang/swi-prolog-devel/Portfile trunk/dports/lang/tclcl/Portfile trunk/dports/mail/procmail/Portfile trunk/dports/math/R/Portfile trunk/dports/multimedia/mpeg2vidcodec/Portfile trunk/dports/net/driftnet/Portfile trunk/dports/net/logjam/Portfile trunk/dports/net/openssh/Portfile trunk/dports/print/espgs/Portfile trunk/dports/print/gv/Portfile trunk/dports/python/py-game/Portfile trunk/dports/python/py-gtk2/Portfile trunk/dports/python/py25-game/Portfile trunk/dports/python/py25-gtk/Portfile trunk/dports/python/py26-game/Portfile trunk/dports/python/py26-mapnik/Portfile trunk/dports/science/geomview/Portfile trunk/dports/science/gwyddion/Portfile trunk/dports/science/opendx/Portfile trunk/dports/science/triangle/Portfile trunk/dports/sysutils/wmcpuload/Portfile trunk/dports/www/firefox-x11/Portfile trunk/dports/www/firefox-x11-devel/Portfile trunk/dports/www/mozplugger/Portfile trunk/dports/x11/SoXt/Portfile trunk/dports/x11/XFree86/Portfile trunk/dports/x11/Xaw3d/Portfile trunk/dports/x11/abclock/Portfile trunk/dports/x11/aewm/Portfile trunk/dports/x11/aterm/Portfile trunk/dports/x11/desklaunch/Portfile trunk/dports/x11/evilwm/Portfile trunk/dports/x11/eyeclock/Portfile trunk/dports/x11/fireworkx/Portfile trunk/dports/x11/fox/Portfile trunk/dports/x11/grace/Portfile trunk/dports/x11/gtk2/Portfile trunk/dports/x11/gtkglarea2/Portfile trunk/dports/x11/kinput2/Portfile trunk/dports/x11/luit/Portfile trunk/dports/x11/mkfontscale/Portfile trunk/dports/x11/openmotif/Portfile trunk/dports/x11/pango/Portfile trunk/dports/x11/qt4-x11/Portfile trunk/dports/x11/rox-filer/Portfile trunk/dports/x11/unclutter/Portfile trunk/dports/x11/windowmaker/Portfile trunk/dports/x11/wine/Portfile trunk/dports/x11/wine/files/wine.in trunk/dports/x11/wine-crossover-games/Portfile trunk/dports/x11/wine-crossover-games/files/wine.in trunk/dports/x11/wine-devel/Portfile trunk/dports/x11/wine-devel/files/wine.in trunk/dports/x11/wmcalclock/Portfile trunk/dports/x11/wmcube/Portfile trunk/dports/x11/wxgtk/Portfile trunk/dports/x11/xauth/Portfile trunk/dports/x11/xcircuit/Portfile trunk/dports/x11/xdiskusage/Portfile trunk/dports/x11/xeyes/Portfile trunk/dports/x11/xfe/Portfile trunk/dports/x11/xforms/Portfile trunk/dports/x11/xglobe/Portfile trunk/dports/x11/xinit/Portfile trunk/dports/x11/xmove/Portfile trunk/dports/x11/xorg-server/Portfile trunk/dports/x11/xorg-server-devel/Portfile trunk/dports/x11/xping/Portfile trunk/dports/x11/xroot/Portfile trunk/dports/x11/xterm/Portfile trunk/dports/xfce/libxfcegui4/Portfile trunk/dports/xfce/xfce-utils/Portfile trunk/dports/xfce/xfce4-settings/Portfile trunk/dports/xfce/xfconf/Portfile trunk/dports/xfce/xfprint/Portfile Modified: trunk/dports/aqua/osx2x/Portfile =================================================================== --- trunk/dports/aqua/osx2x/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/aqua/osx2x/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -38,17 +38,13 @@ post-patch { reinplace s|@PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj - if {[file exists ${prefix}/lib/libX11.dylib]} { - reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj - } else { - reinplace s|@X11_PREFIX@|$x11prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj - } + reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj } depends_lib port:xorg-libXtst \ port:openssl -set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib $x11prefix/lib'" +set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib'" eval xcode.build.settings-append $library_search_path eval xcode.destroot.settings-append $library_search_path Modified: trunk/dports/audio/easytag/Portfile =================================================================== --- trunk/dports/audio/easytag/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/audio/easytag/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -36,11 +36,6 @@ depends_build port:hicolor-icon-theme -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib -} - configure.args --mandir=${prefix}/share/man \ --infodir=${prefix}/share/info Modified: trunk/dports/audio/easytag-devel/Portfile =================================================================== --- trunk/dports/audio/easytag-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/audio/easytag-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -31,11 +31,6 @@ depends_build port:hicolor-icon-theme -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib -} - configure.args --mandir=${prefix}/share/man \ --infodir=${prefix}/share/info \ --disable-flac \ Modified: trunk/dports/devel/evas/Portfile =================================================================== --- trunk/dports/devel/evas/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/evas/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -30,7 +30,6 @@ port:imlib2 \ path:include/gif_lib.h:giflib -configure.cppflags-append "-I${x11prefix}/include" configure.args --mandir=${prefix}/share/man \ --enable-glitz-x11 \ --enable-gl-x11 \ Modified: trunk/dports/devel/gtkglext/Portfile =================================================================== --- trunk/dports/devel/gtkglext/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/gtkglext/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -21,23 +21,4 @@ port:xorg-libXmu \ port:gtk2 -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lXt:-L${prefix}/lib -L${x11prefix}/lib -lXt:g" ${pc} - } - } - } -} +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib Modified: trunk/dports/devel/hat/Portfile =================================================================== --- trunk/dports/devel/hat/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/hat/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -34,10 +34,6 @@ #user_notes Despite being compatible with both nhc98 and ghc, the \ # port depends on the more featureful ghc. -# -# If the message "resize: command not found" appears, -# you need to add ${x11prefix}/bin to your PATH. -# configure.args --mandir=${prefix}/share/man/man1 Modified: trunk/dports/devel/inventor/Portfile =================================================================== --- trunk/dports/devel/inventor/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/inventor/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -59,12 +59,8 @@ patch-widgets-GNUmakefile.componentTest.diff post-patch { - reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs - if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs - } else { - reinplace "s|/usr/X11R6|${x11prefix}|" ${worksrcpath}/make/ivcommondefs - } + reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs + reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs } universal_variant no Modified: trunk/dports/devel/libast/Portfile =================================================================== --- trunk/dports/devel/libast/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/libast/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -33,4 +33,4 @@ use_autoconf yes autoconf.cmd autoreconf autoconf.args -fvi -autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ${x11prefix}/share/aclocal -I ." +autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ." Modified: trunk/dports/devel/libgdiplus/Portfile =================================================================== --- trunk/dports/devel/libgdiplus/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/libgdiplus/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -35,8 +35,6 @@ port:xorg-libsm \ port:xrender -configure.cppflags-append -I${x11prefix}/include - post-patch { reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure } Modified: trunk/dports/devel/mono/Portfile =================================================================== --- trunk/dports/devel/mono/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/mono/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -27,8 +27,6 @@ patchfiles patch-configure.diff -configure.pkg_config "${prefix}/bin/pkg-config" -configure.pkg_config_path "${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig" configure.env-append ACLOCAL_FLAGS="-I ${prefix}/share/aclocal" # Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++) configure.cc-append "-I${worksrcpath}/libgc/include" Modified: trunk/dports/devel/pkgconfig/Portfile =================================================================== --- trunk/dports/devel/pkgconfig/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/pkgconfig/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -29,7 +29,7 @@ configure.args \ --enable-indirect-deps \ - --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${x11prefix}/lib/pkgconfig + --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig platform darwin 6 { configure.cppflags-append \ Modified: trunk/dports/devel/xulrunner/Portfile =================================================================== --- trunk/dports/devel/xulrunner/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/devel/xulrunner/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -208,17 +208,6 @@ installdir="${prefix}/lib/${name}" \ sdkdir="${prefix}/lib/${name}" -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly when we are +system_x11 and x11prefix -# is somewhere non-standard and should cause AC_X_PATH to let us setup our -# CPPFLAGS and LDFLAGS without interference -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - post-destroot { # Workaround to get root certs loaded, so https:// works ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib Modified: trunk/dports/editors/elvis/Portfile =================================================================== --- trunk/dports/editors/elvis/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/editors/elvis/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -25,11 +25,7 @@ # configure.args-delete --without-x # configure.args-append --with-x # -# if { [file exists ${prefix}/lib/libX11.dylib]} { -# configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib -# } else { -# configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib -# } +# configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib # # build.args-append CC="gcc -I${prefix}/include `${prefix}/bin/freetype-config --cflags`" #} Modified: trunk/dports/editors/emacs/Portfile =================================================================== --- trunk/dports/editors/emacs/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/editors/emacs/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -60,12 +60,6 @@ lib:libtiff:tiff \ path:include/gif_lib.h:giflib \ lib:libpng:libpng - - pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.ldflags-append -L${x11prefix}/lib - } - } } variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} { Modified: trunk/dports/games/gnubg/Portfile =================================================================== --- trunk/dports/games/gnubg/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/games/gnubg/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -44,15 +44,8 @@ platform darwin 9 { patchfiles-append patch-rollout.h.diff } configure.cflags-append "-lmx" +configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress" -pre-configure { - if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress" - } else { - configure.ldflags-append "-L${x11prefix}/lib -lX11 -bind_at_load -multiply_defined suppress" - } -} - configure.args --mandir=${prefix}/share/man \ --infodir=${prefix}/share/info \ --sysconfdir=${prefix}/etc \ Modified: trunk/dports/games/jnethack/Portfile =================================================================== --- trunk/dports/games/jnethack/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/games/jnethack/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -61,11 +61,6 @@ set jn_cflags "${jn_cflags} ${configure.universal_cflags}" } - if {[variant_isset x11] && ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - set jn_cflags "${jn_cflags} -I${x11prefix}/include" - set jn_ldflags "${jn_ldflags} -L${x11prefix}/lib" - } - foreach f {sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top Modified: trunk/dports/gnome/at-spi/Portfile =================================================================== --- trunk/dports/gnome/at-spi/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/gnome/at-spi/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -36,18 +36,7 @@ configure.env PYTHON=${prefix}/bin/python2.5 variant x11 conflicts quartz description {Use X11 (default)} { - configure.args-append --with-x - # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. - # This block helps us link correctly and setup our pc files correctly when we - # are +system_x11 and x11prefix is somewhere non-standard and should cause - # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference - configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib - if {![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - } + configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib } variant quartz conflicts x11 description {Use Quartz (broken)} { Modified: trunk/dports/gnustep/gnustep-make/Portfile =================================================================== --- trunk/dports/gnustep/gnustep-make/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/gnustep/gnustep-make/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -64,7 +64,7 @@ to your shell login (in ~/.profile) You may also want to set up your MANPATH : -export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man:${x11prefix}/man +export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man ########################################################## " } Modified: trunk/dports/graphics/SimGear/Portfile =================================================================== --- trunk/dports/graphics/SimGear/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/SimGear/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -26,16 +26,4 @@ port:openal \ port:xorg-libX11 -configure.args --with-x - -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} +configure.args --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib Modified: trunk/dports/graphics/antigraingeometry/Portfile =================================================================== --- trunk/dports/graphics/antigraingeometry/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/antigraingeometry/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -38,30 +38,11 @@ use_autoreconf yes autoreconf.args -fvi autoreconf.env AUTOMAKE="automake --foreign --add-missing --ignore-deps" + configure.cxxflags "-I${prefix}/include" +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib variant sdl { patchfiles-delete configure.in.diff src-platform-Makefile.am.diff depends_lib-append port:libsdl } - -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} Modified: trunk/dports/graphics/cairo/Portfile =================================================================== --- trunk/dports/graphics/cairo/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/cairo/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -76,28 +76,9 @@ --enable-xlib \ --enable-xlib-xrender \ --with-x + --x-include=${prefix}/include \ + --x-lib=${prefix}/lib -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - variant glitz conflicts no_x11 description {Add glitz graphics interface} { depends_lib-append \ port:glitz Modified: trunk/dports/graphics/cairo-devel/Portfile =================================================================== --- trunk/dports/graphics/cairo-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/cairo-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -74,30 +74,9 @@ --enable-svg \ --enable-xlib \ --enable-xlib-xrender \ - --with-x + --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib # change --enable-freetype to --enable-ft starting with cairo-devel 1.9.x -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - variant glitz conflicts no_x11 description {Add glitz graphics interface} { depends_lib-append \ port:glitz Modified: trunk/dports/graphics/jasper/Portfile =================================================================== --- trunk/dports/graphics/jasper/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/jasper/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -51,12 +51,6 @@ configure.args-delete --disable-opengl configure.args-append --enable-opengl - - # In case mesa was installed with system_x11. - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } } livecheck.check regex Modified: trunk/dports/graphics/libguichan/Portfile =================================================================== --- trunk/dports/graphics/libguichan/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/graphics/libguichan/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -19,14 +19,10 @@ sha1 5993e0a5e948b0f3e614025ff02f818bfe9c2198 \ rmd160 a8ab10d9c49542e018d688b9ee90ef2879f94a28 -depends_lib port:libsdl port:libsdl_image port:allegro +depends_lib port:libsdl port:libsdl_image port:allegro port:mesa -configure.cppflags-append -I${x11prefix}/include -configure.ldflags-append -L${x11prefix}/lib use_parallel_build yes -platform darwin 9 { - configure.ldflags-append "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" -} +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib livecheck.regex ||" ${worksrcpath}/abclock.c } use_configure no -build.target all XLIBDIR="-L${prefix}/lib -L${x11prefix}/lib" XINCLUDEDIR="-I${prefix}/include -I${x11prefix}/include" OPT="${configure.cflags}" +build.target all XLIBDIR="-L${prefix}/lib" XINCLUDEDIR="-I${prefix}/include" OPT="${configure.cflags}" destroot { xinstall -m 555 ${worksrcpath}/abclock ${destroot}${prefix}/bin xinstall -m 555 ${worksrcpath}/abc_img ${destroot}${prefix}/bin Modified: trunk/dports/x11/aewm/Portfile =================================================================== --- trunk/dports/x11/aewm/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/aewm/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -4,6 +4,7 @@ name aewm version 1.3.10 +revision 1 categories x11 x11-wm platforms darwin maintainers nomaintainer @@ -22,7 +23,7 @@ universal_variant no use_parallel_build yes -build.args PREFIX=${prefix} XROOT=${x11prefix} \ +build.args PREFIX=${prefix} XROOT=${prefix} \ CC=${configure.cc} destroot.args ${build.args} Modified: trunk/dports/x11/aterm/Portfile =================================================================== --- trunk/dports/x11/aterm/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/aterm/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -28,20 +28,9 @@ --disable-delete-key --enable-fading \ --enable-graphics --enable-half-shadow \ --enable-menubar --enable-transparency \ + --x-include=${prefix}/include --x-lib=${prefix}/lib \ --enable-wtmp -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - variant afterstep description {Enable AfterStep integration} { depends_lib-append port:AfterStep configure.args-append --with-afterimage-config=${prefix}/bin \ Modified: trunk/dports/x11/desklaunch/Portfile =================================================================== --- trunk/dports/x11/desklaunch/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/desklaunch/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -23,16 +23,9 @@ use_configure no destroot.destdir DESTDIR=${destroot}${prefix} -pre-configure { - if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - build.args-append XROOT=${prefix} - } else { - build.args-append XROOT=${x11prefix} - } -} +build.args-append XROOT="${prefix}" \ + CFLAGS="${configure.cflags}" -build.args-append CFLAGS="${configure.cflags}" - variant universal { build.args-append CFLAGS="${configure.cflags} ${configure.universal_cflags}" } Modified: trunk/dports/x11/evilwm/Portfile =================================================================== --- trunk/dports/x11/evilwm/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/evilwm/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -16,11 +16,7 @@ port:xorg-libXext configure { - if {[file exists ${prefix}/lib/pkgconfig/xext]} { - reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile - } else { - reinplace "s|XROOT=.*|XROOT=${x11prefix}|" ${worksrcpath}/Makefile - } + reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile reinplace "s|\$(LDFLAGS)|\$(LDFLAGS) \$(OTHERLDFLAGS)|g" ${worksrcpath}/Makefile } Modified: trunk/dports/x11/eyeclock/Portfile =================================================================== --- trunk/dports/x11/eyeclock/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/eyeclock/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -27,16 +27,9 @@ build.args PREFIX=${prefix} destroot.destdir PREFIX=${destroot}${prefix} -build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}" +build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}" X11BASE=${prefix} variant universal { build.target-append OCFLAGS="${configure.cflags} ${configure.universal_cflags}" OLDFLAGS="${configure.ldflags} ${configure.universal_ldflags}" } -pre-build { - if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - build.target-append X11BASE=${prefix} - } else { - build.target-append X11BASE=${x11prefix} - } -} Modified: trunk/dports/x11/fireworkx/Portfile =================================================================== --- trunk/dports/x11/fireworkx/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/fireworkx/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -31,8 +31,8 @@ ${destroot}${prefix}/share/doc/${name} } -build.target-append CFLAGS="${configure.cflags} -I${prefix}/include -I${x11prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib -L${x11prefix}/lib" +build.target-append CFLAGS="${configure.cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib" variant universal { - build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include -I${x11prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib -L${x11prefix}/lib" + build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib" } Modified: trunk/dports/x11/fox/Portfile =================================================================== --- trunk/dports/x11/fox/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/fox/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -4,7 +4,7 @@ name fox version 1.6.34 -revision 1 +revision 2 description The FOX GUI toolkit long_description FOX is a C++ based Toolkit for developing Graphical \ User Interfaces easily and effectively. @@ -28,10 +28,9 @@ port:xorg-libXcursor \ port:Xft2 \ port:xorg-libXrandr \ - port:freetype + port:freetype \ + port:mesa -configure.cppflags-append "-I${x11prefix}/include" - configure.pre_args --prefix=${prefix} --mandir=${prefix}/share/man configure.args --with-x --with-xft --with-opengl --enable-cups Modified: trunk/dports/x11/grace/Portfile =================================================================== --- trunk/dports/x11/grace/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/grace/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -41,19 +41,8 @@ configure.pre_args --prefix=${prefix}/lib \ --with-helpviewer="open ${prefix}/share/doc/${name}/`basename %s`" + --x-include=${prefix}/include --x-lib=${prefix}/lib -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc file delete ${destroot}${prefix}/bin Modified: trunk/dports/x11/gtk2/Portfile =================================================================== --- trunk/dports/x11/gtk2/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/gtk2/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -205,28 +205,8 @@ port:xorg-libXcomposite \ port:xorg-libXfixes - configure.args-append --with-xinput --enable-xinerama - - # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. - # This block helps us link correctly and setup our pc files correctly when we - # are +system_x11 and x11prefix is somewhere non-standard and should cause - # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference - configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } - } + configure.args-append --with-xinput --enable-xinerama \ + --x-include=${prefix}/include --x-lib=${prefix}/lib } livecheck.check regex Modified: trunk/dports/x11/gtkglarea2/Portfile =================================================================== --- trunk/dports/x11/gtkglarea2/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/gtkglarea2/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -28,10 +28,4 @@ use_autoreconf yes autoreconf.args -fvi -pre-configure { - if { [file exists ${x11prefix}/lib/libGL.dylib ] } { - configure.post_args --with-GL-prefix=${x11prefix} - } else { - configure.post_args --with-GL-prefix=${prefix} - } -} +configure.post_args --with-GL-prefix=${prefix} Modified: trunk/dports/x11/kinput2/Portfile =================================================================== --- trunk/dports/x11/kinput2/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/kinput2/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -60,7 +60,7 @@ pre-destroot { destroot.target install install.man - destroot.post_args-append "PREFIX=${prefix} BINDIR=${prefix}/bin LIBDIR=${prefix}/lib CONFDIR=${prefix}/etc MANSOURCEPATH=${prefix}/share/man/man DOCDIR=${prefix}/share/doc/${name} XAPPLOADDIR=${x11prefix}/lib/X11/app-defaults" + destroot.post_args-append "PREFIX=${prefix} BINDIR=${prefix}/bin LIBDIR=${prefix}/lib CONFDIR=${prefix}/etc MANSOURCEPATH=${prefix}/share/man/man DOCDIR=${prefix}/share/doc/${name} XAPPLOADDIR=${prefix}/lib/X11/app-defaults" #notice: app-defaults/Kinput2 is installed outside of /opt tree. } destroot.violate_mtree yes Modified: trunk/dports/x11/luit/Portfile =================================================================== --- trunk/dports/x11/luit/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/luit/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -33,11 +33,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) - -platform macosx { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} { - configure.env-append \ - LUIT_CFLAGS="-I${x11prefix}/include" \ - LUIT_LIBS="-L${x11prefix}/lib -lfontenc -lX11" - } -} Modified: trunk/dports/x11/mkfontscale/Portfile =================================================================== --- trunk/dports/x11/mkfontscale/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/mkfontscale/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -43,11 +43,3 @@ configure.args --with-bzip2 -platform macosx { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} { - configure.env-append \ - MKFONTSCALE_CFLAGS="-I${x11prefix}/include `pkg-config --cflags freetype2`" \ - MKFONTSCALE_LIBS="-L${x11prefix}/lib -lfontenc `pkg-config --libs freetype2`" - } -} - Modified: trunk/dports/x11/openmotif/Portfile =================================================================== --- trunk/dports/x11/openmotif/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/openmotif/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -51,29 +51,9 @@ configure.args --mandir=${prefix}/share/man \ --enable-xft \ --enable-jpeg \ - --enable-png + --enable-png \ + --x-include=${prefix}/include --x-lib=${prefix}/lib -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - build.env LANG=C post-destroot { Modified: trunk/dports/x11/pango/Portfile =================================================================== --- trunk/dports/x11/pango/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/pango/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -99,29 +99,9 @@ -bind_at_load configure.args \ - --enable-static + --enable-static \ + --x-include=${prefix}/include --x-lib=${prefix}/lib -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - variant no_x11 { depends_lib-delete \ port:Xft2 Modified: trunk/dports/x11/qt4-x11/Portfile =================================================================== --- trunk/dports/x11/qt4-x11/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/qt4-x11/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -5,7 +5,7 @@ name qt4-x11 version 4.4.3 -revision 2 +revision 3 categories x11 maintainers mcalhoun homepage http://www.trolltech.com/ @@ -119,7 +119,7 @@ reinplace "s|CFG_HOST_ARCH=macosx|CFG_HOST_ARCH=`uname -p`|g" ${worksrcpath}/configure # Ensure the correct MacPorts X11 is used - reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf + reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf # Avoid having to call "install_name_tool -change" after destroot. reinplace \ Modified: trunk/dports/x11/rox-filer/Portfile =================================================================== --- trunk/dports/x11/rox-filer/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/rox-filer/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -26,27 +26,8 @@ use_configure no universal_variant no -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - #build.env CC=${configure.cc} CPPFLAGS=${configure.cppflags} LDFLAGS=${configure.ldflags} build { system "cd ${worksrcpath}; CC=${configure.cc} CPPFLAGS=\"${configure.cppflags}\" LDFLAGS=\"${configure.ldflags}\" ./ROX-Filer/AppRun --compile ${configure.args}" } Modified: trunk/dports/x11/unclutter/Portfile =================================================================== --- trunk/dports/x11/unclutter/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/unclutter/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -26,7 +26,7 @@ use_configure no -build.args-append CCOPTIONS='-I${prefix}/include -I${x11prefix}/include' LDOPTIONS='-L${prefix}/lib -L${x11prefix}/lib' +build.args-append CCOPTIONS='-I${prefix}/include' LDOPTIONS='-L${prefix}/lib' destroot.args BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/share/man/man1 Modified: trunk/dports/x11/windowmaker/Portfile =================================================================== --- trunk/dports/x11/windowmaker/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/windowmaker/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -2,7 +2,7 @@ PortSystem 1.0 name windowmaker version 0.92.0 -revision 3 +revision 4 maintainers nomaintainer categories x11 x11-wm platforms darwin freebsd @@ -57,7 +57,7 @@ configure.env LINGUAS="bg cs da de el es et fi fr gl hr hu it ja \ ko ms nl no pl pt ro ru sk sv tr zh_CN" \ - LIBS="-L${prefix}/lib -lintl -L${x11prefix}/lib -lX11" + LIBS="-L${prefix}/lib -lintl -lX11" configure.args --disable-debug --enable-gnome \ --mandir=${prefix}/share/man \ --with-nlsdir=${prefix}/share/locale \ Modified: trunk/dports/x11/wine/Portfile =================================================================== --- trunk/dports/x11/wine/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -64,6 +64,8 @@ -framework CoreServices \ -lz +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib + pre-fetch { if { [string compare ${os.endian} "little"] != 0 } { return -code error "${name} only runs on little-endian computers, such as an Intel Mac." @@ -75,20 +77,7 @@ file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine - reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine } -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly when we are +system_x11 and x11prefix -# is somewhere non-standard and should cause AC_X_PATH to let us setup our -# CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - livecheck.check sourceforge livecheck.regex "Source Packages (\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*) released.*" Modified: trunk/dports/x11/wine/files/wine.in =================================================================== --- trunk/dports/x11/wine/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572) @@ -1,5 +1,5 @@ #!/bin/sh # $Id$ -DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \ +DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \ "@PREFIX@/libexec/wine/wine" "$@" Modified: trunk/dports/x11/wine-crossover-games/Portfile =================================================================== --- trunk/dports/x11/wine-crossover-games/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine-crossover-games/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -55,6 +55,8 @@ -framework CoreServices \ -lz +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib + pre-fetch { if { [string compare ${os.endian} "little"] != 0 } { return -code error "${name} only runs on little-endian computers, such as an Intel Mac." @@ -69,18 +71,5 @@ xinstall -d ${destroot}${prefix}/libexec/wine xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine - reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine } -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly when we are +system_x11 and x11prefix -# is somewhere non-standard and should cause AC_X_PATH to let us setup our -# CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - Modified: trunk/dports/x11/wine-crossover-games/files/wine.in =================================================================== --- trunk/dports/x11/wine-crossover-games/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine-crossover-games/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572) @@ -1,4 +1,4 @@ #!/bin/sh -DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \ +DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \ "@PREFIX@/bin/wineloader" "$@" Modified: trunk/dports/x11/wine-devel/Portfile =================================================================== --- trunk/dports/x11/wine-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -57,6 +57,8 @@ -framework CoreServices \ -lz +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib + pre-fetch { if { [string compare ${os.endian} "little"] != 0 } { return -code error "${name} only runs on little-endian computers, such as an Intel Mac." @@ -68,21 +70,8 @@ file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine - reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine } -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly when we are +system_x11 and x11prefix -# is somewhere non-standard and should cause AC_X_PATH to let us setup our -# CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - livecheck.name ${my_name} livecheck.check sourceforge livecheck.regex "Source Packages (\[0-9\]+\\.\[0-9\]*\[13579\](\\.\[0-9\]+)*) released.*" Modified: trunk/dports/x11/wine-devel/files/wine.in =================================================================== --- trunk/dports/x11/wine-devel/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wine-devel/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572) @@ -1,5 +1,5 @@ #!/bin/sh # $Id$ -DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \ +DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \ "@PREFIX@/libexec/wine/wine" "$@" Modified: trunk/dports/x11/wmcalclock/Portfile =================================================================== --- trunk/dports/x11/wmcalclock/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wmcalclock/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -22,4 +22,4 @@ use_configure no destroot.destdir DESTDIR=${destroot}${prefix} -build.args INCDIR="-I${prefix}/include -I${x11prefix}/include" LIBDIR="-L${prefix}/lib -L${x11prefix}/lib" +build.args INCDIR="-I${prefix}/include" LIBDIR="-L${prefix}/lib" Modified: trunk/dports/x11/wmcube/Portfile =================================================================== --- trunk/dports/x11/wmcube/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wmcube/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -24,7 +24,7 @@ use_configure no universal_variant no -build.args -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L${x11prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include -I${x11prefix}/include" +build.args -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include" destroot { xinstall -m 755 -o root -g wheel ${worksrcpath}/${name} \ Modified: trunk/dports/x11/wxgtk/Portfile =================================================================== --- trunk/dports/x11/wxgtk/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/wxgtk/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -24,8 +24,6 @@ patchfiles patch-Makefile.in -configure.cppflags-append "-I${x11prefix}/include" - configure.args --with-gtk --with-libpng --with-libjpeg --with-libtiff \ --with-freetype --with-zlib Modified: trunk/dports/x11/xauth/Portfile =================================================================== --- trunk/dports/x11/xauth/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xauth/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -28,10 +28,7 @@ port:xorg-libXext \ port:xorg-libXmu -platform macosx { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xmuu.pc]} { - configure.env-append \ - XAUTH_CFLAGS="-I${x11prefix}/include" \ - XAUTH_LIBS="-L${x11prefix}/lib -lXmuu -lXext -lX11 -lXau" - } -} +livecheck.check regex +livecheck.url [lindex ${master_sites} 0]?C=M&O=D +livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) + Modified: trunk/dports/x11/xcircuit/Portfile =================================================================== --- trunk/dports/x11/xcircuit/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xcircuit/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -32,11 +32,6 @@ configure.args --mandir=${prefix}/share/man \ --with-tcl=${prefix}/lib \ --with-tk=${prefix}/lib \ - --with-gs=${prefix}/bin/gs - -# AC_X_PATH doesn't find the X ports correctly -if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib -} else { - configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib -} + --with-gs=${prefix}/bin/gs \ + --x-includes=${prefix}/include \ + --x-libraries=${prefix}/lib Modified: trunk/dports/x11/xdiskusage/Portfile =================================================================== --- trunk/dports/x11/xdiskusage/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xdiskusage/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -18,13 +18,7 @@ depends_lib port:fltk -pre-build { - if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } { - build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib" - } else { - build.args-append CXXFLAGS="-I${prefix}/include -I${x11prefix}/include" LDFLAGS="-L${prefix}/lib -L${x11prefix}/lib" - } -} +build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib" destroot.destdir prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man Modified: trunk/dports/x11/xeyes/Portfile =================================================================== --- trunk/dports/x11/xeyes/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xeyes/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -28,11 +28,3 @@ livecheck.check regex livecheck.url [lindex ${master_sites} 0]?C=M&O=D livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) - -platform macosx { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xt.pc]} { - configure.env-append \ - XEYES_CFLAGS="-I${x11prefix}/include" \ - XEYES_LIBS="-L${x11prefix}/lib -lXmu -lXt -lXext -lX11 -lSM -lICE" - } -} Modified: trunk/dports/x11/xfe/Portfile =================================================================== --- trunk/dports/x11/xfe/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xfe/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -25,13 +25,6 @@ configure.args --with-included-gettext --enable-release -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - configure.env LIBS="-lX11 -lXft" post-configure { reinplace "s;/usr/local/share;${prefix}/share;" \ Modified: trunk/dports/x11/xforms/Portfile =================================================================== --- trunk/dports/x11/xforms/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xforms/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -30,11 +30,3 @@ # not trivial to autoreconf universal_variant no - -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - Modified: trunk/dports/x11/xglobe/Portfile =================================================================== --- trunk/dports/x11/xglobe/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xglobe/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -23,7 +23,7 @@ universal_variant no patchfiles patch-Makefile patch-renderer_cpp configure { reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile - reinplace "s|@@X11PREFIX@@|${x11prefix}|g" ${worksrcpath}/Makefile } + reinplace "s|@@X11PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile } destroot.args DESTDIR=${destroot} destroot.destdir prefix=${destroot}${prefix} post-destroot { system "install -c \ Modified: trunk/dports/x11/xinit/Portfile =================================================================== --- trunk/dports/x11/xinit/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xinit/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -50,11 +50,3 @@ reinplace "s|^X11DIR=.*$|X11DIR=${prefix}|" ${destroot}${prefix}/bin/font_cache reinplace "s|^X11FONTDIR=.*$|X11FONTDIR=${prefix}/share/fonts|" ${destroot}${prefix}/bin/font_cache } - -platform macosx { - if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} { - configure.env-append \ - XINIT_CFLAGS="-I${x11prefix}/include" \ - XINIT_LIBS="-L${x11prefix}/lib -lX11" - } -} Modified: trunk/dports/x11/xmove/Portfile =================================================================== --- trunk/dports/x11/xmove/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xmove/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -17,9 +17,6 @@ master_sites ftp://ftp.cs.columbia.edu/pub/xmove/ checksums md5 d70107f7835b755bd4f57b47a8ac7b38 -#if this is set, put manpages in man and not share/man -#prefix ${x11prefix} - distname ${name}.${version} patchfiles patch-XMOVELib.c patch-externs.h patch-main.c patch-move_window.c \ patch-print11.c patch-put_image.c patch-server.c patch-xmovectrl.h Modified: trunk/dports/x11/xorg-server/Portfile =================================================================== --- trunk/dports/x11/xorg-server/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xorg-server/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -66,8 +66,6 @@ port:xorg-libXfixes post-patch { - reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c - # Yeah, there's probably a better way to do this... system "cd ${worksrcpath}/.. && patch -p0 < ${filespath}/mesa-7.0-multisample.patch" } @@ -76,7 +74,7 @@ # Otherwise glcore.h will be pulled in from glproto in ${prefix}/include/GL/internal configure.cppflags-delete -I${prefix}/include -configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include -I${x11prefix}/include +configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include post-destroot { ln -s Xquartz ${destroot}${prefix}/bin/X Modified: trunk/dports/x11/xorg-server-devel/Portfile =================================================================== --- trunk/dports/x11/xorg-server-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xorg-server-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -60,10 +60,6 @@ port:xorg-libAppleWM \ port:xorg-libXfixes -post-patch { - reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c -} - configure.args --with-apple-applications-dir=${applications_dir} --with-fontdir=${prefix}/share/fonts --with-apple-application-id=org.macports.X11 # Xplugin.h is missing on Tiger, and provided in filespath Modified: trunk/dports/x11/xping/Portfile =================================================================== --- trunk/dports/x11/xping/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xping/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -18,6 +18,6 @@ file copy ${filespath}/${distfiles} ${worksrcpath} } use_configure no -build { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -I${x11prefix}/include -L${prefix}/lib -L${x11prefix}/lib -lX11 -o xping" } +build { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -L${prefix}/lib -lX11 -o xping" } destroot { system "install -m 755 ${worksrcpath}/xping ${destroot}/${prefix}/bin/" } Modified: trunk/dports/x11/xroot/Portfile =================================================================== --- trunk/dports/x11/xroot/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xroot/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -3,7 +3,7 @@ PortSystem 1.0 name xroot version 1.0 -revision 1 +revision 2 categories x11 maintainers nomaintainer description A small X -root window @@ -32,7 +32,7 @@ } build { file copy ${distpath}/${distfile} ${worksrcpath} - system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -L${x11prefix}/lib -I${prefix}/include -I${x11prefix}/include -lX11 -o xroot" + system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -I${prefix}/include -lX11 -o xroot" } destroot { xinstall -m 755 ${worksrcpath}/xroot ${destroot}${prefix}/bin/ Modified: trunk/dports/x11/xterm/Portfile =================================================================== --- trunk/dports/x11/xterm/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/x11/xterm/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -36,20 +36,9 @@ configure.args --mandir=${prefix}/share/man --enable-luit \ --enable-logging --enable-wide-chars \ - --enable-256-color --enable-load-vt-fonts + --enable-256-color --enable-load-vt-fonts \ + --x-include=${prefix}/include --x-lib=${prefix}/lib -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - # If -ltermcap stays in the LDFLAGS, xterm is linked against both # /usr/lib's and ${prefix}/lib's libncurses. post-configure { Modified: trunk/dports/xfce/libxfcegui4/Portfile =================================================================== --- trunk/dports/xfce/libxfcegui4/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/xfce/libxfcegui4/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -16,7 +16,8 @@ sha1 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 \ rmd160 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568 -configure.args --enable-startup-notification +configure.args --enable-startup-notification \ + --x-include=${prefix}/include --x-lib=${prefix}/lib depends_lib port:libxfce4util \ port:xfconf \ @@ -24,25 +25,3 @@ port:gtk-xfce-engine \ port:libxml2 \ port:startup-notification - -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - Modified: trunk/dports/xfce/xfce-utils/Portfile =================================================================== --- trunk/dports/xfce/xfce-utils/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/xfce/xfce-utils/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -20,13 +20,6 @@ configure.args --disable-gdm --with-xsession-prefix=${prefix} -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append "-L${x11prefix}/lib -lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr" - } -} - variant midori { depends_lib-append port:midori configure.args-append --with-browser=midori Modified: trunk/dports/xfce/xfce4-settings/Portfile =================================================================== --- trunk/dports/xfce/xfce4-settings/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/xfce/xfce4-settings/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -4,6 +4,7 @@ name xfce4-settings version 4.6.1 +revision 1 categories xfce platforms darwin maintainers afb at macports.org @@ -21,9 +22,9 @@ platform darwin 8 { patchfiles-append patch-configure.diff - configure.env-append PKG_CONFIG_PATH="${x11prefix}/lib/pkgconfig" \ - XI_VERSION="1.0.0" XI_CFLAGS="-I${x11prefix}/include" XI_LIBS="-L${x11prefix}/lib -lXi" \ - LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${x11prefix}/include" LIBX11_LIBS="-L${x11prefix}/lib -lX11" \ - XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${x11prefix}/include" XRANDR_LIBS="-L${x11prefix}/lib -lXrandr" \ - XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${x11prefix}/include" XCURSOR_LIBS="-L${x11prefix}/lib -lXcursor" + configure.env-append PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" \ + XI_VERSION="1.0.0" XI_CFLAGS="-I${prefix}/include" XI_LIBS="-L${prefix}/lib -lXi" \ + LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${prefix}/include" LIBX11_LIBS="-L${prefix}/lib -lX11" \ + XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${prefix}/include" XRANDR_LIBS="-L${prefix}/lib -lXrandr" \ + XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${prefix}/include" XCURSOR_LIBS="-L${prefix}/lib -lXcursor" } Modified: trunk/dports/xfce/xfconf/Portfile =================================================================== --- trunk/dports/xfce/xfconf/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/xfce/xfconf/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -21,28 +21,8 @@ port:xorg-libsm port:xorg-libX11 \ port:gtk2 +configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib + platform darwin { configure.args-append --disable-visibility } - -# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6. -# This block helps us link correctly and setup our pc files correctly when we -# are +system_x11 and x11prefix is somewhere non-standard and should cause -# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference -configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib -if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - pre-configure { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } - - # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11 - post-destroot { - if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} { - foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] { - reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc} - } - } - } -} - Modified: trunk/dports/xfce/xfprint/Portfile =================================================================== --- trunk/dports/xfce/xfprint/Portfile 2009-05-04 18:52:57 UTC (rev 50571) +++ trunk/dports/xfce/xfprint/Portfile 2009-05-04 19:19:09 UTC (rev 50572) @@ -21,11 +21,4 @@ configure.args --enable-cups -pre-configure { - if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } { - configure.cppflags-append -I${x11prefix}/include - configure.ldflags-append -L${x11prefix}/lib - } -} - configure.ldflags-append "-lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr" -------------- next part -------------- An HTML attachment was scrubbed... URL: From jeremyhu at macports.org Mon May 4 12:31:06 2009 From: jeremyhu at macports.org (jeremyhu at macports.org) Date: Mon, 4 May 2009 12:31:06 -0700 (PDT) Subject: [50573] trunk/base Message-ID: <20090504193107.67AB71716AFE@beta.macosforge.org> Revision: 50573 http://trac.macports.org/changeset/50573 Author: jeremyhu at macports.org Date: 2009-05-04 12:31:06 -0700 (Mon, 04 May 2009) Log Message: ----------- base: No longer search for X11 SDK and remove reference to x11prefix Modified Paths: -------------- trunk/base/aclocal.m4 trunk/base/configure trunk/base/configure.ac trunk/base/doc/macports.conf.in trunk/base/doc/portfile.7 trunk/base/src/config.h.in trunk/base/src/macports1.0/macports.tcl trunk/base/src/port1.0/port_autoconf.tcl.in trunk/base/src/port1.0/portmain.tcl trunk/base/tests/test-macports.conf Modified: trunk/base/aclocal.m4 =================================================================== --- trunk/base/aclocal.m4 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/aclocal.m4 2009-05-04 19:31:06 UTC (rev 50573) @@ -572,111 +572,6 @@ AC_SUBST([MD5_LIBS]) ]) -dnl This macro checks for X11 presence. If the libraries are -dnl present, so must the headers be. If nothing is present, -dnl print a warning - -# MP_CHECK_X11 -# --------------------- -AC_DEFUN([MP_CHECK_X11], [ - - # work around symbolic X11 link in /usr/include by providing explicit defaults - case "$host" in - *-*-darwin9*) - if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then - x_includes="/usr/X11/include" - x_libraries="/usr/X11/lib" - fi - ;; - *-*-darwin*) - if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then - x_includes="/usr/X11R6/include" - x_libraries="/usr/X11R6/lib" - fi - ;; - esac - - AC_PATH_X - AC_PATH_XTRA - - # Check for libX11 - AC_CHECK_LIB([X11], [XOpenDisplay],[ - has_x_runtime=yes - ], [ has_x_runtime=no ], [$X_LIBS]) - -# echo "------done---------" -# echo "x_includes=${x_includes}" -# echo "x_libraries=${x_libraries}" -# echo "no_x=${no_x}" -# echo "X_CFLAGS=${X_CFLAGS}" -# echo "X_LIBS=${X_LIBS}" -# echo "X_DISPLAY_MISSING=${X_DISPLAY_MISSING}" -# echo "has_x_runtime=${has_x_runtime}" -# echo "host_os=${host_os}" -# echo "------done---------" - - state= - - case "__${has_x_runtime}__${no_x}__" in - "__no__yes__") - # either the user said --without-x, or it was not found - # at all (runtime or headers) - AC_MSG_WARN([X11 not available. You will not be able to use ports that use X11]) - state=0 - ;; - "__yes__yes__") - state=1 - ;; - "__yes____") - state=2 - ;; - *) - state=3 - ;; - esac - - case $host_os in - darwin*) - case $state in - 1) - cat <&5 -$as_echo_n "checking for X... " >&6; } - - -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; -fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 -$as_echo "$as_me: error: cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - $as_echo_n "(cached) " >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi - -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { $as_echo "$as_me:$LINENO: result: $have_x" >&5 -$as_echo "$have_x" >&6; } - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } -fi - - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: result: neither works" >&5 -$as_echo "neither works" >&6; } -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XOpenDisplay (); -int -main () -{ -return XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_dnet_ntoa=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dnet_ntoa (); -int -main () -{ -return dnet_ntoa (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_dnet_stub_dnet_ntoa=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5 -$as_echo_n "checking for gethostbyname... " >&6; } -if test "${ac_cv_func_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_gethostbyname || defined __stub___gethostbyname -choke me -#endif - -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_gethostbyname=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -$as_echo "$ac_cv_func_gethostbyname" >&6; } - - if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_nsl_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_nsl_gethostbyname=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int -main () -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_bsd_gethostbyname=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_bsd_gethostbyname=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder at skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - { $as_echo "$as_me:$LINENO: checking for connect" >&5 -$as_echo_n "checking for connect... " >&6; } -if test "${ac_cv_func_connect+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_connect || defined __stub___connect -choke me -#endif - -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_connect=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_connect=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -$as_echo "$ac_cv_func_connect" >&6; } - - if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char connect (); -int -main () -{ -return connect (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_socket_connect=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_socket_connect=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - { $as_echo "$as_me:$LINENO: checking for remove" >&5 -$as_echo_n "checking for remove... " >&6; } -if test "${ac_cv_func_remove+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_remove || defined __stub___remove -choke me -#endif - -int -main () -{ -return remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_remove=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_remove=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -$as_echo "$ac_cv_func_remove" >&6; } - - if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char remove (); -int -main () -{ -return remove (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_posix_remove=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_posix_remove=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - { $as_echo "$as_me:$LINENO: checking for shmat" >&5 -$as_echo_n "checking for shmat... " >&6; } -if test "${ac_cv_func_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_shmat || defined __stub___shmat -choke me -#endif - -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_shmat=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_shmat=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -$as_echo "$ac_cv_func_shmat" >&6; } - - if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shmat (); -int -main () -{ -return shmat (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ipc_shmat=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ipc_shmat=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char IceConnectionNumber (); -int -main () -{ -return IceConnectionNumber (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ICE_IceConnectionNumber=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - - # Check for libX11 - { $as_echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 -$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } -if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $X_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XOpenDisplay (); -int -main () -{ -return XOpenDisplay (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_X11_XOpenDisplay=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_X11_XOpenDisplay=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then - - has_x_runtime=yes - -else - has_x_runtime=no -fi - - -# echo "------done---------" -# echo "x_includes=${x_includes}" -# echo "x_libraries=${x_libraries}" -# echo "no_x=${no_x}" -# echo "X_CFLAGS=${X_CFLAGS}" -# echo "X_LIBS=${X_LIBS}" -# echo "X_DISPLAY_MISSING=${X_DISPLAY_MISSING}" -# echo "has_x_runtime=${has_x_runtime}" -# echo "host_os=${host_os}" -# echo "------done---------" - - state= - - case "__${has_x_runtime}__${no_x}__" in - "__no__yes__") - # either the user said --without-x, or it was not found - # at all (runtime or headers) - { $as_echo "$as_me:$LINENO: WARNING: X11 not available. You will not be able to use ports that use X11" >&5 -$as_echo "$as_me: WARNING: X11 not available. You will not be able to use ports that use X11" >&2;} - state=0 - ;; - "__yes__yes__") - state=1 - ;; - "__yes____") - state=2 - ;; - *) - state=3 - ;; - esac - - case $host_os in - darwin*) - case $state in - 1) - cat <&5 -$as_echo "$as_me: error: Broken X11 install. No X11 headers" >&2;} - { (exit 1); exit 1; }; } - - ;; - 3) - cat <&5 -$as_echo "$as_me: error: Broken X11 install" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - ;; - *) - case $state in - 1) - cat <&5 -$as_echo "$as_me: error: Broken X11 install. No X11 headers" >&2;} - { (exit 1); exit 1; }; } - - ;; - 3) - cat <&5 -$as_echo "$as_me: error: Broken X11 install" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - ;; - esac - - - -{ $as_echo "$as_me:$LINENO: checking for X11 prefix" >&5 -$as_echo_n "checking for X11 prefix... " >&6; } -X_INCLUDES_PREFIX=`echo "$x_includes" | sed "s,/include,,"` -X_LIBRARIES_PREFIX=`echo "$x_libraries" | sed "s,/lib,,"` -if test "x$have_x" = "xyes" -a "x$X_INCLUDES_PREFIX" = "x$X_LIBRARIES_PREFIX" -a "x$X_LIBRARIES_PREFIX" != x; then - x11prefix=$X_LIBRARIES_PREFIX -fi -{ $as_echo "$as_me:$LINENO: result: $x11prefix" >&5 -$as_echo "$x11prefix" >&6; } - - # Check for readline # Check whether --enable-readline was given. if test "${enable_readline+set}" = set; then Modified: trunk/base/configure.ac =================================================================== --- trunk/base/configure.ac 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/configure.ac 2009-05-04 19:31:06 UTC (rev 50573) @@ -173,32 +173,9 @@ AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv]) MP_CHECK_READLINK_IS_P1003_1A -AC_ARG_WITH(x11-prefix, [AC_HELP_STRING([--with-x11-prefix=PREFIX], [use PREFIX as the X11 base dir (default autodetect)])], [ x11prefix="$withval" ] ) -case "$x11prefix" in - "") - # default to traditional value - x11prefix=/usr/X11R6 - ;; - *) - x_includes=$x11prefix/include - x_libraries=$x11prefix/lib - ;; -esac - # Check for md5 implementation MP_LIB_MD5 -# Check for X11 and paraphernalia -MP_CHECK_X11 -AC_MSG_CHECKING(for X11 prefix) -X_INCLUDES_PREFIX=`echo "$x_includes" | sed "s,/include,,"` -X_LIBRARIES_PREFIX=`echo "$x_libraries" | sed "s,/lib,,"` -if test "x$have_x" = "xyes" -a "x$X_INCLUDES_PREFIX" = "x$X_LIBRARIES_PREFIX" -a "x$X_LIBRARIES_PREFIX" != x; then - x11prefix=$X_LIBRARIES_PREFIX -fi -AC_MSG_RESULT([$x11prefix]) -AC_SUBST(x11prefix) - # Check for readline AC_ARG_ENABLE(readline, AC_HELP_STRING([--enable-readline], [Enable addition of readline support, if readline present.]), [ Modified: trunk/base/doc/macports.conf.in =================================================================== --- trunk/base/doc/macports.conf.in 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/doc/macports.conf.in 2009-05-04 19:31:06 UTC (rev 50573) @@ -19,11 +19,8 @@ # PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default # paths are given in the example; it need not be uncommented. Customizing binpath is intended for advanced users only. -#binpath @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin:@x11prefix@/bin +#binpath @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin -# Directory containing the X11 installation. -x11prefix @x11prefix@ - # Directory containing Applications from ports. applications_dir @MPAPPLICATIONSDIR@ Modified: trunk/base/doc/portfile.7 =================================================================== --- trunk/base/doc/portfile.7 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/doc/portfile.7 2009-05-04 19:31:06 UTC (rev 50573) @@ -479,12 +479,6 @@ .br .Sy Default: .Em ${prefix}/Library/Frameworks -.It Ic x11prefix -Absolute path to X11 (eg -.Pa /usr/X11R6 ) -.br -.Sy Type: -.Em read-only .El .Sh DEPENDENCY OPTIONS Port dependencies should refer to other MacPort ports Modified: trunk/base/src/config.h.in =================================================================== --- trunk/base/src/config.h.in 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/src/config.h.in 2009-05-04 19:31:06 UTC (rev 50573) @@ -286,9 +286,6 @@ /* Attribute to mark unused variables */ #undef UNUSED -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - /* Define to `int' if does not define. */ #undef pid_t Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/src/macports1.0/macports.tcl 2009-05-04 19:31:06 UTC (rev 50573) @@ -40,7 +40,7 @@ namespace eval macports { namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities variable bootstrap_options "\ - portdbpath libpath binpath auto_path extra_env sources_conf prefix x11prefix portdbformat \ + portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \ portinstalltype portarchivemode portarchivepath portarchivetype portautoclean \ porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \ rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \ @@ -49,7 +49,7 @@ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip" variable user_options "submitter_name submitter_email submitter_key" variable portinterp_options "\ - portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \ + portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \ registry.path registry.format registry.installtype portarchivemode portarchivepath \ portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \ rsync_options rsync_dir startupitem_type place_worksymlink \ @@ -338,7 +338,6 @@ global macports::prefix global macports::macportsuser global macports::prefix_frozen - global macports::x11prefix global macports::registry.installtype global macports::rsync_dir global macports::rsync_options @@ -604,7 +603,7 @@ } if {![info exists binpath]} { - set env(PATH) "${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin:${x11prefix}/bin" + set env(PATH) "${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin" } else { set env(PATH) "$binpath" } @@ -1191,7 +1190,6 @@ set depline [lindex [split $depspec :] 1] set prefix [_mportkey $mport prefix] set frameworks_dir [_mportkey $mport frameworks_dir] - set x11prefix [_mportkey $mport x11prefix] if {[info exists env(DYLD_FRAMEWORK_PATH)]} { lappend search_path $env(DYLD_FRAMEWORK_PATH) @@ -1204,7 +1202,7 @@ if {[info exists env(DYLD_LIBRARY_PATH)]} { lappend search_path $env(DYLD_LIBRARY_PATH) } - lappend search_path /lib /usr/lib ${x11prefix}/lib ${prefix}/lib + lappend search_path /lib /usr/lib ${prefix}/lib if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} { lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH) } Modified: trunk/base/src/port1.0/port_autoconf.tcl.in =================================================================== --- trunk/base/src/port1.0/port_autoconf.tcl.in 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/src/port1.0/port_autoconf.tcl.in 2009-05-04 19:31:06 UTC (rev 50573) @@ -47,5 +47,4 @@ variable install_group "@DSTGRP@" variable prefix "@prefix_expanded@" variable macportsuser "@RUNUSR@" - variable x11prefix "@x11prefix@" } Modified: trunk/base/src/port1.0/portmain.tcl =================================================================== --- trunk/base/src/port1.0/portmain.tcl 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/src/port1.0/portmain.tcl 2009-05-04 19:31:06 UTC (rev 50573) @@ -59,7 +59,6 @@ default workpath {[getportworkpath_from_buildpath $portbuildpath]} default worksymlink {[file join $portpath work]} default prefix /opt/local -default x11prefix /usr/X11R6 default applications_dir /Applications/MacPorts default frameworks_dir {${prefix}/Library/Frameworks} default destdir destroot Modified: trunk/base/tests/test-macports.conf =================================================================== --- trunk/base/tests/test-macports.conf 2009-05-04 19:19:09 UTC (rev 50572) +++ trunk/base/tests/test-macports.conf 2009-05-04 19:31:06 UTC (rev 50573) @@ -14,9 +14,6 @@ # Type of installation to do for ports, "direct" or "image". See macports.conf(5) and online documentation. portinstalltype image -# Directory containing the X11 installation. -x11prefix /tmp/macports-tests/usr/X11R6 - # Where to find the sources list. sources_conf /tmp/macports-tests/opt/local/etc/macports/sources.conf -------------- next part -------------- An HTML attachment was scrubbed... URL: From portindex at macports.org Mon May 4 12:53:19 2009 From: portindex at macports.org (portindex at macports.org) Date: Mon, 4 May 2009 12:53:19 -0700 (PDT) Subject: [50574] trunk/dports Message-ID: <20090504195321.54F601716DF3@beta.macosforge.org> Revision: 50574 http://trac.macports.org/changeset/50574 Author: portindex at macports.org Date: 2009-05-04 12:53:17 -0700 (Mon, 04 May 2009) Log Message: ----------- Total number of ports parsed: 5801 Ports successfully parsed: 5796 Ports failed: 5 Failed to parse file graphics/cairo/Portfile: invalid command name "--x-include=\${prefix}/include" Failed to parse file graphics/fontconfig/Portfile: can't read "x11prefix": no such variable Failed to parse file math/R/Portfile: invalid command name "--x-include=\${prefix}/include" Failed to parse file net/driftnet/Portfile: can't read "x11prefix": no such variable Failed to parse file x11/grace/Portfile: invalid command name "--x-include=\${prefix}/include" Modified Paths: -------------- trunk/dports/PortIndex trunk/dports/PortIndex.quick Modified: trunk/dports/PortIndex =================================================================== --- trunk/dports/PortIndex 2009-05-04 19:31:06 UTC (rev 50573) +++ trunk/dports/PortIndex 2009-05-04 19:53:17 UTC (rev 50574) @@ -2902,8 +2902,6 @@ variants universal portdir graphics/blinkenthemes description {Blinkenlights simulator themes} homepage http://www.blinkenlights.de/ epoch 0 platforms darwin name blinkenthemes maintainers tim at ccc.de long_description {Themes to use with blinkensim simulator} categories {graphics blinkenlights} version 0.10 revision 1 blinkentools 382 variants {oldtools mng universal} portdir graphics/blinkentools description {Blinkenlights command line tools} homepage http://www.blinkenlights.de/ epoch 0 platforms darwin name blinkentools depends_lib lib:libblib:blib long_description {Bunch of utilities to convert and send Blinkenlights movies} maintainers tim at ccc.de categories {graphics blinkenlights} version 2.9 revision 1 -cairo 664 -variants {universal glitz macosx quartz no_x11 x11_xcb} depends_build port:pkgconfig portdir graphics/cairo description {Cairo is a vector graphics library with cross-device output support.} homepage http://cairographics.org/ epoch 0 platforms {darwin macosx} depends_lib {path:lib/pkgconfig/pixman-1.pc:libpixman port:xrender port:fontconfig port:freetype port:libpng port:zlib port:expat} name cairo maintainers ryandesign long_description {Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available (eg. through the X Render Extension).} categories graphics version 1.8.6 revision 4 cairo-devel 676 variants {universal glitz macosx quartz no_x11 x11_xcb} depends_build port:pkgconfig portdir graphics/cairo-devel description {Cairo is a vector graphics library with cross-device output support.} homepage http://cairographics.org/ epoch 0 platforms {darwin macosx} depends_lib {path:lib/pkgconfig/pixman-1.pc:libpixman port:xrender port:fontconfig port:freetype port:libpng port:zlib port:expat} name cairo-devel maintainers ryandesign long_description {Cairo is designed to produce identical output on all output media while taking advantage of display hardware acceleration when available (eg. through the X Render Extension).} categories graphics version 1.7.6 revision 4 cairomm 516 @@ -2954,8 +2952,6 @@ portdir graphics/fig2ps description {converts xfig files to postscript or PDF, processing text with LaTeX} homepage http://fig2ps.sourceforge.net/ epoch 0 depends_run {path:bin/perl:perl5 port:ghostscript port:transfig bin:latex:texlive} platforms darwin name fig2ps maintainers vcn.com:jjstickel long_description {fig2ps is a perl script which converts xfig files to postscript or PDF, processing text with LaTeX. It's primary aim is to produce documents (such as articles) with a high quality, in which the pictures are seamlessly integrated with the text (notably, the font in the figures is exactly the same as in the text).} version 1.3.6 categories {graphics tex} revision 0 fnlib 536 variants universal depends_build {port:autoconf port:automake port:libtool bin:autoreconf:autoconf} portdir graphics/fnlib description {Fonts and font libraries necessary for Enlightenment} homepage http://www.enlightenment.org/ epoch 0 platforms darwin name fnlib depends_lib {port:xorg-libsm port:xorg-libXext port:libpng port:jpeg port:tiff port:imlib} maintainers nomaintainer long_description {This is a set of fonts and font libraries necessary for the latest release of Enlightenment.} categories graphics version 0.5 revision 4 -fontconfig 411 -variants {universal doc vera macosx} portdir graphics/fontconfig description {An XML-based font configuration API for X Windows} homepage http://fontconfig.org/ epoch 0 platforms darwin depends_lib {port:libiconv port:expat port:freetype} name fontconfig maintainers ryandesign long_description {Fontconfig is a library for configuring and customizing font access.} categories graphics version 2.6.0 revision 2 fontforge 792 variants with_freetype_bytecode portdir graphics/fontforge description {Outline and bitmap font editor/converter for many formats} homepage http://fontforge.sourceforge.net/ epoch 0 platforms darwin name fontforge depends_lib {port:xorg-libXi port:xorg-libxkbui port:xorg-libXt port:freetype port:gettext port:giflib port:jpeg port:libiconv port:libpng port:libuninameslist port:libxml2 port:tiff port:zlib} long_description {FontForge allows you to edit outline and bitmap fonts. You may create new ones or modify old ones. It is also a format converter and can interconvert between PostScript (ascii & binary Type1, some Type3, some Type0), TrueType, OpenType (Type2), CID, SVG. Previously known as pfaedit.} maintainers nomaintainer categories {graphics fonts} version 20090224 revision 0 freeimage 559 @@ -3086,8 +3082,8 @@ variants universal portdir graphics/libggimisc description {GGI Miscellaneous} homepage http://www.ggi-project.org/ epoch 0 platforms darwin name libggimisc depends_lib port:libggi long_description {LibGGIMisc is a place to put support for graphics target features which are not deserving their own special extensions. Right now this means basically some VGA adaptor features -- getting and waiting for the raster position, using a hardware horizontal splitline feature, and loading/unloading font data from hardware text modes.} maintainers nomaintainer categories graphics version 2.2.2 revision 0 libggiwmh 426 variants universal portdir graphics/libggiwmh description {GGI extension for windowed targets} homepage http://www.ggi-project.org/ epoch 0 platforms darwin name libggiwmh depends_lib port:libggi long_description {LibGGIWMH is an extension for GGI targets that are window system based to allow access to things like setting the title bar, resizing, etc..} maintainers nomaintainer categories graphics version 0.3.2 revision 0 -libguichan 452 -variants {darwin_9 universal} portdir graphics/libguichan description {portable C++ GUI library designed for games using SDL} homepage http://guichan.sourceforge.net/ epoch 0 platforms darwin name libguichan depends_lib {port:libsdl port:libsdl_image port:allegro} long_description {Guichan is a portable C++ GUI library designed for games using SDL and/or OpenGL.} maintainers {jmr openmaintainer} categories {graphics devel} version 0.8.0 revision 0 +libguichan 451 +variants universal portdir graphics/libguichan description {portable C++ GUI library designed for games using SDL} homepage http://guichan.sourceforge.net/ epoch 0 platforms darwin name libguichan depends_lib {port:libsdl port:libsdl_image port:allegro port:mesa} long_description {Guichan is a portable C++ GUI library designed for games using SDL and/or OpenGL.} maintainers {jmr openmaintainer} categories {graphics devel} version 0.8.0 revision 0 libhermes 779 variants universal portdir graphics/libhermes description {Hermes is a pixel conversion library.} homepage http://www.clanlib.org/hermes epoch 0 platforms darwin name libhermes maintainers nomaintainer long_description {Hermes is a pixel conversion library. Its only purpose is to take a buffer full of pixels and convert it into a target buffer full of pixels. The two can differ both in size and in format. Hermes is primarily intended for fast graphics display and it is optimized for that. Where this goal can be achieved by dismissing minimal graphic errors, Hermes will do so (minimal means almost not noticeable). But that is likely to be very configurable in the near future to allow for user selection of trade-off.} categories {graphics devel} version 1.3.3 revision 1 libiptcdata 655 @@ -3237,7 +3233,7 @@ vtk44 639 variants {darwin x11 universal} depends_build bin:cmake:cmake portdir graphics/vtk44 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk44 long_description {An open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python. (This port does not currently provide wrappers for these languages.)} maintainers css categories graphics version 4.4.2 revision 0 vtk5 661 -variants {darwin_8 darwin_9 x11 tcltk carbon python universal} depends_build {bin:cmake:cmake port:readline port:xorg-libs port:python25} portdir graphics/vtk5 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk5 long_description {an open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python.} maintainers nomaintainer categories {graphics devel} version 5.2.1 revision 1 +variants {darwin_8 darwin_9 x11 tcltk carbon python universal} depends_build {bin:cmake:cmake port:readline port:xorg-libs port:python25} portdir graphics/vtk5 description {3D visualization toolkit} homepage http://www.vtk.org/ epoch 0 platforms {darwin freebsd} name vtk5 long_description {an open source, freely available software system for 3D computer graphics, image processing, and visualization used by thousands of researchers and developers around the world. VTK consists of a C++ class library, and several interpreted interface layers including Tcl/Tk, Java, and Python.} maintainers nomaintainer categories {graphics devel} version 5.2.1 revision 2 whirlgif 345 portdir graphics/whirlgif description {produces an animated GIF file composed of a series of GIF images} homepage http://www.danbbs.dk/~dino/whirlgif/ epoch 0 platforms darwin name whirlgif maintainers nomaintainer long_description {{produces an animated GIF file composed of a series of GIF images}} version 3.04 categories graphics revision 0 wings 347 @@ -3250,8 +3246,8 @@ variants {nonmonolithic debug universal} portdir graphics/wxWidgets-devel description {mature cross-platform C++ GUI framework} homepage http://www.wxwidgets.org/ epoch 0 platforms darwin name wxWidgets-devel depends_lib {port:jpeg port:tiff port:libpng port:zlib port:libiconv port:expat port:libsdl port:libsdl_mixer} long_description {wxWidgets is a mature open-source cross-platform C++ GUI framework for Mac OS, Unix, Linux, Windows. It can make use of a variety of native widget sets as well as its own widget set: Mac OS, GTK+, Motif, WIN32. wxWidgets will even run on embedded systems using Linux and X11.} maintainers {jwa mww} categories {graphics devel} version 2.8.10-rc2 revision 0 wxWidgets26 660 variants universal portdir graphics/wxWidgets26 description {mature cross-platform C++ GUI framework} homepage http://www.wxwidgets.org/ epoch 0 platforms darwin name wxWidgets26 depends_lib {port:jpeg port:tiff port:libpng port:zlib port:libiconv port:expat port:libsdl port:libsdl_mixer} long_description {wxWidgets is a mature open-source cross-platform C++ GUI framework for Mac OS, Unix, Linux, Windows. It can make use of a variety of native widget sets as well as its own widget set: Mac OS, GTK+, Motif, WIN32. wxWidgets will even run on embedded systems using Linux and X11.} maintainers {mww jwa} categories {graphics devel} version 2.6.4 revision 0 -xaos 983 -variants {macosx universal} portdir graphics/xaos description {real-time interactive fractal zoomer} homepage http://xaos.sourceforge.net/ epoch 0 platforms darwin name xaos depends_lib {port:xorg-libXext port:libpng} long_description {XaoS is a fast portable real-time interactive fractal zoomer. It displays the Mandelbrot set (among other escape time fractals) and allows you zoom smoothly into the fractal. Various coloring modes are provided for both the points inside and outside the selected set. In addition, switching between Julia and Mandelbrot fractal types and on-the-fly plane switching is provided. The first version was a minimal X Window Mandelbrot viewer by Thomas later modified by Jan to support high frame-rate zooming. Other additions were later made by both Thomas and Jan including autopilot (for those of you without drivers licenses), palette changing, GIF saving, and fractal inversion.} maintainers nomaintainer categories graphics version 3.4 revision 1 +xaos 974 +variants universal portdir graphics/xaos description {real-time interactive fractal zoomer} homepage http://xaos.sourceforge.net/ epoch 0 platforms darwin name xaos depends_lib {port:xorg-libXext port:libpng} long_description {XaoS is a fast portable real-time interactive fractal zoomer. It displays the Mandelbrot set (among other escape time fractals) and allows you zoom smoothly into the fractal. Various coloring modes are provided for both the points inside and outside the selected set. In addition, switching between Julia and Mandelbrot fractal types and on-the-fly plane switching is provided. The first version was a minimal X Window Mandelbrot viewer by Thomas later modified by Jan to support high frame-rate zooming. Other additions were later made by both Thomas and Jan including autopilot (for those of you without drivers licenses), palette changing, GIF saving, and fractal inversion.} maintainers nomaintainer categories graphics version 3.4 revision 1 xfig 684 depends_build {path:bin/xmkmf:imake path:bin/xmkmf:imake} portdir graphics/xfig description {Facility for Interactive Generation of figures under X11} homepage http://xfig.org/ epoch 0 depends_run {bin:gs:ghostscript bin:fig2dev:transfig} platforms darwin name xfig depends_lib {port:Xaw3d port:libpng port:jpeg port:zlib} maintainers nomaintainer long_description {Xfig is a menu-driven tool that allows the user to draw and manipulate objects interactively in an X window. The resulting pictures can be saved, printed on postscript printers or converted to a variety of other formats (e.g. to allow inclusion in LaTeX documents).} categories {graphics x11} version 3.2.5 revision 6 xli 395 @@ -4143,7 +4139,7 @@ openmcl 508 variants universal portdir lang/openmcl description {The OpenMCL Common Lisp Implementation} homepage http://www.openmcl.com epoch 0 platforms darwin name openmcl maintainers {waqar at macports.org gwright at macports.org} long_description {OpenMCL is an opensourced Common Lisp implementation, derived from Digitool's Macintosh Common Lisp product. OpenMCL currently runs under LinuxPPC and, as of version 0.10, under Darwin, the BSD/Mach layer on which Mac OS X is based.} categories lang version 1.0 revision 1 otcl 399 -variants universal depends_build {port:autoconf port:automake} portdir lang/otcl description {MIT Object Tcl} homepage http://otcl-tclcl.sourceforge.net/otcl/ epoch 0 platforms darwin name otcl depends_lib {port:tcl port:tk} long_description {OTcl, short for MIT Object Tcl, is an extension to Tcl/Tk for object-oriented programming.} maintainers nomaintainer categories lang version 1.9 revision 0 +variants universal depends_build {port:autoconf port:automake} portdir lang/otcl description {MIT Object Tcl} homepage http://otcl-tclcl.sourceforge.net/otcl/ epoch 0 platforms darwin name otcl depends_lib {port:tcl port:tk} long_description {OTcl, short for MIT Object Tcl, is an extension to Tcl/Tk for object-oriented programming.} maintainers nomaintainer categories lang version 1.9 revision 1 parrot 634 variants universal depends_build bin:perl:perl5 portdir lang/parrot description {Open source virtual machine (for Perl6 et al.)} homepage http://www.parrot.org/ epoch 0 platforms darwin name parrot depends_lib {port:gmp port:icu} long_description {Parrot is a virtual machine designed to efficiently compile and execute bytecode for dynamic languages. Parrot currently hosts a variety of language implementations in various stages of completion, including Tcl, Javascript, Ruby, Lua, Scheme, PHP, Python, Perl 6, and a .NET bytecode translator.} maintainers {bfulgham coleda.com:will} categories {lang devel} version 1.0.0 revision 0 pcc 579 @@ -4263,15 +4259,15 @@ strategoxt 473 variants universal portdir lang/strategoxt description {Stratego language with the XT bundle.} homepage http://strategoxt.org/Stratego/StrategoXT epoch 0 platforms darwin name strategoxt depends_lib {port:libaterm port:sdf2-bundle} maintainers {pguyot at kallisys.net openmaintainer} long_description {StrategoXT is the combination of the Stratego language for strategic programming with the XT bundle of transformation tools.} categories lang version 0.17pre18253 revision 0 swi-prolog 980 -variants {darwin_6 darwin_9 st mt universal} depends_build {port:gawk port:junit} portdir lang/swi-prolog description {SWI-Prolog compiler plus extra packages (stable version)} homepage http://www.swi-prolog.org/ epoch 20051223 platforms darwin name swi-prolog depends_lib {port:readline port:ncurses port:jpeg port:libmcrypt port:gmp port:zlib port:xorg-libs port:expat} long_description {ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries, Garbage-collector, stack-expandor, C/C++-interface, Multiple threads, GNU-readline interface, coroutining, constraint programming, global variables, very fast compiler. Including packages clib (Unix process control, sockets, MIME), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF into triples), ODBC interface and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone) and graphical debugger).} maintainers {J.Wielemaker at uva.nl pmoura at logtalk.org} categories lang version 5.6.63 revision 1 +variants {darwin_6 darwin_9 st mt universal} depends_build {port:gawk port:junit} portdir lang/swi-prolog description {SWI-Prolog compiler plus extra packages (stable version)} homepage http://www.swi-prolog.org/ epoch 20051223 platforms darwin name swi-prolog depends_lib {port:readline port:ncurses port:jpeg port:libmcrypt port:gmp port:zlib port:xorg-libs port:expat} long_description {ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries, Garbage-collector, stack-expandor, C/C++-interface, Multiple threads, GNU-readline interface, coroutining, constraint programming, global variables, very fast compiler. Including packages clib (Unix process control, sockets, MIME), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF into triples), ODBC interface and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone) and graphical debugger).} maintainers {J.Wielemaker at uva.nl pmoura at logtalk.org} categories lang version 5.6.63 revision 2 swi-prolog-devel 996 -variants {darwin_6 darwin_9 st mt universal} depends_build {port:gawk port:junit} portdir lang/swi-prolog-devel description {SWI-Prolog compiler plus extra packages (development version)} homepage http://www.swi-prolog.org/ epoch 20051223 platforms darwin name swi-prolog-devel depends_lib {port:readline port:ncurses port:jpeg port:libmcrypt port:gmp port:zlib port:xorg-libs port:expat} long_description {ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries, Garbage-collector, stack-expandor, C/C++-interface, Multiple threads, GNU-readline interface, coroutining, constraint programming, global variables, very fast compiler. Including packages clib (Unix process control, sockets, MIME), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF into triples), ODBC interface and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone) and graphical debugger).} maintainers {J.Wielemaker at uva.nl pmoura at logtalk.org} categories lang version 5.7.4 revi sion 1 +variants {darwin_6 darwin_9 st mt universal} depends_build {port:gawk port:junit} portdir lang/swi-prolog-devel description {SWI-Prolog compiler plus extra packages (development version)} homepage http://www.swi-prolog.org/ epoch 20051223 platforms darwin name swi-prolog-devel depends_lib {port:readline port:ncurses port:jpeg port:libmcrypt port:gmp port:zlib port:xorg-libs port:expat} long_description {ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries, Garbage-collector, stack-expandor, C/C++-interface, Multiple threads, GNU-readline interface, coroutining, constraint programming, global variables, very fast compiler. Including packages clib (Unix process control, sockets, MIME), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF into triples), ODBC interface and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone) and graphical debugger).} maintainers {J.Wielemaker at uva.nl pmoura at logtalk.org} categories lang version 5.7.4 revi sion 2 swi-prolog-lite 785 variants {darwin_6 st mt universal} portdir lang/swi-prolog-lite description {SWI-Prolog compiler (without extra packages)} homepage http://www.swi-prolog.org/ epoch 0 platforms darwin name swi-prolog-lite depends_lib port:readline long_description {ISO/Edinburgh-style Prolog compiler including modules, autoload, libraries, Garbage-collector, stack-expandor, C/C++-interface, Multiple threads, GNU-readline interface, very fast compiler. Including packages clib (Unix process control, sockets, MIME), cpp (C++ interface), sgml (reading XML/SGML), sgml/RDF (reading RDF into triples), ODBC interface and XPCE (Graphics UI toolkit, integrated editor (Emacs-clone) and graphical debugger).} maintainers {J.Wielemaker at uva.nl pmoura at logtalk.org} categories lang version 5.6.62 revision 0 tcl 631 variants {threads memdebug darwin universal} portdir lang/tcl description {Tool Command Language} homepage http://www.tcl.tk/ epoch 0 platforms {darwin freebsd} name tcl maintainers {mww openmaintainer} long_description {Tcl (Tool Command Language) is a very powerful but easy to learn dynamic programming language, suitable for a very wide range of uses, including web and desktop applications, networking, administration, testing and many more. Open source and business-friendly, Tcl is a mature yet evolving language that is truly cross platform, easily deployed and highly extensible.} categories lang version 8.5.6 revision 0 tclcl 361 -variants universal depends_build {port:autoconf port:automake} portdir lang/tclcl description {TclCL (Tcl with classes)} homepage http://otcl-tclcl.sourceforge.net/tclcl/ epoch 0 platforms darwin name tclcl depends_lib {port:tcl port:tk port:otcl} long_description {TclCL is a Tcl/C++ interface} maintainers nomaintainer categories lang version 1.16 revision 0 +variants universal depends_build {port:autoconf port:automake} portdir lang/tclcl description {TclCL (Tcl with classes)} homepage http://otcl-tclcl.sourceforge.net/tclcl/ epoch 0 platforms darwin name tclcl depends_lib {port:tcl port:tk port:otcl} long_description {TclCL is a Tcl/C++ interface} maintainers nomaintainer categories lang version 1.16 revision 1 tcldoc 441 portdir lang/tcldoc description {Generates HTML pages of API documentation from Tcl source files} homepage http://wiki.tcl.tk/5598 epoch 0 platforms darwin name tcldoc maintainers {afb at macports.org openmaintainer} long_description {TclDoc parses the declarations and documentation comments in a set of Tcl source files and produces a corresponding set of HTML pages describing procedure declarations.} version 0.3 categories lang revision 1 tclx 313 @@ -4459,7 +4455,7 @@ postgrey 717 variants universal portdir mail/postgrey description {Postfix policy server implementing greylisting} homepage http://postgrey.schweikert.ch/ epoch 0 platforms darwin name postgrey depends_lib {port:p5-io-multiplex port:p5-net-server port:p5-berkeleydb} long_description {When a request for delivery of a mail is received by Postfix via SMTP, the triplet CLIENT_IP / SENDER / RECIPIENT is built. If it is the first time that this triplet is seen, or if the triplet was first seen, less than 5 minutes ago, then the mail gets rejected with a temporary error. Hopefully spammers or viruses will not try again later, as it is however required per RFC.} maintainers cbellot at sky.fr categories mail version 1.31 revision 2 procmail 1199 -variants universal portdir mail/procmail description {A local mail delivery agent} homepage http://www.procmail.org/ epoch 0 platforms darwin name procmail maintainers nomaintainer long_description {The procmail mail processing program can be used to create mail-servers, mailing lists, sort your incoming mail into separate folders/files (real convenient when subscribing to one or more mailing lists or for prioritising your mail), preprocess your mail, start any programs upon mail arrival (e.g. to generate different chimes on your workstation for different types of mail) or selectively forward certain incoming mail automatically to someone. Procmail can be used: - and installed by an unprivileged user (for himself only). - as a drop in replacement for the local delivery agent /bin/mail (with biff/comsat support). - as a general mailfilter for whole groups of messages (e.g. when called from within sendmail.cf rules). The accompanying formail program enables you to generate aut oreplies, split up digests/mailboxes into the original messages, do some very simple header-munging/extraction, or force mail into mail-format (with leading From line).} categories mail version 3.22 revision 1 +variants universal portdir mail/procmail description {A local mail delivery agent} homepage http://www.procmail.org/ epoch 0 platforms darwin name procmail maintainers nomaintainer long_description {The procmail mail processing program can be used to create mail-servers, mailing lists, sort your incoming mail into separate folders/files (real convenient when subscribing to one or more mailing lists or for prioritising your mail), preprocess your mail, start any programs upon mail arrival (e.g. to generate different chimes on your workstation for different types of mail) or selectively forward certain incoming mail automatically to someone. Procmail can be used: - and installed by an unprivileged user (for himself only). - as a drop in replacement for the local delivery agent /bin/mail (with biff/comsat support). - as a general mailfilter for whole groups of messages (e.g. when called from within sendmail.cf rules). The accompanying formail program enables you to generate aut oreplies, split up digests/mailboxes into the original messages, do some very simple header-munging/extraction, or force mail into mail-format (with leading From line).} categories mail version 3.22 revision 2 proxsmtp 546 variants universal portdir mail/proxsmtp description {ProxSMTP is a filtering SMTP proxy daemon} homepage http://memberwebs.com/nielsen/software/proxsmtp/ epoch 0 platforms darwin name proxsmtp maintainers nomaintainer long_description {ProxSMTP is a flexible tool that allows you to reject, change or log email based on arbitrary critera. It accepts SMTP connections and forwards the SMTP commands and responses to another SMTP server. The 'DATA' email body is intercepted and filtered before forwarding.} categories mail version 1.2 revision 0 putmail 489 @@ -4512,8 +4508,6 @@ portdir math/LiE description {A computer algebra program for Lie group calculations} homepage http://young.sp2mi.univ-poitiers.fr/~marc/LiE/ epoch 0 name LiE depends_lib port:readline maintainers gwright at macports.org long_description {LiE is a computer algebra system that is specialised in computations involving (reductive) Lie groups and their representations.} version 2.2.2 categories math revision 2 ProofGeneral 566 portdir math/ProofGeneral description {An emacs mode for interactive prooving} homepage http://proofgeneral.inf.ed.ac.uk/ epoch 0 platforms darwin name ProofGeneral maintainers mww long_description {The aim of Proof General is to provide powerful and configurable interfaces which help user-interaction with proof assistants. Proof General targets power users rather than novices, but is designed to be useful to both. Proof General leads to an environment for serious proof engineering of interactively-constructed proofs.} version 3.7.1 categories math revision 0 -R 732 -variants {gcc42 gcc43} portdir math/R description {R is GNU S - an interpreted language for statistical computing} homepage http://www.r-project.org/ epoch 0 platforms darwin name R depends_lib {port:gettext port:glib2 port:jpeg port:libiconv port:pango port:readline port:tcl port:tk port:tiff port:xorg-libXmu port:xorg-libXScrnSaver port:gcc43} long_description {R is a language and environment for statistical computing and graphics. R provides a wide variety of statistical (linear and nonlinear modelling, classical statistical tests, time-series analysis, classification, clustering, ...) and graphical techniques, and is highly extensible.} maintainers kjell.konis at epfl.ch categories {math science} version 2.9.0 revision 0 SuiteSparse 364 depends_build port:metis portdir math/SuiteSparse description {Sparse matrix routines} homepage http://www.cise.ufl.edu/research/sparse/SuiteSparse/ epoch 0 platforms darwin name SuiteSparse maintainers stechert long_description {SuiteSparse is a single archive that contains all packages authored by Tim Davis.} version 3.3.0 categories {math science} revision 0 aamath 478 @@ -5084,8 +5078,6 @@ variants universal portdir net/dnstop description {dnstop is a libpcap application that displays tables of DNS traffic} homepage http://dnstop.measurement-factory.com epoch 0 platforms darwin name dnstop depends_lib {port:libpcap port:ncurses} long_description {{dnstop is a libpcap application that displays tables of DNS traffic}} maintainers pmq categories net version 20080502 revision 0 dnstracer 448 variants universal portdir net/dnstracer description {trace a chain of DNS servers to the source} homepage http://www.mavetju.org/unix/dnstracer.php epoch 0 platforms {darwin freebsd} name dnstracer maintainers blb long_description {dnstracer determines where a given Domain Name Server (DNS) gets its information from, and follows the chain of DNS servers back to the servers which know the data.} categories {net sysutils} version 1.9 revision 0 -driftnet 536 -variants universal portdir net/driftnet description {Watch the pictures go by on your net} homepage http://www.ex-parrot.com/~chris/driftnet epoch 0 platforms darwin name driftnet depends_lib {lib:libjpeg:jpeg lib:libpcap:libpcap lib:libungif:libungif lib:libgtk.1:gtk1} long_description {Inspired by EtherPEG, Driftnet is a program which listens to network traffic and picks out images from TCP streams it observes. Fun to run on a host which sees lots of web traffic.} maintainers nomaintainer categories net version 0.1.6 revision 1 drill 488 variants universal depends_build bin:autoconf:autoconf portdir net/drill description {A dig-style dnssec-aware dns debugging tool} homepage http://www.nlnetlabs.nl/projects/drill/ epoch 0 platforms darwin name drill depends_lib {port:openssl port:ldns} long_description {Drill is a tool ala dig from BIND. It was designed with DNSSEC in mind and should be a useful debugging/query tool for DNSSEC.} maintainers marius.rieder at durchmesser.ch categories {net devel} version 1.5.1 revision 0 dsh 571 @@ -5442,8 +5434,8 @@ variants universal portdir net/openntpd description {free, easy to use implementation of the Network Time Protocol} homepage http://www.openntpd.org/ epoch 0 platforms darwin name openntpd maintainers nomaintainer long_description {OpenNTPD is a free, easy to use implementation of the Network Time Protocol. It provides the ability to sync the local clock to remote NTP servers and can act as NTP server itself, redistributing the local clock.} categories net version 3.9p1 revision 0 openradius 310 variants universal portdir net/openradius description {RADIUS server with various back ends} homepage http://www.xs4all.nl/~evbergen/openradius/ epoch 0 platforms darwin name openradius maintainers nomaintainer long_description {{RADIUS server with various back ends}} categories net version 0.9.10 revision 0 -openssh 892 -variants {apple_x11 hpn darwin darwin_9 universal} portdir net/openssh description {OpenSSH secure login server} homepage http://www.openssh.com/ epoch 0 platforms darwin name openssh depends_lib {port:openssl port:zlib} long_description {OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that increasing numbers of people on the Internet are coming to rely on. Many users of telnet, rlogin, ftp, and other such programs might not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety of authentication methods.} maintainers {jwa openmaintainer} categories net version 5.2p1 revision 0 +openssh 912 +variants {no_x11 hpn darwin darwin_9 universal} portdir net/openssh description {OpenSSH secure login server} homepage http://www.openssh.com/ epoch 0 depends_run port:xauth platforms darwin name openssh depends_lib {port:openssl port:zlib} long_description {OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that increasing numbers of people on the Internet are coming to rely on. Many users of telnet, rlogin, ftp, and other such programs might not realize that their password is transmitted across the Internet unencrypted, but it is. OpenSSH encrypts all traffic (including passwords) to effectively eliminate eavesdropping, connection hijacking, and other network-level attacks. Additionally, OpenSSH provides a myriad of secure tunneling capabilities, as well as a variety of authentication methods.} maintainers {jwa openmaintainer} categories net version 5.2p1 revision 1 openvpn 541 variants {no_lzo universal} portdir net/openvpn description {easy-to-use, robust, and highly configurable VPN} homepage http://openvpn.sourceforge.net/ epoch 0 platforms {darwin openbsd} name openvpn depends_lib lib:liblzo:lzo long_description {OpenVPN is an easy-to-use, robust, and highly configurable VPN (Virtual Private Network) daemon which can be used to securely link two or more private networks using an encrypted tunnel over the internet.} maintainers julien.touche at touche.fr.st categories {net security} version 1.6.0 revision 0 openvpn2 523 @@ -7400,8 +7392,8 @@ portdir python/py-graphpath description {small language for ananlysing graph-structured data in Python} homepage http://www.langdale.com.au/GraphPath epoch 0 platforms {darwin freebsd} depends_lib port:python24 name py-graphpath maintainers nomaintainer long_description {GraphPath is a little-language for analysing graph-structured data, especially RDF. The syntax of GraphPath is reminiscent of XPath. It provides a query evaluator and a goal-driven inference engine, which work together to perform graph analysis.} categories python version 0.7 revision 0 py-gsl 502 variants {numarray Numeric numpy} depends_build port:swig portdir python/py-gsl description {Python interface to the GNU Scientific Library} homepage http://pygsl.sourceforge.net/ epoch 0 platforms darwin depends_lib {port:python24 port:gsl port:py-numpy} name py-gsl long_description {Python interface to the GSL, the GNU Scientfic Library. Variants for the use of different array-objects supported by pygsl are provided.} maintainers nomaintainer version 0.9.1 categories {python science} revision 1 -py-gtk2 567 -variants {darwin_7 darwin_9 universal} depends_build port:pkgconfig portdir python/py-gtk2 description {PyGTK is the Python binding to GTK+ 2.x} homepage http://www.pygtk.org/ epoch 0 platforms darwin name py-gtk2 depends_lib {port:python24 port:atk port:cairo path:lib/pkgconfig/pango.pc:pango port:gtk2 port:libglade2 port:py-cairo port:py-gobject} long_description {PyGTK contains modules that allow you to use gtk in Python programs. At present, it is a fairly complete set of bindings.} maintainers nomaintainer categories {python x11} version 2.12.1 revision 0 +py-gtk2 558 +variants {darwin_9 universal} depends_build port:pkgconfig portdir python/py-gtk2 description {PyGTK is the Python binding to GTK+ 2.x} homepage http://www.pygtk.org/ epoch 0 platforms darwin name py-gtk2 depends_lib {port:python24 port:atk port:cairo path:lib/pkgconfig/pango.pc:pango port:gtk2 port:libglade2 port:py-cairo port:py-gobject} long_description {PyGTK contains modules that allow you to use gtk in Python programs. At present, it is a fairly complete set of bindings.} maintainers nomaintainer categories {python x11} version 2.12.1 revision 0 py-gtkmvc 718 portdir python/py-gtkmvc description {Model-View-Controller for PyGTK2} homepage http://pygtkmvc.sourceforge.net/ epoch 0 depends_lib {port:python24 port:py-gtk2} name py-gtkmvc maintainers nomaintainer long_description {This is an implementation of the Model-View-Controller and Observer patterns for the Pygtk2 toolkit. MVC is a pattern that can be successfully used to design and develop well structured GUI applications. The MVC pattern basically helps in separating sematics and data of the application, from their representation. The Observer pattern is also embedded here. This pattern allows making separated parts independent, but still connected each other.} categories {python x11} version 0.9.2 revision 0 py-harvestman 452 @@ -8074,8 +8066,8 @@ variants universal depends_build {port:docbook-xml-4.1.2 port:docbook-xsl port:pkgconfig} portdir python/py25-goocanvas description {GooCanvas python bindings} homepage http://developer.berlios.de/projects/pygoocanvas/ epoch 0 platforms darwin name py25-goocanvas depends_lib {port:atk port:cairo port:expat port:fontconfig port:freetype port:gettext path:lib/pkgconfig/glib-2.0.pc:glib2 port:goocanvas port:gtk2 port:jpeg port:libiconv port:libpng path:lib/pkgconfig/pango.pc:pango port:py25-cairo port:py25-gobject port:py25-gtk port:py25-numeric port:py25-wxpython port:python25 port:tiff port:zlib} maintainers nomaintainer long_description {GooCanvas python bindings} categories {python gnome} version 0.9.0 revision 0 py25-gsl 505 variants {numarray Numeric numpy} depends_build port:swig portdir python/py25-gsl description {Python interface to the GNU Scientific Library} homepage http://pygsl.sourceforge.net/ epoch 0 platforms darwin depends_lib {port:gsl port:py25-numpy} name py25-gsl long_description {Python interface to the GSL, the GNU Scientfic Library. Variants for the use of different array-objects supported by pygsl are provided.} maintainers {openmaintainer jochen} version 0.9.1 categories {python science} revision 1 -py25-gtk 573 -variants {darwin_7 darwin_9 universal} depends_build port:pkgconfig portdir python/py25-gtk description {PyGTK is the Python binding to GTK+ 2.x} homepage http://www.pygtk.org/ epoch 0 platforms darwin name py25-gtk depends_lib {port:python25 port:atk port:cairo path:lib/pkgconfig/pango.pc:pango port:gtk2 port:libglade2 port:py25-cairo port:py25-gobject} long_description {PyGTK contains modules that allow you to use gtk in Python programs. At present, it is a fairly complete set of bindings.} maintainers nomaintainer categories {python x11} version 2.14.1 revision 0 +py25-gtk 564 +variants {darwin_9 universal} depends_build port:pkgconfig portdir python/py25-gtk description {PyGTK is the Python binding to GTK+ 2.x} homepage http://www.pygtk.org/ epoch 0 platforms darwin name py25-gtk depends_lib {port:python25 port:atk port:cairo path:lib/pkgconfig/pango.pc:pango port:gtk2 port:libglade2 port:py25-cairo port:py25-gobject} long_description {PyGTK contains modules that allow you to use gtk in Python programs. At present, it is a fairly complete set of bindings.} maintainers nomaintainer categories {python x11} version 2.14.1 revision 0 py25-gtkglext 382 variants {darwin_9 universal} portdir python/py25-gtkglext description {Python bindings for GtkGLExt} homepage http://sourceforge.net/projects/gtkglext/ epoch 0 platforms darwin name py25-gtkglext depends_lib {port:gtkglext port:py25-gtk port:py25-opengl} long_description {{Python bindings for GtkGLExt}} maintainers nomaintainer categories {python gnome} version 1.1.0 revision 0 py25-hashlib 403 @@ -9228,8 +9220,8 @@ variants universal depends_build port:libtool portdir science/ng-spice description {Circuit simulator based on Spice 3f5} homepage http://ngspice.sourceforge.net/ epoch 0 platforms darwin name ng-spice long_description {Ngspice is a mixed-level/mixed-signal circuit simulator. Its code is based on three open source software packages: Spice3f5, Cider1b1 and Xspice. Ngspice is part of gEDA project, a full GPL'd suite of Electronic Design Automation tools. Note: this port does not compile the Cider and Xspice modules.} maintainers nomaintainer categories science version rework-18 revision 0 openbabel 647 variants {darwin_7 universal} portdir science/openbabel description {A chemistry file translation program.} homepage http://openbabel.sourceforge.net/ epoch 0 platforms darwin name openbabel depends_lib {port:libiconv port:libxml2 port:zlib} long_description {Open Babel is a free, open-source version of the Babel chemistry file translation program. OpenBabel is a project designed to pick up where Babel left off, as a cross-platform program and library designed to interconvert between many file formats used in molecular modeling and computational chemistry.} maintainers beatrupp at gmail.com categories {science devel} version 2.2.0 revision 0 -opendx 737 -variants {darwin_9 no_java universal} depends_build bin:autoconf:autoconf portdir science/opendx description {IBM's Open Visualization Data Explorer} homepage http://opendx.org epoch 0 platforms darwin name opendx depends_lib {port:netcdf port:cdf port:cosmoplayer port:opendx-java40 port:ImageMagick path:lib/libXm.dylib:openmotif} long_description {OpenDX is a uniquely powerful, full-featured software package for the visualization of scientific, engineering and analytical data: Its open system design is built on familiar standard interface environments. And its sophisticated data model provides users with great flexibility in creating visualizations.} maintainers gwright at macports.org categories science version 4.4.4 revision 1 +opendx 747 +variants {darwin_9 no_java universal} depends_build bin:autoconf:autoconf portdir science/opendx description {IBM's Open Visualization Data Explorer} homepage http://opendx.org epoch 0 platforms darwin name opendx depends_lib {port:netcdf port:cdf port:cosmoplayer port:opendx-java40 port:ImageMagick path:lib/libXm.dylib:openmotif port:mesa} long_description {OpenDX is a uniquely powerful, full-featured software package for the visualization of scientific, engineering and analytical data: Its open system design is built on familiar standard interface environments. And its sophisticated data model provides users with great flexibility in creating visualizations.} maintainers gwright at macports.org categories science version 4.4.4 revision 2 opendx-samples 618 variants universal portdir science/opendx-samples description {IBM's Open Visualization Data Explorer (Data Samples)} homepage http://opendx.org epoch 0 platforms darwin name opendx-samples depends_lib port:opendx long_description {OpenDX is a uniquely powerful, full-featured software package for the visualization of scientific, engineering and analytical data: Its open system design is built on familiar standard interface environments. And its sophisticated data model provides users with great flexibility in creating visualizations.} maintainers gwright at macports.org categories science version 4.4.0 revision 1 openmpi 627 @@ -10741,7 +10733,7 @@ advi 462 variants universal portdir x11/advi description {TeX DVI previewer} homepage http://pauillac.inria.fr/advi/ epoch 0 depends_run bin:tex:texlive platforms darwin name advi depends_lib {port:ocaml port:camlimages port:xorg-libXinerama port:xpm port:freetype} long_description {Active-DVI is an O'Caml Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX.} maintainers nomaintainer categories {x11 graphics} version 1.6.0 revision 2 aewm 331 -portdir x11/aewm description {aewm is a minimalist window manager for X11.} homepage http://www.red-bean.com/~decklin/software/aewm/ epoch 0 platforms darwin name aewm depends_lib port:gtk2 maintainers nomaintainer long_description {{aewm is a minimalist window manager for X11.}} version 1.3.10 categories {x11 x11-wm} revision 0 +portdir x11/aewm description {aewm is a minimalist window manager for X11.} homepage http://www.red-bean.com/~decklin/software/aewm/ epoch 0 platforms darwin name aewm depends_lib port:gtk2 maintainers nomaintainer long_description {{aewm is a minimalist window manager for X11.}} version 1.3.10 categories {x11 x11-wm} revision 1 appres 527 variants universal depends_build port:pkgconfig portdir x11/appres description {Show resources seen by an X11 application} homepage http://www.x.org/ epoch 0 platforms darwin name appres depends_lib port:xorg-libXt long_description {The appres program prints the resources seen by an application (or subhierarchy of an application) with the specified class and instance names. It can be used to determine which resources a particular program will load.} maintainers {blb openmaintainer} categories x11 version 1.0.1 revision 1 aterm 547 @@ -10860,8 +10852,8 @@ variants universal depends_build {port:pkgconfig bin:bdftopcf:bdftopcf port:xorg-font-util port:mkfontscale port:mkfontdir bin:gzip:gzip} portdir x11/font-xfree86-type1 description {X.org XFree86 Type1 font} homepage http://www.x.org/ epoch 0 platforms darwin name font-xfree86-type1 long_description {{X.org XFree86 Type1 font}} maintainers {blb openmaintainer} categories {x11 x11-font graphics} version 1.0.1 revision 1 fonttosfnt 439 variants universal depends_build port:pkgconfig portdir x11/fonttosfnt description {Wrap a bitmap font in a sfnt (TrueType) wrapper} homepage http://www.x.org/ epoch 0 platforms darwin name fonttosfnt depends_lib {port:xorg-libfontenc port:freetype} long_description {Wrap a bitmap font or a set of bitmap fonts in a sfnt (TrueType or OpenType) wrapper.} maintainers {blb openmaintainer} categories {x11 graphics} version 1.0.4 revision 1 -fox 466 -variants universal depends_build port:pkgconfig portdir x11/fox description {The FOX GUI toolkit} homepage http://www.fox-toolkit.org/ epoch 0 platforms darwin name fox depends_lib {port:tiff port:libpng port:jpeg port:xorg-libXcursor port:Xft2 port:xorg-libXrandr port:freetype} maintainers lyle at lylejohnson.name long_description {FOX is a C++ based Toolkit for developing Graphical User Interfaces easily and effectively.} categories x11 version 1.6.34 revision 1 +fox 476 +variants universal depends_build port:pkgconfig portdir x11/fox description {The FOX GUI toolkit} homepage http://www.fox-toolkit.org/ epoch 0 platforms darwin name fox depends_lib {port:tiff port:libpng port:jpeg port:xorg-libXcursor port:Xft2 port:xorg-libXrandr port:freetype port:mesa} maintainers lyle at lylejohnson.name long_description {FOX is a C++ based Toolkit for developing Graphical User Interfaces easily and effectively.} categories x11 version 1.6.34 revision 2 freefont-ttf 339 portdir x11/freefont-ttf description {Free UCS Outline Fonts} homepage http://www.nongnu.org/freefont/ epoch 0 platforms darwin name freefont-ttf maintainers takeshi at macports.org long_description {a set of free outline fonts covering the ISO 10646/Unicode UCS (Universal Character Set).} version 20060126 categories {x11 fonts} revision 0 fslsfonts 377 @@ -10894,8 +10886,6 @@ variants darwin depends_build bin:autoconf:autoconf portdir x11/glw description {Mesa OpenGL widget library} homepage http://www.mesa3d.org/ epoch 0 platforms darwin name glw depends_lib {port:xorg-libsm port:mesa lib:libXm:openmotif} long_description {SGI Xt/Motif OpenGL widget library} maintainers css categories {x11 devel graphics} version 7.2 revision 1 gobby 651 variants universal depends_build port:pkgconfig portdir x11/gobby description {Realtime collaborative editor} homepage http://gobby.0x539.de/ epoch 0 platforms {darwin freebsd} name gobby depends_lib {path:lib/pkgconfig/glib-2.0.pc:glib2 port:gtk2 port:glibmm port:libxmlxx2 port:gtkmm port:gtksourceview2 port:libgnomecups port:net6 port:obby} long_description {Gobby is a free collaborative editor which enables you to edit files simultaneously with other users over a network. It supports multiple documents in one session and is portable to both Windows and POSIX platforms.} maintainers nomaintainer categories {x11 net} version 0.4.8 revision 0 -grace 496 -variants {netcdf universal} portdir x11/grace description {WYSIWYG tool to make two-dimensional plots of numerical data} homepage http://plasma-gate.weizmann.ac.il/Grace/ epoch 0 platforms darwin name grace depends_lib {port:xorg-libXmu port:xorg-libXp port:xpm port:libpng lib:libXm:openmotif port:pdflib port:jpeg port:zlib} long_description {{WYSIWYG tool to make two-dimensional plots of numerical data}} maintainers nomaintainer categories {x11 math science print} version 5.1.22 revision 3 gtimelog 426 portdir x11/gtimelog description {A Gtk+ time tracking application.} homepage http://mg.pov.lt/gtimelog/ epoch 0 platforms darwin depends_lib {port:py25-gtk port:py25-setuptools} name gtimelog maintainers {gmail.com:shreevatsa.public openmaintainer} long_description {GTimeLog is a small Gtk+ app that I use to keep track of my time. Its main goal is to be as unintrusive as possible.} categories x11 version 0.2.0 revision 0 gtk-canvas 526 @@ -10996,8 +10986,8 @@ variants universal depends_build port:pkgconfig portdir x11/listres description {List resources in X11 widgets} homepage http://www.x.org/ epoch 0 platforms darwin name listres depends_lib port:xorg-libXaw long_description {The listres program generates a list of a widget's resource database. The class in which each resource is first defined, the instance and class name, and the type of each resource is listed. If no specific widgets or the -all switch are given, a two-column list of widget names and their class hierarchies is printed.} maintainers {blb openmaintainer} categories {x11 graphics} version 1.0.1 revision 1 lndir 371 variants universal depends_build {port:pkgconfig port:xorg-xproto} portdir x11/lndir description {Create shadow dir of symbolic links to another tree} homepage http://www.x.org/ epoch 0 platforms darwin name lndir long_description {{Create shadow dir of symbolic links to another tree}} maintainers {blb openmaintainer} categories {x11 sysutils} version 1.0.1 revision 0 -luit 344 -variants {macosx universal} depends_build port:pkgconfig portdir x11/luit description {X.org luit} homepage http://www.x.org epoch 0 platforms darwin name luit depends_lib {port:xorg-libX11 port:xorg-libfontenc} long_description {Convert terminal i/o from legacy encodings to UTF-8} maintainers jeremyhu categories x11 version 1.0.3 revision 1 +luit 335 +variants universal depends_build port:pkgconfig portdir x11/luit description {X.org luit} homepage http://www.x.org epoch 0 platforms darwin name luit depends_lib {port:xorg-libX11 port:xorg-libfontenc} long_description {Convert terminal i/o from legacy encodings to UTF-8} maintainers jeremyhu categories x11 version 1.0.3 revision 1 makedepend 694 variants universal depends_build port:pkgconfig portdir x11/makedepend description {Create dependencies in makefiles} homepage http://www.x.org/ epoch 0 platforms darwin name makedepend long_description {The makedepend program reads each sourcefile in sequence and parses it like a C-preprocessor, processing all #include, #define, #undef, #ifdef, #ifndef, #endif, #if, #elif and #else directives so that it can correctly tell which #include, directives would be used in a compilation. Any #include, directives can reference files having other #include directives, and parsing will occur in these files as well.} maintainers {blb openmaintainer} categories {x11 devel} version 1.0.1 revision 0 mesa 589 @@ -11006,8 +10996,8 @@ portdir x11/mikachanfont description {Mikachan-font is Japanese font written by Mikachan} homepage http://www001.upp.so-net.ne.jp/mikachan/ epoch 0 name mikachanfont depends_lib bin:mkfontdir:mkfontdir maintainers pelopor at nifty.com long_description {Mikachan-font is Japanese font. It was written by Mikachan,and scaned and used font making software. It is possible to display Hiragana, Katakana, Numbers, Alphabets, symbols, Kanji for education, Usual kanji, Kanji of person's name, JIS kanji Level 1, JIS kanji Level 2, IBM expantion kanji.} version 8.9 categories {x11 fonts} revision 0 mkfontdir 291 variants universal portdir x11/mkfontdir description {X11 mkfontdir} homepage http://www.x.org epoch 0 depends_run port:mkfontscale platforms darwin name mkfontdir long_description {Create an index of X font files in a directory} maintainers jeremyhu categories x11 version 1.0.4 revision 0 -mkfontscale 480 -variants {macosx universal} depends_build {port:autoconf port:automake port:libtool port:xorg-util-macros port:pkgconfig port:xorg-xproto bin:autoreconf:autoconf} portdir x11/mkfontscale description {X11 mkfontscale} homepage http://www.x.org epoch 0 platforms darwin name mkfontscale depends_lib {port:xorg-libfontenc port:freetype port:bzip2 port:zlib} long_description {Create an index of scalable font files for X} maintainers jeremyhu categories x11 version 1.0.6 revision 1 +mkfontscale 471 +variants universal depends_build {port:autoconf port:automake port:libtool port:xorg-util-macros port:pkgconfig port:xorg-xproto bin:autoreconf:autoconf} portdir x11/mkfontscale description {X11 mkfontscale} homepage http://www.x.org epoch 0 platforms darwin name mkfontscale depends_lib {port:xorg-libfontenc port:freetype port:bzip2 port:zlib} long_description {Create an index of scalable font files for X} maintainers jeremyhu categories x11 version 1.0.6 revision 1 mlterm 921 variants {antialias bidi bgImages gtk2} depends_build {port:autoconf bin:autoconf:autoconf} portdir x11/mlterm description {Multi-lingual X11 terminal emulator} homepage http://mlterm.sourceforge.net/ epoch 0 platforms darwin name mlterm depends_lib {port:xorg-libsm port:Xft2} long_description {mlterm is a multi-lingual terminal emulator written from scratch, which supports various character sets and encodings in the world and complex characters such as double width for East Asian, combining for Thai, Vietnamese, and so on, and bi-direction for Arabic and Hebrew. Indic scripts in ISCII encoding are experimentally supported using libind library. It also supports various unique feature such as anti-alias using FreeType, multiple XIM, multiple windows, scrollbar API, scroll by mouse wheel, automatic selection of encoding, daemon mode, and so on.} maintainers nomaintainer categories x11 version 2.9.4 revision 1 monafont 508 @@ -11047,7 +11037,7 @@ qt3 442 variants {mysql odbc psql darwin_9 darwin_8 darwin_7 darwin_6} portdir x11/qt3 description {Qt Tool Kit} homepage http://www.trolltech.com/products/qt/index.html epoch 0 platforms darwin name qt3 depends_lib {port:mesa port:jpeg port:libpng path:bin/perl:perl5 port:Xft2 port:xrender port:zlib} long_description {Qt 3 is a multiplatform C++ application development framework.} maintainers nomaintainer categories x11 version 3.3.8 revision 6 qt4-x11 706 -variants {darwin_7 webkit} depends_build port:pkgconfig portdir x11/qt4-x11 description {Qt Tool Kit} homepage http://www.trolltech.com/ epoch 0 platforms darwin name qt4-x11 depends_lib {port:zlib path:include/gif_lib.h:giflib port:tiff port:libpng port:libmng port:jpeg port:libiconv path:lib/pkgconfig/glib-2.0.pc:glib2 port:dbus port:unixODBC port:mysql5 port:postgresql83 port:openssl port:fontconfig port:gettext port:xrender port:xorg-libsm port:xorg-libXi port:xorg-libXrandr port:mesa port:gstreamer port:gst-plugins-base port:sqlite3} long_description {This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications.} maintainers mcalhoun categories x11 version 4.4.3 revision 2 +variants {darwin_7 webkit} depends_build port:pkgconfig portdir x11/qt4-x11 description {Qt Tool Kit} homepage http://www.trolltech.com/ epoch 0 platforms darwin name qt4-x11 depends_lib {port:zlib path:include/gif_lib.h:giflib port:tiff port:libpng port:libmng port:jpeg port:libiconv path:lib/pkgconfig/glib-2.0.pc:glib2 port:dbus port:unixODBC port:mysql5 port:postgresql83 port:openssl port:fontconfig port:gettext port:xrender port:xorg-libsm port:xorg-libXi port:xorg-libXrandr port:mesa port:gstreamer port:gst-plugins-base port:sqlite3} long_description {This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications.} maintainers mcalhoun categories x11 version 4.4.3 revision 3 quartz-wm 351 portdir x11/quartz-wm description {Apple's Window Manager for X11} homepage http://xquartz.macosforge.org epoch 0 platforms macosx name quartz-wm depends_lib {port:xorg-libXinerama port:xorg-libAppleWM} maintainers {jeremyhu openmaintainer} long_description {quartz-wm is Apple's closed source window-manager.} version 1.0.3 categories x11 revision 0 ratpoison 894 @@ -11111,7 +11101,7 @@ vtwm 474 depends_build bin:xmkmf:imake portdir x11/vtwm description {Twm with a virtual desktop and optional Motif-like features} homepage ftp://ftp.visi.com/users/hawkeyd/X/ epoch 0 platforms darwin name vtwm depends_lib {port:xorg-libX11 port:xorg-libXt port:xorg-libsm port:xorg-libice port:xorg-libXext port:xpm port:xorg-libXmu} maintainers mdales at mac.com long_description {{Twm with a virtual desktop and optional Motif-like features}} categories x11 version 5.4.6b revision 1 windowmaker 822 -variants {candy darwin_i386} portdir x11/windowmaker description {Window Maker is a X11 window manager supporting GNUstep} homepage http://www.windowmaker.info/ epoch 0 platforms {darwin freebsd} name windowmaker depends_lib {port:xorg-libsm port:xorg-libXext port:Xft2 port:xpm port:libpng port:gettext path:include/gif_lib.h:giflib port:tiff} long_description {Window Maker is an X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. In every way possible, it reproduces the elegant look and feel of the {NEXTSTEP[tm]} user interface. It is fast, feature rich, easy to configure, and easy to use. It is also free software, with contributions being made by programmers from around the world.} maintainers nomaintainer categories {x11 x11-wm} version 0.92.0 revision 3 +variants {candy darwin_i386} portdir x11/windowmaker description {Window Maker is a X11 window manager supporting GNUstep} homepage http://www.windowmaker.info/ epoch 0 platforms {darwin freebsd} name windowmaker depends_lib {port:xorg-libsm port:xorg-libXext port:Xft2 port:xpm port:libpng port:gettext path:include/gif_lib.h:giflib port:tiff} long_description {Window Maker is an X11 window manager originally designed to provide integration support for the GNUstep Desktop Environment. In every way possible, it reproduces the elegant look and feel of the {NEXTSTEP[tm]} user interface. It is fast, feature rich, easy to configure, and easy to use. It is also free software, with contributions being made by programmers from around the world.} maintainers nomaintainer categories {x11 x11-wm} version 0.92.0 revision 4 wine 622 depends_build {port:pkgconfig port:autoconf bin:autoreconf:autoconf} portdir x11/wine description {Wine Is Not an Emulator} homepage http://www.winehq.com/ epoch 0 platforms darwin name wine depends_lib {port:expat port:fontconfig port:freetype port:jpeg port:libiconv port:libxml2 port:libxslt port:ncurses port:open