[122656] trunk/dports/games/nethack

mf2k at macports.org mf2k at macports.org
Fri Jul 25 12:50:08 PDT 2014


Revision: 122656
          https://trac.macports.org/changeset/122656
Author:   mf2k at macports.org
Date:     2014-07-25 12:50:08 -0700 (Fri, 25 Jul 2014)
Log Message:
-----------
nethack: License. Whitespace. Remove useless comments. Rename patches per lint.

Modified Paths:
--------------
    trunk/dports/games/nethack/Portfile

Added Paths:
-----------
    trunk/dports/games/nethack/files/patch-include__config.h.diff
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc.diff
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src.diff
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top.diff
    trunk/dports/games/nethack/files/patch-win__tty__termcap.c.diff
    trunk/dports/games/nethack/files/x11/patch-include__config.h.diff
    trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src.diff
    trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top.diff

Removed Paths:
-------------
    trunk/dports/games/nethack/files/patch-include__config.h
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src
    trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top
    trunk/dports/games/nethack/files/patch-win__tty__termcap.c
    trunk/dports/games/nethack/files/x11/patch-include__config.h
    trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src
    trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top

Modified: trunk/dports/games/nethack/Portfile
===================================================================
--- trunk/dports/games/nethack/Portfile	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/Portfile	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,78 +1,68 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-PortSystem  1.0
+PortSystem          1.0
 
-name        nethack
-version     3.4.3
-revision    2
-categories  games
-maintainers nomaintainer
-description Classic dungeon adventure game.
-long_description ${description}
-homepage    http://nethack.sourceforge.net/
-platforms   darwin freebsd
+name                nethack
+version             3.4.3
+revision            2
+categories          games
+maintainers         nomaintainer
+description         Classic dungeon adventure game.
+long_description    ${description}
+homepage            http://nethack.sourceforge.net/
+platforms           darwin freebsd
+license             Copyleft
 
-master_sites    sourceforge
-distname    ${name}-343-src
-extract.suffix  .tgz
-checksums   ${distfiles} md5 21479c95990eefe7650df582426457f9 \
-            ${distfiles} sha1 c26537093c38152bc0fbcec20468d975b35f59fd \
-            ${distfiles} rmd160 42f600d24715a0b7e631b357c135761410b3ca95
+master_sites        sourceforge
+distname            ${name}-343-src
+extract.suffix      .tgz
+checksums           ${distfiles} md5 21479c95990eefe7650df582426457f9 \
+                    ${distfiles} sha1 c26537093c38152bc0fbcec20468d975b35f59fd \
+                    ${distfiles} rmd160 42f600d24715a0b7e631b357c135761410b3ca95
 
-worksrcdir  ${name}-${version}
+worksrcdir          ${name}-${version}
 
-## patch ##
+patch.args          -p1
+patchfiles          patch-sys__unix__Makefile.doc.diff \
+                    patch-sys__unix__Makefile.src.diff \
+                    patch-sys__unix__Makefile.top.diff \
+                    patch-win__tty__termcap.c.diff
 
-patch.args -p1
-patchfiles  patch-sys__unix__Makefile.doc \
-            patch-sys__unix__Makefile.src \
-            patch-sys__unix__Makefile.top \
-            patch-win__tty__termcap.c
-
 post-patch {
     reinplace "s|__PREFIX__|${prefix}|" \
         "${worksrcpath}/sys/unix/Makefile.doc" \
         "${worksrcpath}/sys/unix/Makefile.top"
 }
 
-## configure ##
-
-configure.dir   ${worksrcpath}/sys/unix
-configure.cmd   /bin/sh
+configure.dir       ${worksrcpath}/sys/unix
+configure.cmd       /bin/sh
 configure.pre_args  setup.sh
 
-## build ##
-
 build.args-append   CFLAGS="-O2 -I../include"
 
-## destroot ##
-
 pre-destroot {
     file mkdir "${destroot}${prefix}/share/man/man6"
     file mkdir "${destroot}${prefix}/share/nethackdir/save"
 }
 
