From owner-svn-ports-head@freebsd.org Wed Sep 5 13:51:09 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADB58FF09D2; Wed, 5 Sep 2018 13:51:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6404781B70; Wed, 5 Sep 2018 13:51:09 +0000 (UTC) (envelope-from danfe@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 5F0EB26A25; Wed, 5 Sep 2018 13:51:09 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w85Dp9fq045808; Wed, 5 Sep 2018 13:51:09 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w85Dp9Xm045796; Wed, 5 Sep 2018 13:51:09 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201809051351.w85Dp9Xm045796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 5 Sep 2018 13:51:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479022 - head/games/yadex X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/games/yadex X-SVN-Commit-Revision: 479022 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.27 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, 05 Sep 2018 13:51:09 -0000 Author: danfe Date: Wed Sep 5 13:51:08 2018 New Revision: 479022 URL: https://svnweb.freebsd.org/changeset/ports/479022 Log: - Do not (ab)use PATCH_SITE_SUBDIR where it's not needed; this also makes the address suitable for paste-and-go in the web browser - Use option helpers to construct PATCHFILES list and during post-patch Modified: head/games/yadex/Makefile Modified: head/games/yadex/Makefile ============================================================================== --- head/games/yadex/Makefile Wed Sep 5 13:38:26 2018 (r479021) +++ head/games/yadex/Makefile Wed Sep 5 13:51:08 2018 (r479022) @@ -30,36 +30,30 @@ SEARCH_DESC= Thing, linedef, or sector search by type EXTRA_TOOLS_DESC= Add a few extra tools to Yadex' repertoire LAPTOP_KEYS_DESC= Key bindings for easier editing on laptops -.include - -PATCH_SITES= http://glbsp.sourceforge.net/%SUBDIR%/ -PATCH_SITE_SUBDIR= ${PORTNAME} +PATCH_SITES= http://glbsp.sourceforge.net/yadex/ PATCH_DIST_STRIP= -p1 PATCH_PREFIX= Yadex_${PORTVERSION:S/.//g} PATCH_SUFFIX= .diff PATCHFILES= ${PATCH_PREFIX}_Depend${PATCH_SUFFIX} +3D_RENDER_PATCHFILES= ${PATCH_PREFIX}_Render3D${PATCH_SUFFIX} +SEARCH_PATCHFILES= ${PATCH_PREFIX}_Find${PATCH_SUFFIX} +EXTRA_TOOLS_PATCHFILES= ${PATCH_PREFIX}_Tools${PATCH_SUFFIX} +LAPTOP_KEYS_PATCHFILES= ${PATCH_PREFIX}_Keys${PATCH_SUFFIX} + +.include + .if ${PORT_OPTIONS:M3D_RENDER} -PATCHFILES+= ${PATCH_PREFIX}_Render3D${PATCH_SUFFIX} PLIST_SUB+= 3DRENDER="" .else PLIST_SUB+= 3DRENDER="@comment " .endif -.if ${PORT_OPTIONS:MSEARCH} -PATCHFILES+= ${PATCH_PREFIX}_Find${PATCH_SUFFIX} -.endif -.if ${PORT_OPTIONS:MEXTRA_TOOLS} -PATCHFILES+= ${PATCH_PREFIX}_Tools${PATCH_SUFFIX} -.endif -.if ${PORT_OPTIONS:MLAPTOP_KEYS} -PATCHFILES+= ${PATCH_PREFIX}_Keys${PATCH_SUFFIX} -.endif -post-patch: -.if ${PORT_OPTIONS:MWHITE_BG} +post-patch-WHITE_BG-on: @${REINPLACE_CMD} -E 's,^#(CXXFLAGS \+= -DWHITE_BACKGROUND)$$,\1,' \ ${WRKSRC}/${MAKEFILE} -.endif + +post-patch: # Fix the build against Clang 6.0.0 @${REINPLACE_CMD} -e 's,1000000ul,1000000l,' ${WRKSRC}/src/input.cc