From owner-svn-ports-all@freebsd.org Sun Jan 31 10:08:23 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 3F4AAA73AC8; Sun, 31 Jan 2016 10:08:23 +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 007621B43; Sun, 31 Jan 2016 10:08:22 +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 u0VA8Mh7001677; Sun, 31 Jan 2016 10:08:22 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0VA8Lae001675; Sun, 31 Jan 2016 10:08:21 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201601311008.u0VA8Lae001675@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 31 Jan 2016 10:08:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407605 - in head/games/nethack33: . 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.20 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: Sun, 31 Jan 2016 10:08:23 -0000 Author: marino Date: Sun Jan 31 10:08:21 2016 New Revision: 407605 URL: https://svnweb.freebsd.org/changeset/ports/407605 Log: nethack33(-nox11): document ncurses requirement (USES+=ncurses) both ports need to link to ncurses. The -nox11 version wasn't respecting LDFLAGS Finally, link to libncurses over ancient termlib (which is symlinked to libncurses on FreeBSD base anyway) approved by: infrastructure blanket Modified: head/games/nethack33/Makefile head/games/nethack33/files/patch-sys-unix-Makefile.src Modified: head/games/nethack33/Makefile ============================================================================== --- head/games/nethack33/Makefile Sun Jan 31 10:00:14 2016 (r407604) +++ head/games/nethack33/Makefile Sun Jan 31 10:08:21 2016 (r407605) @@ -13,7 +13,7 @@ COMMENT= Dungeon explorin', slashin', ha WRKSRC= ${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION} -USES= gmake tar:tgz +USES= gmake ncurses tar:tgz MAKE_ENV= GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKEXT="${HACKEXT}" Modified: head/games/nethack33/files/patch-sys-unix-Makefile.src ============================================================================== --- head/games/nethack33/files/patch-sys-unix-Makefile.src Sun Jan 31 10:00:14 2016 (r407604) +++ head/games/nethack33/files/patch-sys-unix-Makefile.src Sun Jan 31 10:08:21 2016 (r407605) @@ -1,6 +1,6 @@ ---- sys/unix/Makefile.src.orig Sat Aug 5 19:52:57 2000 -+++ sys/unix/Makefile.src Sat May 18 01:19:31 2002 -@@ -139,19 +139,28 @@ +--- sys/unix/Makefile.src.orig 2000-08-05 10:52:57 UTC ++++ sys/unix/Makefile.src +@@ -139,19 +139,28 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un # directories. The ones given below is the usual spot for linux systems. # The paths are for glibconfig.h and gnomesupport.h respectively. # @@ -33,7 +33,7 @@ #LD=g++ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired -@@ -204,7 +213,26 @@ +@@ -204,7 +213,26 @@ WINBEOBJ = # # WINSRC = $(WINTTYSRC) @@ -60,7 +60,12 @@ # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -224,19 +252,19 @@ +@@ -220,23 +248,23 @@ WINOBJ = $(WINTTYOBJ) + # WINTTYLIB = -lcurses + # WINTTYLIB = -lcurses16 + # WINTTYLIB = -lncurses +-WINTTYLIB = -ltermlib ++WINTTYLIB = -lncurses # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. @@ -83,7 +88,7 @@ # # libraries for Gem port WINGEMLIB = -le_gem -lgem -@@ -245,6 +273,15 @@ +@@ -245,6 +273,15 @@ WINGEMLIB = -le_gem -lgem WINBELIB = -lbe WINLIB = $(WINTTYLIB) @@ -99,7 +104,16 @@ # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) -@@ -445,10 +482,10 @@ +@@ -376,7 +413,7 @@ $(GAME): $(SYSTEM) + + Sysunix: $(HOBJ) Makefile + @echo "Loading ..." +- @$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) ++ @$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(LDFLAGS) $(WINLIB) $(LIBS) + @touch Sysunix + + Sys3B2: $(HOBJ) Makefile +@@ -445,10 +482,10 @@ objects.o: # Qt windowport meta-object-compiler output qt_kde0.moc: ../include/qt_kde0.h