-destroot.target install manpages
-destroot.keepdirs "${destroot}${prefix}/share/nethackdir/save/"
+destroot.target     install manpages
+destroot.keepdirs   "${destroot}${prefix}/share/nethackdir/save/"
 
 post-destroot {
     reinplace "s|${destroot}||" "${destroot}${prefix}/bin/nethack"
 }
 
-## variants ##
-
 variant x11 {
     patchfiles-append \
-        x11/patch-include__config.h \
-        x11/patch-sys__unix__Makefile.src \
-        x11/patch-sys__unix__Makefile.top
+        x11/patch-include__config.h.diff \
+        x11/patch-sys__unix__Makefile.src.diff \
+        x11/patch-sys__unix__Makefile.top.diff
     depends_lib-append port:xorg-libXaw
 }
 
 variant autopickup_exceptions description { Automatically pick up things onto which you move } {
-        patchfiles-append \
-                patch-include__config.h
+    patchfiles-append patch-include__config.h.diff
 }
 
 #variant paranoid {
@@ -94,9 +84,9 @@
 #}
 
 variant menucolors description { Allows the user to define in what color menus are shown } {
-        patch_sites-append http://bilious.alt.org/~paxed/nethack
-        patchfiles-append nh343-menucolor.diff
-        checksums-append nh343-menucolor.diff md5 ade00f9cb51f1b0140557d329d56844c
-        build.args-delete CFLAGS="-O2 -I../include"
-        build.args-append CFLAGS="-O2 -I../include -DMENU_COLOR_REGEX_POSIX"
+    patch_sites-append http://bilious.alt.org/~paxed/nethack
+    patchfiles-append nh343-menucolor.diff
+    checksums-append nh343-menucolor.diff md5 ade00f9cb51f1b0140557d329d56844c
+    build.args-delete CFLAGS="-O2 -I../include"
+    build.args-append CFLAGS="-O2 -I../include -DMENU_COLOR_REGEX_POSIX"
 }

Deleted: trunk/dports/games/nethack/files/patch-include__config.h
===================================================================
--- trunk/dports/games/nethack/files/patch-include__config.h	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/patch-include__config.h	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,10 +0,0 @@
---- nethack-3.4.3/include/config.h.apupx	Sun Dec  7 17:39:13 2003
-+++ nethack-3.4.3/include/config.h	Tue Oct 18 07:18:22 2005
-@@ -349,7 +349,7 @@
-  */
- 
- /*#define GOLDOBJ */	/* Gold is kept on obj chains - Helge Hafting */
--/*#define AUTOPICKUP_EXCEPTIONS */ /* exceptions to autopickup */
-+#define AUTOPICKUP_EXCEPTIONS /* exceptions to autopickup */
- 
- /* End of Section 5 */

Copied: trunk/dports/games/nethack/files/patch-include__config.h.diff (from rev 122655, trunk/dports/games/nethack/files/patch-include__config.h)
===================================================================
--- trunk/dports/games/nethack/files/patch-include__config.h.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/patch-include__config.h.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,10 @@
+--- nethack-3.4.3/include/config.h.apupx	Sun Dec  7 17:39:13 2003
++++ nethack-3.4.3/include/config.h	Tue Oct 18 07:18:22 2005
+@@ -349,7 +349,7 @@
+  */
+ 
+ /*#define GOLDOBJ */	/* Gold is kept on obj chains - Helge Hafting */
+-/*#define AUTOPICKUP_EXCEPTIONS */ /* exceptions to autopickup */
++#define AUTOPICKUP_EXCEPTIONS /* exceptions to autopickup */
+ 
+ /* End of Section 5 */

Deleted: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,11 +0,0 @@
---- nethack-3.4.3/sys/unix/Makefile.doc.orig	2005-09-02 13:49:04.000000000 -0700
-+++ nethack-3.4.3/sys/unix/Makefile.doc	2005-09-02 13:49:13.000000000 -0700
-@@ -41,7 +41,7 @@
- 
- 
- GAME	= nethack
--MANDIR	= /usr/man/man6
-+MANDIR	= $(DESTDIR)__PREFIX__/share/man/man6
- MANEXT	= 6
- 
- # manual installation for most BSD-style systems

