Attachment #229926 for bug #260224

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

Lines 16605-16607 sysutils/cfengine-masterfiles315\|\|2021-11-21\|Has expired: Expire one year after Link Here

(-)b/MOVED (+1 lines)
16605	games/linux-unigine-heaven\|benchmarks/linux-unigine-heaven\|2021-11-21\|Moved to a more appropriate category	16605	games/linux-unigine-heaven\|benchmarks/linux-unigine-heaven\|2021-11-21\|Moved to a more appropriate category
16606	games/linux-unigine-valley\|benchmarks/linux-unigine-valley\|2021-11-21\|Moved to a more appropriate category	16606	games/linux-unigine-valley\|benchmarks/linux-unigine-valley\|2021-11-21\|Moved to a more appropriate category
16607	devel/electron12\|devel/electron13\|2021-11-24\|VSCode update requires a newer major version	16607	devel/electron12\|devel/electron13\|2021-11-24\|VSCode update requires a newer major version
		16608	games/xnethack-nox11\|games/xnethack@nox11\|2021-12-05\|Turned into flavor

Lines 1101-1107 Link Here

(-)b/games/Makefile (-1 lines)
1101	SUBDIR += xmulti	1101	SUBDIR += xmulti
1102	SUBDIR += xneko	1102	SUBDIR += xneko
1103	SUBDIR += xnethack	1103	SUBDIR += xnethack
1104	SUBDIR += xnethack-nox11
1105	SUBDIR += xoct	1104	SUBDIR += xoct
1106	SUBDIR += xoids	1105	SUBDIR += xoids
1107	SUBDIR += xoj	1106	SUBDIR += xoj

Removed Link Here

(-)a/games/xnethack-nox11/Makefile (-7 lines)
1	# Created by: Jeremy Chadwick <yoshi@parodius.com>
2
3	MASTERDIR= ${.CURDIR}/../xnethack
4
5	PKGNAMESUFFIX= -nox11
6
7	.include "${MASTERDIR}/Makefile"




# Created by: asami

PORTNAME=	xNetHack
DISTVERSIONPREFIX=	xnh
DISTVERSION=	6.1
PORTREVISION=	1
CATEGORIES=	games

MAINTAINER=	fuz@fuz.su

LICENSE_FILE=	${WRKSRC}/dat/license
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

FLAVORS=	x11 nox11
FLAVOR?=	${FLAVORS:[1]}
nox11_PKGNAMESUFFIX=	-nox11

USES=		alias compiler:c11 gmake ncurses tar:tgz lua:54
USE_GITHUB=	yes
GH_ACCOUNT=	copperwater
GH_PROJECT=	xNetHack

MAKE_ENV=	GRAPHICS="${GRAPHICS}"
PLIST_SUB=	HACKNAME="${HACKNAME}"
		HACKEXT="${HACKEXT}"
TRUEPORTNAME=	xnethack

# Configure these variables as you want them to be.
HACKNAME?=	${PORTNAME:tl}
HACKNAME?=	${TRUEPORTNAME}${HACKEXT}
HACKDIR?=	share/${HACKNAME}
HACKLINK=	${TRUEPORTNAME}

DATADIR=	${PREFIX}/${HACKDIR}
DOCSDIR=	${PREFIX}/share/doc/${HACKNAME}
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall

.if ${FLAVOR} == "x11"
USES+=		xorg
USE_XORG=	xaw xpm xmu xext xt x11 sm ice
CFLAGS+=	-DX11_GRAPHICS -DUSE_TILES
GRAPHICS=	X11_GRAPHICS
.elif ${FLAVOR} == "nox11"
.if ${PKGNAMESUFFIX} == "-nox11"
GRAPHICS=	# none
.endif
.endif
CFLAGS+=	-DNOMAIL -DCURSES_GRAPHICS

OPTIONS_DEFINE=	DOCS

.include <bsd.port.pre.mk>

.if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
PLIST_SUB+=	HACKLINK=""
.else
PLIST_SUB+=	HACKLINK="@comment "
.endif

post-patch:
.for f in include/config.h sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top
	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
		${WRKSRC}/${f}
.endfor
.for f in dlb.6 nethack.6 recover.6
	@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \
		-e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \
		-e 's|%%HACKEXT%%|${HACKEXT}|g' \
		${WRKSRC}/doc/${f}
