From owner-svn-ports-all@FreeBSD.ORG Thu Sep 11 09:34:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8A6EF76; Thu, 11 Sep 2014 09:34:15 +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 98E6796A; Thu, 11 Sep 2014 09:34:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8B9YFBi023532; Thu, 11 Sep 2014 09:34:15 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8B9YFnn023529; Thu, 11 Sep 2014 09:34:15 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201409110934.s8B9YFnn023529@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Thu, 11 Sep 2014 09:34:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367915 - in head/math/scilab-toolbox-swt: . 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-1 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: Thu, 11 Sep 2014 09:34:15 -0000 Author: makc Date: Thu Sep 11 09:34:14 2014 New Revision: 367915 URL: http://svnweb.freebsd.org/changeset/ports/367915 QAT: https://qat.redports.org/buildarchive/r367915/ Log: math/scilab-toolbox-swt: - Fix build with clang and drop USE_GCC Added: head/math/scilab-toolbox-swt/files/patch-clang (contents, props changed) Modified: head/math/scilab-toolbox-swt/Makefile Modified: head/math/scilab-toolbox-swt/Makefile ============================================================================== --- head/math/scilab-toolbox-swt/Makefile Thu Sep 11 09:29:09 2014 (r367914) +++ head/math/scilab-toolbox-swt/Makefile Thu Sep 11 09:34:14 2014 (r367915) @@ -2,7 +2,7 @@ PORTNAME= swt PORTVERSION= 0.1.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= http://atoms.scilab.org/toolboxes/swt/${PORTVERSION}/files/ PKGNAMEPREFIX= scilab-toolbox- @@ -14,8 +14,6 @@ COMMENT= Scilab 1-D and 2-D Wavelet Tool BUILD_DEPENDS= ${SCILAB_CMD}:${PORTSDIR}/math/scilab RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GCC= any - SCILAB_CMD= ${LOCALBASE}/bin/scilab-adv-cli SCILAB_ARGS= -noatomsautoload -nb -nouserstartup MAKE_ENV= LC_ALL="C" SCI_JAVA_ENABLE_HEADLESS=1 SCI_DISABLE_TK=1 Added: head/math/scilab-toolbox-swt/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/scilab-toolbox-swt/files/patch-clang Thu Sep 11 09:34:14 2014 (r367915) @@ -0,0 +1,118 @@ +--- ./sci_gateway/c/swt_common.h.orig ++++ ./sci_gateway/c/swt_common.h +@@ -323,10 +323,10 @@ + //extern int is_scalar (int row, int col); + //extern int is_vector (int row, int col); + //extern int is_matrix (int row, int col); +-extern void void_check (int number, int *type); +-extern void scalar_check (int number, int *type); +-extern void vector_check (int number, int *type); +-extern void matrix_check (int number, int *type); ++extern int void_check (int number, int *type); ++extern int scalar_check (int number, int *type); ++extern int vector_check (int number, int *type); ++extern int matrix_check (int number, int *type); + extern void real_or_complex (int number, int *type); + extern int sci_matrix_vector_real (int number); + extern int sci_matrix_vector_complex (int number); +@@ -341,8 +341,8 @@ + extern int scalar_string_check(char *l, char c); + extern int length_check(int number, int leng); + extern int vector_length_check(int number1, int number2); +-extern void vector_length_compare(int number, int leng, int *res); +-extern void matrix_length_compare(int number, int rowLeng, ++extern int vector_length_compare(int number, int leng, int *res); ++extern int matrix_length_compare(int number, int rowLeng, + int colLeng, int *resRow, + int *resCol); + extern int matrix_length_check (int number1, int number2); +--- ./sci_gateway/c/validate.c.orig ++++ ./sci_gateway/c/validate.c +@@ -42,7 +42,7 @@ + /*------------------------------------------- + * Dimension Checking + *-----------------------------------------*/ +-void void_check (int number, int *type) ++int void_check (int number, int *type) + { + int row, col; + GetMatrixdims(number,&row,&col); +@@ -50,10 +50,10 @@ + *type = 1; + else + *type = 0; +- //return; ++ return 1; + } + +-void scalar_check (int number, int *type) ++int scalar_check (int number, int *type) + { + int row, col; + GetMatrixdims(number,&row,&col); +@@ -61,10 +61,10 @@ + *type = 1; + else + *type = 0; +- //return; ++ return 1; + } + +-void vector_check (int number, int *type) ++int vector_check (int number, int *type) + { + int row, col; + GetMatrixdims(number,&row,&col); +@@ -74,10 +74,10 @@ + *type = 1; + else + *type = 0; +- //return; ++ return 1; + } + +-void matrix_check (int number, int *type) ++int matrix_check (int number, int *type) + { + int row, col; + GetMatrixdims(number,&row,&col); +@@ -85,7 +85,7 @@ + *type = 1; + else + *type = 0; +- //return; ++ return 1; + } + + void real_or_complex (int number, int *type) +@@ -234,7 +234,7 @@ + return 0; + } + +-void vector_length_compare(int number, int leng, int *res) ++int vector_length_compare(int number, int leng, int *res) + { + int row, col; + GetMatrixdims(number,&row,&col); +@@ -244,10 +244,10 @@ + *res = 1; + else + *res = -1; +- return; ++ return 1; + } + +-void matrix_length_compare(int number, int rowLeng, int colLeng, ++int matrix_length_compare(int number, int rowLeng, int colLeng, + int *resRow, int *resCol) + { + int row, col; +@@ -264,7 +264,7 @@ + *resCol = 1; + else + *resCol = -1; +- return; ++ return 1; + } + + int