From owner-svn-ports-all@freebsd.org  Mon Nov 21 15:01:19 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 9B063C4CEC8;
 Mon, 21 Nov 2016 15:01:19 +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 6D0C5A1E;
 Mon, 21 Nov 2016 15:01:19 +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 uALF1IH1005725;
 Mon, 21 Nov 2016 15:01:18 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALF1IB1005724;
 Mon, 21 Nov 2016 15:01:18 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201611211501.uALF1IB1005724@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 21 Nov 2016 15:01:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r426726 - head/games/gtypist
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Nov 2016 15:01:19 -0000

Author: marino
Date: Mon Nov 21 15:01:18 2016
New Revision: 426726
URL: https://svnweb.freebsd.org/changeset/ports/426726

Log:
  games/gtypist: Support ports-bases ncurses
  
  This software must be ancient because it expects the required wide
  ncurses headers to be only at <ncursesw/ncurses.h>.  The previous
  workaround symlinked the base headers to the work directory.
  
  Instead, fix the 5 source files via sed and bypass the conftest.
  
  Approved by:	ncurses blanket

Modified:
  head/games/gtypist/Makefile

Modified: head/games/gtypist/Makefile
==============================================================================
--- head/games/gtypist/Makefile	Mon Nov 21 15:00:40 2016	(r426725)
+++ head/games/gtypist/Makefile	Mon Nov 21 15:01:18 2016	(r426726)
@@ -12,8 +12,10 @@ LICENSE=	GPLv3
 
 USES=		iconv ncurses shebangfix tar:xz
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	EMACS=no
+CONFIGURE_ENV=	EMACS=no \
+		ac_cv_header_ncursesw_ncurses_h=yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${WRKDIR}/include
+CPPFLAGS+=	-I${NCURSESINC}
 LDFLAGS+=	-L${LOCALBASE}/libs
 
 INFO=		gtypist gtypist.cs gtypist.es
@@ -26,9 +28,12 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-# wide curses header expected at <ncursesw/ncurses.h>
-pre-configure:
-	@${MKDIR} ${WRKDIR}/include
-	@${LN} -sf /usr/include ${WRKDIR}/include/ncursesw
+post-patch:
+	${REINPLACE_CMD} -e 's|<ncursesw/ncurses.h>|<ncurses.h>|' \
+		${WRKSRC}/src/error.c \
+		${WRKSRC}/src/cursmenu.c \
+		${WRKSRC}/src/script.c \
+		${WRKSRC}/src/gtypist.c \
+		${WRKSRC}/src/utf8.c
 
 .include <bsd.port.mk>