svn commit: r495538 - in head/games/nethack36: . files
Greg Lewis
glewis at FreeBSD.org
Wed Mar 13 03:22:31 UTC 2019
Author: glewis
Date: Wed Mar 13 03:22:29 2019
New Revision: 495538
URL: https://svnweb.freebsd.org/changeset/ports/495538
Log:
. Update to 3.6.1.
Added:
head/games/nethack36/files/patch-sys-unix-setup.sh (contents, props changed)
Modified:
head/games/nethack36/Makefile
head/games/nethack36/distinfo
head/games/nethack36/files/patch-nethack.6
head/games/nethack36/files/patch-sys-unix-Makefile.src
head/games/nethack36/files/patch-sys-unix-Makefile.top
Modified: head/games/nethack36/Makefile
==============================================================================
--- head/games/nethack36/Makefile Wed Mar 13 03:03:56 2019 (r495537)
+++ head/games/nethack36/Makefile Wed Mar 13 03:22:29 2019 (r495538)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= nethack36
-PORTVERSION= 3.6.0
-PORTREVISION= 1
+PORTVERSION= 3.6.1
CATEGORIES= games
MASTER_SITES= SF/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION}
DISTNAME= ${TRUEPORTNAME}-${PORTVERSION:S/.//g}-src
@@ -36,7 +35,7 @@ DOCSDIR= ${PREFIX}/share/doc/${HACKNAME}
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
.if !defined(PKGNAMESUFFIX)
-USE_XORG= xaw xpm
+USE_XORG= xaw xpm xmu xext xt x11 sm ice
CFLAGS+= -DX11_GRAPHICS -DUSE_TILES
GRAPHICS= X11_GRAPHICS
.else
Modified: head/games/nethack36/distinfo
==============================================================================
--- head/games/nethack36/distinfo Wed Mar 13 03:03:56 2019 (r495537)
+++ head/games/nethack36/distinfo Wed Mar 13 03:22:29 2019 (r495538)
@@ -1,2 +1,3 @@
-SHA256 (nethack-360-src.tgz) = 1ade698d8458b8d87a4721444cb73f178c74ed1b6fde537c12000f8edf2cb18a
-SIZE (nethack-360-src.tgz) = 4261282
+TIMESTAMP = 1552421527
+SHA256 (nethack-361-src.tgz) = 4b8cbf1cc3ad9f6b9bae892d44a9c63106d44782a210906162a7c3be65040ab6
+SIZE (nethack-361-src.tgz) = 4640769
Modified: head/games/nethack36/files/patch-nethack.6
==============================================================================
--- head/games/nethack36/files/patch-nethack.6 Wed Mar 13 03:03:56 2019 (r495537)
+++ head/games/nethack36/files/patch-nethack.6 Wed Mar 13 03:22:29 2019 (r495538)
@@ -1,6 +1,6 @@
---- doc/nethack.6.orig 2003-12-07 15:39:13.000000000 -0800
-+++ doc/nethack.6 2015-12-27 14:12:43.428436000 -0800
-@@ -5,7 +5,7 @@
+--- doc/nethack.6.orig 2018-04-27 05:07:22.000000000 -0700
++++ doc/nethack.6 2019-03-12 14:51:23.925413000 -0700
+@@ -17,7 +17,7 @@
.SH SYNOPSIS
.na
.hy 0
@@ -9,7 +9,7 @@
[
.B \-d
.I directory
-@@ -197,7 +197,7 @@
+@@ -216,7 +216,7 @@
supplies a directory which is to serve as the playground.
It overrides the value from NETHACKDIR, HACKDIR,
or the directory specified by the game administrator during compilation
@@ -18,17 +18,17 @@
This option is usually only useful to the game administrator.
The playground must contain several auxiliary files such as help files,
the list of top scorers, and a subdirectory
-@@ -222,7 +222,7 @@
- distinction, as he may eventually release a new version of his own.
- .SH FILES
- .PP
--All files are in the playground, normally /usr/games/lib/nethackdir.
-+All files are in the playground, normally %%HACKDIR%%.
+@@ -258,7 +258,7 @@
+
+ .br
+ All other files are in the playground directory,
+-normally /usr/games/lib/nethackdir.
++normally %%HACKDIR%%.
If DLB was defined during the compile, the data files and special levels
will be inside a larger file, normally nhdat, instead of being separate
files.
-@@ -295,7 +295,7 @@
- In addition, SHOPTYPE is used in debugging (wizard) mode.
+@@ -386,7 +386,7 @@
+ DEBUGFILES can be used if the program was built with 'DEBUG' enabled.
.SH "SEE ALSO"
.PP
-dgn_comp(6), lev_comp(6), recover(6)
Modified: head/games/nethack36/files/patch-sys-unix-Makefile.src
==============================================================================
--- head/games/nethack36/files/patch-sys-unix-Makefile.src Wed Mar 13 03:03:56 2019 (r495537)
+++ head/games/nethack36/files/patch-sys-unix-Makefile.src Wed Mar 13 03:22:29 2019 (r495538)
@@ -1,6 +1,6 @@
---- ./sys/unix/Makefile.src.orig 2015-11-12 08:51:56.000000000 +0100
-+++ ./sys/unix/Makefile.src 2016-01-20 14:51:33.282986884 +0100
-@@ -149,13 +149,24 @@
+--- sys/unix/Makefile.src.orig 2018-04-27 05:07:22.000000000 -0700
++++ sys/unix/Makefile.src 2019-03-12 14:55:40.550273000 -0700
+@@ -151,13 +151,24 @@
# directories. The ones given below is the usual spot for linux systems.
# The paths are for glibconfig.h and gnomesupport.h respectively.
#
@@ -26,7 +26,7 @@
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
-@@ -222,8 +233,27 @@
+@@ -245,8 +256,27 @@
#
#
@@ -56,35 +56,39 @@
# on some systems the termcap library is in -ltermcap or -lcurses
# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -239,23 +269,23 @@
- # WINTTYLIB = -lcurses
+@@ -263,16 +293,19 @@
# WINTTYLIB = -lcurses16
# WINTTYLIB = -lncurses
--#WINTTYLIB = -ltermlib
+ #WINTTYLIB = -ltermlib
+WINTTYLIB = -lncurses -L${LOCALBASE}/lib
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
++#WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
# WINX11LIB = -lXaw -lXmu -lXt -lX11
# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
# WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
#
- # libraries for Qt
+ # libraries for Qt 3
-WINQTLIB = -L$(QTDIR)/lib -lqt
++#WINQTLIB = -L$(QTDIR)/lib -lqt
+WINQTLIB = ${QTCFGLIBS} ${LIBQT}
#
- # libraries for KDE (with Qt)
+ # libraries for Qt 4
+ WINQT4LIB = `pkg-config QtGui --libs`
+@@ -281,7 +314,8 @@
WINKDELIB = -lkdecore -lkdeui -lXext
#
# libraries for Gnome
-WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
++#WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
+WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
#
# libraries for Gem port
WINGEMLIB = -le_gem -lgem
-@@ -263,7 +293,16 @@
+@@ -289,7 +323,16 @@
# libraries for BeOS
WINBELIB = -lbe
@@ -102,7 +106,7 @@
# any other strange libraries your system needs (for Sysunix only -- the more
# specialized targets should already be right)
-@@ -296,7 +335,7 @@
+@@ -322,7 +365,7 @@
LIBS =
# make NetHack
@@ -111,9 +115,9 @@
# GAME = nethack.prg
# if you defined RANDOM in unixconf.h/tosconf.h since your system did not come
-@@ -482,13 +521,13 @@
+@@ -548,13 +591,13 @@
- # Qt windowport meta-object-compiler output
+ # Qt 3 windowport meta-object-compiler output
qt_kde0.moc: ../include/qt_kde0.h
- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
@@ -126,5 +130,5 @@
- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
+ ${MOC} -o qttableview.moc ../include/qttableview.h
- $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
- ../include/objclass.h ../include/monsym.h \
+ # Qt 4 windowport meta-object-compiler output
+ qt4kde0.moc : ../win/Qt4/qt4kde0.h
Modified: head/games/nethack36/files/patch-sys-unix-Makefile.top
==============================================================================
--- head/games/nethack36/files/patch-sys-unix-Makefile.top Wed Mar 13 03:03:56 2019 (r495537)
+++ head/games/nethack36/files/patch-sys-unix-Makefile.top Wed Mar 13 03:22:29 2019 (r495538)
@@ -1,6 +1,6 @@
---- ./sys/unix/Makefile.top.orig 2015-11-18 21:54:59.000000000 +0100
-+++ ./sys/unix/Makefile.top 2016-01-20 14:57:30.972963262 +0100
-@@ -18,18 +18,18 @@
+--- sys/unix/Makefile.top.orig 2018-04-27 05:07:22.000000000 -0700
++++ sys/unix/Makefile.top 2019-03-12 15:05:31.025765000 -0700
+@@ -20,18 +20,18 @@
# make NetHack
#PREFIX = /usr
@@ -24,7 +24,7 @@
# VARDIRPERM = 0755
# VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else HACKDIR
-@@ -39,10 +39,11 @@
+@@ -41,10 +41,11 @@
# therefore there should not be anything in HACKDIR that you want to keep
# (if there is, you'll have to do the installation by hand or modify the
# instructions)
@@ -39,25 +39,23 @@
# per discussion in Install.X11 and Install.Qt
#VARDATND =
-@@ -53,7 +54,7 @@
+@@ -55,7 +56,7 @@
# for BeOS
# VARDATND = beostiles
# for Gnome
--# VARDATND = x11tiles pet_mark.xbm pilemark.xpm rip.xpm mapbg.xpm
+-# VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
+VARDATND = x11tiles pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm
VARDATD = bogusmon data engrave epitaph oracles options quest.dat rumors
VARDAT = $(VARDATD) $(VARDATND)
-@@ -201,56 +202,34 @@
+@@ -203,52 +204,33 @@
-e '}' \
-e '$$s/.*/nodlb/p' < dat/options` ; \
$(MAKE) dofiles-$${target-nodlb}
-- (cd dat ; cp symbols $(INSTDIR) )
- cp src/$(GAME) $(INSTDIR)
- cp util/recover $(INSTDIR)
- -if test -n '$(SHELLDIR)'; then rm -f $(SHELLDIR)/$(GAME); fi
-+ (cd dat ; cp symbols ${DESTDIR}$(INSTDIR) )
-+ cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)
++ cp src/$(GAME) ${DESTDIR}$(INSTDIR)/$(GAME)
+ cp util/recover ${DESTDIR}$(INSTDIR)
+ -if test -n '${DESTDIR}$(SHELLDIR)'; then rm -f ${DESTDIR}$(SHELLDIR)/$(GAME); fi
if test -n '$(SHELLDIR)'; then \
@@ -75,10 +73,7 @@
- if test -n '$(SHELLDIR)'; then \
- $(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME); \
- chmod $(EXEPERM) $(SHELLDIR)/$(GAME); fi
-- -( cd $(INSTDIR) ; $(CHOWN) $(GAMEUID) symbols ; \
-- $(CHGRP) $(GAMEGRP) symbols ; \
-- chmod $(FILEPERM) symbols )
-+ > ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
++ > ${DESTDIR}$(SHELLDIR)/$(GAME) ; fi
dofiles-dlb: check-dlb
- ( cd dat ; cp nhdat $(DATNODLB) $(INSTDIR) )
@@ -115,7 +110,7 @@
touch $(VARDIR)/perm $(VARDIR)/record
# and a reminder
@echo You may also want to install the man pages via the doc Makefile.
-@@ -262,23 +241,16 @@
+@@ -260,23 +242,16 @@
true; $(PREINSTALL)
# set up the directories
# not all mkdirs have -p; those that don't will create a -p directory
Added: head/games/nethack36/files/patch-sys-unix-setup.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/nethack36/files/patch-sys-unix-setup.sh Wed Mar 13 03:22:29 2019 (r495538)
@@ -0,0 +1,11 @@
+--- sys/unix/setup.sh.orig 2019-03-12 15:54:29.880771000 -0700
++++ sys/unix/setup.sh 2019-03-12 15:55:10.991928000 -0700
+@@ -26,7 +26,7 @@
+ ;;
+ esac
+
+-if [ ! -f "$hints" ]; then
++if [ ! -f "$hints" -a "$hints" != "/dev/null" ]; then
+ echo "Cannot find hints file $hfile"
+ exit 1
+ fi
More information about the svn-ports-all
mailing list