ports/189365: [PATCH] sysutils/tree: update to 1.7.0
milki
milki at FreeBSD.org
Mon May 5 04:00:01 UTC 2014
The following reply was made to PR ports/189365; it has been noted by GNATS.
From: milki <milki at FreeBSD.org>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/189365: [PATCH] sysutils/tree: update to 1.7.0
Date: Sun, 4 May 2014 20:53:37 -0700
--1UWUbFP1cBYEclgG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Cleaned patch.
I believe this patch is better than the proposed patch in ports/189100
as the patch in ports/189100 retains the ?= assignment for
CFLAGS/LDFLAGS
--
milki
--1UWUbFP1cBYEclgG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="tree-1.7.0-port.patch"
diff -ruN /usr/ports/sysutils/tree/Makefile ./Makefile
--- /usr/ports/sysutils/tree/Makefile 2014-01-09 07:17:56.000000000 -0800
+++ ./Makefile 2014-05-04 20:15:40.000000000 -0700
@@ -2,7 +2,7 @@
# $FreeBSD: head/sysutils/tree/Makefile 339252 2014-01-09 15:17:56Z bapt $
PORTNAME= tree
-PORTVERSION= 1.6.0
+PORTVERSION= 1.7.0
CATEGORIES= sysutils
MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ \
CENKES
@@ -27,5 +27,4 @@
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
-
.include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/tree/distinfo ./distinfo
--- /usr/ports/sysutils/tree/distinfo 2014-01-22 07:30:13.000000000 -0800
+++ ./distinfo 2014-05-04 20:07:52.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (tree-1.6.0.tgz) = 4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591
-SIZE (tree-1.6.0.tgz) = 42706
+SHA256 (tree-1.7.0.tgz) = 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12
+SIZE (tree-1.7.0.tgz) = 47082
diff -ruN /usr/ports/sysutils/tree/files/patch-Makefile ./files/patch-Makefile
--- /usr/ports/sysutils/tree/files/patch-Makefile 2014-01-22 09:40:44.000000000 -0800
+++ ./files/patch-Makefile 2014-05-04 20:38:56.000000000 -0700
@@ -1,6 +1,6 @@
---- ./Makefile.orig 2011-06-24 16:25:27.000000000 +0200
-+++ ./Makefile 2012-09-17 13:38:44.926563330 +0200
-@@ -16,14 +16,14 @@
+--- Makefile.orig 2014-05-04 20:11:04.000000000 -0700
++++ Makefile 2014-05-04 20:13:48.000000000 -0700
+@@ -16,28 +16,28 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -10,22 +10,21 @@
-CC=gcc
+CC?=gcc
- VERSION=1.6.0
+ VERSION=1.7.0
TREE_DEST=tree
BINDIR=${prefix}/bin
-MAN=tree.1
+MAN=doc/tree.1
MANDIR=${prefix}/man/man1
- OBJS=tree.o unix.o html.o xml.o hash.o color.o
+ OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o
-@@ -31,13 +31,13 @@
+ # Uncomment options below for your particular OS:
# Linux defaults:
- #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
-+#CFLAGS=-O4 -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#LDFLAGS=-s
+-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
# Uncomment for FreeBSD:
-#CFLAGS=-O2 -Wall -fomit-frame-pointer
@@ -37,7 +36,7 @@
# Uncomment for Solaris:
#CC=cc
-@@ -93,13 +93,11 @@
+@@ -94,13 +94,11 @@
if [ -f tree.o ]; then rm *.o; fi
rm -f *~
@@ -45,7 +44,7 @@
- install -d $(BINDIR)
- install -d $(MANDIR)
- if [ -e $(TREE_DEST) ]; then \
-- install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
+- install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
- fi
- install doc/$(MAN) $(MANDIR)/$(MAN)
+install: $(TREE_DEST)
--1UWUbFP1cBYEclgG--
More information about the freebsd-ports-bugs
mailing list