From source_changes at macosforge.org Fri Jun 1 00:31:28 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25778] trunk/dports/PortIndex
Message-ID: <20070601073128.1498F62B6F5@cvs.opensource.apple.com>
Revision: 25778
http://trac.macosforge.org/projects/macports/changeset/25778
Author: dluke@macports.org
Date: 2007-06-01 00:31:27 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Total number of ports parsed: 4004
Ports successfully parsed: 4004
Ports failed: 0
Modified Paths:
--------------
trunk/dports/PortIndex
Modified: trunk/dports/PortIndex
===================================================================
--- trunk/dports/PortIndex 2007-06-01 06:46:37 UTC (rev 25777)
+++ trunk/dports/PortIndex 2007-06-01 07:31:27 UTC (rev 25778)
@@ -598,8 +598,8 @@
variants {universal mysql4} portdir databases/mysqltcl description {Simple API for Mysql-Database and Tcl scripting language.} homepage http://www.xdobry.de/mysqltcl/ epoch 0 platforms darwin name mysqltcl depends_lib {port:mysql5 port:tcl port:tk} maintainers nomaintainer@macports.org long_description {MySQLTcl is a collection of Tcl commands and a Tcl global array that provide access to one or more mysql database servers.} version 3.02 categories {databases devel} revision 0
mysqlxx 470
variants universal portdir databases/mysqlxx description {C++ wrapper for MySQL's C API} homepage http://tangentsoft.net/mysql++/ epoch 0 platforms {darwin freebsd} name mysqlxx depends_lib lib:libmysqlclient:mysql maintainers kayos@genetikayos.com long_description {MySQL++ is a C++ wrapper for MySQL's C API. It is built around STL principles, to make dealing with the database as easy as dealing with an STL container.} version 1.7.35 categories databases revision 0
-openldap 453
-variants {universal darwin_6 ipv6 aci} portdir databases/openldap description {OpenLDAP Software} homepage http://www.openldap.org/ epoch 0 platforms darwin name openldap depends_lib {port:db4 port:perl5.8 port:cyrus-sasl2 port:openssl} maintainers {landonf@macports.org bchesneau@mac.com} long_description {OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.} version 2.3.35 categories databases revision 0
+openldap 460
+variants {universal server darwin_6 ipv6 aci} portdir databases/openldap description {OpenLDAP Software} homepage http://www.openldap.org/ epoch 0 platforms darwin name openldap depends_lib {port:perl5.8 port:cyrus-sasl2 port:openssl port:db4} maintainers {landonf@macports.org bchesneau@mac.com} long_description {OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.} version 2.3.35 categories databases revision 0
pg2xbase 403
variants universal description {Convert data between PostgreSQL and DBF files} portdir databases/pg2xbase homepage http://www.klaban.torun.pl/prog/pg2xbase/ epoch 0 depends_lib {port:postgresql81 port:xbase} name pg2xbase long_description {pg2xbase provides utilities for converting between PostgreSQL databases and DBF files.} maintainers seanasy@gmail.com categories database version 2.4.1 revision 0
pgpool 541
@@ -830,8 +830,8 @@
variants universal portdir devel/darts description {Double-ARray Trie System} homepage http://chasen.org/~taku/software/darts/ epoch 0 platforms darwin name darts depends_lib port:zlib maintainers takanori@macports.org long_description {Darts is a C++ Templeate library which can be used to make Double-Array. Reference: Aoe, J. An Efficient Digital Search Algorithm by Using a Double-Array Structure. IEEE Transactions on Software Engineering. Vol. 15, 9 (Sep 1989). pp. 1066-1077} version 0.31 categories devel revision 0
dbow 518
variants {universal darwin_8} portdir devel/dbow description {database compiler-compiler} homepage http://dbow.sourceforge.net/ epoch 0 platforms darwin name dbow depends_lib port:mysql4 maintainers nomaintainer@macports.org long_description {DBOW is a database compiler-compiler or front-end. It takes table definitions in a meta language and prepares C, C++, PHP, Perl (etc) functions for manipulating the database. It will also produce SQL table data for MySQL.} version 0.7 categories {devel databases} revision 0
-dbus 472
-variants {universal enable_tests devel} depends_build port:pkgconfig portdir devel/dbus description {A message bus system, a simple way for applications to talk to one another.} homepage http://www.freedesktop.org/Software/dbus epoch 0 platforms darwin name dbus depends_lib {port:expat port:libxml2} long_description {{A message bus system, a simple way for applications to talk to one another.}} maintainers rhwood@macports.org version 1.0.2 categories devel revision 2
+dbus 495
+variants {universal enable_tests devel} depends_build port:pkgconfig portdir devel/dbus description {A message bus system, a simple way for applications to talk to one another.} homepage http://www.freedesktop.org/Software/dbus epoch 0 platforms darwin name dbus depends_lib {port:expat port:libxml2 port:docbook-xml-4.1.2} long_description {{A message bus system, a simple way for applications to talk to one another.}} maintainers rhwood@macports.org version 1.0.2 categories devel revision 2
dbus-glib 466
variants universal depends_build port:pkgconfig portdir devel/dbus-glib description {Glib bindings for the dbus message bus system.} homepage http://www.freedesktop.org/Software/dbus epoch 0 platforms darwin name dbus-glib depends_lib {port:expat port:libxml2 port:glib2 port:dbus port:gettext} long_description {{Glib bindings for the dbus message bus system.}} maintainers {rhwood@macports.org openmaintainer@macports.org} version 0.73 categories devel revision 0
ddd 360
@@ -1165,7 +1165,7 @@
libsockets 365
variants universal portdir devel/libsockets description {C++ Sockets is a C++ wrapper for BSD-style sockets.} homepage http://www.alhem.net/Sockets/ epoch 0 platforms darwin name libsockets depends_lib port:openssl maintainers mww@macports.org long_description {{C++ Sockets is a C++ wrapper for BSD-style sockets.}} version 2.1.2 categories {devel net} revision 0
libspiff 410
-variants universal portdir devel/libspiff description {Library for reading and writing XSPF playlists} homepage http://libspiff.sourceforge.net/ epoch 0 platforms darwin name libspiff depends_lib {port:expat port:uriparser} maintainers {pipping@macports.org openmaintainer@macports.org} long_description {{Library for reading and writing XSPF playlists}} version 0.6.5 categories {devel multimedia} revision 0
+variants universal portdir devel/libspiff description {Library for reading and writing XSPF playlists} homepage http://libspiff.sourceforge.net/ epoch 0 platforms darwin name libspiff depends_lib {port:expat port:uriparser} maintainers {pipping@macports.org openmaintainer@macports.org} long_description {{Library for reading and writing XSPF playlists}} version 0.7.0 categories {devel multimedia} revision 0
libssh 350
portdir devel/libssh variants universal description {an SSH library} name libssh version 0.11 categories {devel security} homepage http://0xbadc0de.be/?part=libssh revision 0 epoch 0 maintainers ron@oneinsane.net long_description {The ssh library was designed to be used by programmers needing a working SSH implementation by the mean of a library.}
libtar 387
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/9135b8ce/attachment.html
From source_changes at macosforge.org Fri Jun 1 02:30:03 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25779] trunk/dports/textproc/docbook-xml-412/Portfile
Message-ID: <20070601093003.6916562BC18@cvs.opensource.apple.com>
Revision: 25779
http://trac.macosforge.org/projects/macports/changeset/25779
Author: rhwood@macports.org
Date: 2007-06-01 02:30:02 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Fix minor typo
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml-412/Portfile
Modified: trunk/dports/textproc/docbook-xml-412/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-412/Portfile 2007-06-01 07:31:27 UTC (rev 25778)
+++ trunk/dports/textproc/docbook-xml-412/Portfile 2007-06-01 09:30:02 UTC (rev 25779)
@@ -5,7 +5,7 @@
name docbook-xml-412
version 4.1.2
revision 1
-description This port is depreciated in favor of port:docbook-xml-4.1.2t
+description This port is depreciated in favor of port:docbook-xml-4.1.2
categories textproc
platforms darwin
maintainers rhwood@macports.org openmaintainer@macports.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/93984ba2/attachment.html
From source_changes at macosforge.org Fri Jun 1 02:31:44 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25780] trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
Message-ID: <20070601093144.CBF2162BC26@cvs.opensource.apple.com>
Revision: 25780
http://trac.macosforge.org/projects/macports/changeset/25780
Author: rhwood@macports.org
Date: 2007-06-01 02:31:44 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Massive radical changes to make this port depend on port:docbook-xml-4.2, which conflicts with this port.
This port will be removed from the ports tree NLT 1 July 2007.
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
Modified: trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile 2007-06-01 09:30:02 UTC (rev 25779)
+++ trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile 2007-06-01 09:31:44 UTC (rev 25780)
@@ -3,28 +3,18 @@
name docbook-xml-scrollkeeper
version 4.2
-description the docbook xml dtds
+description This port is depreciated in favor of port:docbook-xml-4.2
categories textproc
platforms darwin
maintainers nomaintainer@macports.org
-depends_build bin:unzip:unzip
-master_sites http://www.oasis-open.org/docbook/xml/4.2/
-distname docbook-xml-${version}
-checksums md5 73fe50dfe74ca631c1602f558ed8961f
+depends_lib port:docbook-xml-4.2
-use_zip yes
-extract.suffix .zip
-extract.cmd unzip
-
+fetch {}
+checksum {}
+extract {}
configure {}
build {}
-
-destroot {
- file mkdir ${destroot}/${prefix}/share/xml/docbook-xml/${version}
- file mkdir ${destroot}/${prefix}/share/xml/docbook-xml/${version}/ent
- system "for file in \
- `unzip -l ${distpath}/${distname} | awk '/:\[0-9\].*\[^\\/\]\$/\{print \$4\}'`; do \
- install -cv ${workpath}/\$file ${destroot}/${prefix}/share/xml/docbook-xml/${version}/\$file; \
- done"
-}
+destroot {}
+install {}
+activate {}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/7f5bdd00/attachment.html
From source_changes at macosforge.org Fri Jun 1 02:32:33 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25781] trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
Message-ID: <20070601093233.969DC62BC34@cvs.opensource.apple.com>
Revision: 25781
http://trac.macosforge.org/projects/macports/changeset/25781
Author: rhwood@macports.org
Date: 2007-06-01 02:32:33 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Bump the revision so that everyone gets the changes in the prior commit.
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
Modified: trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile 2007-06-01 09:31:44 UTC (rev 25780)
+++ trunk/dports/textproc/docbook-xml-scrollkeeper/Portfile 2007-06-01 09:32:33 UTC (rev 25781)
@@ -3,6 +3,7 @@
name docbook-xml-scrollkeeper
version 4.2
+revision 1
description This port is depreciated in favor of port:docbook-xml-4.2
categories textproc
platforms darwin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/db72cbfb/attachment.html
From source_changes at macosforge.org Fri Jun 1 11:02:50 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25782] branches/dp2mp-move/base/Makefile.in
Message-ID: <20070601180250.1719862CA74@cvs.opensource.apple.com>
Revision: 25782
http://trac.macosforge.org/projects/macports/changeset/25782
Author: jmpp@macports.org
Date: 2007-06-01 11:02:49 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Add sed rule to update dpupdate/base/ sources to the new trunk/base/ rsync module, taking into consideration that some
users might have written dpupdate/base without the trailing slash. Thanks to sfiera for both providing feedback on this
omission of mine and for helping me put the regex together to match trailing slash or not and replace both cases with
trunk/base/.
Tested upgrading a trunk based MP installation.
Modified Paths:
--------------
branches/dp2mp-move/base/Makefile.in
Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in 2007-06-01 09:32:33 UTC (rev 25781)
+++ branches/dp2mp-move/base/Makefile.in 2007-06-01 18:02:49 UTC (rev 25782)
@@ -71,9 +71,10 @@
## 2) new default value for the portdbpath variable;
## 3) new MacPorts rsync server;
## 4) new default value for the base tree;
-## 5) stray quotes are removed from the value of the rsync_options key in old conf files;
-## 6) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 7) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
+## 5) new default value for trunk's base sources for users who have it (some do);
+## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
+## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
+## 8) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
[ ! -f ${sysconfdir}/macports/macports.conf ] || { \
[ -f ${sysconfdir}/macports/macports.conf.mpsaved ] || cp -v ${sysconfdir}/macports/macports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
sed 's/etc\/ports/etc\/macports/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
@@ -84,6 +85,8 @@
mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
sed 's/dpupdate1\/base/release\/base/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
+ sed 's/dpupdate\/base\/\{0,1\}/trunk\/base\//g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+ mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
sed '/^rsync_options/s/"\(.*\)"/\1/' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
sed 's/ ports.conf(5)/ macports.conf(5)/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/198e23d4/attachment.html
From source_changes at macosforge.org Fri Jun 1 11:48:15 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25783] branches/dp2mp-move/base
Message-ID: <20070601184815.4190962CB1B@cvs.opensource.apple.com>
Revision: 25783
http://trac.macosforge.org/projects/macports/changeset/25783
Author: sfiera@macports.org
Date: 2007-06-01 11:48:14 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Merging in r25770
Modified Paths:
--------------
branches/dp2mp-move/base/Mk/macports.autoconf.mk.in
branches/dp2mp-move/base/Mk/macports.tea.mk
branches/dp2mp-move/base/aclocal.m4
branches/dp2mp-move/base/configure
branches/dp2mp-move/base/configure.ac
branches/dp2mp-move/base/src/Makefile.in
Added Paths:
-----------
branches/dp2mp-move/base/src/sqlite-3.1.3.diff
branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz
Modified: branches/dp2mp-move/base/Mk/macports.autoconf.mk.in
===================================================================
--- branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-01 18:48:14 UTC (rev 25783)
@@ -24,6 +24,7 @@
LIBS = @LIBS@
MD5_LIBS = @MD5_LIBS@
+SQLITE3_LIBS = @SQLITE3_LIBS@
INSTALL = @INSTALL@
MTREE = @MTREE@
LN_S = @LN_S@
Modified: branches/dp2mp-move/base/Mk/macports.tea.mk
===================================================================
--- branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-01 18:48:14 UTC (rev 25783)
@@ -2,7 +2,7 @@
${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
$(SHLIB_NAME):: ${OBJS}
- ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS}
+ ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${TCL_STUB_LIB_SPEC} ${SHLIB_LDFLAGS} ${LIBS} ${MD5_LIBS} ${SQLITE3_LIBS}
all:: ${SHLIB_NAME}
Modified: branches/dp2mp-move/base/aclocal.m4
===================================================================
--- branches/dp2mp-move/base/aclocal.m4 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/aclocal.m4 2007-06-01 18:48:14 UTC (rev 25783)
@@ -727,34 +727,6 @@
])
-# MP_PATH_SQLITE3
-# Specify sqlite3 location
-#
-# Arguments:
-# None.
-#
-# Requires:
-# System or user-specified --with-sqlite=dir to specify
-#
-# Results:
-# Sets SQLITE3_DIR to the directory where sqlite3 tcl pkgIndex.tcl is
-#---------------------------------------
-AC_DEFUN([MP_PATH_SQLITE3],[
-
- AC_ARG_WITH([sqlite],
- AS_HELP_STRING([--with-sqlite3=DIR],
- [directory for sqlite3 (default /usr/lib/sqlite3)]),
- [mp_sqlite3_dir=$withval], [mp_sqlite3_dir=/usr/lib/sqlite3])
-
- AC_CACHE_CHECK([for sqlite3 location], [mp_cv_sqlite3_dir],
- [mp_cv_sqlite3_dir=
- test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
- ])
-
- SQLITE3_DIR=$mp_cv_sqlite3_dir
- AC_SUBST(SQLITE3_DIR)
-])
-
dnl This macro tests if the compiler supports GCC's
dnl __attribute__ syntax for unused variables/parameters
AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
Modified: branches/dp2mp-move/base/configure
===================================================================
--- branches/dp2mp-move/base/configure 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/configure 2007-06-01 18:48:14 UTC (rev 25783)
@@ -699,7 +699,6 @@
EXTRA_PROGS
PORTSDIR
MPCONFIGDIR
-SQLITE3_DIR
DSTUSR
DSTGRP
DSTMODE
@@ -729,6 +728,8 @@
CFLAGS_LIBCURL
LDFLAGS_LIBCURL
subdirs
+SQLITE3_LIBS
+SQLITE3_DIR
OUR_INCLUDED_PACKAGES
INCLUDES
CFLAGS_DEBUG
@@ -765,7 +766,8 @@
OPEN
CPP
XMKMF'
-ac_subdirs_all='src/thread2.6'
+ac_subdirs_all='src/thread2.6
+src/sqlite-3.1.3'
# Initialize some variables set by options.
ac_init_help=
@@ -1350,7 +1352,6 @@
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-ports-dir=DIR Specify alternate ports directory
- --with-sqlite3=DIR directory for sqlite3 (default /usr/lib/sqlite3)
--with-install-user=USER
Specify user ownership of installed files
--with-install-group=GROUP
@@ -1362,7 +1363,10 @@
--with-tclinclude directory containing the public Tcl header files.
--with-tclpackage Tcl package installation directory.
--with-curlprefix base directory for the cURL install '/usr', '/usr/local',...
- --with-included-tclthread install included Thread package.
+ --with-included-tclthread
+ install included Thread package.
+ --with-included-sqlite3 build using bundled sqlite3 package
+ --with-tcl-sqlite3=DIR directory for Tcl sqlite3 (default /usr/lib/sqlite3)
Some influential environment variables:
CC C compiler command
@@ -4052,32 +4056,6 @@
-
-
-# Check whether --with-sqlite was given.
-if test "${with_sqlite+set}" = set; then
- withval=$with_sqlite; mp_sqlite3_dir=$withval
-else
- mp_sqlite3_dir=/usr/lib/sqlite3
-fi
-
-
- { echo "$as_me:$LINENO: checking for sqlite3 location" >&5
-echo $ECHO_N "checking for sqlite3 location... $ECHO_C" >&6; }
-if test "${mp_cv_sqlite3_dir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- mp_cv_sqlite3_dir=
- test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
-
-fi
-{ echo "$as_me:$LINENO: result: $mp_cv_sqlite3_dir" >&5
-echo "${ECHO_T}$mp_cv_sqlite3_dir" >&6; }
-
- SQLITE3_DIR=$mp_cv_sqlite3_dir
-
-
-
# Check for install ownership
@@ -9492,8 +9470,136 @@
patch -p0 < src/thread2.6.diff
fi
+## sqlite3 package.
+# Check whether --with-included-sqlite3 was given.
+if test "${with_included_sqlite3+set}" = set; then
+ withval=$with_included_sqlite3; with_included_sqlite3=$withval
+else
+ with_included_sqlite3="unspecified"
+fi
+
+# Check if sqlite3 package is already installed.
+if test "x$with_included_sqlite3" = "xunspecified" ; then
+ { echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
+echo $ECHO_N "checking for sqlite3_open in -lsqlite3... $ECHO_C" >&6; }
+if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3 $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 sqlite3_open ();
+int
+main ()
+{
+return sqlite3_open ();
+ ;
+ 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 "echo \"\$as_me:$LINENO: $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
+ 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 &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_lib_sqlite3_sqlite3_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_sqlite3_sqlite3_open=no
+fi
+
+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
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
+echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+if test $ac_cv_lib_sqlite3_sqlite3_open = yes; then
+ with_included_sqlite3=no
+else
+ with_included_sqlite3=yes
+fi
+
+fi
+
+
+# Check whether --with-tcl-sqlite3 was given.
+if test "${with_tcl_sqlite3+set}" = set; then
+ withval=$with_tcl_sqlite3; mp_sqlite3_dir=$withval
+else
+ mp_sqlite3_dir=/usr/lib/sqlite3
+fi
+
+
+# If sqlite3 package isn't installed, configure and install sqlite3 package.
+if test "$with_included_sqlite3" = "yes"; then
+ OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES sqlite-3.1.3"
+ subdirs="$subdirs src/sqlite-3.1.3"
+
+ # Extract sqlite3 package
+ (cd src/; gzip -d < sqlite-3.1.3.tar.gz | tar xf -)
+ # patch sqlite3 with desired configure options
+ patch -p0 < src/sqlite-3.1.3.diff
+ # the new tclinstaller.tcl needs to have substitution occur
+ mv src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3/tclinstaller.tcl.in
+ SQLITE3_LIBS=`pwd`"/src/sqlite-3.1.3/.libs/libsqlite3.a"
+ if test "x$prefix" = "xNONE" ; then
+ SQLITE3_DIR=$ac_default_prefix/share/macports/Tcl/sqlite3
+ else
+ SQLITE3_DIR=$prefix/share/macports/Tcl/sqlite3
+ fi
+else
+ SQLITE3_LIBS="-lsqlite3"
+
+ { echo "$as_me:$LINENO: checking for Tcl sqlite3 location" >&5
+echo $ECHO_N "checking for Tcl sqlite3 location... $ECHO_C" >&6; }
+if test "${mp_cv_sqlite3_dir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ mp_cv_sqlite3_dir=
+ test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
+
+fi
+{ echo "$as_me:$LINENO: result: $mp_cv_sqlite3_dir" >&5
+echo "${ECHO_T}$mp_cv_sqlite3_dir" >&6; }
+
+ SQLITE3_DIR=$mp_cv_sqlite3_dir
+fi
+
+
+
+
+
+
# Allows building of shared libraries
{ echo "$as_me:$LINENO: checking how to build libraries" >&5
@@ -10285,7 +10391,6 @@
EXTRA_PROGS!$EXTRA_PROGS$ac_delim
PORTSDIR!$PORTSDIR$ac_delim
MPCONFIGDIR!$MPCONFIGDIR$ac_delim
-SQLITE3_DIR!$SQLITE3_DIR$ac_delim
DSTUSR!$DSTUSR$ac_delim
DSTGRP!$DSTGRP$ac_delim
DSTMODE!$DSTMODE$ac_delim
@@ -10299,6 +10404,7 @@
X_PRE_LIBS!$X_PRE_LIBS$ac_delim
X_LIBS!$X_LIBS$ac_delim
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+TCL_VERSION!$TCL_VERSION$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10340,7 +10446,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-TCL_VERSION!$TCL_VERSION$ac_delim
TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
@@ -10356,6 +10461,8 @@
CFLAGS_LIBCURL!$CFLAGS_LIBCURL$ac_delim
LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim
subdirs!$subdirs$ac_delim
+SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
+SQLITE3_DIR!$SQLITE3_DIR$ac_delim
OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
INCLUDES!$INCLUDES$ac_delim
CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
@@ -10374,7 +10481,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 33; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: branches/dp2mp-move/base/configure.ac
===================================================================
--- branches/dp2mp-move/base/configure.ac 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/configure.ac 2007-06-01 18:48:14 UTC (rev 25783)
@@ -58,7 +58,6 @@
AC_PREFIX_DEFAULT(/opt/local)
MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
MP_PATH_MPCONFIGDIR
-MP_PATH_SQLITE3
# Check for install ownership
MP_CHECK_INSTALLUSER
@@ -135,7 +134,8 @@
## Thread package.
AC_ARG_WITH(
included-tclthread,
- [ --with-included-tclthread install included Thread package.],
+ AS_HELP_STRING([--with-included-tclthread],
+ [install included Thread package.]),
[with_included_tclthread=$withval],
[with_included_tclthread="unspecified"])
@@ -157,6 +157,58 @@
patch -p0 < src/thread2.6.diff
fi
+## sqlite3 package.
+AC_ARG_WITH(
+ included-sqlite3,
+ AS_HELP_STRING([--with-included-sqlite3],
+ [build using bundled sqlite3 package]),
+ [with_included_sqlite3=$withval],
+ [with_included_sqlite3="unspecified"])
+
+# Check if sqlite3 package is already installed.
+if test "x$with_included_sqlite3" = "xunspecified" ; then
+ AC_CHECK_LIB([sqlite3],[sqlite3_open],
+ [with_included_sqlite3=no],
+ [with_included_sqlite3=yes])
+fi
+
+AC_ARG_WITH(
+ tcl-sqlite3,
+ AS_HELP_STRING([--with-tcl-sqlite3=DIR],
+ [directory for Tcl sqlite3 (default /usr/lib/sqlite3)]),
+ [mp_sqlite3_dir=$withval],
+ [mp_sqlite3_dir=/usr/lib/sqlite3])
+
+# If sqlite3 package isn't installed, configure and install sqlite3 package.
+if test "$with_included_sqlite3" = "yes"; then
+ OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES sqlite-3.1.3"
+ AC_CONFIG_SUBDIRS([src/sqlite-3.1.3])
+ # Extract sqlite3 package
+ (cd src/; gzip -d < sqlite-3.1.3.tar.gz | tar xf -)
+ # patch sqlite3 with desired configure options
+ patch -p0 < src/sqlite-3.1.3.diff
+ # the new tclinstaller.tcl needs to have substitution occur
+ mv src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3/tclinstaller.tcl.in
+ SQLITE3_LIBS=`pwd`"/src/sqlite-3.1.3/.libs/libsqlite3.a"
+ if test "x$prefix" = "xNONE" ; then
+ SQLITE3_DIR=$ac_default_prefix/share/macports/Tcl/sqlite3
+ else
+ SQLITE3_DIR=$prefix/share/macports/Tcl/sqlite3
+ fi
+else
+ SQLITE3_LIBS="-lsqlite3"
+
+ AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],
+ [mp_cv_sqlite3_dir=
+ test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
+ ])
+
+ SQLITE3_DIR=$mp_cv_sqlite3_dir
+fi
+
+AC_SUBST(SQLITE3_LIBS)
+AC_SUBST(SQLITE3_DIR)
+
AC_SUBST(OUR_INCLUDED_PACKAGES)
# Allows building of shared libraries
Modified: branches/dp2mp-move/base/src/Makefile.in
===================================================================
--- branches/dp2mp-move/base/src/Makefile.in 2007-06-01 18:02:49 UTC (rev 25782)
+++ branches/dp2mp-move/base/src/Makefile.in 2007-06-01 18:48:14 UTC (rev 25783)
@@ -1,5 +1,5 @@
-TCLPKG= macports1.0 port1.0 package1.0 pextlib1.0 registry1.0 \
- darwintracelib1.0 @OUR_INCLUDED_PACKAGES@
+TCLPKG= @OUR_INCLUDED_PACKAGES@ macports1.0 port1.0 package1.0 \
+ pextlib1.0 registry1.0 darwintracelib1.0
SUBDIR= ${TCLPKG} port programs
all::
Added: branches/dp2mp-move/base/src/sqlite-3.1.3.diff
===================================================================
--- branches/dp2mp-move/base/src/sqlite-3.1.3.diff (rev 0)
+++ branches/dp2mp-move/base/src/sqlite-3.1.3.diff 2007-06-01 18:48:14 UTC (rev 25783)
@@ -0,0 +1,45 @@
+diff -ru src/sqlite-3.1.3/Makefile.in src/sqlite-3.1.3.mine/Makefile.in
+--- src/sqlite-3.1.3/Makefile.in 2005-02-19 19:11:19.000000000 -0500
++++ src/sqlite-3.1.3.mine/Makefile.in 2007-05-31 17:34:02.000000000 -0400
+@@ -605,7 +605,7 @@
+ mkdir -p doc
+ mv $(DOC) doc
+
+-install: sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
++dont_install: sqlite3 libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
+ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
+@@ -615,7 +615,7 @@
+ $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;
+ $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig;
+
+-tcl_install: libtclsqlite3.la
++install: libtclsqlite3.la
+ tclsh $(TOP)/tclinstaller.tcl $(VERSION)
+
+ clean:
+diff -ru src/sqlite-3.1.3/configure src/sqlite-3.1.3.mine/configure
+--- src/sqlite-3.1.3/configure 2005-02-19 09:30:48.000000000 -0500
++++ src/sqlite-3.1.3.mine/configure 2007-05-31 17:39:49.000000000 -0400
+@@ -20343,7 +20343,7 @@
+ #########
+ # Generate the output files.
+ #
+- ac_config_files="$ac_config_files Makefile sqlite3.pc"
++ ac_config_files="$ac_config_files Makefile sqlite3.pc tclinstaller.tcl"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+diff -ru src/sqlite-3.1.3/tclinstaller.tcl src/sqlite-3.1.3.mine/tclinstaller.tcl
+--- src/sqlite-3.1.3/tclinstaller.tcl 2005-01-30 17:10:01.000000000 -0500
++++ src/sqlite-3.1.3.mine/tclinstaller.tcl 2007-05-31 17:33:32.000000000 -0400
+@@ -7,7 +7,7 @@
+ set VERSION [lindex $argv 0]
+ set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
+ if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
+-set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
++set LIBDIR @prefix@/share/macports/Tcl
+ set LIBNAME [file tail $LIBFILE]
+ set LIB $LIBDIR/sqlite3/$LIBNAME
+
Added: branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz
===================================================================
(Binary files differ)
Property changes on: branches/dp2mp-move/base/src/sqlite-3.1.3.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/f95a76e9/attachment.html
From source_changes at macosforge.org Fri Jun 1 12:31:30 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25784] trunk/dports/PortIndex
Message-ID: <20070601193130.739FD62CBC4@cvs.opensource.apple.com>
Revision: 25784
http://trac.macosforge.org/projects/macports/changeset/25784
Author: dluke@macports.org
Date: 2007-06-01 12:31:29 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Total number of ports parsed: 4004
Ports successfully parsed: 4004
Ports failed: 0
Modified Paths:
--------------
trunk/dports/PortIndex
Modified: trunk/dports/PortIndex
===================================================================
--- trunk/dports/PortIndex 2007-06-01 18:48:14 UTC (rev 25783)
+++ trunk/dports/PortIndex 2007-06-01 19:31:29 UTC (rev 25784)
@@ -7076,10 +7076,10 @@
variants universal description {Version 4.4 of the DocBook XML DTDs} portdir textproc/docbook-xml-4.4 homepage http://www.docbook.org/xml/4.4/ depends_run port:xmlcatmgr epoch 0 platforms darwin name docbook-xml-4.4 maintainers {boeyms@macports.org openmaintainer@macports.org} categories textproc version 4.4 revision 0
docbook-xml-4.5 321
variants universal description {Version 4.5 of the DocBook XML DTDs} portdir textproc/docbook-xml-4.5 homepage http://www.docbook.org/xml/4.5/ depends_run port:xmlcatmgr epoch 0 platforms darwin name docbook-xml-4.5 maintainers {boeyms@macports.org openmaintainer@macports.org} categories textproc version 4.5 revision 0
-docbook-xml-412 315
-portdir textproc/docbook-xml-412 variants universal description {This port is depreciated in favor of port:docbook-xml-4.1.2t} platforms darwin name docbook-xml-412 depends_lib port:docbook-xml-4.1.2 version 4.1.2 categories textproc revision 1 epoch 0 maintainers {rhwood@macports.org openmaintainer@macports.org}
-docbook-xml-scrollkeeper 262
-portdir textproc/docbook-xml-scrollkeeper variants universal description {the docbook xml dtds} platforms darwin name docbook-xml-scrollkeeper version 4.2 categories textproc depends_build bin:unzip:unzip revision 0 epoch 0 maintainers nomaintainer@macports.org
+docbook-xml-412 314
+portdir textproc/docbook-xml-412 variants universal description {This port is depreciated in favor of port:docbook-xml-4.1.2} platforms darwin name docbook-xml-412 depends_lib port:docbook-xml-4.1.2 version 4.1.2 categories textproc revision 1 epoch 0 maintainers {rhwood@macports.org openmaintainer@macports.org}
+docbook-xml-scrollkeeper 302
+portdir textproc/docbook-xml-scrollkeeper variants universal description {This port is depreciated in favor of port:docbook-xml-4.2} platforms darwin name docbook-xml-scrollkeeper depends_lib port:docbook-xml-4.2 version 4.2 categories textproc revision 1 epoch 0 maintainers nomaintainer@macports.org
docbook-xsl 308
variants universal description {the docbook xsl stylesheets} portdir textproc/docbook-xsl homepage http://docbook.sourceforge.net/ depends_run port:xmlcatmgr epoch 0 platforms darwin name docbook-xsl maintainers {boeyms@macports.org openmaintainer@macports.org} categories textproc version 1.72.0 revision 0
docbook2X 574
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/789e62ca/attachment.html
From source_changes at macosforge.org Fri Jun 1 12:33:04 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25785] trunk/base/src/port1.0/portstartupitem.tcl
Message-ID: <20070601193304.82B3D62CBD0@cvs.opensource.apple.com>
Revision: 25785
http://trac.macosforge.org/projects/macports/changeset/25785
Author: jberry@macports.org
Date: 2007-06-01 12:33:04 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Make StartupItems default to disabled, like we claim they do. Thanks markd.
Modified Paths:
--------------
trunk/base/src/port1.0/portstartupitem.tcl
Modified: trunk/base/src/port1.0/portstartupitem.tcl
===================================================================
--- trunk/base/src/port1.0/portstartupitem.tcl 2007-06-01 19:31:29 UTC (rev 25784)
+++ trunk/base/src/port1.0/portstartupitem.tcl 2007-06-01 19:33:04 UTC (rev 25785)
@@ -564,7 +564,7 @@
puts ${plist} ""
puts ${plist} "Debug"
- puts ${plist} "Disabled"
+ puts ${plist} "Disabled"
puts ${plist} "OnDemand"
puts ${plist} "RunAtLoad"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/a424fbf4/attachment.html
From source_changes at macosforge.org Fri Jun 1 12:35:55 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25786] trunk/base/ChangeLog
Message-ID: <20070601193555.76C1A62CBDC@cvs.opensource.apple.com>
Revision: 25786
http://trac.macosforge.org/projects/macports/changeset/25786
Author: jberry@macports.org
Date: 2007-06-01 12:35:55 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Update ChangeLog
Modified Paths:
--------------
trunk/base/ChangeLog
Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog 2007-06-01 19:33:04 UTC (rev 25785)
+++ trunk/base/ChangeLog 2007-06-01 19:35:55 UTC (rev 25786)
@@ -6,6 +6,9 @@
(unreleased)
+ - Bugfix startup item generation so that launchd.plists are disabled
+ by default, as we claim they are in our documentation. (jberry r25785).
+
- Update adduser/addgroup to use dscl instead of niutil. Also add support
for realname key in addgroup (ticket #11012, eridius r25586).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/666cfd91/attachment.html
From source_changes at macosforge.org Fri Jun 1 15:23:01 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25787] trunk/base/src/port/port.1
Message-ID: <20070601222301.4D67C62CF54@cvs.opensource.apple.com>
Revision: 25787
http://trac.macosforge.org/projects/macports/changeset/25787
Author: markd@macports.org
Date: 2007-06-01 15:23:00 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Closes #11898. Update port.1 to reflect what "port dependents" really does.
Modified Paths:
--------------
trunk/base/src/port/port.1
Modified: trunk/base/src/port/port.1
===================================================================
--- trunk/base/src/port/port.1 2007-06-01 19:35:55 UTC (rev 25786)
+++ trunk/base/src/port/port.1 2007-06-01 22:23:00 UTC (rev 25787)
@@ -279,7 +279,7 @@
Lists the other ports that are required to build and run
.Ar portname .
.Ss dependents
-Lists the ports that depend on the port
+Lists the installed ports that depend on the port
.Ar portname .
.Ss install
Install and activate
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/a4191f78/attachment.html
From source_changes at macosforge.org Fri Jun 1 21:00:13 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25788] trunk/dports/python/py-gmpy/Portfile
Message-ID: <20070602040013.1929962D32C@cvs.opensource.apple.com>
Revision: 25788
http://trac.macosforge.org/projects/macports/changeset/25788
Author: markd@macports.org
Date: 2007-06-01 21:00:10 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Closes #11780. Update to 1.01.
Modified Paths:
--------------
trunk/dports/python/py-gmpy/Portfile
Modified: trunk/dports/python/py-gmpy/Portfile
===================================================================
--- trunk/dports/python/py-gmpy/Portfile 2007-06-01 22:23:00 UTC (rev 25787)
+++ trunk/dports/python/py-gmpy/Portfile 2007-06-02 04:00:10 UTC (rev 25788)
@@ -4,8 +4,7 @@
PortGroup python24 1.0
name py-gmpy
-version 1.0alpha
-revision 1
+version 1.01
categories python
platforms darwin
maintainers nomaintainer@macports.org
@@ -15,12 +14,12 @@
library 'gmp'.
homepage http://gmpy.sourceforge.net/
-master_sites sourceforge:gmpy
-distname gmpy-sources-10
-checksums md5 a34de2f217f89d82e8d9dd1abe4f1122
+master_sites sourceforge:gmpy
+distname gmpy-sources-101
+checksums md5 7b2e951912d4bee9613c35244ca32673
use_zip yes
-depends_lib-append lib:libgmp:gmp
+depends_lib-append port:gmp
worksrcdir gmpy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/fc82f2a7/attachment.html
From source_changes at macosforge.org Fri Jun 1 22:07:28 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25789] trunk/base/src/port/port.tcl
Message-ID: <20070602050728.9D35162D3A1@cvs.opensource.apple.com>
Revision: 25789
http://trac.macosforge.org/projects/macports/changeset/25789
Author: jberry@macports.org
Date: 2007-06-01 22:07:27 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Fix bug #10674.
port installed, active, list, and search all behaved poorly if given
a pseudo port that evaluated to nothing. The root problem was that the
argument parsing code could not tell the difference between no arguments
and arguments that evaluated to a null set.
The change puts a hack in that sets a global option if there are indeed
no arguments to an action, to allow us to distinguish this case.
Modified Paths:
--------------
trunk/base/src/port/port.tcl
Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2007-06-02 04:00:10 UTC (rev 25788)
+++ trunk/base/src/port/port.tcl 2007-06-02 05:07:27 UTC (rev 25789)
@@ -912,10 +912,6 @@
}
# Walk through each item in a, matching against b
- #
- # Note: -regexp may not be present in all versions of Tcl we need to work
- # against, in which case we may have to fall back to a slower alternative
- # for those cases. I'm not worrying about that for now, however. -jdb
foreach aitem $a {
array set port $aitem
@@ -1509,7 +1505,8 @@
set status 0
set restrictedList 0
set ilist {}
- if { [llength $portlist] } {
+
+ if { [llength $portlist] || ![global_option_isset ports_no_args]} {
set restrictedList 1
foreachport $portlist {
set composite_version [composite_version $portversion [array get variations]]
@@ -1561,10 +1558,10 @@
set status 0
- # If port names were supplied, limit ourselves to those port, else check all installed ports
+ # If port names were supplied, limit ourselves to those ports, else check all installed ports
set ilist {}
set restrictedList 0
- if { [llength $portlist] } {
+ if { [llength $portlist] || ![global_option_isset ports_no_args]} {
set restrictedList 1
foreach portspec $portlist {
array set port $portspec
@@ -1793,7 +1790,7 @@
proc action_search { action portlist opts } {
set status 0
- if {![llength portlist]} {
+ if {![llength $portlist] && [global_option_isset ports_no_args]} {
ui_error "You must specify a search pattern"
return 1
}
@@ -1841,9 +1838,9 @@
proc action_list { action portlist opts } {
set status 0
-
+
# Default to list all ports if no portnames are supplied
- if {![llength $portlist]} {
+ if {![llength $portlist] && [global_option_isset ports_no_args]} {
add_to_portlist portlist [list name "-all-"]
}
@@ -2340,14 +2337,23 @@
# used to terminate option processing, or the pseudo-port current must be specified).
parse_options $action ui_options global_options
- # Parse port specifications into portlist
+ # Parse action arguments, setting a special flag if there were none
+ # We otherwise can't tell the difference between arguments that evaluate
+ # to the empty set, and the empty set itself.
set portlist {}
- if {![portExpr portlist]} {
- ui_error "Improper expression syntax while processing parameters"
- set action_status 1
- break
+ switch -- [lookahead] {
+ ; -
+ _EOF_ { set global_options(ports_no_args) yes }
+ default {
+ # Parse port specifications into portlist
+ if {![portExpr portlist]} {
+ ui_error "Improper expression syntax while processing parameters"
+ set action_status 1
+ break
+ }
+ }
}
-
+
# Find an action to execute
set action_proc [find_action_proc $action]
if { $action_proc != "" } {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/4d8f5367/attachment.html
From source_changes at macosforge.org Fri Jun 1 22:15:12 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25790] trunk/dports/x11/wxgtk/Portfile
Message-ID: <20070602051512.112D462D3B8@cvs.opensource.apple.com>
Revision: 25790
http://trac.macosforge.org/projects/macports/changeset/25790
Author: markd@macports.org
Date: 2007-06-01 22:15:11 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Closes #11761. Update to 2.8.4.
Modified Paths:
--------------
trunk/dports/x11/wxgtk/Portfile
Modified: trunk/dports/x11/wxgtk/Portfile
===================================================================
--- trunk/dports/x11/wxgtk/Portfile 2007-06-02 05:07:27 UTC (rev 25789)
+++ trunk/dports/x11/wxgtk/Portfile 2007-06-02 05:15:11 UTC (rev 25790)
@@ -2,7 +2,7 @@
PortSystem 1.0
name wxgtk
-version 2.8.0
+version 2.8.4
categories x11
maintainers nomaintainer@macports.org
description The wxWidgets GUI toolkit with GTK+ bindings
@@ -13,7 +13,7 @@
platforms darwin
master_sites sourceforge:wxwindows
distname wxGTK-${version}
-checksums md5 9de30aeaad9bac6f8869907fa42fe950
+checksums md5 22e42c1601d9759530c875ffa2c3c554
use_bzip2 yes
depends_lib port:gtk2 port:tiff port:jpeg \
@@ -22,8 +22,9 @@
patchfiles patch-Makefile.in
-configure.env LDFLAGS="-L${prefix}/lib" \
- CPPFLAGS="-I${prefix}/include -I${x11prefix}/include"
+
+configure.cppflags-append "-I${x11prefix}/include"
+
configure.args --with-gtk --with-libpng --with-libjpeg --with-libtiff \
--with-freetype --with-zlib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070601/b44c7ff9/attachment.html
From source_changes at macosforge.org Sat Jun 2 00:31:33 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25791] trunk/dports/PortIndex
Message-ID: <20070602073133.2F97C62D490@cvs.opensource.apple.com>
Revision: 25791
http://trac.macosforge.org/projects/macports/changeset/25791
Author: dluke@macports.org
Date: 2007-06-02 00:31:32 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Total number of ports parsed: 4004
Ports successfully parsed: 4004
Ports failed: 0
Modified Paths:
--------------
trunk/dports/PortIndex
Modified: trunk/dports/PortIndex
===================================================================
--- trunk/dports/PortIndex 2007-06-02 05:15:11 UTC (rev 25790)
+++ trunk/dports/PortIndex 2007-06-02 07:31:32 UTC (rev 25791)
@@ -5542,8 +5542,8 @@
variants universal portdir python/py-ggy description {parser and lexer generator for python, in python} homepage http://lava.net/~newsham/pyggy/ epoch 0 platforms darwin depends_lib port:python24 name py-ggy maintainers nomaintainer@macports.org long_description {This is a Python package for generating parsers and lexers in Python. The distribution contains a generator for generating complicated multi-state lexers with support for backing up. It also includes a generator for generating GLR parsers capable of parsing arbitrary grammars.} categories python version 0.4.1 revision 1
py-glewpy 634
variants universal portdir python/py-glewpy description {Python bindings for GLEW (OpenGL Extension Wrangler)} homepage http://glewpy.sourceforge.net/ epoch 0 platforms {darwin freebsd} depends_lib {port:python24 port:glew port:py-pyrex} name py-glewpy maintainers nomaintainer@macports.org long_description {GLEWpy aims to bring advanced OpenGL extensions to Python. This will allow the Python OpenGL developer to use features such as fragment and vertex shaders and image processing on the GPU. It serves as a compliment to PyOpenGL and toolkits such as GLUT and SDL (pygame).} categories {python graphics} version 0.7.4 revision 2
-py-gmpy 455
-variants universal portdir python/py-gmpy description {general MultiPrecision arithmetic module for Python} homepage http://gmpy.sourceforge.net/ epoch 0 platforms darwin depends_lib {port:python24 lib:libgmp:gmp} name py-gmpy maintainers nomaintainer@macports.org long_description {gmpy is a general MultiPrecision arithmetic module for Python wrapping the GNU arbitrary precision arithmetic library 'gmp'.} categories python version 1.0alpha revision 1
+py-gmpy 445
+variants universal portdir python/py-gmpy description {general MultiPrecision arithmetic module for Python} homepage http://gmpy.sourceforge.net/ epoch 0 platforms darwin depends_lib {port:python24 port:gmp} name py-gmpy maintainers nomaintainer@macports.org long_description {gmpy is a general MultiPrecision arithmetic module for Python wrapping the GNU arbitrary precision arithmetic library 'gmp'.} categories python version 1.01 revision 0
py-gnome 401
variants universal portdir python/py-gnome description {gnome-python is a set of python interfaces to gnome-libs.} homepage http://www.pygtk.org/ epoch 0 platforms darwin name py-gnome depends_lib {port:libzvt port:py-gtk2 port:py-orbit} maintainers pguyot@kallisys.net long_description {{gnome-python is a set of python interfaces to gnome-libs.}} version 2.18.2 categories {python gnome} revision 0
py-gnupg 528
@@ -7845,7 +7845,7 @@
wmii 482
variants universal description {Window Manager Improved is a dynamic window manager for X11} portdir x11/wmii homepage http://wmii.de epoch 0 depends_lib {lib:libX11.6:XFree86 lib:libXext.6:XFree86} name wmii long_description {Window Manager Improved is a dynamic window manager for X11. It supports classic and tiled window management with extended keyboard, mouse, and 9P-based remote control.} maintainers nomaintainer@macports.org categories {x11 x11-wm} version 3.1 revision 0
wxgtk 409
-variants {universal opengl} portdir x11/wxgtk description {The wxWidgets GUI toolkit with GTK+ bindings} homepage http://wxwidgets.org/ epoch 0 platforms darwin name wxgtk depends_lib {port:gtk2 port:tiff port:jpeg port:libpng port:freetype port:zlib} maintainers nomaintainer@macports.org long_description {A C++ package for platform independent software development} version 2.8.0 categories x11 revision 0
+variants {universal opengl} portdir x11/wxgtk description {The wxWidgets GUI toolkit with GTK+ bindings} homepage http://wxwidgets.org/ epoch 0 platforms darwin name wxgtk depends_lib {port:gtk2 port:tiff port:jpeg port:libpng port:freetype port:zlib} maintainers nomaintainer@macports.org long_description {A C++ package for platform independent software development} version 2.8.4 categories x11 revision 0
x3270 963
portdir x11/x3270 variants universal description {x3270 is an IBM 3270 terminal emulator for the X Window System.} name x3270 version 3.3.4p8 categories x11 homepage http://x3270.bgp.nu/index.html revision 0 epoch 0 maintainers mark.church@gmail.com long_description {x3270 is an IBM 3270 terminal emulator for the X Window System. It runs on most Unix-like operating systems -- e.g., Linux, Mac OS X, Solaris, and Cygwin. x3270 runs over a TELNET connection, emulating either an IBM 3279 (color) or 3278 (monochrome). It supports: * The full TN3270E protocol * SSL/TLS (via the OpenSSL library) for encrypted sessions * APL2 characters * Non-English character sets, including Russian, Turkish, Hebrew and DBCS Chinese and Japanese * {IND$FILE} file transfer * NVT mode (emulating a color xterm) * A pop-up keypad for 3270-specific keys * A scrollbar * Printer session integration * Extensive debugging and scripting facilities It does not yet support graphics.}
xcb 662
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/5d2bc701/attachment.html
From source_changes at macosforge.org Sat Jun 2 03:17:22 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25792] trunk/dports/www/php5/Portfile
Message-ID: <20070602101722.3E31262D5F2@cvs.opensource.apple.com>
Revision: 25792
http://trac.macosforge.org/projects/macports/changeset/25792
Author: jwa@macports.org
Date: 2007-06-02 03:17:19 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
update to 5.2.3, add dependency to gd2 to circumvent the problem
php5 not building (configure stopped)
Modified Paths:
--------------
trunk/dports/www/php5/Portfile
Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile 2007-06-02 07:31:32 UTC (rev 25791)
+++ trunk/dports/www/php5/Portfile 2007-06-02 10:17:19 UTC (rev 25792)
@@ -3,7 +3,7 @@
PortSystem 1.0
name php5
-version 5.2.2
+version 5.2.3
categories lang php www
maintainers ryandesign@macports.org jwa@macports.org
distfiles php-${version}.tar.bz2:release
@@ -32,9 +32,9 @@
http://downloads.php.net/jani/:rc
checksums \
- md5 d084337867d70b50a10322577be0e44e \
- sha1 b9b0b8f778eee61afcff24e286e626baed8d2934 \
- rmd160 15e844530bced2960e35fd291fb71a416562aec0
+ md5 eb50b751c8e1ced05bd012d5a0e4dec3 \
+ sha1 0a02e05e1c663c0d4ee0b253917c0e140e606261 \
+ rmd160 3c895cf7e513e5a3d7d9f742a9d56102cbb3a79b
depends_lib \
port:libxml2 \
@@ -51,6 +51,7 @@
port:pcre \
port:jpeg \
port:libpng \
+ port:gd2 \
port:freetype
configure.args \
@@ -84,7 +85,7 @@
--with-xsl=${prefix} \
--with-curl=${prefix} \
--with-pcre-regex=${prefix} \
- --with-gd \
+ --with-gd=${prefix} \
--with-jpeg-dir=${prefix} \
--with-png-dir=${prefix} \
--enable-gd-native-ttf \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/c44ef640/attachment.html
From source_changes at macosforge.org Sat Jun 2 03:57:21 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25793] trunk/dports/textproc/docbook-xml
Message-ID: <20070602105721.7993162DAB8@cvs.opensource.apple.com>
Revision: 25793
http://trac.macosforge.org/projects/macports/changeset/25793
Author: rhwood@macports.org
Date: 2007-06-02 03:57:20 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Change port from a specific docbook-xml DTD version to a meta-port that ensures
that the user has all of the docbook-xml DTDs that MacPorts ships on his system.
Add a readme file that explains this and ensures that this port can be
registered as installed and is therefore upgradable.
Set the version on the port to the version of the highest versioned docbook-xml
DTD port.
This is the last change to the docbook-xml ports from
docbook-xml[|-scrollkeeper|-412] to docbook-xml-${version} before we can edit
ports that depended on the old docbook-xml ports to the new docbook-xml ports.
MAINTAINERS: Please use only the actual DTD versions that you need when setting
dependencies on your ports instead of depending on this port.
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml/Portfile
Added Paths:
-----------
trunk/dports/textproc/docbook-xml/files/
trunk/dports/textproc/docbook-xml/files/README.docbook-xml.txt
Modified: trunk/dports/textproc/docbook-xml/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml/Portfile 2007-06-02 10:17:19 UTC (rev 25792)
+++ trunk/dports/textproc/docbook-xml/Portfile 2007-06-02 10:57:20 UTC (rev 25793)
@@ -3,26 +3,32 @@
PortSystem 1.0
name docbook-xml
-version 4.3
-description the docbook xml dtds
+# the version should always be the version of the highest
+# versioned docbook-xml-* port.
+version 4.5
+description Install all of the versioned docbook-xml-* ports
+long_description \
+ This port is an uninstallable metaport that simply ensures
+ that a number of other ports are installed.
categories textproc
platforms darwin
maintainers nomaintainer@macports.org
-depends_build bin:unzip:unzip
+homepage http://www.docbook.org
-master_sites http://www.oasis-open.org/docbook/xml/4.3/
-checksums md5 ab200202b9e136a144db1e0864c45074
+# add every docbook-xml-* port as it is created
+depends_build \
+ port:docbook-xml-4.1.2 \
+ port:docbook-xml-4.2 \
+ port:docbook-xml-4.3 \
+ port:docbook-xml-4.4 \
+ port:docbook-xml-4.5
-use_zip yes
-extract.suffix .zip
-extract.cmd unzip
-
+fetch {}
+checksum {}
+extract {}
configure {}
build {}
-
-destroot { file mkdir ${destroot}/${prefix}/share/xml/${name}/${version}
- file mkdir ${destroot}/${prefix}/share/xml/${name}/${version}/ent
- system "for file in \
- `unzip -l ${distpath}/${distname} | awk '/:\[0-9\].*\[^\\/\]\$/\{print \$4\}'`; do \
- install -cv ${workpath}/\$file ${destroot}/${prefix}/share/xml/${name}/${version}/\$file; \
- done" }
+destroot {
+ file mkdir ${destroot}${prefix}/share/doc/
+ file copy ${filespath}/README.${name}.txt ${destroot}${prefix}/share/doc
+}
Added: trunk/dports/textproc/docbook-xml/files/README.docbook-xml.txt
===================================================================
--- trunk/dports/textproc/docbook-xml/files/README.docbook-xml.txt (rev 0)
+++ trunk/dports/textproc/docbook-xml/files/README.docbook-xml.txt 2007-06-02 10:57:20 UTC (rev 25793)
@@ -0,0 +1,11 @@
+Please note that the docbook-xml port is simply a meta-port
+that installs all versions of the docbook-xml Document Type
+Definitions (DTDs) that MacPorts ships.
+
+It should be possible to freely uninstall, reinstall, and
+upgrade the various versions of the docbook-xml DTDs without
+affecting the docbook-xml port.
+
+When MacPorts ships new versions of the docbook-xml DTDs, this
+port will be updated so that the new DTD is installed on your
+system when you upgrade outdated ports.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/be891622/attachment.html
From source_changes at macosforge.org Sat Jun 2 07:24:59 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:29 2007
Subject: [25794] trunk/dports/devel/libmcrypt/Portfile
Message-ID: <20070602142459.9B70562DC63@cvs.opensource.apple.com>
Revision: 25794
http://trac.macosforge.org/projects/macports/changeset/25794
Author: nox@macports.org
Date: 2007-06-02 07:24:59 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Fixed livecheck distname.
Modified Paths:
--------------
trunk/dports/devel/libmcrypt/Portfile
Modified: trunk/dports/devel/libmcrypt/Portfile
===================================================================
--- trunk/dports/devel/libmcrypt/Portfile 2007-06-02 10:57:20 UTC (rev 25793)
+++ trunk/dports/devel/libmcrypt/Portfile 2007-06-02 14:24:59 UTC (rev 25794)
@@ -41,3 +41,5 @@
CPP=/usr/bin/cpp-4.0 \
CXX=/usr/bin/g++-4.0
}
+
+livecheck.distname Libmcrypt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/1c5337f6/attachment.html
From source_changes at macosforge.org Sat Jun 2 07:26:59 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25795] trunk/base/src/port
Message-ID: <20070602142659.0694C62DC75@cvs.opensource.apple.com>
Revision: 25795
http://trac.macosforge.org/projects/macports/changeset/25795
Author: jberry@macports.org
Date: 2007-06-02 07:26:58 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Add support for decoding of obscured maintainer addresses.
We support two types of obscured addresses in Portfile maintainers field:
(1) username ==> implies username@macports.org
(2) subdomain.tld:username ==> implies username@subdomain.tld
These are unobscured by port info, and by port submit during the submission process,
but are left obscured in the Portfile to avoid accidental disclosure.
Modified Paths:
--------------
trunk/base/src/port/port.tcl
trunk/base/src/port1.0/portsubmit.tcl
trunk/base/src/port1.0/portutil.tcl
Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl 2007-06-02 14:24:59 UTC (rev 25794)
+++ trunk/base/src/port/port.tcl 2007-06-02 14:26:58 UTC (rev 25795)
@@ -432,6 +432,22 @@
}
+proc unobscure_maintainers { list } {
+ set result {}
+ foreach m $list {
+ if {[string first "@" $m] < 0} {
+ if {[string first ":" $m] >= 0} {
+ set m [regsub -- "(.*):(.*)" $m "\\2@\\1"]
+ } else {
+ set m "$m@macports.org"
+ }
+ }
+ lappend result $m
+ }
+ return $result
+}
+
+
##########################################
# Port selection
##########################################
@@ -1241,6 +1257,9 @@
# Format the data
set inf $portinfo($ropt)
+ if { $ropt eq "maintainers" } {
+ set inf [unobscure_maintainers $inf]
+ }
if [info exists list_map($ropt)] {
set field [join $inf $subfield_sep]
} else {
@@ -1294,7 +1313,9 @@
}
if {[info exists portinfo(platforms)]} { puts "Platforms: $portinfo(platforms)"}
- if {[info exists portinfo(maintainers)]} { puts "Maintainers: $portinfo(maintainers)"}
+ if {[info exists portinfo(maintainers)]} {
+ puts "Maintainers: [unobscure_maintainers $portinfo(maintainers)]"
+ }
}
}
Modified: trunk/base/src/port1.0/portsubmit.tcl
===================================================================
--- trunk/base/src/port1.0/portsubmit.tcl 2007-06-02 14:24:59 UTC (rev 25794)
+++ trunk/base/src/port1.0/portsubmit.tcl 2007-06-02 14:26:58 UTC (rev 25795)
@@ -107,6 +107,9 @@
foreach var $vars {
if {![info exists $var]} { set $var {} }
}
+
+ # Unobscure the maintainer addresses
+ set maintainers [unobscure_maintainers $maintainers]
# Make sure our workpath is clean
file delete -force $dirpath $metapath $pkgpath
@@ -182,6 +185,9 @@
global mp_remote_submit_url portname portversion portverbose prefix UI_PREFIX workpath portpath
set submiturl $mp_remote_submit_url
+
+ # Make sure we have a work directory
+ file mkdir ${workpath}
# Create portpkg.xar in the work directory
set pkgpath [create_portpkg]
@@ -201,7 +207,8 @@
if {[tbool portverbose]} {
ui_msg "Submitting portpkg $pkgpath for $portname to $submiturl"
}
-
+
+ # 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]
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2007-06-02 14:24:59 UTC (rev 25794)
+++ trunk/base/src/port1.0/portutil.tcl 2007-06-02 14:26:58 UTC (rev 25795)
@@ -1005,6 +1005,32 @@
}
}
+
+# unobscure maintainer addresses as used in Portfiles
+# We allow two obscured forms:
+# (1) User name only with no domain:
+# foo implies foo@macports.org
+# (2) Mangled name:
+# subdomain.tld:username implies username@subdomain.tld
+#
+proc unobscure_maintainers { list } {
+ set result {}
+ foreach m $list {
+ if {[string first "@" $m] < 0} {
+ if {[string first ":" $m] >= 0} {
+ set m [regsub -- "(.*):(.*)" $m "\\2@\\1"]
+ } else {
+ set m "$m@macports.org"
+ }
+ }
+ lappend result $m
+ }
+ return $result
+}
+
+
+
+
########### Internal Dependency Manipulation Procedures ###########
proc target_run {ditem} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/5e6f74bd/attachment.html
From source_changes at macosforge.org Sat Jun 2 07:32:23 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25796] trunk/base/ChangeLog
Message-ID: <20070602143223.35F9862DC8E@cvs.opensource.apple.com>
Revision: 25796
http://trac.macosforge.org/projects/macports/changeset/25796
Author: jberry@macports.org
Date: 2007-06-02 07:32:22 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Update ChangeLog to reflect support for obscured email addresses.
Modified Paths:
--------------
trunk/base/ChangeLog
Modified: trunk/base/ChangeLog
===================================================================
--- trunk/base/ChangeLog 2007-06-02 14:26:58 UTC (rev 25795)
+++ trunk/base/ChangeLog 2007-06-02 14:32:22 UTC (rev 25796)
@@ -6,6 +6,14 @@
(unreleased)
+ - Add support for decoding of obscured maintainer addresses.
+ We support two types of obscured addresses in Portfile maintainers field:
+ (1) username ==> implies username@macports.org
+ (2) subdomain.tld:username ==> implies username@subdomain.tld
+ These are unobscured by port info, and by port submit during the submission process,
+ but are left obscured in the Portfile to avoid accidental disclosure.
+ (jberry r25795).
+
- Bugfix startup item generation so that launchd.plists are disabled
by default, as we claim they are in our documentation. (jberry r25785).
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/38f6e4e0/attachment.html
From source_changes at macosforge.org Sat Jun 2 07:43:27 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25797] trunk/dports/textproc/docbook-xml/Portfile
Message-ID: <20070602144327.1B8D662DCB3@cvs.opensource.apple.com>
Revision: 25797
http://trac.macosforge.org/projects/macports/changeset/25797
Author: jberry@macports.org
Date: 2007-06-02 07:43:26 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Fix a syntax error
Modified Paths:
--------------
trunk/dports/textproc/docbook-xml/Portfile
Modified: trunk/dports/textproc/docbook-xml/Portfile
===================================================================
--- trunk/dports/textproc/docbook-xml/Portfile 2007-06-02 14:32:22 UTC (rev 25796)
+++ trunk/dports/textproc/docbook-xml/Portfile 2007-06-02 14:43:26 UTC (rev 25797)
@@ -8,7 +8,7 @@
version 4.5
description Install all of the versioned docbook-xml-* ports
long_description \
- This port is an uninstallable metaport that simply ensures
+ This port is an uninstallable metaport that simply ensures \
that a number of other ports are installed.
categories textproc
platforms darwin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/61a30fba/attachment.html
From source_changes at macosforge.org Sat Jun 2 08:26:44 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25798] trunk/dports/textproc/libxslt/Portfile
Message-ID: <20070602152644.C327062DD0B@cvs.opensource.apple.com>
Revision: 25798
http://trac.macosforge.org/projects/macports/changeset/25798
Author: nox@macports.org
Date: 2007-06-02 08:26:44 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Added homepage.
Added livecheck.
Removed hard-coded version in the gnome mirror subdir.
Modified Paths:
--------------
trunk/dports/textproc/libxslt/Portfile
Modified: trunk/dports/textproc/libxslt/Portfile
===================================================================
--- trunk/dports/textproc/libxslt/Portfile 2007-06-02 14:43:26 UTC (rev 25797)
+++ trunk/dports/textproc/libxslt/Portfile 2007-06-02 15:26:44 UTC (rev 25798)
@@ -8,7 +8,9 @@
platforms darwin
maintainers rhwood@macports.org openmaintainer@macports.org
-master_sites gnome:sources/libxslt/1.1/ ftp://xmlsoft.org/
+homepage http://xmlsoft.org/XSLT/
+master_sites gnome:sources/${name}/[strsed ${version} {/\.[0-9]*$//}]/ \
+ ftp://xmlsoft.org/${name}/
use_bzip2 yes
checksums rmd160 663816b06322574473185582a6407bcf3fc38111
depends_lib port:libiconv port:libxml2 port:zlib
@@ -26,3 +28,7 @@
Libxslt is based on libxml2 the XML C library developed for the Gnome project. \
It also implements most of the EXSLT set of processor-portable extensions \
functions and some of Saxon's evaluate and expressions extensions.
+
+livecheck.check regex
+livecheck.url ${homepage}news.html
+livecheck.regex {
(\d+(?:\.\d+)*): .*
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/aac1dc6c/attachment.html
From source_changes at macosforge.org Sat Jun 2 08:31:41 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25799] trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl
Message-ID: <20070602153141.CAE1F62DD14@cvs.opensource.apple.com>
Revision: 25799
http://trac.macosforge.org/projects/macports/changeset/25799
Author: pipping@macports.org
Date: 2007-06-02 08:31:41 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
* add missing slash
Modified Paths:
--------------
trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl
Modified: trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl 2007-06-02 15:26:44 UTC (rev 25798)
+++ trunk/base/src/port1.0/resources/fetch/mirror_sites.tcl 2007-06-02 15:31:41 UTC (rev 25799)
@@ -40,7 +40,7 @@
set portfetch::mirror_sites::sites(gnome) {
http://mandril.creatis.insa-lyon.fr/linux/gnome.org/
http://mirror.aarnet.edu.au/pub/GNOME/
- http://ftp.unina.it/pub/linux/GNOME
+ http://ftp.unina.it/pub/linux/GNOME/
http://fr.rpmfind.net/linux/gnome.org/
http://fr2.rpmfind.net/linux/gnome.org/
http://ftp.acc.umu.se/pub/GNOME/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/f5ae20ff/attachment.html
From source_changes at macosforge.org Sat Jun 2 09:15:59 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25800] trunk/dports/lang/ocaml
Message-ID: <20070602161559.7C20D62DD69@cvs.opensource.apple.com>
Revision: 25800
http://trac.macosforge.org/projects/macports/changeset/25800
Author: pguyot@kallisys.net
Date: 2007-06-02 09:15:58 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Update to 3.10.0
Modified Paths:
--------------
trunk/dports/lang/ocaml/Portfile
Removed Paths:
-------------
trunk/dports/lang/ocaml/files/
Modified: trunk/dports/lang/ocaml/Portfile
===================================================================
--- trunk/dports/lang/ocaml/Portfile 2007-06-02 15:31:41 UTC (rev 25799)
+++ trunk/dports/lang/ocaml/Portfile 2007-06-02 16:15:58 UTC (rev 25800)
@@ -2,17 +2,16 @@
PortSystem 1.0
name ocaml
-version 3.09.3
-revision 1
+version 3.10.0
platforms darwin
maintainers pguyot@kallisys.net
categories lang
description Objective Caml is an implementation of the ML language
homepage http://www.ocaml.org/
-master_sites http://caml.inria.fr/pub/distrib/ocaml-3.09/
-checksums md5 8b3744efd0d51b82d55b61d0e2bf0e2b \
- sha1 5d63c6e0d13463f85c0d5147d641d2bceef87d6b \
- rmd160 fdc124218c556c62c897ee6720970279e2d5426b
+master_sites http://caml.inria.fr/pub/distrib/ocaml-3.10/
+checksums md5 5b14fe7ef863ab8295c9b7d428d5e93c \
+ sha1 5c7ee7dd5ac55bee2877ca0ace5ffb044df8efb5 \
+ rmd160 19615743230f0215135eb966f1f08a6a828f9aa4
long_description \
Objective Caml is an implementation of the ML language, based on \
@@ -20,7 +19,6 @@
system and a powerful module system in the style of Standard ML.
use_bzip2 yes
-patchfiles patch-configure
# Configure.
configure.pre_args -prefix ${prefix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/830ebafa/attachment.html
From source_changes at macosforge.org Sat Jun 2 09:55:25 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25801] trunk/dports/www/midgard-data/Portfile
Message-ID: <20070602165525.7234B62DDB9@cvs.opensource.apple.com>
Revision: 25801
http://trac.macosforge.org/projects/macports/changeset/25801
Author: jwa@macports.org
Date: 2007-06-02 09:55:24 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
two post-destroot workarounds no more needed
Modified Paths:
--------------
trunk/dports/www/midgard-data/Portfile
Modified: trunk/dports/www/midgard-data/Portfile
===================================================================
--- trunk/dports/www/midgard-data/Portfile 2007-06-02 16:15:58 UTC (rev 25800)
+++ trunk/dports/www/midgard-data/Portfile 2007-06-02 16:55:24 UTC (rev 25801)
@@ -3,6 +3,7 @@
PortSystem 1.0
name midgard-data
version 1.8.3
+revision 1
categories www
maintainers jwa@macports.org
description A content management system
@@ -31,11 +32,6 @@
--with-mysqldump=${prefix}/bin/mysqldump5 \
--with-pear=${prefix}/bin/pear
-post-destroot {
- reinplace "s/zcat/gzcat/" ${destroot}${prefix}/share/midgard/datagard/lib.postinst
- reinplace "s;/usr/bin/pear;${prefix}/bin/pear;" ${destroot}${prefix}/share/midgard/datagard/datagard.conf
-}
-
platform darwin 8 {
configure.env CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0 CXX=/usr/bin/g++-4.0
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/d810a578/attachment.html
From source_changes at macosforge.org Sat Jun 2 12:31:26 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25802] trunk/dports/PortIndex
Message-ID: <20070602193126.4053062DFD9@cvs.opensource.apple.com>
Revision: 25802
http://trac.macosforge.org/projects/macports/changeset/25802
Author: dluke@macports.org
Date: 2007-06-02 12:31:25 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
Total number of ports parsed: 4004
Ports successfully parsed: 4004
Ports failed: 0
Modified Paths:
--------------
trunk/dports/PortIndex
Modified: trunk/dports/PortIndex
===================================================================
--- trunk/dports/PortIndex 2007-06-02 16:55:24 UTC (rev 25801)
+++ trunk/dports/PortIndex 2007-06-02 19:31:25 UTC (rev 25802)
@@ -3177,7 +3177,7 @@
nqc 194
portdir lang/nqc variants universal description {Not-Quite-C Lego RCX Compiler} platforms darwin name nqc version 2.4.r3 categories lang revision 0 epoch 0 maintainers nomaintainer@macports.org
ocaml 473
-variants {universal labltk} description {Objective Caml is an implementation of the ML language} portdir lang/ocaml homepage http://www.ocaml.org/ epoch 0 platforms darwin name ocaml long_description {Objective Caml is an implementation of the ML language, based on the Caml Light dialect extended with a complete class-based object system and a powerful module system in the style of Standard ML.} maintainers pguyot@kallisys.net categories lang version 3.09.3 revision 1
+variants {universal labltk} description {Objective Caml is an implementation of the ML language} portdir lang/ocaml homepage http://www.ocaml.org/ epoch 0 platforms darwin name ocaml long_description {Objective Caml is an implementation of the ML language, based on the Caml Light dialect extended with a complete class-based object system and a powerful module system in the style of Standard ML.} maintainers pguyot@kallisys.net categories lang version 3.10.0 revision 0
ocaml-mode.el 445
variants universal portdir lang/ocaml-mode.el description {An EMACS major mode for editing OCaml programs.} homepage http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/ocaml.html depends_run bin:ocaml:ocaml epoch 0 platforms darwin name ocaml-mode.el depends_lib {{path:\${prefix}/bin/emacs:emacs}} maintainers pguyot@kallisys.net long_description {{An EMACS major mode for editing OCaml programs.}} version 3.05 categories {lang editors} revision 0
ocamlduce 455
@@ -7064,8 +7064,8 @@
variants {universal darwin} description {GNU diction and style} portdir textproc/diction homepage http://www.gnu.org/software/diction/ epoch 0 platforms darwin name diction long_description {This is the GNU diction and style, free implementations of old standard unix commands. For some reason, many modern systems lack them. Diction prints wordy and commonly misused phrases. Style analyses surface characteristics of a document, e.g. sentence length and various readability measures.} maintainers nomaintainer@macports.org categories textproc version 1.02 revision 0
docbook-dsssl 246
portdir textproc/docbook-dsssl variants universal description {the docbook dsssl stylesheets} platforms darwin name docbook-dsssl version 1.79 categories textproc homepage http://docbook.sf.net/ revision 0 epoch 0 maintainers decibel@decibel.org
-docbook-xml 236
-portdir textproc/docbook-xml variants universal description {the docbook xml dtds} platforms darwin name docbook-xml version 4.3 categories textproc depends_build bin:unzip:unzip revision 0 epoch 0 maintainers nomaintainer@macports.org
+docbook-xml 511
+variants universal depends_build {port:docbook-xml-4.1.2 port:docbook-xml-4.2 port:docbook-xml-4.3 port:docbook-xml-4.4 port:docbook-xml-4.5} portdir textproc/docbook-xml description {Install all of the versioned docbook-xml-* ports} homepage http://www.docbook.org epoch 0 platforms darwin name docbook-xml long_description {This port is an uninstallable metaport that simply ensures that a number of other ports are installed.} maintainers nomaintainer@macports.org version 4.5 categories textproc revision 0
docbook-xml-4.1.2 331
variants universal description {Version 4.1.2 of the DocBook XML DTDs} portdir textproc/docbook-xml-4.1.2 homepage http://www.docbook.org/xml/4.1.2/ depends_run port:xmlcatmgr epoch 0 platforms darwin name docbook-xml-4.1.2 maintainers {boeyms@macports.org openmaintainer@macports.org} categories textproc version 4.1.2 revision 0
docbook-xml-4.2 321
@@ -7186,8 +7186,8 @@
variants {universal darwin_8} depends_build bin:pkg-config:pkgconfig portdir textproc/libxmlxx description {libxml++ is a C++ interface for working with XML files} homepage http://libxmlplusplus.sourceforge.net/ epoch 0 platforms darwin name libxmlxx depends_lib {port:libxml2 port:zlib port:libiconv} maintainers waqar@macports.org long_description {libxml++ is a C++ interface for working with XML files, using libxml (gnome-xml) to parse and write the actual XML files. It has a simple but complete API.} version 1.0.5 categories textproc revision 0
libxmlxx2 574
variants universal depends_build bin:pkg-config:pkgconfig portdir textproc/libxmlxx2 description {libxml++ is a C++ interface for working with XML files} homepage http://libxmlplusplus.sourceforge.net epoch 0 platforms darwin name libxmlxx2 depends_lib {port:libxml2 lib:libglibmm-2:glibmm} maintainers {rhwood@macports.org openmaintainer@macports.org} long_description {libxml++ is a C++ interface for working with XML files, using libxml (gnome-xml) to parse and write the actual XML files. It has a simple but complete API.} version 2.18.0 categories textproc revision 0
-libxslt 656
-variants universal description {gnome xslt library and xsltproc} portdir textproc/libxslt epoch 0 platforms darwin depends_lib {port:libiconv port:libxml2 port:zlib} name libxslt long_description {Libxslt is the XSLT C library developed for the Gnome project. XSLT itself is a an XML language to define transformation for XML. Libxslt is based on libxml2 the XML C library developed for the Gnome project. It also implements most of the EXSLT set of processor-portable extensions functions and some of Saxon's evaluate and expressions extensions.} maintainers {rhwood@macports.org openmaintainer@macports.org} categories textproc version 1.1.20 revision 0
+libxslt 690
+variants universal portdir textproc/libxslt description {gnome xslt library and xsltproc} homepage http://xmlsoft.org/XSLT/ epoch 0 platforms darwin name libxslt depends_lib {port:libiconv port:libxml2 port:zlib} maintainers {rhwood@macports.org openmaintainer@macports.org} long_description {Libxslt is the XSLT C library developed for the Gnome project. XSLT itself is a an XML language to define transformation for XML. Libxslt is based on libxml2 the XML C library developed for the Gnome project. It also implements most of the EXSLT set of processor-portable extensions functions and some of Saxon's evaluate and expressions extensions.} version 1.1.20 categories textproc revision 0
linuxdoc 326
variants universal description {Linuxdoc SGML DTD} portdir textproc/linuxdoc depends_run {bin:mkcatalog:mkcatalog {bin:\${prefix}/share/sgml/iso8879/catalog:iso8879}} epoch 0 platforms darwin name linuxdoc long_description {{Linuxdoc SGML DTD}} maintainers nomaintainer@macports.org categories textproc version 1.1 revision 0
lout 440
@@ -7481,7 +7481,7 @@
midgard-core 463
variants {universal check darwin_8} 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:libiconv port:libxml2 port:mysql5 port:openssl port:zlib} maintainers jwa@macports.org long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} version 1.8.3 categories www revision 0
midgard-data 446
-variants {universal darwin_8} 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:midgard-php4 port:dialog port:ImageMagick} maintainers jwa@macports.org long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} version 1.8.3 categories www revision 0
+variants {universal darwin_8} 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:midgard-php4 port:dialog port:ImageMagick} maintainers jwa@macports.org long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} version 1.8.3 categories www revision 1
midgard-php4 388
variants {universal darwin_8} portdir www/midgard-php4 description {A content management system} homepage http://www.midgard-project.org/ epoch 0 platforms darwin name midgard-php4 depends_lib {port:midgard-core port:php5} maintainers jwa@macports.org long_description {Midgard is a content management system platform using Apache, PHP and MySQL.} version 1.8.3 categories www revision 0
mnogosearch 715
@@ -7538,8 +7538,8 @@
variants universal description {PHP PEAR Base system (PEAR, Archive_Tar, Console_Getopt, XML_RPC)} portdir www/pear-base homepage http://pear.php.net epoch 0 platforms darwin name pear-base long_description {{PHP PEAR Base system (PEAR, Archive_Tar, Console_Getopt, XML_RPC)}} maintainers nomaintainer@macports.org categories {www php lang} version 1.4.9 revision 1
php4 596
variants {universal darwin_6 darwin_7 darwin_8 freebsd macosx apache apache2 apache20 crypt curl gd mysql3 mysql4 mysql5 postgresql8 ldap imap xslt} description {PHP: Hypertext Preprocessor} portdir www/php4 epoch 0 platforms {darwin freebsd} depends_lib {port:libiconv port:expat port:gettext port:zlib port:openssl port:tiff port:libxml2 port:libtool} name php4 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@macports.org categories {lang php www} version 4.4.7 revision 0
-php5 746
-variants {universal darwin_6 darwin_7 darwin_8 macosx apache apache2 fastcgi imap tidy mssql snmp macports_snmp mysql3 mysql4 mysql5 postgresql sqlite ipc pcntl pear} description {PHP: Hypertext Preprocessor} portdir www/php5 epoch 0 platforms {darwin freebsd} depends_lib {port:libxml2 port:libxslt port:openssl port:zlib port:libiconv port:expat port:gettext port:tiff port:mhash port:libmcrypt port:curl port:pcre port:jpeg port:libpng port:freetype} name php5 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@macports.org jwa@macports.org} categories {lang php www} version 5.2.2 revision 0
+php5 755
+variants {universal darwin_6 darwin_7 darwin_8 macosx apache apache2 fastcgi imap tidy mssql snmp macports_snmp mysql3 mysql4 mysql5 postgresql sqlite ipc pcntl pear} description {PHP: Hypertext Preprocessor} portdir www/php5 epoch 0 platforms {darwin freebsd} depends_lib {port:libxml2 port:libxslt port:openssl port:zlib port:libiconv port:expat port:gettext port:tiff port:mhash port:libmcrypt port:curl port:pcre port:jpeg port:libpng port:gd2 port:freetype} name php5 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@macports.org jwa@macports.org} categories {lang php www} version 5.2.3 revision 0
php5-memcache 606
variants universal portdir www/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 {port:memcached port:php5 port:zlib} maintainers {emory.smith@gmail.com openmaintainer@macports.org} 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.} version 2.1.2 categories {www net devel} revision 0
php5-rrdtool 363
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070602/dbdddf88/attachment.html
From source_changes at macosforge.org Sat Jun 2 13:00:40 2007
From: source_changes at macosforge.org (source_changes@macosforge.org)
Date: Tue Oct 9 16:34:30 2007
Subject: [25803] users/jberry/mpwa
Message-ID: <20070602200040.A37C862E11B@cvs.opensource.apple.com>
Revision: 25803
http://trac.macosforge.org/projects/macports/changeset/25803
Author: jberry@macports.org
Date: 2007-06-02 13:00:40 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
mpwa: new changes to schema, of note:
* files are now referenced by file_ref, which provides a new level
of indirection and allows single instance, multiple reference storage
of files, providing more compact storage, especially across minor
changes to port submissions.
* also allows file blobs to be linked into other objects besides
port pkgs, in the future, which might allow, for instance, pictures
to be connected to users.
Modified Paths:
--------------
users/jberry/mpwa/app/models/file_blob.rb
users/jberry/mpwa/app/models/port_pkg.rb
users/jberry/mpwa/app/views/port_pkg/show.rhtml
users/jberry/mpwa/doc/schema.sql
users/jberry/mpwa/lib/mpwa-conf.rb
Added Paths:
-----------
users/jberry/mpwa/app/controllers/file_info_controller.rb
users/jberry/mpwa/app/controllers/file_ref_controller.rb
users/jberry/mpwa/app/helpers/file_infos_helper.rb
users/jberry/mpwa/app/helpers/file_refs_helper.rb
users/jberry/mpwa/app/models/file_info.rb
users/jberry/mpwa/app/models/file_ref.rb
users/jberry/mpwa/app/views/file_info/
users/jberry/mpwa/app/views/file_info/_form.rhtml
users/jberry/mpwa/app/views/file_info/edit.rhtml
users/jberry/mpwa/app/views/file_info/list.rhtml
users/jberry/mpwa/app/views/file_info/new.rhtml
users/jberry/mpwa/app/views/file_info/show.rhtml
users/jberry/mpwa/app/views/file_ref/
users/jberry/mpwa/app/views/file_ref/_form.rhtml
users/jberry/mpwa/app/views/file_ref/edit.rhtml
users/jberry/mpwa/app/views/file_ref/list.rhtml
users/jberry/mpwa/app/views/file_ref/new.rhtml
users/jberry/mpwa/app/views/file_ref/show.rhtml
users/jberry/mpwa/test/fixtures/file_infos.yml
users/jberry/mpwa/test/fixtures/file_refs.yml
users/jberry/mpwa/test/functional/file_infos_controller_test.rb
users/jberry/mpwa/test/functional/file_refs_controller_test.rb
users/jberry/mpwa/test/unit/file_info_test.rb
users/jberry/mpwa/test/unit/file_ref_test.rb
Added: users/jberry/mpwa/app/controllers/file_info_controller.rb
===================================================================
--- users/jberry/mpwa/app/controllers/file_info_controller.rb (rev 0)
+++ users/jberry/mpwa/app/controllers/file_info_controller.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,54 @@
+class FileInfoController < ApplicationController
+ def index
+ list
+ render :action => 'list'
+ end
+
+ # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+ verify :method => :post, :only => [ :destroy, :create, :update ],
+ :redirect_to => { :action => :list }
+
+ def list
+ @file_info_pages, @file_infos = paginate :file_infos, :per_page => 10
+ end
+
+ def show
+ @file_info = FileInfo.find(params[:id])
+ end
+
+ def new
+ @file_info = FileInfo.new
+ end
+
+ def create
+ @file_info = FileInfo.new(params[:file_info])
+ if @file_info.save
+ flash[:notice] = 'FileInfo was successfully created.'
+ redirect_to :action => 'list'
+ else
+ render :action => 'new'
+ end
+ end
+
+ def edit
+ @file_info = FileInfo.find(params[:id])
+ end
+
+ def update
+ @file_info = FileInfo.find(params[:id])
+ if @file_info.update_attributes(params[:file_info])
+ flash[:notice] = 'FileInfo was successfully updated.'
+ redirect_to :action => 'show', :id => @file_info
+ else
+ render :action => 'edit'
+ end
+ end
+
+ def destroy
+ FileInfo.find(params[:id]).destroy
+ redirect_to :action => 'list'
+ end
+
+ private :create, :edit, :update, :destroy
+
+end
Added: users/jberry/mpwa/app/controllers/file_ref_controller.rb
===================================================================
--- users/jberry/mpwa/app/controllers/file_ref_controller.rb (rev 0)
+++ users/jberry/mpwa/app/controllers/file_ref_controller.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,66 @@
+class FileRefController < ApplicationController
+ def index
+ list
+ render :action => 'list'
+ end
+
+ # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
+ verify :method => :post, :only => [ :destroy, :create, :update ],
+ :redirect_to => { :action => :list }
+
+ def list
+ @file_ref_pages, @file_refs = paginate :file_refs, :per_page => 10
+ end
+
+ def show
+ @file_ref = FileRef.find(params[:id])
+ end
+
+ def new
+ @file_ref = FileRef.new
+ end
+
+ def create
+ @file_ref = FileRef.new(params[:file_ref])
+ if @file_ref.save
+ flash[:notice] = 'FileRef was successfully created.'
+ redirect_to :action => 'list'
+ else
+ render :action => 'new'
+ end
+ end
+
+ def edit
+ @file_ref = FileRef.find(params[:id])
+ end
+
+ def update
+ @file_ref = FileRef.find(params[:id])
+ if @file_ref.update_attributes(params[:file_ref])
+ flash[:notice] = 'FileRef was successfully updated.'
+ redirect_to :action => 'show', :id => @file_ref
+ else
+ render :action => 'edit'
+ end
+ end
+
+ def destroy
+ FileRef.find(params[:id]).destroy
+ redirect_to :action => 'list'
+ end
+
+ def emit
+ ref = FileRef.find(params[:id])
+ send_data ref.file_info.data,
+ :filename => ref.file_info.file_path,
+ :type => ref.file_info.mime_type,
+ :disposition => 'inline'
+
+ # Bump download counts for the ref, and for the portpkg too if the file is a portpkg.
+ FileRef.increment_counter('download_count', ref)
+ PortPkg.increment_counter('download_count', ref.port_pkg) if ref.is_port_pkg
+ end
+
+ private :create, :edit, :update, :destroy
+
+end
Added: users/jberry/mpwa/app/helpers/file_infos_helper.rb
===================================================================
--- users/jberry/mpwa/app/helpers/file_infos_helper.rb (rev 0)
+++ users/jberry/mpwa/app/helpers/file_infos_helper.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,2 @@
+module FileInfosHelper
+end
Added: users/jberry/mpwa/app/helpers/file_refs_helper.rb
===================================================================
--- users/jberry/mpwa/app/helpers/file_refs_helper.rb (rev 0)
+++ users/jberry/mpwa/app/helpers/file_refs_helper.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,2 @@
+module FileRefsHelper
+end
Modified: users/jberry/mpwa/app/models/file_blob.rb
===================================================================
--- users/jberry/mpwa/app/models/file_blob.rb 2007-06-02 19:31:25 UTC (rev 25802)
+++ users/jberry/mpwa/app/models/file_blob.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -1,5 +1,7 @@
+require 'file_info'
+
class FileBlob < ActiveRecord::Base
- belongs_to :port_pkg_file
+ belongs_to :file_info
def read(file)
self.data = file.read
Added: users/jberry/mpwa/app/models/file_info.rb
===================================================================
--- users/jberry/mpwa/app/models/file_info.rb (rev 0)
+++ users/jberry/mpwa/app/models/file_info.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,98 @@
+require 'stringio'
+
+require 'file_blob'
+require 'file_ref'
+require 'mpwa-conf'
+
+class FileInfoException < RuntimeError
+end
+
+class FileInfo < ActiveRecord::Base
+ has_many :file_refs
+ #has_many :file_blobs -- we don't use this association to avoid keeping many blobs in memory
+ before_destroy { |f| FileBlob.delete_all "file_info_id = #{f.id}" }
+
+ def FileInfo.mimetype_from_path(path)
+ mimetype = /^([^;]+)(;\w*(.*))?/.match(`#{MPWA::FILETOOL} --mime --brief #{path}`)[1]
+ end
+
+ def read_from_path(path, path_root = nil, options = {})
+ mimetype = options[:mimetype] || FileInfo.mimetype_from_path(path)
+ reported_path = options[:filename] || path_root.nil? ?
+ path.to_s : Pathname.new(path).relative_path_from(path_root).to_s
+
+ File.open(path, "r") { |f| read_from_file(f, :path => reported_path, :mimetype => mimetype) }
+ return self
+ end
+
+ def read_from_file(file, options = {})
+ # Save file meta information
+ self.file_path = options[:path]
+ self.length = 0
+ self.mime_type = options[:mimetype] || 'application/octet-stream'
+
+ # Save so that we get a primary id for the blob associations
+ self.save
+
+ # Create digesters for our digests
+ md5 = Digest::MD5.new
+ sha256 = Digest::SHA256.new
+
+ # Read the file, creating blobs of data as we go
+ buf = ''
+ length = 0
+ seq = 0
+ while (file.read(MPWA::MAX_BLOB_SIZE, buf))
+ # Update the digests
+ md5.update buf
+ sha256.update buf
+
+ # Create a new bob
+ blob = FileBlob.create(:file_info => self, :data => buf, :sequence => seq)
+
+ length += buf.length
+ seq += 1
+ end
+
+ # Finish up
+ self.md5 = md5.hexdigest
+ self.sha256 = sha256.hexdigest
+ self.length = length
+
+ self.save
+ return self
+ end
+
+ def write_to_file(file)
+ # Create a digester so that we can verify the digest
+ digest = Digest::MD5.new
+
+ # Page in the blobs, writing to file as we go
+ length = 0
+ seq = 0
+ while (length < self.length)
+ blob = FileBlob.find(:first, :conditions => "file_info_id=#{self.id} and sequence=#{seq}")
+ raise FileInfoException, "file_info missing segment" if !blob
+
+ buf = blob.data
+ digest.update buf
+
+ file.write(buf)
+ length += buf.length
+
+ seq += 1
+ end
+
+ # Verify the digest
+ raise FileInfoException, "digest mismatch while reading file_info #{self.id}" if digest.hexdigest != self.md5
+ end
+
+ def data()
+ StringIO.open("rw") do |f|
+ write_to_file(f)
+ f.string
+ end
+ end
+
+
+end
Added: users/jberry/mpwa/app/models/file_ref.rb
===================================================================
--- users/jberry/mpwa/app/models/file_ref.rb (rev 0)
+++ users/jberry/mpwa/app/models/file_ref.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,39 @@
+require 'file_info'
+require 'port_pkg'
+
+class FileRef < ActiveRecord::Base
+ belongs_to :file_info
+ belongs_to :port_pkg
+
+ def FileRef.create_from_path(path, path_root, options = {})
+ ref = FileRef.new()
+
+ # Create a new FileInfo object from specfied path
+ new_info = FileInfo.new()
+ new_info.read_from_path(path, path_root, options)
+
+ # If we already had a FileInfo matching the specifics
+ # (path and digests) then use that one, deleting the new
+ existing_info = FileInfo.find_by_md5_and_sha256_and_file_path(
+ new_info.md5, new_info.sha256,
+ new_info.file_path,
+ :conditions => "id != #{new_info.id}")
+ if (existing_info)
+ ref.file_info = existing_info
+ FileInfo.destroy(new_info)
+ else
+ ref.file_info = new_info
+ end
+
+ return ref
+ end
+
+ def <=>(other)
+ if (self.file_info.file_path == other.file_info.file_path)
+ return self.id <=> other.id
+ else
+ return self.file_info.file_path <=> other.file_info.file_path
+ end
+ end
+
+end
Modified: users/jberry/mpwa/app/models/port_pkg.rb
===================================================================
--- users/jberry/mpwa/app/models/port_pkg.rb 2007-06-02 19:31:25 UTC (rev 25802)
+++ users/jberry/mpwa/app/models/port_pkg.rb 2007-06-02 20:00:40 UTC (rev 25803)
@@ -20,7 +20,8 @@
class PortPkg < ActiveRecord::Base
belongs_to :port
belongs_to :submitter, :class_name => 'Person', :foreign_key => 'submitter_id'
- has_many :files, :class_name => 'PortPkgFile', :dependent => :destroy
+ has_many :file_refs, :dependent => :destroy
+ has_many :file_infos, :through => :file_refs
has_many :variants, :dependent => :destroy
has_and_belongs_to_many :tags
@@ -110,11 +111,14 @@
meta.categories.each { |c| self.add_tag(c) }
# Save unpacked data into a file
- self.files << PortPkgFile.from_path(self, pkgPath, tempDirPath, :mimetype => 'application/vnd.macports.portpkg')
+ portpkg_ref = FileRef.create_from_path(pkgPath, tempDirPath,
+ :mimetype => 'application/vnd.macports.portpkg')
+ portpkg_ref.is_port_pkg = true
+ self.file_refs << portpkg_ref
# Save files from the expanded package
expandedPkgPath.find do |p|
- self.files << PortPkgFile.from_path(self, p, tempDirPath) if p.file?
+ self.file_refs << FileRef.create_from_path(p, tempDirPath) if p.file?
end
# Save the pkg (maybe we shouldn't?)
@@ -132,10 +136,16 @@
return candidates.first
end
- def portpkg_file()
- file_by_path("portpkg.portpkg")
+ def portpkg_file_ref()
+ candidates = self.file_refs.select { |r| r.is_port_pkg }
+ return candidates.first
end
+ def data_file_refs()
+ refs = self.file_refs.select { |r| !r.is_port_pkg }
+ return refs
+ end
+
def has_tag(name)
!self.tags.select { |t| t.name == name }.empty?
end
Added: users/jberry/mpwa/app/views/file_info/_form.rhtml
===================================================================
--- users/jberry/mpwa/app/views/file_info/_form.rhtml (rev 0)
+++ users/jberry/mpwa/app/views/file_info/_form.rhtml 2007-06-02 20:00:40 UTC (rev 25803)
@@ -0,0 +1,19 @@
+<%= error_messages_for 'file_info' %>
+
+
+