From owner-svn-ports-head@freebsd.org Wed May 16 12:47:21 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 1493BEE03A1; Wed, 16 May 2018 12:47:21 +0000 (UTC) (envelope-from ehaupt@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 BE528871C2; Wed, 16 May 2018 12:47:20 +0000 (UTC) (envelope-from ehaupt@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 9CE671A5D8; Wed, 16 May 2018 12:47:20 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4GClKOB071265; Wed, 16 May 2018 12:47:20 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4GClK2P071264; Wed, 16 May 2018 12:47:20 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201805161247.w4GClK2P071264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Wed, 16 May 2018 12:47:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470117 - head/graphics/grafx2/files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: head/graphics/grafx2/files X-SVN-Commit-Revision: 470117 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.26 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, 16 May 2018 12:47:21 -0000 Author: ehaupt Date: Wed May 16 12:47:20 2018 New Revision: 470117 URL: https://svnweb.freebsd.org/changeset/ports/470117 Log: Add missing patch. Forgotten in previous update. Added: head/graphics/grafx2/files/ head/graphics/grafx2/files/patch-Makefile (contents, props changed) Added: head/graphics/grafx2/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/grafx2/files/patch-Makefile Wed May 16 12:47:20 2018 (r470117) @@ -0,0 +1,36 @@ +--- Makefile.orig 2018-05-06 15:36:46 UTC ++++ Makefile +@@ -35,7 +35,11 @@ + + # Detect GIT revision + GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..) +- GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) ++ ifneq (,$(CI_COMMIT_REF_NAME)) ++ GIT_BRANCH = $(CI_COMMIT_REF_NAME) ++ else ++ GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) ++ endif + ifneq (master,$(GIT_BRANCH)) + GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)" + endif +@@ -384,7 +388,9 @@ endif + COPT += $(LUACOPT) + LOPT += $(LUALOPT) + OBJDIR = ../obj/win32 ++ WINDRES ?= $(shell which i686-w64-mingw32-windres || which mingw32-windres) + PLATFORM = win32 ++ PLATFORMOBJ = winres.o + PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS) + else + ifdef GP2XCROSS +@@ -789,6 +795,10 @@ install : $(BIN) + test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/libs + test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/palette + test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture ++ test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson ++ test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/thomson/lib ++ test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit ++ test -d $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib || $(MKDIR) $(DESTDIR)$(datadir)/grafx2/scripts/samples_2.4/picture/others-8bit/lib + test -d $(DESTDIR)$(datadir)/applications || $(MKDIR) $(DESTDIR)$(datadir)/applications + test -d $(DESTDIR)$(pixmapdir) || $(MKDIR) $(DESTDIR)$(pixmapdir) +