Received: by mail.netbsd.org (Postfix, from userid 605) id 4169384CFC; Wed, 6 Nov 2019 23:13:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BE6D184CE3 for ; Wed, 6 Nov 2019 23:13:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 16kEZBKdx_-a for ; Wed, 6 Nov 2019 23:13:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 374E084C2B for ; Wed, 6 Nov 2019 23:13:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2A34EFA93; Wed, 6 Nov 2019 23:13:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157308203713510" MIME-Version: 1.0 Date: Wed, 6 Nov 2019 23:13:57 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/games/gargoyle To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20191106231357.2A34EFA93@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157308203713510 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Nov 6 23:13:57 UTC 2019 Modified Files: pkgsrc/games/gargoyle: Makefile distinfo pkgsrc/games/gargoyle/patches: patch-Jamrules Log Message: gargoyle: improve distfile name, and make patch apply after update To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/gargoyle/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/gargoyle/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/gargoyle/patches/patch-Jamrules Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157308203713510 Content-Disposition: inline Content-Length: 3030 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/gargoyle/Makefile diff -u pkgsrc/games/gargoyle/Makefile:1.8 pkgsrc/games/gargoyle/Makefile:1.9 --- pkgsrc/games/gargoyle/Makefile:1.8 Wed Nov 6 19:05:08 2019 +++ pkgsrc/games/gargoyle/Makefile Wed Nov 6 23:13:56 2019 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2019/11/06 19:05:08 yhardy Exp $ +# $NetBSD: Makefile,v 1.9 2019/11/06 23:13:56 wiz Exp $ -DISTNAME= 2019.1 -PKGNAME= gargoyle-2019.1 +DISTNAME= gargoyle-2019.1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=garglk/} GITHUB_PROJECT= garglk Index: pkgsrc/games/gargoyle/distinfo diff -u pkgsrc/games/gargoyle/distinfo:1.2 pkgsrc/games/gargoyle/distinfo:1.3 --- pkgsrc/games/gargoyle/distinfo:1.2 Wed Nov 6 19:05:08 2019 +++ pkgsrc/games/gargoyle/distinfo Wed Nov 6 23:13:56 2019 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2019/11/06 19:05:08 yhardy Exp $ +$NetBSD: distinfo,v 1.3 2019/11/06 23:13:56 wiz Exp $ -SHA1 (2019.1.tar.gz) = 3423afe9e17fb5e703ec0789633db550ed0e4921 -RMD160 (2019.1.tar.gz) = 905477b0479bcd27fed95fdf704658463da417fd -SHA512 (2019.1.tar.gz) = 59f32be9e5faa542e5d12a03466a92503f15023add1da5370645e15ef5b6c1eb2696456b0f9fcc924a5341b40cc98e9e7bcb1aec0ea05acfd66ccc412e39cbb7 -Size (2019.1.tar.gz) = 14702153 bytes -SHA1 (patch-Jamrules) = 601ac16e4cffa01dc20ec1ad8c53e0446a1b7e8f +SHA1 (gargoyle-2019.1.tar.gz) = 3423afe9e17fb5e703ec0789633db550ed0e4921 +RMD160 (gargoyle-2019.1.tar.gz) = 905477b0479bcd27fed95fdf704658463da417fd +SHA512 (gargoyle-2019.1.tar.gz) = 59f32be9e5faa542e5d12a03466a92503f15023add1da5370645e15ef5b6c1eb2696456b0f9fcc924a5341b40cc98e9e7bcb1aec0ea05acfd66ccc412e39cbb7 +Size (gargoyle-2019.1.tar.gz) = 14702153 bytes +SHA1 (patch-Jamrules) = 26376ab4c3ea7950caaf4c6eeb78dcfb78f27a73 SHA1 (patch-terps_nitfol_nitfol.h) = 63e73928684260cd5ae9446604fbdd3d76f364c7 Index: pkgsrc/games/gargoyle/patches/patch-Jamrules diff -u pkgsrc/games/gargoyle/patches/patch-Jamrules:1.1 pkgsrc/games/gargoyle/patches/patch-Jamrules:1.2 --- pkgsrc/games/gargoyle/patches/patch-Jamrules:1.1 Sat Jul 29 06:25:39 2017 +++ pkgsrc/games/gargoyle/patches/patch-Jamrules Wed Nov 6 23:13:56 2019 @@ -1,18 +1,18 @@ -$NetBSD: patch-Jamrules,v 1.1 2017/07/29 06:25:39 wiz Exp $ +$NetBSD: patch-Jamrules,v 1.2 2019/11/06 23:13:56 wiz Exp $ Turned on a static compile option (as no other apps use GARGLK at this time and made changes to the build file to support compiling on NetBSD. Also reported upstream in github. Issue #274 ---- Jamrules.orig 2011-10-19 20:34:39.000000000 +0000 +--- Jamrules.orig 2019-11-03 19:03:20.000000000 +0000 +++ Jamrules @@ -6,6 +6,7 @@ BUILD ?= RELEASE ; USESDL ?= yes ; USEBABEL ?= yes ; - BUNDLEFONTS ?= yes ; + MAC_USEHOMEBREW ?= no ; +STATIC = yes ; - - # jam -sGUILIB=EFL - GUILIB ?= gtk+ ; -@@ -100,6 +101,23 @@ switch $(OS) + MACOS_MIN_VER ?= 10.7 ; + BUNDLEFONTS ?= yes ; + USETTS ?= no ; +@@ -139,6 +140,23 @@ switch $(PLATFORM) if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; } else { SHRLINKLIBS += $(GARGLKLIBS) ; } --_----------=_157308203713510--