[59535] branches/gsoc09-logging/base

blb at macports.org blb at macports.org
Fri Oct 16 00:35:07 PDT 2009 

Revision: 59535
          http://trac.macports.org/changeset/59535
Author:   blb at macports.org
Date:     2009-10-16 00:35:04 -0700 (Fri, 16 Oct 2009)
Log Message:
-----------
Miscellaneous fallout after r59527

Revision Links:
--------------
    http://trac.macports.org/changeset/59527

Modified Paths:
--------------
    branches/gsoc09-logging/base/src/macports1.0/macports.tcl
    branches/gsoc09-logging/base/src/pextlib1.0/system.c
    branches/gsoc09-logging/base/src/port1.0/portclean.tcl
    branches/gsoc09-logging/base/src/port1.0/portfetch.tcl
    branches/gsoc09-logging/base/src/port1.0/portutil.tcl

Added Paths:
-----------
    branches/gsoc09-logging/base/portmgr/fedora/macports.spec

Property Changed:
----------------
    branches/gsoc09-logging/base/portmgr/fedora/


Property changes on: branches/gsoc09-logging/base/portmgr/fedora
___________________________________________________________________
Modified: svn:ignore
   - macports.spec

   + 


Added: branches/gsoc09-logging/base/portmgr/fedora/macports.spec
===================================================================
--- branches/gsoc09-logging/base/portmgr/fedora/macports.spec	                        (rev 0)
+++ branches/gsoc09-logging/base/portmgr/fedora/macports.spec	2009-10-16 07:35:04 UTC (rev 59535)
@@ -0,0 +1,100 @@
+Summary: MacPorts allows installing software on Mac OS X (and other platforms)
+Name: macports
+Version: 1.6.0
+Release: 0%{?dist}
+License: BSD
+Group: System Environment/Base
+URL: http://www.macports.org
+Source: http://svn.macosforge.org/repository/macports/distfiles/MacPorts/MacPorts-%{version}.tar.bz2
+Prefix: /opt/local
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: curl tcl rsync coreutils make
+BuildRequires: curl-devel tcl-devel tcl-thread sqlite-devel gcc-objc gnustep-base
+BuildRequires: mtree fakeroot /usr/GNUstep/System/Library/Makefiles/GNUstep.sh 
+BuildRequires: openssl-devel
+
+%description
+MacPorts is a system for compiling, installing, and managing free and
+open source software. A MacPorts "port" is a set of specifications
+contained in a Portfile that defines an application, its characteristics,
+and any files or special instructions required to install it, so MacPorts
+may automatically fetch, patch, compile, and install ported software.
+
+MacPorts may also be used to pre-compile ported software into binaries
+that may be installed on remote computers. Binaries of ported software
+may be installed very quickly since the steps required to install ports
+from source code have all been performed in advance.
+
+%prep
+%setup -n MacPorts-%{version}
+# avoid the whole upgrade and information procedure
+perl -pe 's/^install::/interactive::/' -i Makefile.in
+
+%define _prefix         %{prefix}
+%define _bindir         %{prefix}/bin
+%define _sysconfdir     %{prefix}/etc
+%define _datadir        %{prefix}/share
+%define _mandir         %{prefix}/share/man
+%define _infodir        %{prefix}/share/info
+%define _localstatedir  %{prefix}/var
+
+%build
+source /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+%configure \
+	--without-included-tclthread --without-included-sqlite3 \
+	--with-objc-runtime=GNU --with-objc-foundation=GNUstep
+make
+
+%install
+source /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
+rm -rf $RPM_BUILD_ROOT
+make install \
+	DESTDIR="$RPM_BUILD_ROOT" INSTALL="fakeroot install"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%doc LICENSE ChangeLog
+%{_bindir}/port
+%{_bindir}/portf
+%{_bindir}/portindex
+%{_bindir}/portmirror
+%config(noreplace) %{_sysconfdir}/macports
+%doc %{_mandir}/man1/port.1*
+%doc %{_mandir}/man5/macports.conf.5*
+%doc %{_mandir}/man7/portfile.7*
+%doc %{_mandir}/man7/portgroup.7*
+%doc %{_mandir}/man7/porthier.7*
+%doc %{_mandir}/man7/portstyle.7*
+%{_datadir}/macports
+%{_localstatedir}/macports
+/usr/share/tcl8.4/macports1.0
+#### mtree
+%dir %{prefix}
+%dir %{prefix}/bin
+%dir %{prefix}/etc
+%dir %{prefix}/include
+%dir %{prefix}/lib
+%dir %{prefix}/libexec
+     %{prefix}/man
+%dir %{prefix}/sbin
+%dir %{prefix}/share
+%dir %{prefix}/share/info
+%dir %{prefix}/share/man
+%dir %{prefix}/share/man/cat?
+%dir %{prefix}/share/man/man?
+%dir %{prefix}/share/nls
+%dir %{prefix}/share/nls/*
+#dir %{prefix}/skel
+#dir %{prefix}/src
+%dir %{prefix}/var
+
+%changelog
+* Sun Aug 12 2007 Anders F Bjorklund <afb at macports.org> - 1.5.0
+- Updated to version 1.5.0
+
+* Sun Aug 12 2007 Anders F Bjorklund <afb at macports.org> - 1.4.0
+- Initial Fedora packaging

Modified: branches/gsoc09-logging/base/src/macports1.0/macports.tcl
===================================================================
--- branches/gsoc09-logging/base/src/macports1.0/macports.tcl	2009-10-16 07:28:50 UTC (rev 59534)
+++ branches/gsoc09-logging/base/src/macports1.0/macports.tcl	2009-10-16 07:35:04 UTC (rev 59535)
@@ -1492,13 +1492,16 @@
 # Execute the specified target of the given mport.
 proc mportexec {mport target} {
     global macports::registry.installtype
+
     set workername [ditem_key $mport workername]
+
     # check variants
     if {[$workername eval check_variants variations $target] != 0} {
         return 1
     }
     set portname [_mportkey $mport name]
     macports::init_logging $portname
+
     # Before we build the port, we must build its dependencies.
     # XXX: need a more general way of comparing against targets
     set dlist {}

Modified: branches/gsoc09-logging/base/src/pextlib1.0/system.c
===================================================================
--- branches/gsoc09-logging/base/src/pextlib1.0/system.c	2009-10-16 07:28:50 UTC (rev 59534)
+++ branches/gsoc09-logging/base/src/pextlib1.0/system.c	2009-10-16 07:35:04 UTC (rev 59535)
@@ -40,6 +40,7 @@
 #include <paths.h>
 #endif
 
+#include <sys/wait.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>

Modified: branches/gsoc09-logging/base/src/port1.0/portclean.tcl
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/portclean.tcl	2009-10-16 07:28:50 UTC (rev 59534)
+++ branches/gsoc09-logging/base/src/port1.0/portclean.tcl	2009-10-16 07:35:04 UTC (rev 59535)
@@ -60,6 +60,7 @@
     global ports_clean_dist ports_clean_work ports_clean_archive ports_clean_logs
     global ports_clean_all usealtworkpath 
     global	keeplogs
+
     if {[info exists ports_clean_all] && $ports_clean_all == "yes" || \
         [info exists ports_clean_dist] && $ports_clean_dist == "yes"} {
         ui_info "$UI_PREFIX [format [msgcat::mc "Removing distfiles for %s"] [option name]]"

Modified: branches/gsoc09-logging/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/portfetch.tcl	2009-10-16 07:28:50 UTC (rev 59534)
+++ branches/gsoc09-logging/base/src/port1.0/portfetch.tcl	2009-10-16 07:35:04 UTC (rev 59535)
@@ -172,15 +172,11 @@
                 depends_fetch-append bin:cvs:cvs
             }
             svn {
-<<<<<<< .working
-                depends_fetch-append port:subversion
-=======
                 if {${os.platform} == "darwin" && ${os.major} >= 10} {
                     depends_fetch-append bin:svn:subversion
                 } else {
                     depends_fetch-append port:subversion
                 }
->>>>>>> .merge-right.r59490
             }
             git {
                 depends_fetch-append bin:git:git-core

Modified: branches/gsoc09-logging/base/src/port1.0/portutil.tcl
===================================================================
--- branches/gsoc09-logging/base/src/port1.0/portutil.tcl	2009-10-16 07:28:50 UTC (rev 59534)
+++ branches/gsoc09-logging/base/src/port1.0/portutil.tcl	2009-10-16 07:35:04 UTC (rev 59535)
@@ -1198,7 +1198,7 @@
 
 proc target_run {ditem} {
     global target_state_fd workpath ports_trace PortInfo ports_dryrun ports_dry_last_skipped current_stage worksrcpath prefix
-   set portname [option name]
+    set portname [option name]
     set result 0
     set skipped 0
     set procedure [ditem_key $ditem procedure]
@@ -1242,7 +1242,6 @@
 
             # otherwise execute the task.
             if {$skipped == 0} {
-   
                 set target [ditem_key $ditem provides]
 
                 # Execute pre-run procedure
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091016/4308ccad/attachment.html>

More information about the macports-changes mailing list