diff --git a/app-text/tree/patches/tree-1.7.0.patchset b/app-text/tree/patches/tree-1.7.0.patchset deleted file mode 100644 index 3be28bd97..000000000 --- a/app-text/tree/patches/tree-1.7.0.patchset +++ /dev/null @@ -1,34 +0,0 @@ -From 30e49b8a31a6e43a22c1fa093d9a57fbacb4e710 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 24 Apr 2014 16:37:07 +0000 -Subject: Haiku patch - - -diff --git a/Makefile b/Makefile -index e91f1f6..9ae1149 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,7 @@ OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o - # Uncomment options below for your particular OS: - - # Linux defaults: --CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #LDFLAGS=-s - -@@ -59,6 +59,11 @@ CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #MANDIR=/usr/share/man/man1 - #OBJS+=strverscmp.o - -+# Uncomment for Haiku: -+CFLAGS=-O2 -Wall -fomit-frame-pointer -+LDFLAGS= -+OBJS+=strverscmp.o -+ - # Uncomment for HP/UX: - #CC=cc - #CFLAGS=-O2 -DAportable -Wall --- -1.8.3.4 - diff --git a/app-text/tree/patches/tree-1.8.0.patchset b/app-text/tree/patches/tree-1.8.0.patchset new file mode 100644 index 000000000..af67f0a42 --- /dev/null +++ b/app-text/tree/patches/tree-1.8.0.patchset @@ -0,0 +1,40 @@ +From c44e177a02ccfe9dfbdfc830aed8837afa2ad6b1 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 24 Apr 2014 16:37:07 +0000 +Subject: Haiku patch + + +diff --git a/Makefile b/Makefile +index 842281e..f13abd6 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,12 +30,12 @@ OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o file.o + # Uncomment options below for your particular OS: + + # Linux defaults: +-CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++#CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + #LDFLAGS=-s + + # Uncomment for FreeBSD: +-#CFLAGS=-O2 -Wall -fomit-frame-pointer ++CFLAGS=-O2 -Wall -fomit-frame-pointer + #LDFLAGS=-s + #OBJS+=strverscmp.o + +@@ -68,6 +68,11 @@ CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=6 + #MANDIR=/usr/share/man/man1 + #OBJS+=strverscmp.o + ++# Uncomment for Haiku: ++CFLAGS=-O2 -Wall -fomit-frame-pointer ++LDFLAGS= ++OBJS+=strverscmp.o ++ + # Uncomment for HP/UX: + #CC=cc + #CFLAGS=-O2 -DAportable -Wall +-- +2.19.1 + diff --git a/app-text/tree/tree-1.7.0.recipe b/app-text/tree/tree-1.8.0.recipe similarity index 85% rename from app-text/tree/tree-1.7.0.recipe rename to app-text/tree/tree-1.8.0.recipe index 87520f55f..5ebca9f23 100644 --- a/app-text/tree/tree-1.7.0.recipe +++ b/app-text/tree/tree-1.8.0.recipe @@ -4,10 +4,10 @@ of files." HOMEPAGE="http://mama.indstate.edu/users/ice/tree/" COPYRIGHT="1996-2011 Steve Baker" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="http://mama.indstate.edu/users/ice/tree/src/tree-$portVersion.tgz" -CHECKSUM_SHA256="6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12" -PATCHES="tree-1.7.0.patchset" +CHECKSUM_SHA256="715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2" +PATCHES="tree-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"