3 files changed, 14 insertions, 27 deletions

diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 804eb7d53021..74ace8a5488f 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -45,10 +45,11 @@ GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
 .if defined(WITH_MENUCOLORS)
-PATCHFILES+=	nh343-menucolor.diff
-PATCH_SITES+=	${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis|}
+PATCHFILES+=	nh343-menucolor_jilles.diff
+PATCH_SITES+=	http://www.stack.nl/~jilles/games/ \
+		${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis|}
 PATCH_DIST_STRIP=	-p1
-MAKE_ENV+=	LIBTTY="-lgnuregex"
+CFLAGS+=	-DMENU_COLOR_REGEX_POSIX
 .endif
 .elif ${PKGNAMESUFFIX} == "-qt"
 USE_QT_VER=	3
@@ -61,15 +62,6 @@ GRAPHICS=	QT_GRAPHICS
 
 .include <bsd.port.pre.mk>
 
-# FreeBSD 5.2.1-RELEASE (or, well, almost) and above use include/gnu/regex.h
-# while prior releases use include/gnuregex.h.  This simply gets rid of the
-# repetitive warning during the build process on 5.x.
-.if ${OSVERSION} >= 502010
-GNU_REGEX_H=	<gnu/regex.h>
-.else
-GNU_REGEX_H=	<gnuregex.h>
-.endif
-
 pre-everything::
 	@if [ "${PKGBASE}" != "nethack" ]; then \
 	${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
@@ -82,18 +74,14 @@ pre-everything::
 
 post-patch:
 .for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
-	${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f}
+	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f}
 .endfor
-	${REINPLACE_CMD} -e 's|<regex.h>|${GNU_REGEX_H}|g' ${WRKSRC}/src/sounds.c
-	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/win/Qt/qt_win.cpp
 .if defined(WITHOUT_SHELL)
-	${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h
-.endif
-.if defined(WITH_MENUCOLORS)
-	${REINPLACE_CMD} -e 's|<regex.h>|${GNU_REGEX_H}|g' ${WRKSRC}/include/color.h
+	@${REINPLACE_CMD} -e 's|#define SHELL|/* #define SHELL|' ${WRKSRC}/include/unixconf.h
 .endif
 .if defined(WITH_MAIL)
-	${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h
+	@${REINPLACE_CMD} -e 's|/\* #define MAIL \*/|#define MAIL|' ${WRKSRC}/include/unixconf.h
 .endif
 
 pre-configure:
diff --git a/games/nethack34/distinfo b/games/nethack34/distinfo
index 02f29b8fae71..e908d77cc485 100644
--- a/games/nethack34/distinfo
+++ b/games/nethack34/distinfo
@@ -1,6 +1,6 @@
 MD5 (nethack-343-src.tgz) = 21479c95990eefe7650df582426457f9
-SIZE (nethack-343-src.tgz) = 3497458
 SHA256 (nethack-343-src.tgz) = bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4
-MD5 (nh343-menucolor.diff) = 42e8c979c0ebe3e799c62056f86935bb
-SIZE (nh343-menucolor.diff) = 17914
-SHA256 (nh343-menucolor.diff) = 28ffb66cc901c74f6321a4537f07313363d35cf60a621d829a14d46c080f3913
+SIZE (nethack-343-src.tgz) = 3497458
+MD5 (nh343-menucolor_jilles.diff) = 42e8c979c0ebe3e799c62056f86935bb
+SHA256 (nh343-menucolor_jilles.diff) = 28ffb66cc901c74f6321a4537f07313363d35cf60a621d829a14d46c080f3913
+SIZE (nh343-menucolor_jilles.diff) = 17914
diff --git a/games/nethack34/files/patch-ad b/games/nethack34/files/patch-ad
index 0c6dfb8f83d3..86219e9fefaf 100644
--- a/games/nethack34/files/patch-ad
+++ b/games/nethack34/files/patch-ad
@@ -66,8 +66,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
  # WINTTYLIB = -lcurses
  # WINTTYLIB = -lcurses16
  # WINTTYLIB = -lncurses
--WINTTYLIB = -ltermlib
-+WINTTYLIB = -ltermlib ${LIBTTY}
+ WINTTYLIB = -ltermlib
  #
  # libraries for X11
  # If USE_XPM is defined in config.h, you will also need -lXpm here.
@@ -79,7 +78,7 @@ diff -ruN sys.orig/unix/Makefile.src sys/unix/Makefile.src
  #
  # libraries for Qt
 -WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex
++WINQTLIB = ${QTCFGLIBS} ${LIBQT}
  #
  # libraries for KDE (with Qt)
  WINKDELIB = -lkdecore -lkdeui -lXext