From owner-svn-ports-all@FreeBSD.ORG Sat May 31 10:48:32 2014 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 ESMTPS id 76891B9; Sat, 31 May 2014 10:48:32 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 614B92D61; Sat, 31 May 2014 10:48:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4VAmVix046626; Sat, 31 May 2014 10:48:31 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4VAmVpS046622; Sat, 31 May 2014 10:48:31 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201405311048.s4VAmVpS046622@svn.freebsd.org> From: Dmitry Sivachenko Date: Sat, 31 May 2014 10:48:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355954 - in head/net/haproxy-devel: . 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.18 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: Sat, 31 May 2014 10:48:32 -0000 Author: demon Date: Sat May 31 10:48:30 2014 New Revision: 355954 URL: http://svnweb.freebsd.org/changeset/ports/355954 QAT: https://qat.redports.org/buildarchive/r355954/ Log: Update to -dev26. Added: head/net/haproxy-devel/files/patch-fix-uint (contents, props changed) Modified: head/net/haproxy-devel/Makefile head/net/haproxy-devel/distinfo Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Sat May 31 10:32:15 2014 (r355953) +++ head/net/haproxy-devel/Makefile Sat May 31 10:48:30 2014 (r355954) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.5-dev25 +DISTVERSION= 1.5-dev26 CATEGORIES= net MASTER_SITES= http://haproxy.1wt.eu/download/1.5/src/devel/ PKGNAMESUFFIX= -devel Modified: head/net/haproxy-devel/distinfo ============================================================================== --- head/net/haproxy-devel/distinfo Sat May 31 10:32:15 2014 (r355953) +++ head/net/haproxy-devel/distinfo Sat May 31 10:48:30 2014 (r355954) @@ -1,2 +1,2 @@ -SHA256 (haproxy-1.5-dev25.tar.gz) = c98d6ae13233815f1c26acfd2df50e85fedf0673f01f149b3211da17d6309c4b -SIZE (haproxy-1.5-dev25.tar.gz) = 1296917 +SHA256 (haproxy-1.5-dev26.tar.gz) = fb1557bebb5843c572f81f69d8f8e4ec952963982b2c945989caa471e5b036ae +SIZE (haproxy-1.5-dev26.tar.gz) = 1308611 Added: head/net/haproxy-devel/files/patch-fix-uint ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/haproxy-devel/files/patch-fix-uint Sat May 31 10:48:30 2014 (r355954) @@ -0,0 +1,66 @@ +From: Willy Tarreau +Date: Wed, 28 May 2014 21:05:07 +0000 (+0200) +Subject: BUILD: don't use type "uint" which is not portable +X-Git-Url: http://haproxy.1wt.eu:81/git?p=haproxy.git;a=commitdiff_plain;h=c874653bb45b101f50ea710576c7b47766874d1c;hp=2e85840266f056d7a51e885b03b50963209d7111 + +BUILD: don't use type "uint" which is not portable + +Dmitry Sivachenko reported that "uint" doesn't build on FreeBSD 10. +On Linux it's defined in sys/types.h and indicated as "old". Just +get rid of the very few occurrences. +--- + +diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c +index c686de1..fc927bd 100644 +--- contrib/halog/halog.c ++++ contrib/halog/halog.c +@@ -694,7 +694,7 @@ int main(int argc, char **argv) + struct eb32_node *n; + struct url_stat *ustat = NULL; + int val, test; +- uint uval; ++ unsigned int uval; + int filter_acc_delay = 0, filter_acc_count = 0; + int filter_time_resp = 0; + int filt_http_status_low = 0, filt_http_status_high = 0; +diff --git a/include/common/regex.h b/include/common/regex.h +index 63689af..2e26b67 100644 +--- include/common/regex.h ++++ include/common/regex.h +@@ -79,7 +79,7 @@ extern regmatch_t pmatch[MAX_MATCH]; + * The function return 1 is succes case, else return 0 and err is filled. + */ + int regex_comp(const char *str, struct my_regex *regex, int cs, int cap, char **err); +-int exp_replace(char *dst, uint dst_size, char *src, const char *str, const regmatch_t *matches); ++int exp_replace(char *dst, unsigned int dst_size, char *src, const char *str, const regmatch_t *matches); + const char *check_replace_string(const char *str); + const char *chain_regex(struct hdr_exp **head, const regex_t *preg, + int action, const char *replace, void *cond); +diff --git a/src/regex.c b/src/regex.c +index b081477..a31bcda 100644 +--- src/regex.c ++++ src/regex.c +@@ -22,7 +22,7 @@ + /* regex trash buffer used by various regex tests */ + regmatch_t pmatch[MAX_MATCH]; /* rm_so, rm_eo for regular expressions */ + +-int exp_replace(char *dst, uint dst_size, char *src, const char *str, const regmatch_t *matches) ++int exp_replace(char *dst, unsigned int dst_size, char *src, const char *str, const regmatch_t *matches) + { + char *old_dst = dst; + char* dst_end = dst + dst_size; +diff --git a/src/standard.c b/src/standard.c +index 9cec295..06176d7 100644 +--- src/standard.c ++++ src/standard.c +@@ -2416,8 +2416,8 @@ char *env_expand(char *in) + const char *strnistr(const char *str1, int len_str1, const char *str2, int len_str2) + { + char *pptr, *sptr, *start; +- uint slen, plen; +- uint tmp1, tmp2; ++ unsigned int slen, plen; ++ unsigned int tmp1, tmp2; + + if (str1 == NULL || len_str1 == 0) // search pattern into an empty string => search is not found + return NULL;