[31277] trunk/dports/games/jnethack
takanori at macports.org
takanori at macports.org
Sun Nov 18 22:42:05 PST 2007
Revision: 31277
http://trac.macosforge.org/projects/macports/changeset/31277
Author: takanori at macports.org
Date: 2007-11-18 22:42:03 -0800 (Sun, 18 Nov 2007)
Log Message:
-----------
jnethack: Linted.
Modified Paths:
--------------
trunk/dports/games/jnethack/Portfile
Added Paths:
-----------
trunk/dports/games/jnethack/files/patch-src_options.c.diff
trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.doc.diff
trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.top.diff
trunk/dports/games/jnethack/files/patch-sys_unix_nethack.sh.diff
trunk/dports/games/jnethack/files/patch-win_tty_termcap.c.diff
trunk/dports/games/jnethack/files/x11/patch-include_config.h.diff
trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.src.diff
trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.top.diff
trunk/dports/games/jnethack/files/x11/patch-win_X11_JNetHack.ad.diff
Removed Paths:
-------------
trunk/dports/games/jnethack/files/patch-src__options.c
trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.doc
trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.top
trunk/dports/games/jnethack/files/patch-sys__unix__nethack.sh
trunk/dports/games/jnethack/files/patch-win__tty__termcap.c
trunk/dports/games/jnethack/files/x11/patch-include__config.h
trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.src
trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.top
trunk/dports/games/jnethack/files/x11/patch-win__X11__JNetHack.ad
Modified: trunk/dports/games/jnethack/Portfile
===================================================================
--- trunk/dports/games/jnethack/Portfile 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/Portfile 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,21 +1,20 @@
# $Id$
PortSystem 1.0
+
name jnethack
version 3.4.3-0.9
categories games japanese
-maintainers kyut at rutiler.net takanori at macports.org
+maintainers rutiler.net:kyut takanori
description Classic dungeon adventure game, translated in Japanese.
long_description \
${description}
+platforms darwin
homepage http://jnethack.sourceforge.jp/
-platforms darwin
-
-set nethacksrc "nethack-343-src.tgz"
-set jnethackpatch "${name}-${version}.diff.gz"
+#master_sites sourceforge_jp:${name}/9091/:nh \
+# sourceforge_jp:${name}/25190/:jnh
set sfjpid_nh 9091
set sfjpid_jnh 25190
-
master_sites http://keihanna.dl.sourceforge.jp/${name}/${sfjpid_nh}/:nh \
http://osdn.dl.sourceforge.jp/${name}/${sfjpid_nh}/:nh \
http://globalbase.dl.sourceforge.jp/${name}/${sfjpid_nh}/:nh \
@@ -24,41 +23,38 @@
http://osdn.dl.sourceforge.jp/${name}/${sfjpid_jnh}/:jnh \
http://globalbase.dl.sourceforge.jp/${name}/${sfjpid_jnh}/:jnh \
http://jaist.dl.sourceforge.jp/${name}/${sfjpid_jnh}/:jnh
+set nethacksrc "nethack-343-src.tgz"
+set jnethackpatch "${name}-${version}.diff.gz"
distfiles ${nethacksrc}:nh \
${jnethackpatch}:jnh
+patchfiles patch-sys_unix_Makefile.doc.diff \
+ patch-sys_unix_Makefile.top.diff \
+ patch-sys_unix_nethack.sh.diff \
+ patch-win_tty_termcap.c.diff \
+ patch-src_options.c.diff
checksums ${nethacksrc} sha1 c26537093c38152bc0fbcec20468d975b35f59fd \
${jnethackpatch} sha1 547acd967c75a6bc8d464821b41ed026c1c2bb3a
-patchfiles patch-sys__unix__Makefile.doc \
- patch-sys__unix__Makefile.top \
- patch-sys__unix__nethack.sh \
- patch-win__tty__termcap.c \
- patch-src__options.c
depends_build port:bison \
port:flex
depends_run port:cocot
-livecheck.check regex
-livecheck.url ${homepage}
-livecheck.regex <li>\\(\[0-9/\]+\\) (\[0-9.-\]+)
+## extract ##
extract.only ${nethacksrc}
worksrcdir nethack-3.4.3
-
-## extract ##
-
post-extract {
- system "cd ${worksrcpath} && gunzip -dc ${distpath}/${jnethackpatch} | patch -p 1"
+ system "cd ${worksrcpath} && gunzip -dc ${distpath}/${jnethackpatch} | patch -p 1"
}
## patch ##
pre-patch {
if {[variant_isset x11]} {
- patchfiles-append x11/patch-include__config.h \
- x11/patch-sys__unix__Makefile.top \
- x11/patch-sys__unix__Makefile.src \
- x11/patch-win__X11__JNetHack.ad
+ patchfiles-append x11/patch-include_config.h.diff \
+ x11/patch-sys_unix_Makefile.top.diff \
+ x11/patch-sys_unix_Makefile.src.diff \
+ x11/patch-win_X11_JNetHack.ad.diff
}
}
post-patch {
@@ -79,8 +75,8 @@
addgroup games
adduser games gid=[existsgroup games]
- file mkdir "${destroot}${prefix}/share/man/man6"
- file mkdir "${destroot}${prefix}/share/jnethackdir/save"
+ xinstall -m 755 -d "${destroot}${prefix}/share/man/man6"
+ xinstall -m 755 -d "${destroot}${prefix}/share/jnethackdir/save"
}
destroot.target install manpages
@@ -89,7 +85,7 @@
post-destroot {
reinplace "s|${destroot}||" "${destroot}${prefix}/bin/jnethack"
if {[variant_isset x11]} {
- file copy ${worksrcpath}/win/X11/JNetHack.ad ${destroot}${prefix}/share/jnethackdir/
+ copy ${worksrcpath}/win/X11/JNetHack.ad ${destroot}${prefix}/share/jnethackdir/
}
}
@@ -112,3 +108,7 @@
reinplace "s|\$(CC) \$(LFLAGS)|\$(CC) \$(CFLAGS) \$(LFLAGS)|" ${worksrcpath}/sys/unix/Makefile.utl
}
}
+
+livecheck.check regex
+livecheck.url ${homepage}
+livecheck.regex <li>\\(\[0-9/\]+\\) (\[0-9.-\]+)
Deleted: trunk/dports/games/jnethack/files/patch-src__options.c
===================================================================
--- trunk/dports/games/jnethack/files/patch-src__options.c 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/patch-src__options.c 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,11 +0,0 @@
---- src/options.c.orig 2006-08-12 16:45:15.000000000 +0900
-+++ src/options.c 2006-08-12 16:45:43.000000000 +0900
-@@ -137,7 +137,7 @@
- #else
- {"news", (boolean *)0, FALSE, SET_IN_FILE},
- #endif
-- {"null", &flags.null, TRUE, SET_IN_GAME},
-+ {"null", &flags.null, FALSE, SET_IN_GAME},
- #ifdef MAC
- {"page_wait", &flags.page_wait, TRUE, SET_IN_GAME},
- #else
Copied: trunk/dports/games/jnethack/files/patch-src_options.c.diff (from rev 30574, trunk/dports/games/jnethack/files/patch-src__options.c)
===================================================================
--- trunk/dports/games/jnethack/files/patch-src_options.c.diff (rev 0)
+++ trunk/dports/games/jnethack/files/patch-src_options.c.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,11 @@
+--- src/options.c.orig 2006-08-12 16:45:15.000000000 +0900
++++ src/options.c 2006-08-12 16:45:43.000000000 +0900
+@@ -137,7 +137,7 @@
+ #else
+ {"news", (boolean *)0, FALSE, SET_IN_FILE},
+ #endif
+- {"null", &flags.null, TRUE, SET_IN_GAME},
++ {"null", &flags.null, FALSE, SET_IN_GAME},
+ #ifdef MAC
+ {"page_wait", &flags.page_wait, TRUE, SET_IN_GAME},
+ #else
Deleted: trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.doc
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.doc 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.doc 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,13 +0,0 @@
---- sys/unix/Makefile.doc.orig 2006-07-29 05:14:04.000000000 +0900
-+++ sys/unix/Makefile.doc 2006-07-29 05:24:47.000000000 +0900
-@@ -40,8 +40,8 @@
- latex Guidebook.tex
-
-
--GAME = nethack
--MANDIR = /usr/local/man/man6
-+GAME = jnethack
-+MANDIR = $(DESTDIR)__PREFIX__/share/man/man6
- MANEXT = 6
-
- # manual installation for most BSD-style systems
Deleted: trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.top
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.top 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.top 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,38 +0,0 @@
---- sys/unix/Makefile.top.orig 2006-08-11 13:30:01.000000000 +0900
-+++ sys/unix/Makefile.top 2006-08-11 13:35:41.000000000 +0900
-@@ -14,18 +14,18 @@
- # MAKE = make
-
- # make NetHack
--PREFIX = /usr
-+PREFIX = $(DESTDIR)__PREFIX__
- GAME = jnethack
- # GAME = nethack.prg
- GAMEUID = games
--GAMEGRP = bin
-+GAMEGRP = games
-
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM = 0755
--DIRPERM = 0755
-+DIRPERM = 0775
-
- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -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 =
Deleted: trunk/dports/games/jnethack/files/patch-sys__unix__nethack.sh
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys__unix__nethack.sh 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/patch-sys__unix__nethack.sh 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,33 +0,0 @@
---- sys/unix/nethack.sh.orig 2006-08-24 23:23:30.000000000 +0900
-+++ sys/unix/nethack.sh 2006-08-24 23:24:35.000000000 +0900
-@@ -5,6 +5,7 @@
- export HACKDIR
- HACK=$HACKDIR/nethack
- MAXNROFPLAYERS=20
-+COCOT="__PREFIX__/bin/cocot -t UTF-8 -p EUC-JP"
-
- # JP
- # set LC_ALL, NETHACKOPTIONS etc..
-@@ -26,6 +27,10 @@
- export USERFILESEARCHPATH
- fi
-
-+if [ "X$LANG" = "Xja_JP.eucJP" ] ; then
-+ COCOT=""
-+fi
-+
- #if [ "X$DISPLAY" ] ; then
- # xset fp+ $HACKDIR
- #fi
-@@ -84,9 +89,9 @@
- cd $HACKDIR
- case $1 in
- -s*)
-- exec $HACK "$@"
-+ exec $COCOT $HACK "$@"
- ;;
- *)
-- exec $HACK "$@" $MAXNROFPLAYERS
-+ exec $COCOT $HACK "$@" $MAXNROFPLAYERS
- ;;
- esac
Copied: trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.doc.diff (from rev 30574, trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.doc)
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.doc.diff (rev 0)
+++ trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.doc.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,13 @@
+--- sys/unix/Makefile.doc.orig 2006-07-29 05:14:04.000000000 +0900
++++ sys/unix/Makefile.doc 2006-07-29 05:24:47.000000000 +0900
+@@ -40,8 +40,8 @@
+ latex Guidebook.tex
+
+
+-GAME = nethack
+-MANDIR = /usr/local/man/man6
++GAME = jnethack
++MANDIR = $(DESTDIR)__PREFIX__/share/man/man6
+ MANEXT = 6
+
+ # manual installation for most BSD-style systems
Copied: trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.top.diff (from rev 30574, trunk/dports/games/jnethack/files/patch-sys__unix__Makefile.top)
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.top.diff (rev 0)
+++ trunk/dports/games/jnethack/files/patch-sys_unix_Makefile.top.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,38 @@
+--- sys/unix/Makefile.top.orig 2006-08-11 13:30:01.000000000 +0900
++++ sys/unix/Makefile.top 2006-08-11 13:35:41.000000000 +0900
+@@ -14,18 +14,18 @@
+ # MAKE = make
+
+ # make NetHack
+-PREFIX = /usr
++PREFIX = $(DESTDIR)__PREFIX__
+ GAME = jnethack
+ # GAME = nethack.prg
+ GAMEUID = games
+-GAMEGRP = bin
++GAMEGRP = games
+
+ # Permissions - some places use setgid instead of setuid, for instance
+ # See also the option "SECURE" in include/config.h
+-GAMEPERM = 04755
+-FILEPERM = 0644
++GAMEPERM = 02755
++FILEPERM = 0664
+ EXEPERM = 0755
+-DIRPERM = 0755
++DIRPERM = 0775
+
+ # GAMEDIR also appears in config.h as "HACKDIR".
+ # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
+@@ -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 =
Copied: trunk/dports/games/jnethack/files/patch-sys_unix_nethack.sh.diff (from rev 30574, trunk/dports/games/jnethack/files/patch-sys__unix__nethack.sh)
===================================================================
--- trunk/dports/games/jnethack/files/patch-sys_unix_nethack.sh.diff (rev 0)
+++ trunk/dports/games/jnethack/files/patch-sys_unix_nethack.sh.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,33 @@
+--- sys/unix/nethack.sh.orig 2006-08-24 23:23:30.000000000 +0900
++++ sys/unix/nethack.sh 2006-08-24 23:24:35.000000000 +0900
+@@ -5,6 +5,7 @@
+ export HACKDIR
+ HACK=$HACKDIR/nethack
+ MAXNROFPLAYERS=20
++COCOT="__PREFIX__/bin/cocot -t UTF-8 -p EUC-JP"
+
+ # JP
+ # set LC_ALL, NETHACKOPTIONS etc..
+@@ -26,6 +27,10 @@
+ export USERFILESEARCHPATH
+ fi
+
++if [ "X$LANG" = "Xja_JP.eucJP" ] ; then
++ COCOT=""
++fi
++
+ #if [ "X$DISPLAY" ] ; then
+ # xset fp+ $HACKDIR
+ #fi
+@@ -84,9 +89,9 @@
+ cd $HACKDIR
+ case $1 in
+ -s*)
+- exec $HACK "$@"
++ exec $COCOT $HACK "$@"
+ ;;
+ *)
+- exec $HACK "$@" $MAXNROFPLAYERS
++ exec $COCOT $HACK "$@" $MAXNROFPLAYERS
+ ;;
+ esac
Deleted: trunk/dports/games/jnethack/files/patch-win__tty__termcap.c
===================================================================
--- trunk/dports/games/jnethack/files/patch-win__tty__termcap.c 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/patch-win__tty__termcap.c 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,11 +0,0 @@
---- win/tty/termcap.c.orig 2006-08-09 19:55:36.000000000 +0900
-+++ win/tty/termcap.c 2006-08-09 20:05:44.000000000 +0900
-@@ -861,7 +861,7 @@
-
- #include <curses.h>
-
--#ifndef LINUX
-+#if !defined(LINUX) && !defined(__APPLE__)
- extern char *tparm();
- #endif
-
Copied: trunk/dports/games/jnethack/files/patch-win_tty_termcap.c.diff (from rev 30574, trunk/dports/games/jnethack/files/patch-win__tty__termcap.c)
===================================================================
--- trunk/dports/games/jnethack/files/patch-win_tty_termcap.c.diff (rev 0)
+++ trunk/dports/games/jnethack/files/patch-win_tty_termcap.c.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,11 @@
+--- win/tty/termcap.c.orig 2006-08-09 19:55:36.000000000 +0900
++++ win/tty/termcap.c 2006-08-09 20:05:44.000000000 +0900
+@@ -861,7 +861,7 @@
+
+ #include <curses.h>
+
+-#ifndef LINUX
++#if !defined(LINUX) && !defined(__APPLE__)
+ extern char *tparm();
+ #endif
+
Deleted: trunk/dports/games/jnethack/files/x11/patch-include__config.h
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-include__config.h 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/x11/patch-include__config.h 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,29 +0,0 @@
---- include/config.h 2006-08-05 16:00:45.000000000 +0900
-+++ include/config.h 2006-08-05 16:21:55.000000000 +0900
-@@ -44,7 +44,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 */
-@@ -133,7 +133,7 @@
- * would allow:
- * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
- */
--/*# define USE_XPM*/ /* Disable if you do not have the XPM library */
-+# define USE_XPM /* Disable if you do not have the XPM library */
- # ifdef USE_XPM
- # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
- # define X11LARGETILE /* Large tile for X11 */
-@@ -368,7 +368,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/jnethack/files/x11/patch-include_config.h.diff (from rev 30574, trunk/dports/games/jnethack/files/x11/patch-include__config.h)
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-include_config.h.diff (rev 0)
+++ trunk/dports/games/jnethack/files/x11/patch-include_config.h.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,29 @@
+--- include/config.h 2006-08-05 16:00:45.000000000 +0900
++++ include/config.h 2006-08-05 16:21:55.000000000 +0900
+@@ -44,7 +44,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 */
+@@ -133,7 +133,7 @@
+ * would allow:
+ * xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
+ */
+-/*# define USE_XPM*/ /* Disable if you do not have the XPM library */
++# define USE_XPM /* Disable if you do not have the XPM library */
+ # ifdef USE_XPM
+ # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
+ # define X11LARGETILE /* Large tile for X11 */
+@@ -368,7 +368,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/jnethack/files/x11/patch-sys__unix__Makefile.src
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.src 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.src 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,45 +0,0 @@
---- sys/unix/Makefile.src 2006-08-05 16:00:44.000000000 +0900
-+++ sys/unix/Makefile.src 2006-08-05 16:06:00.000000000 +0900
-@@ -154,8 +154,8 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
-
--CFLAGS = -W -g -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
-@@ -227,8 +227,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
-@@ -248,9 +248,9 @@
- #
- # 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 -lXt -lX11
--# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
-+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
-@@ -268,7 +268,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/jnethack/files/x11/patch-sys__unix__Makefile.top
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.top 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.top 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,14 +0,0 @@
---- sys/unix/Makefile.top 2006-08-05 16:00:44.000000000 +0900
-+++ sys/unix/Makefile.top 2006-08-05 16:02:33.000000000 +0900
-@@ -40,9 +40,9 @@
- SHELLDIR = $(PREFIX)/bin
-
- # per discussion in Install.X11 and Install.Qt
--VARDATND =
-+# VARDATND =
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
--# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
-+VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
- # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
- # for BeOS
Copied: trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.src.diff (from rev 30574, trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.src)
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.src.diff (rev 0)
+++ trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.src.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,45 @@
+--- sys/unix/Makefile.src 2006-08-05 16:00:44.000000000 +0900
++++ sys/unix/Makefile.src 2006-08-05 16:06:00.000000000 +0900
+@@ -154,8 +154,8 @@
+ # flags for debugging:
+ # CFLAGS = -g -I../include
+
+-CFLAGS = -W -g -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
+@@ -227,8 +227,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
+@@ -248,9 +248,9 @@
+ #
+ # 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 -lXt -lX11
+-# WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
++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
+@@ -268,7 +268,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/jnethack/files/x11/patch-sys_unix_Makefile.top.diff (from rev 30574, trunk/dports/games/jnethack/files/x11/patch-sys__unix__Makefile.top)
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.top.diff (rev 0)
+++ trunk/dports/games/jnethack/files/x11/patch-sys_unix_Makefile.top.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,14 @@
+--- sys/unix/Makefile.top 2006-08-05 16:00:44.000000000 +0900
++++ sys/unix/Makefile.top 2006-08-05 16:02:33.000000000 +0900
+@@ -40,9 +40,9 @@
+ SHELLDIR = $(PREFIX)/bin
+
+ # per discussion in Install.X11 and Install.Qt
+-VARDATND =
++# VARDATND =
+ # VARDATND = x11tiles NetHack.ad pet_mark.xbm
+-# VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
++VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
+ # for Atari/Gem
+ # VARDATND = nh16.img title.img GEM_RSC.RSC rip.img
+ # for BeOS
Copied: trunk/dports/games/jnethack/files/x11/patch-win_X11_JNetHack.ad.diff (from rev 30574, trunk/dports/games/jnethack/files/x11/patch-win__X11__JNetHack.ad)
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-win_X11_JNetHack.ad.diff (rev 0)
+++ trunk/dports/games/jnethack/files/x11/patch-win_X11_JNetHack.ad.diff 2007-11-19 06:42:03 UTC (rev 31277)
@@ -0,0 +1,37 @@
+--- win/X11/JNetHack.ad 2006-08-05 16:00:47.000000000 +0900
++++ win/X11/JNetHack.ad 2006-08-05 16:25:18.000000000 +0900
+@@ -5,14 +5,14 @@
+ !
+ JNetHack*colormap: install
+ !
+-JNetHack*font: variable
+-JNetHack*display_file*font: fixed
+-JNetHack*tombstone*font: fixed
+-JNetHack*rip*font: -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
+-JNetHack*menu*font: fixed
+-JNetHack*text*font: fixed
++JNetHack*font: *-14-*
++!JNetHack*display_file*font: fixed
++!JNetHack*tombstone*font: fixed
++!JNetHack*rip*font: -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
++!JNetHack*menu*font: fixed
++!JNetHack*text*font: fixed
+ !JNetHack*map*font: nh10
+-JNetHack*map*font: fixed
++!JNetHack*map*font: fixed
+
+ ! To use full-color tiles for the map, uncomment the tile file name.
+ ! If you use a 100dpi (or greater) monitor you may wish to double the
+@@ -23,9 +23,9 @@
+ ! such as XV or preferably PBMplus.
+ !
+ !JNetHack.tile_file: x11tiles32j
+-JNetHack.tile_file: t32-1024.xpm
+-JNetHack.tile_width: 32
+-JNetHack.tile_height: 32
++JNetHack.tile_file: x11tiles
++JNetHack.tile_width: 16
++JNetHack.tile_height: 16
+ !JNetHack.double_tile_size: True
+ !
+ ! The annotation of pets.
Deleted: trunk/dports/games/jnethack/files/x11/patch-win__X11__JNetHack.ad
===================================================================
--- trunk/dports/games/jnethack/files/x11/patch-win__X11__JNetHack.ad 2007-11-19 06:41:36 UTC (rev 31276)
+++ trunk/dports/games/jnethack/files/x11/patch-win__X11__JNetHack.ad 2007-11-19 06:42:03 UTC (rev 31277)
@@ -1,37 +0,0 @@
---- win/X11/JNetHack.ad 2006-08-05 16:00:47.000000000 +0900
-+++ win/X11/JNetHack.ad 2006-08-05 16:25:18.000000000 +0900
-@@ -5,14 +5,14 @@
- !
- JNetHack*colormap: install
- !
--JNetHack*font: variable
--JNetHack*display_file*font: fixed
--JNetHack*tombstone*font: fixed
--JNetHack*rip*font: -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
--JNetHack*menu*font: fixed
--JNetHack*text*font: fixed
-+JNetHack*font: *-14-*
-+!JNetHack*display_file*font: fixed
-+!JNetHack*tombstone*font: fixed
-+!JNetHack*rip*font: -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
-+!JNetHack*menu*font: fixed
-+!JNetHack*text*font: fixed
- !JNetHack*map*font: nh10
--JNetHack*map*font: fixed
-+!JNetHack*map*font: fixed
-
- ! To use full-color tiles for the map, uncomment the tile file name.
- ! If you use a 100dpi (or greater) monitor you may wish to double the
-@@ -23,9 +23,9 @@
- ! such as XV or preferably PBMplus.
- !
- !JNetHack.tile_file: x11tiles32j
--JNetHack.tile_file: t32-1024.xpm
--JNetHack.tile_width: 32
--JNetHack.tile_height: 32
-+JNetHack.tile_file: x11tiles
-+JNetHack.tile_width: 16
-+JNetHack.tile_height: 16
- !JNetHack.double_tile_size: True
- !
- ! The annotation of pets.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/99e366e4/attachment-0001.html
More information about the macports-changes
mailing list