From owner-svn-ports-all@FreeBSD.ORG Fri Nov 2 17:20:56 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48BA8B14; Fri, 2 Nov 2012 17:20:56 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2718A8FC15; Fri, 2 Nov 2012 17:20:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA2HKulw067524; Fri, 2 Nov 2012 17:20:56 GMT (envelope-from rm@svn.freebsd.org) Received: (from rm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2HKtoD067519; Fri, 2 Nov 2012 17:20:55 GMT (envelope-from rm@svn.freebsd.org) Message-Id: <201211021720.qA2HKtoD067519@svn.freebsd.org> From: Ruslan Mahmatkhanov Date: Fri, 2 Nov 2012 17:20:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306874 - in head/sysutils/tree: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2012 17:20:56 -0000 Author: rm Date: Fri Nov 2 17:20:55 2012 New Revision: 306874 URL: http://svn.freebsd.org/changeset/ports/306874 Log: - update to 1.6.0 - pass maintainership to submitter while here - install license via license framework, not manually - convert to optionsng - remove deprecated Author field in pkg-descr - whitespace fixes in pkg-descr PR: 171723 Submitted by: Guy Brand Feature safe: yes Deleted: head/sysutils/tree/files/patch-tree.c Modified: head/sysutils/tree/Makefile head/sysutils/tree/distinfo head/sysutils/tree/files/patch-Makefile (contents, props changed) head/sysutils/tree/pkg-descr Modified: head/sysutils/tree/Makefile ============================================================================== --- head/sysutils/tree/Makefile Fri Nov 2 17:17:11 2012 (r306873) +++ head/sysutils/tree/Makefile Fri Nov 2 17:20:55 2012 (r306874) @@ -2,24 +2,29 @@ # $FreeBSD$ PORTNAME= tree -PORTVERSION= 1.5.3 +PORTVERSION= 1.6.0 CATEGORIES= sysutils MASTER_SITES= ftp://mama.indstate.edu/linux/tree/ \ CENKES EXTRACT_SUFX= .tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gb@unistra.fr COMMENT= Display a tree-view of directories with optional color or HTML output +LICENSE= GPLv2 + MAKE_ENV+= MKDIR="${MKDIR}" +USE_GMAKE= yes MAN1= tree.1 PLIST_FILES= bin/tree -PORTDOCS= CHANGES LICENSE README +PORTDOCS= CHANGES README + +.include post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} .endif Modified: head/sysutils/tree/distinfo ============================================================================== --- head/sysutils/tree/distinfo Fri Nov 2 17:17:11 2012 (r306873) +++ head/sysutils/tree/distinfo Fri Nov 2 17:20:55 2012 (r306874) @@ -1,2 +1,2 @@ -SHA256 (tree-1.5.3.tgz) = 1128755ea9455615188212bb04319cf103114fb78f687aa887ce29ef184ffb8d -SIZE (tree-1.5.3.tgz) = 34494 +SHA256 (tree-1.6.0.tgz) = 4dc470a74880338b01da41701d8db90d0fb178877e526d385931a007d68d7591 +SIZE (tree-1.6.0.tgz) = 42706 Modified: head/sysutils/tree/files/patch-Makefile ============================================================================== --- head/sysutils/tree/files/patch-Makefile Fri Nov 2 17:17:11 2012 (r306873) +++ head/sysutils/tree/files/patch-Makefile Fri Nov 2 17:20:55 2012 (r306874) @@ -1,8 +1,8 @@ ---- ./Makefile.orig 2010-01-14 14:04:12.000000000 +0100 -+++ ./Makefile 2010-01-14 14:08:21.000000000 +0100 -@@ -6,27 +6,27 @@ - # warranties, including, without limitation, the implied warranties - # of merchant-ability and fitness for a particular purpose. +--- ./Makefile.orig 2011-06-24 16:25:27.000000000 +0200 ++++ ./Makefile 2012-09-17 13:38:44.926563330 +0200 +@@ -16,14 +16,14 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -prefix = /usr +prefix = ${PREFIX} @@ -10,32 +10,34 @@ -CC=gcc +CC?=gcc - VERSION=1.5.3 + VERSION=1.6.0 TREE_DEST=tree BINDIR=${prefix}/bin -MAN=tree.1 -+MAN=man/tree.1 ++MAN=doc/tree.1 MANDIR=${prefix}/man/man1 + OBJS=tree.o unix.o html.o xml.o hash.o color.o - # Uncomment options below for your particular OS: +@@ -31,13 +31,13 @@ # 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=-O2 -Wall -fomit-frame-pointer -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #LDFLAGS=-s + #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 # Uncomment for FreeBSD: -#CFLAGS=-O2 -Wall -fomit-frame-pointer -#LDFLAGS=-s --#XOBJS=strverscmp.o +-#OBJS+=strverscmp.o +CFLAGS?=-O2 -Wall -fomit-frame-pointer +LDFLAGS?=-s -+XOBJS?=strverscmp.o ++OBJS+=strverscmp.o # Uncomment for Solaris: #CC=cc -@@ -82,13 +82,11 @@ +@@ -93,13 +93,11 @@ if [ -f tree.o ]; then rm *.o; fi rm -f *~ @@ -45,7 +47,7 @@ - if [ -e $(TREE_DEST) ]; then \ - install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \ - fi -- install man/$(MAN) $(MANDIR)/$(MAN) +- install doc/$(MAN) $(MANDIR)/$(MAN) +install: $(TREE_DEST) + @$(MKDIR) $(BINDIR) + @$(MKDIR) $(MANDIR) Modified: head/sysutils/tree/pkg-descr ============================================================================== --- head/sysutils/tree/pkg-descr Fri Nov 2 17:17:11 2012 (r306873) +++ head/sysutils/tree/pkg-descr Fri Nov 2 17:20:55 2012 (r306874) @@ -1,6 +1,5 @@ -Tree is a simple utility that displays a tree-view of directories -and files. It has options to use ANSI color escape-sequences or ASCII +Tree is a simple utility that displays a tree-view of directories +and files. It has options to use ANSI color escape-sequences or ASCII graphic characters, and can also output in HTML format. -Author: Steve Baker WWW: http://mama.indstate.edu/users/ice/tree/