Copied: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc.diff (from rev 122655, trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc)
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.doc.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,11 @@
+--- nethack-3.4.3/sys/unix/Makefile.doc.orig	2005-09-02 13:49:04.000000000 -0700
++++ nethack-3.4.3/sys/unix/Makefile.doc	2005-09-02 13:49:13.000000000 -0700
+@@ -41,7 +41,7 @@
+ 
+ 
+ GAME	= nethack
+-MANDIR	= /usr/man/man6
++MANDIR	= $(DESTDIR)__PREFIX__/share/man/man6
+ MANEXT	= 6
+ 
+ # manual installation for most BSD-style systems

Deleted: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,16 +0,0 @@
---- nethack-3.4.3/sys/unix/Makefile.src.orig	2003-12-07 15:39:13.000000000 -0800
-+++ nethack-3.4.3/sys/unix/Makefile.src	2005-09-02 13:46:21.000000000 -0700
-@@ -227,11 +227,11 @@
- # Be uses -ltermcap
- #
- # libraries for tty ports
--# WINTTYLIB = -ltermcap
-+WINTTYLIB = -ltermcap
- # WINTTYLIB = -lcurses
- # WINTTYLIB = -lcurses16
- # WINTTYLIB = -lncurses
--WINTTYLIB = -ltermlib
-+# WINTTYLIB = -ltermlib
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.

Copied: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src.diff (from rev 122655, trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src)
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.src.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,16 @@
+--- nethack-3.4.3/sys/unix/Makefile.src.orig	2003-12-07 15:39:13.000000000 -0800
++++ nethack-3.4.3/sys/unix/Makefile.src	2005-09-02 13:46:21.000000000 -0700
+@@ -227,11 +227,11 @@
+ # Be uses -ltermcap
+ #
+ # libraries for tty ports
+-# WINTTYLIB = -ltermcap
++WINTTYLIB = -ltermcap
+ # WINTTYLIB = -lcurses
+ # WINTTYLIB = -lcurses16
+ # WINTTYLIB = -lncurses
+-WINTTYLIB = -ltermlib
++# WINTTYLIB = -ltermlib
+ #
+ # libraries for X11
+ # If USE_XPM is defined in config.h, you will also need -lXpm here.

