From owner-svn-ports-head@FreeBSD.ORG Thu Sep 12 13:53:54 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id 043A1A12; Thu, 12 Sep 2013 13:53:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) 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 E65D824AF; Thu, 12 Sep 2013 13:53:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8CDrrCr051694; Thu, 12 Sep 2013 13:53:53 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8CDrr7i051681; Thu, 12 Sep 2013 13:53:53 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201309121353.r8CDrr7i051681@svn.freebsd.org> From: Alexey Dokuchaev Date: Thu, 12 Sep 2013 13:53:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327066 - in head/games/mvdsv: . 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.14 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: Thu, 12 Sep 2013 13:53:54 -0000 Author: danfe Date: Thu Sep 12 13:53:53 2013 New Revision: 327066 URL: http://svnweb.freebsd.org/changeset/ports/327066 Log: - Unbreak the build in GCC-less environments: respect CC, pacify Clang - Fix the inner Makefile.BSD to allow -jX builds, remove MAKE_JOBS_UNSAFE Reported by: pkg-fallout Modified: head/games/mvdsv/Makefile head/games/mvdsv/files/patch-Makefile.BSD Modified: head/games/mvdsv/Makefile ============================================================================== --- head/games/mvdsv/Makefile Thu Sep 12 13:49:32 2013 (r327065) +++ head/games/mvdsv/Makefile Thu Sep 12 13:53:53 2013 (r327066) @@ -17,9 +17,9 @@ USE_ZIP= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= ${OPSYS} ${ARCH:C/.*(64)/\1/} +MAKE_ARGS= CC="${CC}" ALL_TARGET= ${PORTNAME} WRKSRC= ${WRKDIR}/mvdsv -MAKE_JOBS_UNSAFE= yes PLIST_FILES= bin/${PORTNAME} @@ -45,6 +45,9 @@ MAKE_ARGS+= -DNOKQUEUE MAKE_ARGS+= -DWITHOUT_X86_ASM .endif +post-patch: + @${REINPLACE_CMD} -e 's,^inline ,,' ${WRKSRC}/source/sv_sys_unix.c + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin Modified: head/games/mvdsv/files/patch-Makefile.BSD ============================================================================== --- head/games/mvdsv/files/patch-Makefile.BSD Thu Sep 12 13:49:32 2013 (r327065) +++ head/games/mvdsv/files/patch-Makefile.BSD Thu Sep 12 13:53:53 2013 (r327066) @@ -18,3 +18,16 @@ QWDTOOLS_ASM_OBJS = \ ${SV_DIR}/bothtoolsa.o .endif +@@ -129,10 +129,10 @@ + ############################################################################# + + .c.o: +- ${CC} ${DO_CFLAGS} -c $< -o $*.o ++ ${CC} ${DO_CFLAGS} -c $< -o $@ + + .s.o: +- ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o ++ ${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@ + + all: mvdsv qwdtools + ${STRIP} ${STRIP_FLAGS} mvdsv qwdtools