Attachment #97478 for bug #136220

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




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_DIST_STRIP=	-p1
CFLAGS+=	-DHPMON
.endif

Lines 4-9 Link Here

(-)nethack34/distinfo (-3 / +3 lines)
4	MD5 (nh343-menucolor.diff) = ade00f9cb51f1b0140557d329d56844c	4	MD5 (nh343-menucolor.diff) = ade00f9cb51f1b0140557d329d56844c
5	SHA256 (nh343-menucolor.diff) = 21f37f759686ac405f1032648d38977096930200e04aeec989d8a450d5532733	5	SHA256 (nh343-menucolor.diff) = 21f37f759686ac405f1032648d38977096930200e04aeec989d8a450d5532733
6	SIZE (nh343-menucolor.diff) = 20010	6	SIZE (nh343-menucolor.diff) = 20010
7	MD5 (hpmon.diff) = a8e5cab6a93100612d428f3973dc418f	7	MD5 (nh343-statuscolors.fixed.patch) = 2d0cf44770867f42e7b5b28951af048b
8	SHA256 (hpmon.diff) = d9369768f81f06e75b7349609bdff6fd9deff226452f04a89597190e4489074f	8	SHA256 (nh343-statuscolors.fixed.patch) = 1c0c7a5e7a5cd564b5bd3fa790393f13ea584bdb0cbd4c34942e551cb9a6656e
9	SIZE (hpmon.diff) = 2041	9	SIZE (nh343-statuscolors.fixed.patch) = 19090

Return to bug 136220

Lines 45-60 Link Here

(-)nethack34/Makefile (-2 / +14 lines)
45	GRAPHICS= GNOME_GRAPHICS	45	GRAPHICS= GNOME_GRAPHICS
46	.elif ${PKGNAMESUFFIX} == "-nox11"	46	.elif ${PKGNAMESUFFIX} == "-nox11"
47	GRAPHICS= # none	47	GRAPHICS= # none
		48	#
		49	# Patch notes:
		50	# 1) hpmon and statuscolors conflict with one another
		51	# 2) menucolors patch must be applied before statuscolors
		52	#
		53	.if defined(WITH_HPMON) && defined(WITH_STATUSCOLORS)
		54	IGNORE= you cannot enable both HPMON and STATUSCOLORS
		55	.endif
48	.if defined(WITH_MENUCOLORS)	56	.if defined(WITH_MENUCOLORS)
49	PATCHFILES+= nh343-menucolor.diff	57	PATCHFILES+= nh343-menucolor.diff
50	PATCH_SITES+= http://bilious.homelinux.org/~paxed/nethack/	58	PATCH_SITES+= http://bilious.homelinux.org/~paxed/nethack/
51	PATCH_DIST_STRIP= -p1	59	PATCH_DIST_STRIP= -p1
52	CFLAGS+= -DMENU_COLOR_REGEX_POSIX	60	CFLAGS+= -DMENU_COLOR_REGEX_POSIX
53	.endif	61	.endif
		62	.if defined(WITH_STATUSCOLORS)
		63	PATCHFILES+= nh343-statuscolors.fixed.patch
		64	PATCH_SITES+= http://jdc.parodius.com/nethack/
		65	PATCH_DIST_STRIP= -p1
		66	.endif
54	.if defined(WITH_HPMON)	67	.if defined(WITH_HPMON)
55	PATCHFILES+= hpmon.diff	68	PATCHFILES+= hpmon.diff
56	PATCH_SITES+= http://www.netsonic.fi/~walker/nh/ \	69	PATCH_SITES+= http://www.netsonic.fi/~walker/nh/
57	${MASTER_SITE_LOCAL:S\|%SUBDIR%\|koitsu\|}
58	PATCH_DIST_STRIP= -p1	70	PATCH_DIST_STRIP= -p1
59	CFLAGS+= -DHPMON	71	CFLAGS+= -DHPMON
60	.endif	72	.endif