Attachment #148666 for bug #194611

View | Details | Raw Unified | Return to bug 194611
Collapse All | Expand All

Lines 68-73 Link Here

(-)nethack34/Makefile (+2 lines)
68	post-install:	68	post-install:
69	(cd ${WRKSRC}/doc && \	69	(cd ${WRKSRC}/doc && \
70	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages)	70	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages)
		71	${INSTALL_DATA} ${WRKSRC}/win/X11/JNetHack.ad \
		72	${STAGEDIR}${PREFIX}/lib/X11/app-defaults/JNetHack
71	.if ${PORT_OPTIONS:MDOCS}	73	.if ${PORT_OPTIONS:MDOCS}
72	@${MKDIR} ${STAGEDIR}${DOCSDIR}	74	@${MKDIR} ${STAGEDIR}${DOCSDIR}
73	(cd ${WRKSRC} && ${INSTALL_DATA} README.j ChangeLog.j INSTALL.j \	75	(cd ${WRKSRC} && ${INSTALL_DATA} README.j ChangeLog.j INSTALL.j \

Lines 1-5 Link Here

(-)nethack34/files/patch-include-config.h (-2 / +11 lines)
1	--- include/config.h.orig 2014-08-28 15:09:32.000000000 +0900	1	--- include/config.h.orig 2014-10-18 21:39:21.000000000 +0900
2	+++ include/config.h 2014-08-28 15:10:15.000000000 +0900	2	+++ include/config.h 2014-10-18 21:48:34.000000000 +0900
		3	@@ -133,7 +133,7 @@
		4	* would allow:
		5	* xpmtoppm <x11tiles.xpm \| pnmscale 1.25 \| ppmquant 90 >x11tiles_big.xpm
		6	*/
		7	-/# define USE_XPM/ /* Disable if you do not have the XPM library */
		8	+# define USE_XPM /* Disable if you do not have the XPM library */
		9	# ifdef USE_XPM
		10	# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
		11	# define X11LARGETILE /* Large tile for X11 */
3	@@ -219,7 +219,7 @@	12	@@ -219,7 +219,7 @@
4	* otherwise it will be the current directory.	13	* otherwise it will be the current directory.
5	*/	14	*/




--- include/xwindow.h.orig	2003-12-08 08:39:13.000000000 +0900
+++ include/xwindow.h	2014-10-17 22:46:12.000000000 +0900
@@ -78,6 +78,9 @@
 
 extern XFontStruct *WindowFontStruct(/* Widget */);
 extern Font WindowFont(/* Widget */);
+#ifdef XI18N
+extern XFontSet WindowFontSet(/* Widget */);
+#endif
 
 #define XtCWindowResource "WindowResource"
 #define XtCRows			"Rows"

Lines 1-5 Link Here

(-)nethack34/files/patch-sys-unix-Makefile.top (-4 / +3 lines)
1	--- sys/unix/Makefile.top.orig 2014-09-01 22:34:32.000000000 +0900	1	--- sys/unix/Makefile.top.orig 2014-10-22 13:50:35.000000000 +0900
2	+++ sys/unix/Makefile.top 2014-09-01 22:36:34.000000000 +0900	2	+++ sys/unix/Makefile.top 2014-10-22 13:52:56.000000000 +0900
3	@@ -14,7 +14,6 @@	3	@@ -14,7 +14,6 @@
4	# MAKE = make	4	# MAKE = make
5		5
Lines 112-118 Link Here
112	touch $(VARDIR)/perm $(VARDIR)/record	112	touch $(VARDIR)/perm $(VARDIR)/record
113	# and a reminder	113	# and a reminder
114	@echo You may also want to install the man pages via the doc Makefile.	114	@echo You may also want to install the man pages via the doc Makefile.
115	@@ -241,20 +223,15 @@	115	@@ -241,20 +223,14 @@
116	install: $(GAME) recover $(VARDAT) dungeon spec_levs	116	install: $(GAME) recover $(VARDAT) dungeon spec_levs
117	# set up the directories	117	# set up the directories
118	# not all mkdirs have -p; those that don't will create a -p directory	118	# not all mkdirs have -p; those that don't will create a -p directory
Lines 126-132 Link Here
126	- -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	126	- -$(CHOWN) $(GAMEUID) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
127	- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	127	- $(CHGRP) $(GAMEGRP) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
128	- chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save	128	- chmod $(DIRPERM) $(GAMEDIR) $(VARDIR) $(VARDIR)/save
129	+ -chmod $(DIRPERM) ${DESTDIR}$(GAMEDIR) ${DESTDIR}$(VARDIR) ${DESTDIR}$(VARDIR)/save
130	# set up the game files	129	# set up the game files
131	( $(MAKE) dofiles )	130	( $(MAKE) dofiles )
132	# set up some additional files	131	# set up some additional files




--- win/X11/JNetHack.ad.orig	2014-10-18 21:32:38.000000000 +0900
+++ win/X11/JNetHack.ad	2014-10-18 21:36:57.000000000 +0900
@@ -22,11 +22,10 @@
 ! the custom format - to enlarge an XPM file, use processing tools
 ! 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.double_tile_size: True
+!JNetHack.tile_file: x11tiles
+!JNetHack.tile_width: 16
+!JNetHack.tile_height: 16
+!!JNetHack.double_tile_size: True
 !
 ! The annotation of pets.
 JNetHack.pet_mark_bitmap: pet_mark.xbm
@@ -132,6 +131,42 @@
 JNetHack*player_selection*quit.accelerators: #override\n\
 				<Key>Escape:	set() notify() unset()
 
+JNetHack*race_selection*random.borderColor:	blue
+JNetHack*race_selection*random.borderWidth:	2
+JNetHack*race_selection*random.foreground:	blue
+JNetHack*race_selection*random.accelerators: #override\n\
+				<Key>Return:	set() notify() unset()
+JNetHack*race_selection*quit.borderColor:	blue
+JNetHack*race_selection*quit.foreground:		blue
+JNetHack*race_selection*Command.borderColor:	red
+JNetHack*race_selection*Command.foreground:	red
+JNetHack*race_selection*quit.accelerators: #override\n\
+				<Key>Escape:	set() notify() unset()
+
+JNetHack*gender_selection*random.borderColor:	blue
+JNetHack*gender_selection*random.borderWidth:	2
+JNetHack*gender_selection*random.foreground:	blue
+JNetHack*gender_selection*random.accelerators: #override\n\
+				<Key>Return:	set() notify() unset()
+JNetHack*gender_selection*quit.borderColor:	blue
+JNetHack*gender_selection*quit.foreground:	blue
+JNetHack*gender_selection*Command.borderColor:	red
+JNetHack*gender_selection*Command.foreground:	red
+JNetHack*gender_selection*quit.accelerators: #override\n\
+				<Key>Escape:	set() notify() unset()
+
+JNetHack*alignment_selection*random.borderColor:	blue
+JNetHack*alignment_selection*random.borderWidth:	2
+JNetHack*alignment_selection*random.foreground:	blue
+JNetHack*alignment_selection*random.accelerators: #override\n\
+				<Key>Return:	set() notify() unset()
+JNetHack*alignment_selection*quit.borderColor:	blue
+JNetHack*alignment_selection*quit.foreground:	blue
+JNetHack*alignment_selection*Command.borderColor: red
+JNetHack*alignment_selection*Command.foreground:	red
+JNetHack*alignment_selection*quit.accelerators: #override\n\
+				<Key>Escape:	set() notify() unset()
+
 JNetHack*extended_commands*dismiss.borderColor:	blue
 JNetHack*extended_commands*dismiss.foreground:	blue
 JNetHack*extended_commands*help.borderColor:	blue

Lines 148-153 Link Here

(-)nethack34/pkg-plist (-5 / +3 lines)
148	@mode	148	@mode
149	@owner	149	@owner
150	@group	150	@group
		151	lib/X11/app-defaults/JNetHack
151	man/man6/dgn_comp.6.gz	152	man/man6/dgn_comp.6.gz
152	man/man6/dlb.6.gz	153	man/man6/dlb.6.gz
153	man/man6/lev_comp.6.gz	154	man/man6/lev_comp.6.gz
Lines 158-165 Link Here
158	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j	159	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.j
159	%%PORTDOCS%%%%DOCSDIR%%/README.j	160	%%PORTDOCS%%%%DOCSDIR%%/README.j
160	%%PORTDOCS%%%%DOCSDIR%%/jGuidebook.txt	161	%%PORTDOCS%%%%DOCSDIR%%/jGuidebook.txt
161	@exec chown games:games %D/%%DATADIR%%/save %D/%%DATADIR%%	162	@dir(games,games,0775) %%DATADIR%%
162	@exec chmod 0775 %D/%%DATADIR%%/save %D/%%DATADIR%%	163	@dir(games,games,0775) %%DATADIR%%/save
163	@dirrmtry %%DATADIR%%/save
164	@dirrmtry %%DATADIR%%
165	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 194611

Line 0 Link Here

(-)nethack34/files/patch-include__xwindow.h (+12 lines)
	1	--- include/xwindow.h.orig 2003-12-08 08:39:13.000000000 +0900
	2	+++ include/xwindow.h 2014-10-17 22:46:12.000000000 +0900
	3	@@ -78,6 +78,9 @@
	4
	5	extern XFontStruct WindowFontStruct(/ Widget */);
	6	extern Font WindowFont(/* Widget */);
	7	+#ifdef XI18N
	8	+extern XFontSet WindowFontSet(/* Widget */);
	9	+#endif
	10
	11	#define XtCWindowResource "WindowResource"
	12	#define XtCRows "Rows"

Line 0 Link Here

(-)nethack34/files/patch-win__X11__JNetHack.ad (+61 lines)
	1	--- win/X11/JNetHack.ad.orig 2014-10-18 21:32:38.000000000 +0900
	2	+++ win/X11/JNetHack.ad 2014-10-18 21:36:57.000000000 +0900
	3	@@ -22,11 +22,10 @@
	4	! the custom format - to enlarge an XPM file, use processing tools
	5	! such as XV or preferably PBMplus.
	6	!
	7	-!JNetHack.tile_file: x11tiles32j
	8	-JNetHack.tile_file: t32-1024.xpm
	9	-JNetHack.tile_width: 32
	10	-JNetHack.tile_height: 32
	11	-!JNetHack.double_tile_size: True
	12	+!JNetHack.tile_file: x11tiles
	13	+!JNetHack.tile_width: 16
	14	+!JNetHack.tile_height: 16
	15	+!!JNetHack.double_tile_size: True
	16	!
	17	! The annotation of pets.
	18	JNetHack.pet_mark_bitmap: pet_mark.xbm
	19	@@ -132,6 +131,42 @@
	20	JNetHackplayer_selectionquit.accelerators: #override\n\
	21	<Key>Escape: set() notify() unset()
	22
	23	+JNetHackrace_selectionrandom.borderColor: blue
	24	+JNetHackrace_selectionrandom.borderWidth: 2
	25	+JNetHackrace_selectionrandom.foreground: blue
	26	+JNetHackrace_selectionrandom.accelerators: #override\n\
	27	+ <Key>Return: set() notify() unset()
	28	+JNetHackrace_selectionquit.borderColor: blue
	29	+JNetHackrace_selectionquit.foreground: blue
	30	+JNetHackrace_selectionCommand.borderColor: red
	31	+JNetHackrace_selectionCommand.foreground: red
	32	+JNetHackrace_selectionquit.accelerators: #override\n\
	33	+ <Key>Escape: set() notify() unset()
	34	+
	35	+JNetHackgender_selectionrandom.borderColor: blue
	36	+JNetHackgender_selectionrandom.borderWidth: 2
	37	+JNetHackgender_selectionrandom.foreground: blue
	38	+JNetHackgender_selectionrandom.accelerators: #override\n\
	39	+ <Key>Return: set() notify() unset()
	40	+JNetHackgender_selectionquit.borderColor: blue
	41	+JNetHackgender_selectionquit.foreground: blue
	42	+JNetHackgender_selectionCommand.borderColor: red
	43	+JNetHackgender_selectionCommand.foreground: red
	44	+JNetHackgender_selectionquit.accelerators: #override\n\
	45	+ <Key>Escape: set() notify() unset()
	46	+
	47	+JNetHackalignment_selectionrandom.borderColor: blue
	48	+JNetHackalignment_selectionrandom.borderWidth: 2
	49	+JNetHackalignment_selectionrandom.foreground: blue
	50	+JNetHackalignment_selectionrandom.accelerators: #override\n\
	51	+ <Key>Return: set() notify() unset()
	52	+JNetHackalignment_selectionquit.borderColor: blue
	53	+JNetHackalignment_selectionquit.foreground: blue
	54	+JNetHackalignment_selectionCommand.borderColor: red
	55	+JNetHackalignment_selectionCommand.foreground: red
	56	+JNetHackalignment_selectionquit.accelerators: #override\n\
	57	+ <Key>Escape: set() notify() unset()
	58	+
	59	JNetHackextended_commandsdismiss.borderColor: blue
	60	JNetHackextended_commandsdismiss.foreground: blue
	61	JNetHackextended_commandshelp.borderColor: blue