Bug 236377 - games/bsdgames update to 5.5.0
Summary: games/bsdgames update to 5.5.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Rodrigo Osorio
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-03-07 20:37 UTC by Joachim Werner
Modified: 2019-03-11 14:03 UTC (History)
1 user (show)

See Also:


Attachments
bsdgames-5.5.0.diff (27.31 KB, patch)
2019-03-07 20:37 UTC, Joachim Werner
no flags Details | Diff
maintainer patch (202704: bsdgames-5.5.0.diff) with minor changes (11.71 KB, patch)
2019-03-10 17:45 UTC, Rodrigo Osorio
no flags Details | Diff
all-inclusive patch with new DISTFILES fetching (26.60 KB, patch)
2019-03-10 18:40 UTC, Joachim Werner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Joachim Werner 2019-03-07 20:37:26 UTC
Created attachment 202704 [details]
bsdgames-5.5.0.diff

Update to DragonflyBSD 5.5.0 sources.
Pulled sail from NetBSD, since it wasn't working.
Comment 1 Rodrigo Osorio freebsd_committer freebsd_triage 2019-03-10 17:42:37 UTC
Hi,

Thanks for the submission, the changes works fine.

I think you can simplify a little bit the Makefile by removing the dist section
and using multiple DISTFILES like that:

MASTER_SITES=   https://github.com/DragonFlyBSD/DragonFlyBSD/archive/ \
                https://deb.debian.org/debian/pool/main/b/bsdgames/
DISTFILES=  v${PORTVERSION}.zip \
            ${PORTNAME}_2.17.orig.tar.gz

and adding a do-extract section to generate the proper WRKSRC:

do-extract:
        ${MKDIR} ${WRKDIR}
        ${TAR} -xzf ${DISTDIR}/v${PORTVERSION}.zip -C ${WRKDIR}
        ${TAR} -xzf ${DISTDIR}/${PORTNAME}_2.17.orig.tar.gz -C ${WRKDIR}
        ${MV} ${WRKDIR}/DragonFlyBSD-${PORTVERSION}/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

Why do you think about that changes ? Fin attached a pach who include my suggestions.
Comment 2 Rodrigo Osorio freebsd_committer freebsd_triage 2019-03-10 17:45:49 UTC
Created attachment 202779 [details]
maintainer patch (202704: bsdgames-5.5.0.diff) with minor changes
Comment 3 Joachim Werner 2019-03-10 18:40:30 UTC
Created attachment 202780 [details]
all-inclusive patch with new DISTFILES fetching

Thanks!
Great idea, since I guess we don't have debian or github to vanish in the near future. I'm still finding my way around the whole ports Makefile business, so I'm always happy to learn something new!
I changed some patches in the files/ subdir which your patch didn't include, so I created a new one ...
This one should work now!
Comment 4 commit-hook freebsd_committer freebsd_triage 2019-03-11 14:03:11 UTC
A commit references this bug:

Author: rodrigo
Date: Mon Mar 11 14:02:16 UTC 2019
New revision: 495354
URL: https://svnweb.freebsd.org/changeset/ports/495354

Log:
  Upgrade games/bsdgames from v5.2.2 to v5.5.0

  Update to DragonflyBSD 5.5.0 sources.
  Pulled sail from NetBSD, since it wasn't working.
  Remake patches

  PR:		236377
  Submitted by:	Joachim Werner <jockl@pianojockl.org>

Changes:
  head/games/bsdgames/Makefile
  head/games/bsdgames/distinfo
  head/games/bsdgames/files/patch-adventure_adventure_Makefile
  head/games/bsdgames/files/patch-adventure_setup_Makefile
  head/games/bsdgames/files/patch-backgammon-teachgammon-Makefile
  head/games/bsdgames/files/patch-backgammon_teachgammon_Makefile
  head/games/bsdgames/files/patch-boggle-boggle-extern.h
  head/games/bsdgames/files/patch-boggle-dictfiles-Makefile
  head/games/bsdgames/files/patch-boggle-mkdict-Makefile
  head/games/bsdgames/files/patch-boggle-mkindex-Makefile
  head/games/bsdgames/files/patch-boggle_boggle_extern.h
  head/games/bsdgames/files/patch-boggle_dictfiles_Makefile
  head/games/bsdgames/files/patch-boggle_mkdict_Makefile
  head/games/bsdgames/files/patch-boggle_mkindex_Makefile
  head/games/bsdgames/files/patch-canfield-cfscores-Makefile
  head/games/bsdgames/files/patch-canfield_cfscores_Makefile
  head/games/bsdgames/files/patch-colorbars-colorbars.c
  head/games/bsdgames/files/patch-colorbars_colorbars.c
  head/games/bsdgames/files/patch-hack_hack_Makefile
  head/games/bsdgames/files/patch-hack_makedefs_Makefile
  head/games/bsdgames/files/patch-phantasia_phantasia_Makefile
  head/games/bsdgames/files/patch-phantasia_setup_Makefile
  head/games/bsdgames/files/patch-primes-Makefile
  head/games/bsdgames/files/patch-primes_Makefile
  head/games/bsdgames/files/patch-sail_pathnames.h
  head/games/bsdgames/files/patch-snake-snscore-Makefile
  head/games/bsdgames/files/patch-snake_snscore_Makefile
  head/games/bsdgames/pkg-descr
Comment 5 Rodrigo Osorio freebsd_committer freebsd_triage 2019-03-11 14:03:59 UTC
Committed thanks.