From owner-svn-ports-all@freebsd.org Mon Apr 18 18:40:25 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 975B9B1297B; Mon, 18 Apr 2016 18:40:25 +0000 (UTC) (envelope-from marino@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 mx1.freebsd.org (Postfix) with ESMTPS id 4DF07101A; Mon, 18 Apr 2016 18:40:25 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3IIeOw6066187; Mon, 18 Apr 2016 18:40:24 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3IIeOvE066184; Mon, 18 Apr 2016 18:40:24 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201604181840.u3IIeOvE066184@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 18 Apr 2016 18:40:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413605 - in head/games/2048: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Apr 2016 18:40:25 -0000 Author: marino Date: Mon Apr 18 18:40:24 2016 New Revision: 413605 URL: https://svnweb.freebsd.org/changeset/ports/413605 Log: games/2048: Restore build for ports ncurses The LIBS Make argument no longer works; libcurses was hardcoded to the curses target in the 2048 v0.9.1 makefile. To restore the build on systems without base ncurses (e.g. DragonFly), extend the existing Makefile file to link to libncurses instead. While here, remove the non-functional MAKE_ARGS=LIBS definition. Approved by: just-fix-it / Restore DF functionality blanket Modified: head/games/2048/Makefile head/games/2048/files/patch-Makefile Modified: head/games/2048/Makefile ============================================================================== --- head/games/2048/Makefile Mon Apr 18 18:39:44 2016 (r413604) +++ head/games/2048/Makefile Mon Apr 18 18:40:24 2016 (r413605) @@ -18,7 +18,6 @@ GH_PROJECT= 2048-cli USES= ncurses gmake ALL_TARGET= curses -MAKE_ARGS= LIBS="-lncurses" PLIST_FILES= bin/2048 man/man1/2048.1.gz PORTDOCS= README.md Modified: head/games/2048/files/patch-Makefile ============================================================================== --- head/games/2048/files/patch-Makefile Mon Apr 18 18:39:44 2016 (r413604) +++ head/games/2048/files/patch-Makefile Mon Apr 18 18:40:24 2016 (r413605) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-04-08 17:50:58 UTC +--- Makefile.orig 2016-03-30 07:46:31 UTC +++ Makefile @@ -1,7 +1,7 @@ CC ?= clang @@ -9,3 +9,12 @@ CFLAGS += -DINVERT_COLORS -DVT100 -O2 LFLAGS += +@@ -13,7 +13,7 @@ FILTERED_C_FILES := $(filter-out src/gfx + all: terminal + + curses: $(FILTERED_C_FILES) src/gfx_curses.c +- $(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_curses.c -o $(PROGRAM) $(LDFLAGS) -lcurses ++ $(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_curses.c -o $(PROGRAM) $(LDFLAGS) -lncurses + + terminal: $(FILTERED_C_FILES) src/gfx_terminal.c + $(CC) $(CFLAGS) $(FILTERED_C_FILES) $(MERGE_FILE) src/gfx_terminal.c -o $(PROGRAM) $(LDFLAGS)