From owner-svn-ports-head@freebsd.org Wed Sep 2 10:10:07 2015 Return-Path: Delivered-To: svn-ports-head@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 F171B9C9C62; Wed, 2 Sep 2015 10:10:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.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 C97ABC1B; Wed, 2 Sep 2015 10:10:07 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t82AA7bu034349; Wed, 2 Sep 2015 10:10:07 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t82AA7nd033985; Wed, 2 Sep 2015 10:10:07 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201509021010.t82AA7nd033985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 2 Sep 2015 10:10:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395828 - in head/biology/babel: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 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: Wed, 02 Sep 2015 10:10:08 -0000 Author: danfe Date: Wed Sep 2 10:10:06 2015 New Revision: 395828 URL: https://svnweb.freebsd.org/changeset/ports/395828 Log: Unbreak the build on PowerPC (at least) by always using va_copy() macro for copying variable argument lists, not just on AMD64. Modified: head/biology/babel/Makefile head/biology/babel/files/patch-block.c Modified: head/biology/babel/Makefile ============================================================================== --- head/biology/babel/Makefile Wed Sep 2 09:54:52 2015 (r395827) +++ head/biology/babel/Makefile Wed Sep 2 10:10:06 2015 (r395828) @@ -16,14 +16,12 @@ CONFLICTS_INSTALL= openbabel-* USES= tar:Z MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" -PLIST_FILES+= bin/babel libexec/babel +PLIST_FILES= bin/babel libexec/babel PORTDATA= element.lis new.lis quanta.lis types.lis PORTDOCS= README.1ST OPTIONS_DEFINE= DOCS -BROKEN_powerpc= Does not compile on powerpc - post-build: ${SED} -e 's%@PREFIX@%${PREFIX}%g' \ ${FILESDIR}/babel.sh >${WRKSRC}/babel.sh Modified: head/biology/babel/files/patch-block.c ============================================================================== --- head/biology/babel/files/patch-block.c Wed Sep 2 09:54:52 2015 (r395827) +++ head/biology/babel/files/patch-block.c Wed Sep 2 10:10:06 2015 (r395828) @@ -1,39 +1,28 @@ --- block.c.orig Tue Jan 21 16:52:32 1997 +++ block.c Sun Feb 1 22:56:41 2004 -@@ -7,6 +7,10 @@ +@@ -7,6 +7,7 @@ */ #include "bbltyp.h" -+#include -+#if __FreeBSD_version > 500000 +#include -+#endif /* the routine that does all the work */ static int block__doalloc(int, block_ptr *, const char *, va_list); -@@ -99,7 +103,11 @@ +@@ -99,7 +100,7 @@ block__doalloc(int clear, block_ptr *han void *array; /* calc how much space we are gonna need */ -+ #if __FreeBSD_version > 500000 && defined(__amd64__) +- ap = initap; + va_copy(ap, initap); -+ #else - ap = initap; -+ #endif size = 0; for(i=0; types[i] != '\0'; i++) { -@@ -115,8 +123,12 @@ - +@@ -116,7 +117,7 @@ block__doalloc(int clear, block_ptr *han /* set up the ptrs if we can alloc the memory */ if(*handle != NULL) -- { -+ { -+ #if __FreeBSD_version > 500000 && defined(__amd64__) + { +- ap = initap; + va_copy(ap, initap); -+ #else - ap = initap; -+ #endif ptr = 0; for(i=0; types[i] != '\0'; i++) {