svn commit: r532497 - in head/games/frotz: . files

[Tobias C. Berner]

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 <dave at 661.org>  (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 at 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