From owner-svn-ports-all@FreeBSD.ORG Sun Jan 12 19:07:29 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 6E8505D5; Sun, 12 Jan 2014 19:07:29 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3FAB418D0; Sun, 12 Jan 2014 19:07:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0CJ7Tb7064101; Sun, 12 Jan 2014 19:07:29 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0CJ7SPB064099; Sun, 12 Jan 2014 19:07:28 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201401121907.s0CJ7SPB064099@svn.freebsd.org> From: Thomas Zander Date: Sun, 12 Jan 2014 19:07:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339532 - in head/biology/mapm3: . 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.17 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: Sun, 12 Jan 2014 19:07:29 -0000 Author: riggs Date: Sun Jan 12 19:07:28 2014 New Revision: 339532 URL: http://svnweb.freebsd.org/changeset/ports/339532 Log: - Fix build with clang - Stage support PR: ports/185655 Submitted by: Tassilo Philipp (maintainer) Approved by: thierry (mentor) Modified: head/biology/mapm3/Makefile (contents, props changed) head/biology/mapm3/files/patch-Makefile (contents, props changed) Modified: head/biology/mapm3/Makefile ============================================================================== --- head/biology/mapm3/Makefile Sun Jan 12 19:01:55 2014 (r339531) +++ head/biology/mapm3/Makefile Sun Jan 12 19:07:28 2014 (r339532) @@ -14,11 +14,15 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= tphilipp@potion-studios.com COMMENT= Constructs linkage maps of markers segregating in experimental crosses +USE_CSTD= gnu89 +CFLAGS+= -Wno-return-type NO_WRKSUBDIR= yes MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes post-patch: ${CP} ${WRKSRC}/sun/* ${WRKSRC} +pre-install: + @${REINPLACE_CMD} -e 's|/usr/local|${STAGEDIR}${PREFIX}|' ${WRKSRC}/Makefile + .include Modified: head/biology/mapm3/files/patch-Makefile ============================================================================== --- head/biology/mapm3/files/patch-Makefile Sun Jan 12 19:01:55 2014 (r339531) +++ head/biology/mapm3/files/patch-Makefile Sun Jan 12 19:07:28 2014 (r339532) @@ -1,5 +1,5 @@ ---- Makefile.orig 2008-04-04 20:05:29.000000000 +0000 -+++ Makefile 2008-04-04 19:51:04.000000000 +0000 +--- Makefile.orig 1993-02-10 07:12:59.000000000 +0100 ++++ Makefile 2014-01-12 18:47:03.605582463 +0100 @@ -16,6 +16,7 @@ #### #### For Macs with A/UX, use: SYS= -D_SYS_AUX @@ -17,15 +17,6 @@ #### Next define the system libraries to link with Mapmaker. On SunOS, Ultrix #### and other vanilla-ish BSD systems, the correct setting is: -@@ -46,7 +47,7 @@ - #### Be sure that you have write permission to this directory (e.g. you may - #### need to be logged in as "root" to install MAPMAKER in some directories). - --DIR= /usr/local/bin -+DIR= ${PREFIX}/bin - - #### RDLN below refers to the GNU Readline library, which can (optionally) be - #### used by MAPMAKER to provide interactive command line editing. See the @@ -70,9 +71,11 @@ #### (see the end of readline/readline.c). Readline will not compile on #### A/UX without using GCC instead of A/UX's cc (because it needs alloca). @@ -47,7 +38,7 @@ -COMPILE= cc -LINKALL= cc -+COMPILE= ${CC} ++COMPILE= ${CC} ${CFLAGS} +LINKALL= ${CC} LINKLIB= ld -r DELETE= rm -f