[26761] branches/release_1_5/base
source_changes at macosforge.org
source_changes at macosforge.org
Thu Jul 5 22:06:48 PDT 2007
Revision: 26761
http://trac.macosforge.org/projects/macports/changeset/26761
Author: jmpp at macports.org
Date: 2007-07-05 22:06:48 -0700 (Thu, 05 Jul 2007)
Log Message:
-----------
Merged revisions 26719-26736,26738-26743,26745-26753 via svnmerge from
http://svn.macports.org/repository/macports/trunk/base
........
r26719 | jmpp at macports.org | 2007-07-05 04:56:37 -0400 (Thu, 05 Jul 2007) | 8 lines
I ran the ./regen script and found out this file had been left out when updating autoconf files
after including the pthread macro. Updating it now.
Landon, please review this commit and correct it if it seems wrong to you (it's just the output of ./regen.sh,
which in turn just runs 'autoconf; autoheader').
........
r26721 | eridius at macports.org | 2007-07-05 07:05:47 -0400 (Thu, 05 Jul 2007) | 1 line
Fix test failure on dlist_eval that, as near as I can tell, must have existed for over 4 years based on the failure reason
........
r26722 | eridius at macports.org | 2007-07-05 07:10:27 -0400 (Thu, 05 Jul 2007) | 1 line
Fix curl test - research.att.com removed the download we were using, so update to the smallest ast-ksh download currently available
........
r26723 | eridius at macports.org | 2007-07-05 07:43:44 -0400 (Thu, 05 Jul 2007) | 1 line
Fix checksums test to work regardless of current locale
........
r26730 | afb at macports.org | 2007-07-05 10:26:17 -0400 (Thu, 05 Jul 2007) | 1 line
don't write Epoch:0, don't kill auto-provides
........
r26731 | afb at macports.org | 2007-07-05 10:43:15 -0400 (Thu, 05 Jul 2007) | 1 line
don't write Epoch:0, don't kill auto-provides
........
r26753 | yves at macports.org | 2007-07-05 22:05:50 -0400 (Thu, 05 Jul 2007) | 2 lines
Upgrade portgroup.7 to match latest gnustep portgroup
........
Modified Paths:
--------------
branches/release_1_5/base/doc/portgroup.7
branches/release_1_5/base/src/config.h.in
branches/release_1_5/base/src/macports1.0/tests/macports_dlist.tcl
branches/release_1_5/base/src/package1.0/portrpm.tcl
branches/release_1_5/base/src/package1.0/portsrpm.tcl
branches/release_1_5/base/src/pextlib1.0/tests/checksums.tcl
branches/release_1_5/base/src/pextlib1.0/tests/curl.tcl
Property Changed:
----------------
branches/release_1_5/base/
Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
- /trunk/base:1-26609,26611-26654,26656-26681,26683-26692,26695-26713
+ /trunk/base:1-26609,26611-26654,26656-26681,26683-26692,26695-26713,26719-26736,26738-26743,26745-26753
Modified: branches/release_1_5/base/doc/portgroup.7
===================================================================
--- branches/release_1_5/base/doc/portgroup.7 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/doc/portgroup.7 2007-07-06 05:06:48 UTC (rev 26761)
@@ -242,6 +242,27 @@
objective-C runtime. It handles configuration, build and destroot phases.
It also defines some values for GNUstep-based software. A minimum Portfile
using the gnustep PortGroup class only defines the fetch and the checksum phases.
+.Sh GNUSTEP FILESYSTEM LAYOUTS
+.Nm PortGroup gnustep
+also supports both the traditionnal gnustep file layout and the new fhs file layout.
+However, the ports themselves do not necessarily support both.
+The Portfiles have access to many procedures in dealing with these two layouts :
+.Bl -tag -width lc
+.It Ic set_gnustep_make
+Sets GNUSTEP_MAKEFILES according to the FilesystemLayout
+.br
+.It Ic set_gnustep_env
+Sets DYLD_LIBRARY_PATH and PATH for the gnustep FilesystemLayout
+.br
+.It Ic gnustep_layout
+Returns true (1) if current file layout is gnustep
+.br
+.It Ic set_system_library
+Sets GNUSTEP_SYSTEM_LIBRARY according to the FilesystemLayout
+.br
+.It Ic set_local_library
+Sets GNUSTEP_LOCAL_LIBRARY according to the FilesystemLayout
+.br
.Pp
.Sh GNUSTEP PORTGROUP SUGAR
Portfiles using gnustep PortGroup do not need to define the following variables:
@@ -258,38 +279,39 @@
.Sy Default:
.Em gnustep:core
.br
-.It Ic depends_build
-.Sy Default:
-.Em port:gnustep-make
-.br
.It Ic depends_lib
.Sy Default:
-.Em gnustep-back
+.Em gnustep-core
.br
.It Ic use_configure
.Sy Default:
.Em no
-.It Ic configure.args
+.It Ic configure.env
.Sy Default:
-.Em CC=gcc-mp-4.1
+.Em DYLD_LIBRARY_PATH PATH
+.It Ic configure.pre_args-append
+.Sy Default:
+.Em CC=gcc-mp-4.2 GNUSTEP_MAKEFILES
.br
.It Ic build.type
.Sy Default:
.Em gnu
.br
-.It Ic build.args
+.It Ic build.env
.Sy Default:
+.Em DYLD_LIBRARY_PATH PATH
+.It Ic build.pre_args-append
+.Sy Default:
.Em messages=yes
.br
-.It Ic destroot.args
+.It Ic destroot.env
.Sy Default:
+.Em DYLD_LIBRARY_PATH PATH
+.It Ic destroot.pre_args-append
+.Sy Default:
.Em messages=yes
.br
-.It Ic destroot.destdir
-.Sy Default:
-.Em GNUSTEP_INSTALLATION_DIR=${destroot}${prefix}/GNUstep/$gnustep.domain
.br
-.br
.El
.br
Moreover, Portfiles using
@@ -317,19 +339,16 @@
.Dl }
.Dl }
.br
-.It Ic gnustep.domain
-can be System or Local. It is usually guessed by the
-.Nm gnustep PortGroup
-but it is sometimes necessary to force the installation directory.
+.It Ic gnustep.cc
.br
.Sy Type:
.Em optional
.br
.Sy Default:
-.Em Local
+.Em gcc-mp-4.2
.br
.Sy Example:
-.Dl gnustep.domain System
+.Dl gnustep.cc gcc-mp-4.3
.br
.It Ic variant with_docs
Many GNUstep packages include a Documentation sub-directory that is not
Modified: branches/release_1_5/base/src/config.h.in
===================================================================
--- branches/release_1_5/base/src/config.h.in 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/config.h.in 2007-07-06 05:06:48 UTC (rev 26761)
@@ -132,6 +132,9 @@
/* Define to 1 if you have the <paths.h> header file. */
#undef HAVE_PATHS_H
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
@@ -251,6 +254,10 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Define to necessary symbol if this constant uses a non-standard name on
+ your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
/* Define to 1 if readlink does not conform with POSIX 1003.1a (where third
argument is a size_t and return value is a ssize_t) */
#undef READLINK_IS_NOT_P1003_1A
Modified: branches/release_1_5/base/src/macports1.0/tests/macports_dlist.tcl
===================================================================
--- branches/release_1_5/base/src/macports1.0/tests/macports_dlist.tcl 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/macports1.0/tests/macports_dlist.tcl 2007-07-06 05:06:48 UTC (rev 26761)
@@ -97,7 +97,7 @@
puts -nonewline "Checking dlist_eval... "
proc handler {ditem} { puts -nonewline "[ditem_key $ditem provides] " }
-if {[catch {dlist_eval [list $A $B $C] handler} value] || $value != {}} {
+if {[catch {dlist_eval [list $A $B $C] {} handler} value] || $value != {}} {
puts "failed: ${value}"
} else {
puts "ok"
Modified: branches/release_1_5/base/src/package1.0/portrpm.tcl
===================================================================
--- branches/release_1_5/base/src/package1.0/portrpm.tcl 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/package1.0/portrpm.tcl 2007-07-06 05:06:48 UTC (rev 26761)
@@ -179,8 +179,10 @@
License: ${license}
URL: ${homepage}
BuildRoot: ${destroot}
-Epoch: ${epoch}
-AutoReqProv: no"
+AutoReq: no"
+ if {[expr ${epoch} != 0]} {
+ puts $specfd "Epoch: ${epoch}"
+ }
if {[llength ${dependencies}] != 0} {
foreach require ${dependencies} {
puts $specfd "Requires: [regsub -all -- "\-" $require "_"]"
Modified: branches/release_1_5/base/src/package1.0/portsrpm.tcl
===================================================================
--- branches/release_1_5/base/src/package1.0/portsrpm.tcl 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/package1.0/portsrpm.tcl 2007-07-06 05:06:48 UTC (rev 26761)
@@ -173,9 +173,11 @@
License: ${license}
URL: ${homepage}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Epoch: ${epoch}
Source0: ${portname}-Portfile
Source1: ${portname}-files.zip"
+ if {[expr ${epoch} != 0]} {
+ puts $specfd "Epoch: ${epoch}"
+ }
set first 2
set count $first
puts $specfd "#distfiles"
@@ -198,8 +200,7 @@
}
incr count
}
- puts $specfd ""
- puts $specfd "AutoReqProv: no"
+ puts $specfd "AutoReq: no"
if {[llength ${dependencies}] != 0} {
foreach require ${dependencies} {
puts $specfd "BuildRequires: [regsub -all -- "\-" $require "_"]"
Modified: branches/release_1_5/base/src/pextlib1.0/tests/checksums.tcl
===================================================================
--- branches/release_1_5/base/src/pextlib1.0/tests/checksums.tcl 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/pextlib1.0/tests/checksums.tcl 2007-07-06 05:06:48 UTC (rev 26761)
@@ -6,6 +6,8 @@
proc main {pextlibname} {
load $pextlibname
+ encoding system utf-8
+
set testfile "/tmp/macports-pextlib-testchecksums"
file delete -force $testfile
Modified: branches/release_1_5/base/src/pextlib1.0/tests/curl.tcl
===================================================================
--- branches/release_1_5/base/src/pextlib1.0/tests/curl.tcl 2007-07-06 04:59:10 UTC (rev 26760)
+++ branches/release_1_5/base/src/pextlib1.0/tests/curl.tcl 2007-07-06 05:06:48 UTC (rev 26761)
@@ -28,8 +28,8 @@
test {[md5 file $tempfile] == "a4b0f4a5fbd8bec23002ad8023e01729"}
# use -u
- curl fetch -u "I accept www.opensource.org/licenses/cpl:." http://www.research.att.com/~gsf/download/tgz/ast-ksh.2007-01-11.tgz $tempfile
- test {[md5 file $tempfile] == "a24a0b8d8dc81600d624e3c0f2159e38"}
+ curl fetch -u "I accept www.opensource.org/licenses/cpl:." http://www.research.att.com/~gsf/download/tgz/ast-ksh.2007-03-28.2007-03-25.tgz $tempfile
+ test {[md5 file $tempfile] == "33b5dad7b2f6da0d7c2b16f3a91efeef"}
file delete -force $tempfile
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070705/cb1efcf1/attachment.html
More information about the macports-changes
mailing list