.endfor
.if defined(WITHOUT_SHELL)

do-configure:
	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh

pre-install:
	@${CAT} ${FILESDIR}/pkg-deinstall.in | ${SED} \
		-e 's|%%HACKDIR%%|${HACKDIR}|g' > ${PKGDEINSTALL}

post-install:
	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover
	${STRIP_CMD} ${STAGEDIR}${DATADIR}/${HACKNAME}
.endif
	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
	@${MKDIR} ${STAGEDIR}${DATADIR}/save
	@${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf

Lines 5-11 Link Here

(-)b/games/xnethack/files/patch-doc_dlb.6 (-1 / +1 lines)
5	.SH "SEE ALSO"	5	.SH "SEE ALSO"
6	.PP	6	.PP
7	-nethack(6), tar(1)	7	-nethack(6), tar(1)
8	+xnethack%%HACKEXT%%(6), tar(1)	8	+xnethack(6), tar(1)
9	.SH BUGS	9	.SH BUGS
10	.PP	10	.PP
11	Not a good tar emulation; - does not mean stdin or stdout.	11	Not a good tar emulation; - does not mean stdin or stdout.

Lines 32-38 Link Here

(-)b/games/xnethack/files/patch-doc_nethack.6 (-1 / +1 lines)
32	.SH "SEE ALSO"	32	.SH "SEE ALSO"
33	.PP	33	.PP
34	-recover(6)	34	-recover(6)
35	+recover%%HACKEXT%%(6)	35	+recover(6)
36	.SH BUGS	36	.SH BUGS
37	.PP	37	.PP
38	Probably infinite.	38	Probably infinite.

Lines 14-20 Link Here

(-)b/games/xnethack/files/patch-doc_recover.6 (-1 / +1 lines)
14	will find them in the uncompressed form.	14	will find them in the uncompressed form.
15	.SH "SEE ALSO"	15	.SH "SEE ALSO"
16	-nethack(6)	16	-nethack(6)
17	+xnethack%%HACKEXT%%(6)	17	+xnethack(6)
18	.SH BUGS	18	.SH BUGS
19	.PP	19	.PP
20	.I recover	20	.I recover




 
-GAME	= nethack
-MANDIR	= /usr/man/man6
+GAME	= xnethack
+MANDIR	= ${PREFIX}/man/man6
 MANEXT	= 6
 

-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
-	-$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
+	-$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)/$(GAME).$(MANEXT)
+	-$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)/recover.$(MANEXT)
+	-$(DLBMANCREATE) ${DESTDIR}$(MANDIR)/dlb.$(MANEXT)
+	-$(MDMANCREATE) ${DESTDIR}$(MANDIR)/makedefs.$(MANEXT)
 
 # manual creation for distribution
 DISTRIB = Guidebook.txt nethack.txt recover.txt \

Lines 105-111 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.src (-1 / +1 lines)
105		105
106	# make NetHack	106	# make NetHack
107	-GAME = xnethack	107	-GAME = xnethack
108	+GAME = xnethack%%HACKEXT%%	108	+GAME = xnethack
109	# GAME = nethack.prg	109	# GAME = nethack.prg
110	GAMEBIN = $(GAME)	110	GAMEBIN = $(GAME)
111		111

Lines 5-11 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.top (-1 / +1 lines)
5	# make NetHack	5	# make NetHack
6	#PREFIX = /usr	6	#PREFIX = /usr
7	-GAME = xnethack	7	-GAME = xnethack
8	+GAME = xnethack%%HACKEXT%%	8	+GAME = xnethack
9	# GAME = nethack.prg	9	# GAME = nethack.prg
10	#GAMEUID = games	10	#GAMEUID = games
11	-#GAMEGRP = bin	11	-#GAMEGRP = bin




#!/bin/sh

if [ "${2}" = "POST-DEINSTALL" ]; then
	if [ -d "${PKG_PREFIX}/%%HACKDIR%%" ]; then
		echo
		echo "The ${1} save files have not been removed."
		echo
		echo "If you are deleting ${1} permanently then you can "
		echo "remove the save files with the command:"
		echo
		echo "	rm -rf ${PKG_PREFIX}/%%HACKDIR%%"
		echo
	fi
fi

Lines 1-4 Link Here

