Index: head/games/bsdgames/Makefile =================================================================== --- head/games/bsdgames/Makefile (revision 518478) +++ head/games/bsdgames/Makefile (revision 518479) @@ -1,84 +1,77 @@ # Created by: Mark Murray # $FreeBSD$ PORTNAME= bsdgames -PORTVERSION= 5.5.0 +PORTVERSION= 0.7 DISTVERSIONPREFIX= v -PORTEPOCH= 1 +PORTEPOCH= 2 CATEGORIES= games -MASTER_SITES= https://deb.debian.org/debian/pool/main/b/bsdgames/:deb -DISTFILES= ${PORTNAME}_2.17.orig.tar.gz:deb MAINTAINER= jockl@pianojockl.org -COMMENT= Traditional BSD games taken from DragonFly BSD +COMMENT= Traditional BSD games taken mostly from DragonFly BSD LICENSE= BSD3CLAUSE USES= ncurses tar:xz uidfix -USE_GITHUB= nodefault -GH_ACCOUNT= DragonFlyBSD:bsd -GH_PROJECT= DragonFlyBSD:bsd +USE_GITHUB= yes +GH_ACCOUNT= pianojockl + CONFLICTS= hangman-[0-9]* MAKE_ENV= NO_WERROR=1 MAKE_ARGS= BINGRP=${BINGRP} # contain /usr/share/games SHAREPATH_FILES=atc/atc.6 \ atc/pathnames.h \ boggle/boggle/bog.h \ boggle/boggle/boggle.6 \ cribbage/cribbage.6 \ cribbage/pathnames.h \ fish/pathnames.h \ larn/pathnames.h \ quiz/datfiles/index \ quiz/pathnames.h \ quiz/quiz.6 \ wump/pathnames.h # contain /usr/games/* GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \ backgammon/common_source/init.c \ canfield/canfield/canfield.6 \ cribbage/cribbage.6 \ hunt/hunt/hunt.6 \ hunt/huntd/huntd.6 \ phantasia/pathnames.h \ wargames/wargames.sh - -post-extract: - ${MV} ${WRKSRC_bsd}/games ${WRKSRC} - ${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/ - ${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h post-patch: @for f in ${SHAREPATH_FILES}; do \ ${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \ ${WRKSRC}/$${f}; \ done @for f in ${GAMESPATH_FILES}; do \ ${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \ ${WRKSRC}/$${f}; \ done pre-install: .for d in atc larn quiz.db boggle @${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d .endfor .for d in atc battlestar hackdir/save larn phantasia @${MKDIR} ${STAGEDIR}/var/games/$d .endfor post-install: # avoid conflict with games/bs and shells/fish .for prog in bs fish ${MV} ${STAGEDIR}${PREFIX}/bin/${prog} ${STAGEDIR}${PREFIX}/bin/${prog}-game ${MV} ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}-game.6.gz .endfor @${TOUCH} ${STAGEDIR}/var/games/atc_score @${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \; .include Index: head/games/bsdgames/distinfo =================================================================== --- head/games/bsdgames/distinfo (revision 518478) +++ head/games/bsdgames/distinfo (revision 518479) @@ -1,5 +1,3 @@ -TIMESTAMP = 1557603153 -SHA256 (bsdgames_2.17.orig.tar.gz) = 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60 -SIZE (bsdgames_2.17.orig.tar.gz) = 2563311 -SHA256 (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = e54ca3fea6e4ae4b384df4718f5ca749e597537112f1b2170e8fb5c296c1720b -SIZE (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = 137084047 +TIMESTAMP = 1574784789 +SHA256 (pianojockl-bsdgames-v0.7_GH0.tar.gz) = f79dec751ac78cfef5f80453e6c771052eaa9e9e55ab779799b78a82b6e004fc +SIZE (pianojockl-bsdgames-v0.7_GH0.tar.gz) = 2349706 Index: head/games/bsdgames/files/patch-Makefile.inc =================================================================== --- head/games/bsdgames/files/patch-Makefile.inc (revision 518478) +++ head/games/bsdgames/files/patch-Makefile.inc (revision 518479) @@ -1,68 +1,68 @@ ---- Makefile.inc.orig 2018-06-15 14:40:00 UTC +--- Makefile.inc.orig 2018-11-23 03:38:50 UTC +++ Makefile.inc @@ -1,19 +1,16 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 # $FreeBSD: src/games/Makefile.inc,v 1.10.2.2 2002/02/18 16:02:39 ru Exp $ -- ++# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $ + -BINDIR?= /usr/games -FILESDIR?= ${SHAREDIR}/games -WARNS?= 6 -+# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $ - +- # These games write to /var/games/ .if defined(VARGAMES) BINGRP= games -BINMODE= 550 +BINMODE= 2555 .endif # Handle libcrypto dependency .if defined(GAMESCRYPTO) -LDADD+= -lprivate_crypto +LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv LDFLAGS+= ${PRIVATELIB_LDFLAGS} @@ -22,7 +19,40 @@ LDFLAGS+= ${PRIVATELIB_LDFLAGS} # Handle libncurses dependency .if defined(GAMESCURSES) DPADD+= ${LIBNCURSES} -LDADD+= -lprivate_ncurses -CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/priv/ncurses +LDADD+= -lncurses +CFLAGS+= -I${_SHLIBDIRPREFIX}/usr/include/ncurses LDFLAGS+= ${PRIVATELIB_LDFLAGS} .endif + +PREFIX?= /usr/local +BINDIR?= ${PREFIX}/bin +SHAREDIR= ${PREFIX}/share +MANDIR= ${PREFIX}/man/man +FILESDIR?= ${SHAREDIR}/games +WARNS?= 6 + +# cribbed from DragonflyBSD build system + +NXCC?= ${CC} +NXCFLAGS?= ${CFLAGS:N-mtune*:N-mcpu*:N-march*} + +.SUFFIXES: .nx .no + +# .no == native object file, for helper code when cross building. +# +.c.no: + ${NXCC} ${_${.IMPSRC:T}_FLAGS} ${NXCFLAGS} -c ${.IMPSRC} -o ${.TARGET} + +.y.no: + ${YACC} ${YFLAGS} ${.IMPSRC} + ${NXCC} ${NXCFLAGS} -c y.tab.c -o ${.TARGET} + rm -f y.tab.c + +.l.no: + ${LEX} ${LFLAGS} -o${.TARGET}.c ${.IMPSRC} + ${NXCC} ${NXCFLAGS} -c ${.TARGET}.c -o ${.TARGET} + rm -f ${.TARGET}.c + +.no.nx .c.nx: + ${NXCC} ${_${.IMPSRC:T}_FLAGS} ${NXCFLAGS} ${NXLDFLAGS} ${.IMPSRC} \ + ${NXLDLIBS} -o ${.TARGET} Index: head/games/bsdgames/pkg-descr =================================================================== --- head/games/bsdgames/pkg-descr (revision 518478) +++ head/games/bsdgames/pkg-descr (revision 518479) @@ -1,4 +1,4 @@ This is a port of the BSD "standard" games from Dragonfly BSD which includes many improvements and cleanups from NetBSD and OpenBSD. -Sail is pulled from NetBSD sources, since the Dragonfly version +Sail is pulled from NetBSD sources, since the Dragonfly version wasn't working.