From owner-svn-ports-head@freebsd.org Sun Oct 13 13:10:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4CB0BF8C3A; Sun, 13 Oct 2019 13:10:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46rhrk1NNPz3PqG; Sun, 13 Oct 2019 13:10:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 13BF71D4A3; Sun, 13 Oct 2019 13:10:46 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9DDAjSX063960; Sun, 13 Oct 2019 13:10:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9DDAjGx063959; Sun, 13 Oct 2019 13:10:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910131310.x9DDAjGx063959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 Oct 2019 13:10:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514391 - head/devel/cvswrap/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/devel/cvswrap/files X-SVN-Commit-Revision: 514391 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Oct 2019 13:10:46 -0000 Author: jbeich Date: Sun Oct 13 13:10:45 2019 New Revision: 514391 URL: https://svnweb.freebsd.org/changeset/ports/514391 Log: devel/cvswrap: drop FreeBSD < 7.2 support Modified: head/devel/cvswrap/files/patch-cvswrap.c (contents, props changed) Modified: head/devel/cvswrap/files/patch-cvswrap.c ============================================================================== --- head/devel/cvswrap/files/patch-cvswrap.c Sun Oct 13 13:07:28 2019 (r514390) +++ head/devel/cvswrap/files/patch-cvswrap.c Sun Oct 13 13:10:45 2019 (r514391) @@ -1,33 +1,27 @@ --- cvswrap.c.orig 2009-02-24 15:40:55.000000000 +0100 +++ cvswrap.c 2009-02-24 15:38:24.000000000 +0100 -@@ -94,7 +94,12 @@ +@@ -94,7 +94,9 @@ char **cvsrootp); static void slashfix(char *); static int strings_have_line(char * const *strings, const char *line); -+#if defined(__FreeBSD__) -+#include -+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 ++#if !defined(__FreeBSD__) static char * strndup(const char *str, size_t len); +#endif -+#endif static int timeval_diff(const struct timeval *tv1, const struct timeval *tv2); static int writebuf(int fd, const char *buf, size_t len); -@@ -324,6 +329,9 @@ +@@ -324,6 +329,7 @@ return (0); } -+#if defined(__FreeBSD__) -+#include -+#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 ++#if !defined(__FreeBSD__) /* * return: a copy of "len" bytes from byte string "str" and NULL terminate. */ -@@ -340,6 +348,8 @@ +@@ -340,6 +348,7 @@ *(ret + len) = '\0'; return (ret); } -+#endif +#endif /*