(-)b/games/xnethack/pkg-plist (-2 lines)
1	%%HACKLINK%%bin/xnethack
2	@mode 555	1	@mode 555
3	bin/%%HACKNAME%%	2	bin/%%HACKNAME%%
4	@owner games	3	@owner games
5	-

Return to bug 260224

Lines 1-8 Link Here

(-)b/games/xnethack/Makefile (-31 / +12 lines)
1	# Created by: asami
2
3	PORTNAME= xNetHack	1	PORTNAME= xNetHack
4	DISTVERSIONPREFIX= xnh	2	DISTVERSIONPREFIX= xnh
5	DISTVERSION= 6.1	3	DISTVERSION= 6.1
		4	PORTREVISION= 1
6	CATEGORIES= games	5	CATEGORIES= games
7		6
8	MAINTAINER= fuz@fuz.su	7	MAINTAINER= fuz@fuz.su
Lines 13-72 LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE Link Here
13	LICENSE_FILE= ${WRKSRC}/dat/license	12	LICENSE_FILE= ${WRKSRC}/dat/license
14	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	13	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
15		14
16	USES= alias compiler:c11 gmake ncurses tar:tgz lua	15	FLAVORS= x11 nox11
17	USE_GITHUB= yes	16	FLAVOR?= ${FLAVORS:[1]}
		17	nox11_PKGNAMESUFFIX= -nox11
18		18
		19	USES= alias compiler:c11 gmake ncurses tar:tgz lua:54
		20	USE_GITHUB= yes
