From jdc@pentarou.parodius.com  Sat Jun 26 11:40:11 2004
Return-Path: <jdc@pentarou.parodius.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 70AF216A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Jun 2004 11:40:11 +0000 (GMT)
Received: from mail.parodius.com (mail.parodius.com [64.62.145.229])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4161C43D49
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Jun 2004 11:40:11 +0000 (GMT)
	(envelope-from jdc@pentarou.parodius.com)
Received: from pentarou.parodius.com (jdc@localhost [127.0.0.1])
	by mail.parodius.com (8.12.11/8.12.11) with ESMTP id i5QBeAMC059254
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 26 Jun 2004 04:40:10 -0700 (PDT)
	(envelope-from jdc@pentarou.parodius.com)
Received: (from jdc@localhost)
	by pentarou.parodius.com (8.12.11/8.12.11/Submit) id i5QBeAQT059253;
	Sat, 26 Jun 2004 04:40:10 -0700 (PDT)
	(envelope-from jdc)
Message-Id: <200406261140.i5QBeAQT059253@pentarou.parodius.com>
Date: Sat, 26 Jun 2004 04:40:10 -0700 (PDT)
From: Jeremy Chadwick <freebsd@jdc.parodius.com>
Reply-To: Jeremy Chadwick <freebsd@jdc.parodius.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Add support for "menucolor" patch
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         68363
>Category:       ports
>Synopsis:       [PATCH] games/nethack34: Add support for "menucolor" patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 26 11:40:24 GMT 2004
>Closed-Date:    Wed Jun 30 09:59:22 GMT 2004
>Last-Modified:  Wed Jun 30 09:59:22 GMT 2004
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 4.10-PRERELEASE i386
>Organization:
Parodius Networking
>Environment:
System: FreeBSD pentarou.parodius.com 4.10-PRERELEASE FreeBSD 4.10-PRERELEASE #0: Wed May 5 03:33:17 PDT 2004 root@pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386
>Description:
	This modification adds the WITH_MENUCOLORS tweak for those who want
	the non-standard "menucolors" option.  This patch will only apply
	to the "-nox11" version of nethack34.

	For further details, see the following URLs:

	http://www.cs.joensuu.fi/~pkalli/code/
	http://www.netsonic.fi/~walker/nethack.html
>How-To-Repeat:
	Not applicable.
>Fix:
	See included patch below.


diff -ruN nethack34.orig/Makefile nethack34/Makefile
--- nethack34.orig/Makefile	Tue Feb  3 21:20:33 2004
+++ nethack34/Makefile	Sat Jun 26 04:31:17 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	nethack
 PORTVERSION=	3.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -45,6 +45,11 @@
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
+.if defined(WITH_MENUCOLORS)
+PATCHFILES+=	nh343-menucolor.diff
+PATCH_SITES+=	http://www.cs.joensuu.fi/~pkalli/code/
+PATCH_DIST_STRIP=	-p1
+.endif
 .elif ${PKGNAMESUFFIX} == "-qt"
 USE_QT_VER=	3
 MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
@@ -70,6 +75,9 @@
 	${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>|<gnuregex.h>|g' ${WRKSRC}/include/color.h
 .endif
 
 pre-configure:
diff -ruN nethack34.orig/distinfo nethack34/distinfo
--- nethack34.orig/distinfo	Wed Jan 28 23:23:58 2004
+++ nethack34/distinfo	Sat Jun 26 04:20:39 2004
@@ -1,2 +1,4 @@
 MD5 (nethack-343-src.tgz) = 21479c95990eefe7650df582426457f9
 SIZE (nethack-343-src.tgz) = 3497458
+MD5 (nh343-menucolor.diff) = 8177010cbf6cfa50b6fd063458f28e25
+SIZE (nh343-menucolor.diff) = 17862
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Wed Jun 30 09:58:35 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

BTW, nethack could need a FreeBSD-maintainer...and you could 
optionally include all the patches you'd want ;) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=68363 
>Unformatted:
