Attachment #44221 for bug #68522

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

Lines 49-54 Link Here

(-)nethack34/Makefile (-4 / +19 lines)
49	PATCHFILES+= nh343-menucolor.diff	49	PATCHFILES+= nh343-menucolor.diff
50	PATCH_SITES+= http://www.cs.joensuu.fi/~pkalli/code/	50	PATCH_SITES+= http://www.cs.joensuu.fi/~pkalli/code/
51	PATCH_DIST_STRIP= -p1	51	PATCH_DIST_STRIP= -p1
		52	MAKE_ENV+= LIBTTY="-lgnuregex"
52	.endif	53	.endif
53	.elif ${PKGNAMESUFFIX} == "-qt"	54	.elif ${PKGNAMESUFFIX} == "-qt"
54	USE_QT_VER= 3	55	USE_QT_VER= 3
Lines 59-64 Link Here
59	.endif	60	.endif
60	.endif	61	.endif
61		62
		63	.include <bsd.port.pre.mk>
		64
		65	# FreeBSD 5.2.1-RELEASE (or, well, almost) and above use include/gnu/regex.h
		66	# while prior releases use include/gnuregex.h. This simply gets rid of the
		67	# repetitive warning during the build process on 5.x.
		68	.if ${OSVERSION} >= 502010
		69	GNU_REGEX_H= <gnu/regex.h>
		70	.else
		71	GNU_REGEX_H= <gnuregex.h>
		72	.endif
		73
62	pre-everything::	74	pre-everything::
63	@if [ "${PKGBASE}" != "nethack" ]; then \	75	@if [ "${PKGBASE}" != "nethack" ]; then \
64	${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \	76	${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
Lines 73-85 Link Here
73	.for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top	85	.for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
74	${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g;s\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' ${WRKSRC}/${f}	86	${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g;s\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' ${WRKSRC}/${f}
75	.endfor	87	.endfor
76	${REINPLACE_CMD} -e 's\|<regex.h>\|<gnuregex.h>\|g' ${WRKSRC}/src/sounds.c	88	${REINPLACE_CMD} -e 's\|<regex.h>\|${GNU_REGEX_H}\|g' ${WRKSRC}/src/sounds.c
77	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|g' ${WRKSRC}/win/Qt/qt_win.cpp	89	${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|g' ${WRKSRC}/win/Qt/qt_win.cpp
78	.if defined(WITHOUT_SHELL)	90	.if defined(WITHOUT_SHELL)
79	@${REINPLACE_CMD} -e 's\|#define SHELL\|/* #define SHELL\|' ${WRKSRC}/include/unixconf.h	91	${REINPLACE_CMD} -e 's\|#define SHELL\|/* #define SHELL\|' ${WRKSRC}/include/unixconf.h
80	.endif	92	.endif
81	.if defined(WITH_MENUCOLORS)	93	.if defined(WITH_MENUCOLORS)
82	${REINPLACE_CMD} -e 's\|<regex.h>\|<gnuregex.h>\|g' ${WRKSRC}/include/color.h	94	${REINPLACE_CMD} -e 's\|<regex.h>\|${GNU_REGEX_H}\|g' ${WRKSRC}/include/color.h
		95	.endif
		96	.if defined(WITH_MAIL)
		97	${REINPLACE_CMD} -e 's\|/\* #define MAIL \*/\|#define MAIL\|' ${WRKSRC}/include/unixconf.h
83	.endif	98	.endif
84		99
85	pre-configure:	100	pre-configure:
Lines 92-95 Link Here
92	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}	107	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
93	.endif	108	.endif
94		109
95	.include <bsd.port.mk>	110	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)nethack34/files/patch-ad (-3 / +9 lines)
1	--- sys/unix/Makefile.src.orig Sat Aug 30 09:08:04 2003	1	diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
2	+++ sys/unix/Makefile.src Mon Sep 1 23:12:45 2003	2	--- sys.orig/unix/Makefile.src Sun Dec 7 15:39:13 2003
		3	+++ sys/unix/Makefile.src Wed Jun 30 08:27:32 2004
3	@@ -146,19 +146,29 @@	4	@@ -146,19 +146,29 @@
4	# directories. The ones given below is the usual spot for linux systems.	5	# directories. The ones given below is the usual spot for linux systems.
5	# The paths are for glibconfig.h and gnomesupport.h respectively.	6	# The paths are for glibconfig.h and gnomesupport.h respectively.
Lines 61-67 Link Here
61		62
62	# on some systems the termcap library is in -ltermcap or -lcurses	63	# on some systems the termcap library is in -ltermcap or -lcurses
63	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead	64	# on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
64	@@ -235,19 +264,19 @@	65	@@ -231,23 +260,23 @@
		66	# WINTTYLIB = -lcurses
		67	# WINTTYLIB = -lcurses16
		68	# WINTTYLIB = -lncurses
		69	-WINTTYLIB = -ltermlib
		70	+WINTTYLIB = -ltermlib ${LIBTTY}
65	#	71	#
66	# libraries for X11	72	# libraries for X11
67	# If USE_XPM is defined in config.h, you will also need -lXpm here.	73	# If USE_XPM is defined in config.h, you will also need -lXpm here.

Return to bug 68522