From owner-svn-ports-head@FreeBSD.ORG Sat Feb 28 02:24:17 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37C1AA4E; Sat, 28 Feb 2015 02:24:17 +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 08BF5EA2; Sat, 28 Feb 2015 02:24:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1S2OGvM057880; Sat, 28 Feb 2015 02:24:16 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1S2OGXC057879; Sat, 28 Feb 2015 02:24:16 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502280224.t1S2OGXC057879@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 28 Feb 2015 02:24:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380131 - head/emulators/gngeo 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.18-1 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: Sat, 28 Feb 2015 02:24:17 -0000 Author: amdmi3 Date: Sat Feb 28 02:24:16 2015 New Revision: 380131 URL: https://svnweb.freebsd.org/changeset/ports/380131 QAT: https://qat.redports.org/buildarchive/r380131/ Log: - Simplify MASTER_SITES - Remove unneeded MAN1 - Don't show pkg-message from Makefile - Disable and mark broken RAZE and STAR options, as they fail to link - Fix configure to properly detect amd64 arch - When compiling with clang, drop compiler flags not supported by it - Disable -malign-double on amd64, gcc says it makes no sense Approved by: bapt MFH: 2015Q1 Modified: head/emulators/gngeo/Makefile Modified: head/emulators/gngeo/Makefile ============================================================================== --- head/emulators/gngeo/Makefile Sat Feb 28 01:37:04 2015 (r380130) +++ head/emulators/gngeo/Makefile Sat Feb 28 02:24:16 2015 (r380131) @@ -5,13 +5,12 @@ PORTNAME= gngeo PORTVERSION= 0.8 PORTREVISION= 2 CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GOOGLE_CODE/${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= NeoGeo emulator -USES= gmake +USES= compiler:features gmake USE_SDL= image sdl USE_GL= yes @@ -27,11 +26,10 @@ MAKE_ARGS+= CC_FOR_BUILD=${CC} SUB_FILES= pkg-message OPTIONS_DEFINE_i386= ASM RAZE STAR -OPTIONS_DEFAULT_i386= ASM RAZE STAR -RAZE_DESC= Use Raze as z80 emulator -STAR_DESC= Use Starscream as 68k emulator +OPTIONS_DEFAULT_i386= ASM +RAZE_DESC= Use Raze as z80 emulator (broken) +STAR_DESC= Use Starscream as 68k emulator (broken) -MAN1= gngeo.1 .include .if ${PORT_OPTIONS:MI386ASM} || ${PORT_OPTIONS:MRAZE} || \ @@ -47,17 +45,29 @@ CONFIGURE_ARGS+= --disable-i386asm .if ${PORT_OPTIONS:MRAZE} CONFIGURE_ARGS+= --with-z80core=raze +BROKEN= fails to link .else CONFIGURE_ARGS+= --with-z80core=mamez80 .endif .if ${PORT_OPTIONS:MSTAR} CONFIGURE_ARGS+= --with-m68kcore=starscream +BROKEN= fails to link .else CONFIGURE_ARGS+= --with-m68kcore=gen68k .endif post-patch: + @${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure +.if ${ARCH} == "amd64" + @${REINPLACE_CMD} -e 's|-malign-double||' ${WRKSRC}/configure +.endif +.if ${COMPILER_TYPE} == "clang" + @${REINPLACE_CMD} -e 's|-frerun-loop-opt||; \ + s|-falign-jumps=2||; s|-falign-loops=2||; \ + s|-fschedule-insns2||; s|-malign-double||' \ + ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} \ ${WRKSRC}/src/generator68k/Makefile.in @@ -65,6 +75,5 @@ post-patch: post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample_gngeorc ${STAGEDIR}${EXAMPLESDIR}/gngeorc - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include