ports/136220: Add WITH_STATUSCOLORS knob + statuscolors patch

[Jeremy Chadwick]

>Number:         136220
>Category:       ports
>Synopsis:       Add WITH_STATUSCOLORS knob + statuscolors patch
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 01 15:00:09 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD icarus.home.lan 7.2-STABLE FreeBSD 7.2-STABLE #0: Thu May 21 07:50:35 PDT 2009 root at icarus.home.lan:/usr/obj/usr/src/sys/X7SBA_RELENG_7_amd64 amd64
>Description:
	Adds support for the (optional) statuscolors patch, via the knob
	WITH_STATUSCOLORS.  Official patch page is here:

	http://bilious.homelinux.org/?142

	This patch conflicts with WITH_HPMON, so an .ifdef check is done to
	ensure both are not used together (using IGNORE to bail out).

	Also note that the version of the statuscolors patch provided is
	a fixed version; the stock version causes problems for users who
	prefer IBMgraphics (CP437).  The fix is mentioned in one of the
	comments at the above web page, and my patch includes that fix.

	It would be good for the maintainer to add the patch to his/her
	public_distfiles/ directory on freefall so that there are two
	available sites for the patch.
>How-To-Repeat:
	Tested on FreeBSD 7.2-STABLE, i386 and amd64.
>Fix:
	n/a


diff -ruN nethack34.orig/Makefile nethack34/Makefile
--- nethack34.orig/Makefile	2009-05-09 04:01:06.000000000 -0700
+++ nethack34/Makefile	2009-07-01 05:41:01.000000000 -0700
@@ -45,16 +45,28 @@
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
+#
+# Patch notes:
+# 1) hpmon and statuscolors conflict with one another
+# 2) menucolors patch must be applied before statuscolors
+#
+.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
+IGNORE=		you cannot enable both HPMON and STATUSCOLORS
+.endif
 .if defined(WITH_MENUCOLORS)
 PATCHFILES+=	nh343-menucolor.diff
 PATCH_SITES+=	http://bilious.homelinux.org/~paxed/nethack/
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DMENU_COLOR_REGEX_POSIX
 .endif
+.if defined(WITH_STATUSCOLORS)
+PATCHFILES+=	nh343-statuscolors.fixed.patch
+PATCH_SITES+=	http://jdc.parodius.com/nethack/
+PATCH_DIST_STRIP=	-p1
+.endif
 .if defined(WITH_HPMON)
 PATCHFILES+=	hpmon.diff
-PATCH_SITES+=	http://www.netsonic.fi/~walker/nh/ \
-		${MASTER_SITE_LOCAL:S|%SUBDIR%|koitsu|}
+PATCH_SITES+=	http://www.netsonic.fi/~walker/nh/
 PATCH_DIST_STRIP=	-p1
 CFLAGS+=	-DHPMON
 .endif
diff -ruN nethack34.orig/distinfo nethack34/distinfo
--- nethack34.orig/distinfo	2008-05-27 01:22:29.000000000 -0700
+++ nethack34/distinfo	2009-07-01 05:41:17.000000000 -0700
@@ -4,6 +4,6 @@
 MD5 (nh343-menucolor.diff) = ade00f9cb51f1b0140557d329d56844c
 SHA256 (nh343-menucolor.diff) = 21f37f759686ac405f1032648d38977096930200e04aeec989d8a450d5532733
 SIZE (nh343-menucolor.diff) = 20010
-MD5 (hpmon.diff) = a8e5cab6a93100612d428f3973dc418f
-SHA256 (hpmon.diff) = d9369768f81f06e75b7349609bdff6fd9deff226452f04a89597190e4489074f
-SIZE (hpmon.diff) = 2041
+MD5 (nh343-statuscolors.fixed.patch) = 2d0cf44770867f42e7b5b28951af048b
+SHA256 (nh343-statuscolors.fixed.patch) = 1c0c7a5e7a5cd564b5bd3fa790393f13ea584bdb0cbd4c34942e551cb9a6656e
+SIZE (nh343-statuscolors.fixed.patch) = 19090
>Release-Note:
>Audit-Trail:
>Unformatted: