From owner-svn-ports-all@FreeBSD.ORG Fri Oct 11 20:46:30 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6C84A835; Fri, 11 Oct 2013 20:46:30 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 595CC22CC; Fri, 11 Oct 2013 20:46:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BKkUnl004377; Fri, 11 Oct 2013 20:46:30 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BKkUlv004374; Fri, 11 Oct 2013 20:46:30 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201310112046.r9BKkUlv004374@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Fri, 11 Oct 2013 20:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330101 - in head/misc/sls: . 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, 11 Oct 2013 20:46:30 -0000 Author: danilo Date: Fri Oct 11 20:46:29 2013 New Revision: 330101 URL: http://svnweb.freebsd.org/changeset/ports/330101 Log: - Fix build with clang [1] - Add stage support PR: ports/182888 Submitted by: Stefan `Sec` Zehl (maintainer) [1] Approved by: wg/culot (mentors, implicit) Added: head/misc/sls/files/patch-sls.c (contents, props changed) Deleted: head/misc/sls/files/patch-aa Modified: head/misc/sls/Makefile Modified: head/misc/sls/Makefile ============================================================================== --- head/misc/sls/Makefile Fri Oct 11 20:20:59 2013 (r330100) +++ head/misc/sls/Makefile Fri Oct 11 20:46:29 2013 (r330101) @@ -13,8 +13,16 @@ COMMENT= List information about file(s) WRKSRC= ${WRKDIR}/sls -MAN1= sls.1 -PLIST_FILES= bin/sls +PLIST_FILES= bin/sls \ + man/man1/sls.1.gz + +ALL_TARGET= sls + +post-patch: + @${REINPLACE_CMD} -e 's|CFLAGS|#&|' ${WRKSRC}/Makefile + +do-install: + ${CP} ${WRKSRC}/sls ${STAGEDIR}${PREFIX}/bin + ${CP} ${WRKSRC}/sls.1 ${STAGEDIR}${PREFIX}/man/man1 -NO_STAGE= yes .include Added: head/misc/sls/files/patch-sls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/sls/files/patch-sls.c Fri Oct 11 20:46:29 2013 (r330101) @@ -0,0 +1,79 @@ +--- ./sls.c.orig 2013-10-11 17:05:37.000000000 -0300 ++++ ./sls.c 2013-10-11 17:06:06.000000000 -0300 +@@ -24,7 +24,10 @@ + #include + #include + #include +-#include ++#include ++#include ++#include ++#include + + #define ISEXEC(m) (m & (S_IEXEC|(S_IEXEC>>3)|(S_IEXEC>>6))) + #define MAXUIDS 200 /* max #of user names from passwd file */ +@@ -86,12 +89,14 @@ + static int sortsfile(), sortfile(); + static time_t getsixmosago(); /* for emulating 'ls' date silliness */ + +-extern char *getenv(), *malloc(), *realloc(); +-extern int errno; +-extern time_t time(); +- ++void dirread (char *dirname); ++void dofile (register char *fname, int cmdarg); ++void selectfs (register char *fname, register struct stat *psbuf); ++void selectf (register char *fname); ++void display (SFILESTAT *pf); + /******************************************************************************/ + ++int + main (ac, av) + int ac; + char *av[]; +@@ -211,6 +216,7 @@ + + /******************************************************************************/ + ++void + dofile (fname, cmdarg) + register char *fname; /* name of file to stat and list */ + int cmdarg; /* =1 if fname was command line arg */ +@@ -267,11 +273,12 @@ + + /******************************************************************************/ + ++void + dirread (dirname) + char *dirname; + { /* read a directory and everything under it that's on the same device */ + register DIR *dirp; /* ptr to directory list */ +- register struct direct *dentp; /* ptr to directory entry */ ++ register struct dirent *dentp; /* ptr to directory entry */ + register char *pfname; + register int len; + char fname[512]; /* maximum pathname length */ +@@ -314,6 +321,7 @@ + + /******************************************************************************/ + ++void + selectf (fname) + register char *fname; + { /* allocate space for this file name for sorting */ +@@ -356,6 +364,7 @@ + + /******************************************************************************/ + ++void + selectfs (fname, psbuf) + register char *fname; + register struct stat *psbuf; +@@ -594,6 +603,7 @@ + + /******************************************************************************/ + ++void + display (pf) + SFILESTAT *pf; + { /* display info about a file */