pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/games/nethack-lib Use the infrastructure to find termc...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f2a4e4422ec
branches:  trunk
changeset: 362227:6f2a4e4422ec
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 09 14:12:30 2017 +0000

description:
Use the infrastructure to find termcap correctly.

diffstat:

 games/nethack-lib/Makefile.common |  14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r de99cfc59e25 -r 6f2a4e4422ec games/nethack-lib/Makefile.common
--- a/games/nethack-lib/Makefile.common Tue May 09 13:29:38 2017 +0000
+++ b/games/nethack-lib/Makefile.common Tue May 09 14:12:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2016/02/25 13:19:47 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.31 2017/05/09 14:12:30 jperkin Exp $
 #
 # used by games/nethack/Makefile
 # used by games/nethack-lib/Makefile
@@ -29,16 +29,14 @@
 CONFIGURE_SCRIPT=      ./sys/unix/setup.sh
 USE_TOOLS+=            gzip yacc lex awk
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
-SUBST_CLASSES.Darwin+= ttylib
-SUBST_CLASSES.Linux+=  ttylib
-SUBST_MESSAGE.ttylib=  Configuring to use ncurses
+SUBST_CLASSES+=                ttylib
+SUBST_MESSAGE.ttylib=  Configuring to use correct termcap library
 SUBST_STAGE.ttylib=    post-patch
 SUBST_FILES.ttylib=    sys/unix/Makefile.src
-SUBST_SED.ttylib=      -e 's,^WINTTYLIB = -ltermlib,WINTTYLIB = -lncurses,'
-
-.include "../../mk/curses.buildlink3.mk"
+SUBST_SED.ttylib=      -e 's!^WINTTYLIB = -ltermlib!WINTTYLIB = -L${BUILDLINK_PREFIX.termcap}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.termcap}/lib -l${BUILDLINK_LIBNAME.termcap}!'
 
 OPSYSVARS+=            NETHACK_OS
 NETHACK_OS.Linux=      SYSV



Home | Main Index | Thread Index | Old Index