Deleted: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,70 +0,0 @@
---- nethack-3.4.3/sys/unix/Makefile.top.orig	2003-12-07 15:39:13.000000000 -0800
-+++ nethack-3.4.3/sys/unix/Makefile.top	2005-09-02 13:59:43.000000000 -0700
-@@ -14,7 +14,7 @@
- # MAKE = make
- 
- # make NetHack
--PREFIX	 = /usr
-+PREFIX	 = $(DESTDIR)__PREFIX__
- GAME     = nethack
- # GAME     = nethack.prg
- GAMEUID  = games
-@@ -35,9 +35,9 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
-+GAMEDIR  = $(PREFIX)/share/$(GAME)dir
- VARDIR  = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+SHELLDIR = $(PREFIX)/bin
- 
- # per discussion in Install.X11 and Install.Qt
- VARDATND = 
-@@ -191,27 +191,21 @@
- 		< sys/unix/nethack.sh \
- 		> $(SHELLDIR)/$(GAME)
- # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
--			$(CHGRP) $(GAMEGRP) $(GAME) recover )
- 	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
- 	chmod $(EXEPERM) $(GAMEDIR)/recover
--	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
--	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
- 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
- 
- dofiles-dlb: check-dlb
- 	( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
- # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
--			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
-+	-( cd $(GAMEDIR) ; \
- 			chmod $(FILEPERM) nhdat $(DATNODLB) )
- 
- dofiles-nodlb:
- # copy over the game files
- 	( cd dat ; cp $(DAT) $(GAMEDIR) )
- # set up their permissions
--	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
--			$(CHGRP) $(GAMEGRP) $(DAT) ; \
-+	-( cd $(GAMEDIR) ; \
- 			chmod $(FILEPERM) $(DAT) )
- 
- update: $(GAME) recover $(VARDAT) dungeon spec_levs
-@@ -237,15 +231,12 @@
- 	-rm -rf $(GAMEDIR) $(VARDIR)
- 	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
- 	-rmdir ./-p
--	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
--	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
- 	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
- # set up the game files
- 	( $(MAKE) dofiles )
- # set up some additional files
- 	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
--	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
--			$(CHGRP) $(GAMEGRP) perm record logfile ; \
-+	-( cd $(VARDIR) ; \
- 			chmod $(FILEPERM) perm record logfile )
- # and a reminder
- 	@echo You may also want to reinstall the man pages via the doc Makefile.

Copied: trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top.diff (from rev 122655, trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top)
===================================================================
--- trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/patch-sys__unix__Makefile.top.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,70 @@
+--- nethack-3.4.3/sys/unix/Makefile.top.orig	2003-12-07 15:39:13.000000000 -0800
++++ nethack-3.4.3/sys/unix/Makefile.top	2005-09-02 13:59:43.000000000 -0700
+@@ -14,7 +14,7 @@
+ # MAKE = make
+ 
+ # make NetHack
+-PREFIX	 = /usr
++PREFIX	 = $(DESTDIR)__PREFIX__
+ GAME     = nethack
+ # GAME     = nethack.prg
+ GAMEUID  = games
+@@ -35,9 +35,9 @@
+ # therefore there should not be anything in GAMEDIR that you want to keep
+ # (if there is, you'll have to do the installation by hand or modify the
+ # instructions)
+-GAMEDIR  = $(PREFIX)/games/lib/$(GAME)dir
++GAMEDIR  = $(PREFIX)/share/$(GAME)dir
+ VARDIR  = $(GAMEDIR)
+-SHELLDIR = $(PREFIX)/games
++SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+ VARDATND = 
+@@ -191,27 +191,21 @@
+ 		< sys/unix/nethack.sh \
+ 		> $(SHELLDIR)/$(GAME)
+ # set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(GAME) recover ; \
+-			$(CHGRP) $(GAMEGRP) $(GAME) recover )
+ 	chmod $(GAMEPERM) $(GAMEDIR)/$(GAME)
+ 	chmod $(EXEPERM) $(GAMEDIR)/recover
+-	-$(CHOWN) $(GAMEUID) $(SHELLDIR)/$(GAME)
+-	$(CHGRP) $(GAMEGRP) $(SHELLDIR)/$(GAME)
+ 	chmod $(EXEPERM) $(SHELLDIR)/$(GAME)
+ 
+ dofiles-dlb: check-dlb
+ 	( cd dat ; cp nhdat $(DATNODLB) $(GAMEDIR) )
+ # set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) nhdat $(DATNODLB) ; \
+-			$(CHGRP) $(GAMEGRP) nhdat $(DATNODLB) ; \
++	-( cd $(GAMEDIR) ; \
+ 			chmod $(FILEPERM) nhdat $(DATNODLB) )
+ 
+ dofiles-nodlb:
+ # copy over the game files
+ 	( cd dat ; cp $(DAT) $(GAMEDIR) )
+ # set up their permissions
+-	-( cd $(GAMEDIR) ; $(CHOWN) $(GAMEUID) $(DAT) ; \
+-			$(CHGRP) $(GAMEGRP) $(DAT) ; \
++	-( cd $(GAMEDIR) ; \
+ 			chmod $(FILEPERM) $(DAT) )
+ 
+ update: $(GAME) recover $(VARDAT) dungeon spec_levs
+@@ -237,15 +231,12 @@
+ 	-rm -rf $(GAMEDIR) $(VARDIR)
+ 	-mkdir -p $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+ 	-rmdir ./-p
+-	-$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+-	$(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+ 	chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
+ # set up the game files
+ 	( $(MAKE) dofiles )
+ # set up some additional files
+ 	touch $(VARDIR)/perm $(VARDIR)/record $(VARDIR)/logfile
+-	-( cd $(VARDIR) ; $(CHOWN) $(GAMEUID) perm record logfile ; \
+-			$(CHGRP) $(GAMEGRP) perm record logfile ; \
++	-( cd $(VARDIR) ; \
+ 			chmod $(FILEPERM) perm record logfile )
+ # and a reminder
+ 	@echo You may also want to reinstall the man pages via the doc Makefile.

Deleted: trunk/dports/games/nethack/files/patch-win__tty__termcap.c
===================================================================
--- trunk/dports/games/nethack/files/patch-win__tty__termcap.c	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/patch-win__tty__termcap.c	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,11 +0,0 @@
---- nethack-3.4.3/win/tty/termcap.c.orig	2005-09-02 13:35:49.000000000 -0700
-+++ nethack-3.4.3/win/tty/termcap.c	2005-09-02 13:36:13.000000000 -0700
-@@ -835,7 +835,7 @@
- 
- #include <curses.h>
- 
--#ifndef LINUX
-+#if !defined(LINUX) && !defined(__APPLE__)
- extern char *tparm();
- #endif
- 

Copied: trunk/dports/games/nethack/files/patch-win__tty__termcap.c.diff (from rev 122655, trunk/dports/games/nethack/files/patch-win__tty__termcap.c)
===================================================================
--- trunk/dports/games/nethack/files/patch-win__tty__termcap.c.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/patch-win__tty__termcap.c.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,11 @@
+--- nethack-3.4.3/win/tty/termcap.c.orig	2005-09-02 13:35:49.000000000 -0700
++++ nethack-3.4.3/win/tty/termcap.c	2005-09-02 13:36:13.000000000 -0700
+@@ -835,7 +835,7 @@
+ 
+ #include <curses.h>
+ 
+-#ifndef LINUX
++#if !defined(LINUX) && !defined(__APPLE__)
+ extern char *tparm();
+ #endif
+ 

Deleted: trunk/dports/games/nethack/files/x11/patch-include__config.h
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-include__config.h	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/x11/patch-include__config.h	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,11 +0,0 @@
---- nethack-3.4.3/include/config.h.orig	Mon Sep  2 17:43:56 2002
-+++ nethack-3.4.3/include/config.h	Mon Sep  2 17:44:14 2002
-@@ -43,7 +43,7 @@
-  * Some combinations make no sense.  See the installation document.
-  */
- #define TTY_GRAPHICS	/* good old tty based graphics */
--/* #define X11_GRAPHICS */	/* X11 interface */
-+#define X11_GRAPHICS	/* X11 interface */
- /* #define QT_GRAPHICS */	/* Qt interface */
- /* #define GNOME_GRAPHICS */	/* Gnome interface */
- /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */

Copied: trunk/dports/games/nethack/files/x11/patch-include__config.h.diff (from rev 122655, trunk/dports/games/nethack/files/x11/patch-include__config.h)
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-include__config.h.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/x11/patch-include__config.h.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,11 @@
+--- nethack-3.4.3/include/config.h.orig	Mon Sep  2 17:43:56 2002
++++ nethack-3.4.3/include/config.h	Mon Sep  2 17:44:14 2002
+@@ -43,7 +43,7 @@
+  * Some combinations make no sense.  See the installation document.
+  */
+ #define TTY_GRAPHICS	/* good old tty based graphics */
+-/* #define X11_GRAPHICS */	/* X11 interface */
++#define X11_GRAPHICS	/* X11 interface */
+ /* #define QT_GRAPHICS */	/* Qt interface */
+ /* #define GNOME_GRAPHICS */	/* Gnome interface */
+ /* #define MSWIN_GRAPHICS */	/* Windows NT, CE, Graphics */

Deleted: trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,33 +0,0 @@
---- nethack-3.4.3/sys/unix/Makefile.src.orig	Mon Sep  2 18:25:46 2002
-+++ nethack-3.4.3/sys/unix/Makefile.src	Mon Sep  2 18:26:59 2002
-@@ -151,8 +151,8 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
- 
--CFLAGS = -O -I../include
--LFLAGS = 
-+CFLAGS = -O -I../include -I/usr/X11R6/include
-+LFLAGS = -L/usr/X11R6/lib
- 
- # 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
-@@ -214,8 +214,8 @@
- 
- #
- #
--WINSRC = $(WINTTYSRC)
--WINOBJ = $(WINTTYOBJ)
-+WINSRC = $(WINTTYSRC) $(WINX11SRC)
-+WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
- 
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -255,7 +255,7 @@
- # libraries for BeOS 
- WINBELIB = -lbe
- 
--WINLIB = $(WINTTYLIB)
-+WINLIB = $(WINTTYLIB) $(WINX11LIB)
- 
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)

Copied: trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src.diff (from rev 122655, trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src)
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.src.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,33 @@
+--- nethack-3.4.3/sys/unix/Makefile.src.orig	Mon Sep  2 18:25:46 2002
++++ nethack-3.4.3/sys/unix/Makefile.src	Mon Sep  2 18:26:59 2002
+@@ -151,8 +151,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+ 
+-CFLAGS = -O -I../include
+-LFLAGS = 
++CFLAGS = -O -I../include -I/usr/X11R6/include
++LFLAGS = -L/usr/X11R6/lib
+ 
+ # 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
+@@ -214,8 +214,8 @@
+ 
+ #
+ #
+-WINSRC = $(WINTTYSRC)
+-WINOBJ = $(WINTTYOBJ)
++WINSRC = $(WINTTYSRC) $(WINX11SRC)
++WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
+ 
+ # on some systems the termcap library is in -ltermcap or -lcurses
+ # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
+@@ -255,7 +255,7 @@
+ # libraries for BeOS 
+ WINBELIB = -lbe
+ 
+-WINLIB = $(WINTTYLIB)
++WINLIB = $(WINTTYLIB) $(WINX11LIB)
+ 
+ # any other strange libraries your system needs (for Sysunix only -- the more
+ # specialized targets should already be right)

Deleted: trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top	2014-07-25 19:18:38 UTC (rev 122655)
+++ trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top	2014-07-25 19:50:08 UTC (rev 122656)
@@ -1,13 +0,0 @@
---- nethack-3.4.3/sys/unix/Makefile.top.orig	Mon Sep  2 17:44:55 2002
-+++ nethack-3.4.3/sys/unix/Makefile.top	Mon Sep  2 17:46:44 2002
-@@ -40,8 +40,8 @@
- SHELLDIR = $(PREFIX)/bin
- 
- # per discussion in Install.X11 and Install.Qt
--VARDATND = 
--# VARDATND = x11tiles NetHack.ad pet_mark.xbm
-+# VARDATND = 
-+VARDATND = x11tiles NetHack.ad pet_mark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
- # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img

Copied: trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top.diff (from rev 122655, trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top)
===================================================================
--- trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top.diff	                        (rev 0)
+++ trunk/dports/games/nethack/files/x11/patch-sys__unix__Makefile.top.diff	2014-07-25 19:50:08 UTC (rev 122656)
@@ -0,0 +1,13 @@
+--- nethack-3.4.3/sys/unix/Makefile.top.orig	Mon Sep  2 17:44:55 2002
++++ nethack-3.4.3/sys/unix/Makefile.top	Mon Sep  2 17:46:44 2002
+@@ -40,8 +40,8 @@
+ SHELLDIR = $(PREFIX)/bin
+ 
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND = 
+-# VARDATND = x11tiles NetHack.ad pet_mark.xbm
++# VARDATND = 
++VARDATND = x11tiles NetHack.ad pet_mark.xbm
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140725/9f422634/attachment-0001.html>


More information about the macports-changes mailing list