[84834] trunk/dports/sysutils/tree

[ryandesign at macports.org]

Revision: 84834
          http://trac.macports.org/changeset/84834
Author:   ryandesign at macports.org
Date:     2011-10-02 16:04:44 -0700 (Sun, 02 Oct 2011)
Log Message:
-----------
tree: update to 1.6.0 (#30637); enable universal variant; add modeline; use project's own http download instead of freebsd which doesn't have this version

Modified Paths:
--------------
    trunk/dports/sysutils/tree/Portfile
    trunk/dports/sysutils/tree/files/patch-Makefile.diff
    trunk/dports/sysutils/tree/files/patch-caseinsensitive.diff

Modified: trunk/dports/sysutils/tree/Portfile
===================================================================
--- trunk/dports/sysutils/tree/Portfile	2011-10-02 22:02:58 UTC (rev 84833)
+++ trunk/dports/sysutils/tree/Portfile	2011-10-02 23:04:44 UTC (rev 84834)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem          1.0
@@ -3,5 +4,5 @@
 
 name                tree
-version             1.5.3
+version             1.6.0
 categories          sysutils
 license             GPL-2+
@@ -16,12 +17,13 @@
                     Baker for Linux.
 
 homepage            http://mama.indstate.edu/users/ice/tree/
-master_sites        freebsd \
+master_sites        ${homepage}/src/ \
                     ftp://mama.indstate.edu/linux/tree/ \
                     ftp://mama.indstate.edu/linux/tree/old/
-checksums           md5     c07ce9065667a23f27aca4de8ecccb10 \
-                    sha1    329e05e500754109ff1f648c14924d8cac42c6ea \
-                    rmd160  72ca2be3ea05bd18819973ad0dfc60a3b9247d90
+
+checksums           rmd160  d0e89f49fa902c7a72056d1a4ef826ddfee6be15 \
+                    sha256  4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591
+
 extract.suffix      .tgz
 
 patchfiles          patch-caseinsensitive.diff \
@@ -29,9 +31,11 @@
 
 use_configure       no
 
+variant universal {}
+
 build.args          CC=${configure.cc} \
-                    CFLAGS="${configure.cflags} ${configure.cc_archflags}" \
-                    LDFLAGS="${configure.ldflags} ${configure.ld_archflags}"
+                    CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                    LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
 destroot.args       BINDIR=${destroot}${prefix}/bin \
                     MANDIR=${destroot}${prefix}/share/man/man1

Modified: trunk/dports/sysutils/tree/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/tree/files/patch-Makefile.diff	2011-10-02 22:02:58 UTC (rev 84833)
+++ trunk/dports/sysutils/tree/files/patch-Makefile.diff	2011-10-02 23:04:44 UTC (rev 84834)
@@ -1,11 +1,11 @@
---- Makefile.orig	2010-09-16 13:57:54.000000000 +0200
-+++ Makefile	2010-09-16 14:00:35.000000000 +0200
-@@ -45,7 +45,7 @@
+--- Makefile.orig	2011-06-24 09:25:27.000000000 -0500
++++ Makefile	2011-10-02 17:53:00.000000000 -0500
+@@ -56,7 +56,7 @@
  #CC=cc
  #CFLAGS=-O2 -Wall -fomit-frame-pointer -no-cpp-precomp
  #LDFLAGS=
--#XOBJS=strverscmp.o
-+XOBJS=strverscmp.o
+-#OBJS+=strverscmp.o
++OBJS+=strverscmp.o
  
  # Uncomment for HP/UX:
  #CC=cc

Modified: trunk/dports/sysutils/tree/files/patch-caseinsensitive.diff
===================================================================
--- trunk/dports/sysutils/tree/files/patch-caseinsensitive.diff	2011-10-02 22:02:58 UTC (rev 84833)
+++ trunk/dports/sysutils/tree/files/patch-caseinsensitive.diff	2011-10-02 23:04:44 UTC (rev 84834)
@@ -1,10 +1,7 @@
 Make install isn't executed on case insensitive filesystems!
-
-Index: Makefile
-===================================================================
---- Makefile.orig	2009-01-24 16:38:22.000000000 +0100
-+++ Makefile	2009-01-24 16:39:16.000000000 +0100
-@@ -82,6 +82,7 @@
+--- Makefile.orig	2011-06-24 09:25:27.000000000 -0500
++++ Makefile	2011-10-02 17:53:00.000000000 -0500
+@@ -93,6 +93,7 @@
  	if [ -f tree.o ]; then rm *.o; fi
  	rm -f *~
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111002/7d4b74c7/attachment.html>