19	GH_ACCOUNT= copperwater	21	GH_ACCOUNT= copperwater
20	GH_PROJECT= xNetHack
21		22
22	MAKE_ENV= GRAPHICS="${GRAPHICS}"	23	MAKE_ENV= GRAPHICS="${GRAPHICS}"
23	PLIST_SUB= HACKNAME="${HACKNAME}" \	24	PLIST_SUB= HACKNAME="${HACKNAME}"
24	HACKEXT="${HACKEXT}"
25	TRUEPORTNAME= xnethack
26		25
27	# Configure these variables as you want them to be.	26	# Configure these variables as you want them to be.
28	HACKEXT?=	27	HACKNAME?= ${PORTNAME:tl}
29	HACKNAME?= ${TRUEPORTNAME}${HACKEXT}
30	HACKDIR?= share/${HACKNAME}	28	HACKDIR?= share/${HACKNAME}
31	HACKLINK= ${TRUEPORTNAME}
32		29
33	DATADIR= ${PREFIX}/${HACKDIR}	30	DATADIR= ${PREFIX}/${HACKDIR}
34	DOCSDIR= ${PREFIX}/share/doc/${HACKNAME}	31	DOCSDIR= ${PREFIX}/share/doc/${HACKNAME}
35	PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
36		32
37	.if !defined(PKGNAMESUFFIX)	33	.if ${FLAVOR} == "x11"
38	USES+= xorg	34	USES+= xorg
39	USE_XORG= xaw xpm xmu xext xt x11 sm ice	35	USE_XORG= xaw xpm xmu xext xt x11 sm ice
40	CFLAGS+= -DX11_GRAPHICS -DUSE_TILES	36	CFLAGS+= -DX11_GRAPHICS -DUSE_TILES
41	GRAPHICS= X11_GRAPHICS	37	GRAPHICS= X11_GRAPHICS
42	.else	38	.elif ${FLAVOR} == "nox11"
43	.if ${PKGNAMESUFFIX} == "-nox11"
44	GRAPHICS= # none	39	GRAPHICS= # none
45	.endif	40	.endif
46	.endif
47	CFLAGS+= -DNOMAIL -DCURSES_GRAPHICS	41	CFLAGS+= -DNOMAIL -DCURSES_GRAPHICS
48		42
49	OPTIONS_DEFINE= DOCS	43	OPTIONS_DEFINE= DOCS
50		44
51	.include <bsd.port.pre.mk>	45	.include <bsd.port.pre.mk>
52		46
53	.if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
54	PLIST_SUB+= HACKLINK=""
55	.else
56	PLIST_SUB+= HACKLINK="@comment "
57	.endif
58
59	post-patch:	47	post-patch:
60	.for f in include/config.h sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top	48	.for f in include/config.h sys/unix/Makefile.doc sys/unix/Makefile.src sys/unix/Makefile.top
61	@${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g' \	49	@${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g' \
62	-e 's\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' \	50	-e 's\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' \
63	-e 's\|%%HACKEXT%%\|${HACKEXT}\|g' \
64	${WRKSRC}/${f}	51	${WRKSRC}/${f}
65	.endfor	52	.endfor
66	.for f in dlb.6 nethack.6 recover.6	53	.for f in dlb.6 nethack.6 recover.6
67	@${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g' \	54	@${REINPLACE_CMD} -e 's\|%%HACKNAME%%\|${HACKNAME}\|g' \
68	-e 's\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' \	55	-e 's\|%%HACKDIR%%\|${PREFIX}/${HACKDIR}\|g' \
69	-e 's\|%%HACKEXT%%\|${HACKEXT}\|g' \
70	${WRKSRC}/doc/${f}	56	${WRKSRC}/doc/${f}
71	.endfor	57	.endfor
72	.if defined(WITHOUT_SHELL)	58	.if defined(WITHOUT_SHELL)
Lines 79-92 post-patch: Link Here
79	do-configure:	65	do-configure:
80	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh	66	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
81		67
82	pre-install:
83	@${CAT} ${FILESDIR}/pkg-deinstall.in \| ${SED} \
84	-e 's\|%%HACKDIR%%\|${HACKDIR}\|g' > ${PKGDEINSTALL}
85
86	post-install:	68	post-install:
87	.if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}	69	${STRIP_CMD} ${STAGEDIR}${DATADIR}/recover
88	@${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK}	70	${STRIP_CMD} ${STAGEDIR}${DATADIR}/${HACKNAME}
89	.endif
90	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages	71	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages
91	@${MKDIR} ${STAGEDIR}${DATADIR}/save	72	@${MKDIR} ${STAGEDIR}${DATADIR}/save
92	@${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf	73	@${CP} ${WRKSRC}/sys/unix/sysconf ${STAGEDIR}/${DATADIR}/sysconf

Lines 6-12 Link Here

(-)b/games/xnethack/files/patch-sys-unix-Makefile.doc (-5 / +5 lines)
6		6
7	-GAME = nethack	7	-GAME = nethack
8	-MANDIR = /usr/man/man6	8	-MANDIR = /usr/man/man6
9	+GAME = xnethack%%HACKEXT%%	9	+GAME = xnethack
10	+MANDIR = ${PREFIX}/man/man6	10	+MANDIR = ${PREFIX}/man/man6
11	MANEXT = 6	11	MANEXT = 6
12		12
Lines 30-39 Link Here
30	- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)	30	- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
31	- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)	31	- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
32	- -$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)	32	- -$(MDMANCREATE) $(MANDIR)/makedefs.$(MANEXT)
33	+ -$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)/$(GAME)%%HACKEXT%%.$(MANEXT)	33	+ -$(GAMEMANCREATE) ${DESTDIR}$(MANDIR)/$(GAME).$(MANEXT)
34	+ -$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)/recover%%HACKEXT%%.$(MANEXT)	34	+ -$(RCVRMANCREATE) ${DESTDIR}$(MANDIR)/recover.$(MANEXT)
35	+ -$(DLBMANCREATE) ${DESTDIR}$(MANDIR)/dlb%%HACKEXT%%.$(MANEXT)	35	+ -$(DLBMANCREATE) ${DESTDIR}$(MANDIR)/dlb.$(MANEXT)
36	+ -$(MDMANCREATE) ${DESTDIR}$(MANDIR)/makedefs%%HACKEXT%%.$(MANEXT)	36	+ -$(MDMANCREATE) ${DESTDIR}$(MANDIR)/makedefs.$(MANEXT)
37		37
38	# manual creation for distribution	38	# manual creation for distribution
39	DISTRIB = Guidebook.txt nethack.txt recover.txt \	39	DISTRIB = Guidebook.txt nethack.txt recover.txt \

Removed Link Here

(-)a/games/xnethack/files/pkg-deinstall.in (-14 lines)
1	#!/bin/sh
2
3	if [ "${2}" = "POST-DEINSTALL" ]; then
4	if [ -d "${PKG_PREFIX}/%%HACKDIR%%" ]; then
5	echo
6	echo "The ${1} save files have not been removed."
7	echo
8	echo "If you are deleting ${1} permanently then you can "
9	echo "remove the save files with the command:"
10	echo
11	echo " rm -rf ${PKG_PREFIX}/%%HACKDIR%%"
12	echo
13	fi
14	fi