From owner-svn-ports-head@freebsd.org Tue Feb 9 00:26:25 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEF29547310; Tue, 9 Feb 2021 00:26:25 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZNwx4ZPbz3Ntg; Tue, 9 Feb 2021 00:26:25 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FB69210A6; Tue, 9 Feb 2021 00:26:25 +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 1190QP6I057056; Tue, 9 Feb 2021 00:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1190QP7v057054; Tue, 9 Feb 2021 00:26:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <202102090026.1190QP7v057054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 9 Feb 2021 00:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564747 - in head/emulators/pcem: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/emulators/pcem: . files X-SVN-Commit-Revision: 564747 X-SVN-Commit-Repository: ports 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.34 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: Tue, 09 Feb 2021 00:26:25 -0000 Author: amdmi3 Date: Tue Feb 9 00:26:24 2021 New Revision: 564747 URL: https://svnweb.freebsd.org/changeset/ports/564747 Log: Cleanup and simplify emulators/pcem - Add LICENSE_FILE - Remove bogus PATCHDIR - Use WX_CONFIG - Switch to USES=localbase - Simplify configure patch PR: 253033 Submitted by: amdmi3 Approved by: maintainer timeout (darkfm@vera.com.uy, 2 weeks) Modified: head/emulators/pcem/Makefile head/emulators/pcem/files/patch-configure.ac Modified: head/emulators/pcem/Makefile ============================================================================== --- head/emulators/pcem/Makefile Tue Feb 9 00:11:34 2021 (r564746) +++ head/emulators/pcem/Makefile Tue Feb 9 00:26:24 2021 (r564747) @@ -11,16 +11,16 @@ MAINTAINER= darkfm@vera.com.uy COMMENT= PC/PC-Compatible low-level emulator striving for accuracy LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -USES= autoreconf compiler gl gmake openal pkgconfig sdl zip +USES= autoreconf compiler gl gmake localbase:ldflags openal pkgconfig sdl zip USE_GL= gl USE_SDL= sdl2 USE_WX= 3.0 WRKSRC= ${WRKDIR}/pcem_emulator-pcem-faf5d6423060/ -PATCHDIR=files PLIST_FILES= bin/pcem -CONFIGURE_ARGS= --enable-release-build --with-wx-config=wxgtk3u-3.0-config +CONFIGURE_ARGS= --enable-release-build --with-wx-config="${WX_CONFIG}" GNU_CONFIGURE= yes ONLY_FOR_ARCHS= amd64 Modified: head/emulators/pcem/files/patch-configure.ac ============================================================================== --- head/emulators/pcem/files/patch-configure.ac Tue Feb 9 00:11:34 2021 (r564746) +++ head/emulators/pcem/files/patch-configure.ac Tue Feb 9 00:26:24 2021 (r564747) @@ -1,32 +1,11 @@ --- configure.ac.orig 2019-04-17 19:37:48 UTC +++ configure.ac -@@ -64,6 +64,10 @@ case "${host_cpu}" in +@@ -60,7 +60,7 @@ case "${host_cpu}" in + CPU=i386 + AC_MSG_RESULT(${host_cpu}) + ;; +- x86_64) ++ x86_64|amd64) CPU=x86_64 AC_MSG_RESULT(${host_cpu}) ;; -+ amd64) -+ CPU=x86_64 -+ AC_MSG_RESULT(${host_cpu}) -+ ;; - *) - AC_MSG_ERROR([Unsupported CPU.]) - ;; -@@ -149,6 +153,18 @@ case "$host" in - [echo "You need to install the OpenAL library." - exit -1]) - build_linux="yes" -+ ;; -+ *-*-freebsd*) -+ CFLAGS="$CFLAGS -I/usr/local/include" -+ CXXFLAGS="$CXXFLAGS -I/usr/local/include" -+ LDFLAGS="$LDFLAGS -L/usr/local/lib" -+ AC_CHECK_LIB([GL], [glGetError], [], \ -+ [echo "You need to install the OpenGL library." -+ exit -1]) -+ AC_CHECK_LIB([openal], [alGetError], [], \ -+ [echo "You need to install the OpenAL library." -+ exit -1]) -+ build_other="yes" - ;; - *) - AC_CHECK_LIB([GL], [glGetError], [], \