From owner-svn-ports-head@freebsd.org Wed Apr 22 18:29:44 2020 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 06DCB2BCFC6; Wed, 22 Apr 2020 18:29:44 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 496pr76SYLz4cLP; Wed, 22 Apr 2020 18:29:43 +0000 (UTC) (envelope-from tcberner@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 BA9B51F090; Wed, 22 Apr 2020 18:29:43 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03MIThqI057115; Wed, 22 Apr 2020 18:29:43 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03MIThbk057112; Wed, 22 Apr 2020 18:29:43 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202004221829.03MIThbk057112@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Wed, 22 Apr 2020 18:29:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532497 - in head/games/frotz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/games/frotz: . files X-SVN-Commit-Revision: 532497 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.29 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, 22 Apr 2020 18:29:44 -0000 Author: tcberner Date: Wed Apr 22 18:29:42 2020 New Revision: 532497 URL: https://svnweb.freebsd.org/changeset/ports/532497 Log: games/frotz: Update to version 2.51 PR: 245225 Submitted by: David Griffith (maintainer) Modified: head/games/frotz/Makefile head/games/frotz/distinfo head/games/frotz/files/patch-Makefile Modified: head/games/frotz/Makefile ============================================================================== --- head/games/frotz/Makefile Wed Apr 22 18:23:03 2020 (r532496) +++ head/games/frotz/Makefile Wed Apr 22 18:29:42 2020 (r532497) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= frotz -PORTVERSION= 2.50 +PORTVERSION= 2.51 CATEGORIES= games MAINTAINER= dave@661.org @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_GITLAB= yes GL_ACCOUNT= DavidGriffith -GL_COMMIT= 9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64 +GL_COMMIT= 73eec90ebb159ed687b74cbaf81e135c3e7e390b USES= gmake ncurses Modified: head/games/frotz/distinfo ============================================================================== --- head/games/frotz/distinfo Wed Apr 22 18:23:03 2020 (r532496) +++ head/games/frotz/distinfo Wed Apr 22 18:29:42 2020 (r532497) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576709471 -SHA256 (DavidGriffith-frotz-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64_GL0.tar.gz) = 0fdbf055edd31e2f07b52f720a74a098d81b766a00a4103955edb2171d13b0d6 -SIZE (DavidGriffith-frotz-9867a1f14da1e9c0707492d2ac74d1e8ffdd3a64_GL0.tar.gz) = 346458 +TIMESTAMP = 1585613720 +SHA256 (DavidGriffith-frotz-73eec90ebb159ed687b74cbaf81e135c3e7e390b_GL0.tar.gz) = e8f85a3d6348fed0a1cba79c0e0eb0c2552e98c41dc3d840dce5c0822a8dc7b7 +SIZE (DavidGriffith-frotz-73eec90ebb159ed687b74cbaf81e135c3e7e390b_GL0.tar.gz) = 350429 Modified: head/games/frotz/files/patch-Makefile ============================================================================== --- head/games/frotz/files/patch-Makefile Wed Apr 22 18:23:03 2020 (r532496) +++ head/games/frotz/files/patch-Makefile Wed Apr 22 18:29:42 2020 (r532497) @@ -1,11 +1,37 @@ ---- Makefile.orig 2019-12-18 22:55:03 UTC -+++ Makefile -@@ -297,7 +297,7 @@ ifneq ($(and $(wildcard $(GIT_DIR)),$(sh - $(NAME)src/doc/*.6 $(NAME)src/doc/frotz.conf* \ - $(NAME)src/doc/Xresources > /dev/null - else -- @echo "Not in a git repository or git command not found. Cannot make a tarball." -+ @echo "Not in a git repository or git command not found. Cannot make a tarball." - endif - - all: $(FROTZ_BIN) $(DFROTZ_BIN) $(SFROTZ_BIN) +--- Makefile.orig 2020-02-12 08:22:40.000000000 -0800 ++++ Makefile 2020-03-30 21:03:40.586161000 -0700 +@@ -108,6 +108,9 @@ + RANLIB ?= $(shell which ranlib) + AR ?= $(shell which ar) + PKG_CONFIG ?= pkg-config ++ ifeq ($(shell which $(PKG_CONFIG)),) ++ NO_PKG_CONFIG = yes ++ endif + # For now, assume !windows == unix. + OS_TYPE ?= unix + UNAME_S := $(shell uname -s) +@@ -122,13 +125,19 @@ + LDFLAGS += -L/opt/local/lib + CURSES_LDFLAGS += -lcurses + else +- # If we have pkg-config, that good. Otherwise maybe warn later. +- ifneq (, $(shell which $(PKG_CONFIG))) +- CURSES_LDFLAGS += $(shell $(PKG_CONFIG) $(CURSES) --libs) +- CURSES_CFLAGS += $(shell $(PKG_CONFIG) $(CURSES) --cflags) ++ ++ # If we don't have pkg-config, try something obvious ++ ifdef NO_PKG_CONFIG ++ CURSES_LDFLAGS += -l$(CURSES) + else +- NO_PKG_CONFIG = yes ++ ifneq ($(shell $(PKG_CONFIG) --exists),) ++ CURSES_LDFLAGS += $(shell $(PKG_CONFIG) $(CURSES) --libs) ++ CURSES_CFLAGS += $(shell $(PKG_CONFIG) $(CURSES) --cflags) ++ else ++ CURSES_LDFLAGS += -l$(CURSES) ++ endif + endif ++ + # NetBSD + ifeq ($(UNAME_S),NetBSD) + NETBSD = yes