From owner-svn-ports-all@freebsd.org Thu Aug 18 09:31:59 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D1F71BBD0EA; Thu, 18 Aug 2016 09:31:59 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id B00A011F0; Thu, 18 Aug 2016 09:31:59 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7I9Vw3x098259; Thu, 18 Aug 2016 09:31:58 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7I9VwCX098256; Thu, 18 Aug 2016 09:31:58 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608180931.u7I9VwCX098256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 18 Aug 2016 09:31:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420392 - in head/biology/lamarc: . 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.22 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, 18 Aug 2016 09:31:59 -0000 Author: amdmi3 Date: Thu Aug 18 09:31:58 2016 New Revision: 420392 URL: https://svnweb.freebsd.org/changeset/ports/420392 Log: - Switch to options helpers - Regenerate patches with `make makepatch` - Mark WXGTK option broken: does not build: src/convErr/gc_errhandling.cpp:75:12: error: cannot initialize return object of type 'const char *' with an rvalue of type 'const wxChar *' (aka 'const wchar_t *') Added: head/biology/lamarc/files/patch-src_control_defaults.h - copied, changed from r420391, head/biology/lamarc/files/patch-src__control__defaults.h head/biology/lamarc/files/patch-src_tools_stringx.h - copied, changed from r420391, head/biology/lamarc/files/patch-src-tools_stringx.h Deleted: head/biology/lamarc/files/patch-src-tools_stringx.h head/biology/lamarc/files/patch-src__control__defaults.h Modified: head/biology/lamarc/Makefile Modified: head/biology/lamarc/Makefile ============================================================================== --- head/biology/lamarc/Makefile Thu Aug 18 09:31:33 2016 (r420391) +++ head/biology/lamarc/Makefile Thu Aug 18 09:31:58 2016 (r420392) @@ -14,8 +14,6 @@ COMMENT= Package of programs for computi LICENSE= APACHE20 -OPTIONS_DEFINE= WXGTK DOCS - WRKSRC= ${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,} GNU_CONFIGURE= yes @@ -23,16 +21,13 @@ GNU_CONFIGURE= yes PORTDOCS= * PLIST_FILES= bin/${PORTNAME} -.include +OPTIONS_DEFINE= WXGTK DOCS -.if ${PORT_OPTIONS:MWXGTK} -USE_WX= 2.8 -WX_CONF_ARGS= absolute -WX_UNICODE= yes -PLIST_FILES+= bin/lam_conv -.else -CONFIGURE_ARGS+= --disable-converter -.endif +WXGTK_USE= WX=2.8 +WXGTK_VARS= WX_CONF_ARGS=absolute +WXGTK_PLIST_FILES= bin/lam_conv +WXGTK_CONFIGURE_OFF= --disable-converter +WXGTK_BROKEN= does not build post-patch: @${REINPLACE_CMD} -e \ Copied and modified: head/biology/lamarc/files/patch-src_control_defaults.h (from r420391, head/biology/lamarc/files/patch-src__control__defaults.h) ============================================================================== --- head/biology/lamarc/files/patch-src__control__defaults.h Thu Aug 18 09:31:33 2016 (r420391, copy source) +++ head/biology/lamarc/files/patch-src_control_defaults.h Thu Aug 18 09:31:58 2016 (r420392) @@ -1,4 +1,4 @@ ---- src/control/defaults.h.orig +--- src/control/defaults.h.orig 2012-05-01 21:38:26 UTC +++ src/control/defaults.h @@ -3,6 +3,7 @@ #ifndef DEFAULTS_H Copied and modified: head/biology/lamarc/files/patch-src_tools_stringx.h (from r420391, head/biology/lamarc/files/patch-src-tools_stringx.h) ============================================================================== --- head/biology/lamarc/files/patch-src-tools_stringx.h Thu Aug 18 09:31:33 2016 (r420391, copy source) +++ head/biology/lamarc/files/patch-src_tools_stringx.h Thu Aug 18 09:31:58 2016 (r420392) @@ -1,6 +1,6 @@ ---- src/tools/stringx.h.orig 2012-12-03 12:01:34.000000000 +0100 -+++ src/tools/stringx.h 2012-12-03 12:02:30.000000000 +0100 -@@ -107,6 +107,26 @@ +--- src/tools/stringx.h.orig 2011-04-23 02:02:49 UTC ++++ src/tools/stringx.h +@@ -107,6 +107,26 @@ struct CIStringCompare : public std::bin bool ciStringEqual(const std::string& s1, const std::string& s2); @@ -27,7 +27,7 @@ //------------------------------------------------------------------------------------ template -@@ -188,26 +208,6 @@ +@@ -188,26 +208,6 @@ bool FromString(const std::string & in, DoubleVec1d StringToDoubleVecOrBarf(const std::string& in);