Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Nov 2016 15:01:18 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426726 - head/games/gtypist
Message-ID:  <201611211501.uALF1IB1005724@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611211501.uALF1IB1005724>