Upstream modified the manuals without changing the filenames. The new manuals seem to have better fonts.
We can't just update the checksums, because that'll break the build machines. So this diff does the {} thing to give the distfiles unique filenames. I also moved the manuals to share/doc/ since that's where documentation usually goes. ok? diff /usr/ports path + /usr/ports commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 45e003345bb4f706c7efe87d6878281ae0f782f9 file + games/alephone/scenarios/marathon/Makefile --- games/alephone/scenarios/marathon/Makefile +++ games/alephone/scenarios/marathon/Makefile @@ -5,9 +5,12 @@ V = 20200904 DISTNAME = marathon-0.0.${V} HOMEPAGE = https://alephone.lhowon.org/games/marathon.html +REVISION = 0 + DISTFILES = DISTFILES.g = Marathon-${V}-Data.zip -DISTFILES.e = Marathon_Manual.pdf +DISTFILES.e = Marathon_Manual-${M_V}{Marathon_Manual}.pdf +M_V = 20220718 # http://trilogyrelease.bungie.org/faq.html PERMIT_PACKAGE = YES @@ -15,14 +18,15 @@ PERMIT_PACKAGE = YES EXTRACT_ONLY = ${DISTFILES.g} INSTALL_LOC = ${PREFIX}/share/alephone INSTALL_M = ${INSTALL_LOC}/Marathon +INSTALL_DOC = ${PREFIX}/share/doc/alephone - do-install: - ${INSTALL_DATA_DIR} ${INSTALL_M} + ${INSTALL_DATA_DIR} ${INSTALL_M} ${INSTALL_DOC} # Marathon 1 @cd ${WRKDIR}/Marathon && pax -rw . ${INSTALL_M} ${INSTALL_SCRIPT} ${FILESDIR}/marathon.sh ${PREFIX}/bin/marathon - ${INSTALL_DATA} ${FULLDISTDIR}/Marathon_Manual.pdf ${INSTALL_M} + ${INSTALL_DATA} ${FULLDISTDIR}/Marathon_Manual-${M_V}.pdf \ + ${INSTALL_DOC}/Marathon_Manual.pdf NO_BUILD = Yes NO_TEST = Yes commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 53034182e3f46e752c4c3f1ba3425bfd8cbd57ed file + games/alephone/scenarios/marathon/distinfo --- games/alephone/scenarios/marathon/distinfo +++ games/alephone/scenarios/marathon/distinfo @@ -1,4 +1,4 @@ SHA256 (alephone/Marathon-20200904-Data.zip) = x5M8RkxH+Rn8hUJIIq/AFC5Ibn0zF95BqZIDEwM6wVg= -SHA256 (alephone/Marathon_Manual.pdf) = qrhbHp+8Dq/fb4z1M+rR7lBqPlgvziYKwlxqLwKnOdM= +SHA256 (alephone/Marathon_Manual-20220718.pdf) = 1VFpKm8nPV17ibhaaJyvCQerL2E24pPdvMbxQ1lpeY4= SIZE (alephone/Marathon-20200904-Data.zip) = 43892667 -SIZE (alephone/Marathon_Manual.pdf) = 237541 +SIZE (alephone/Marathon_Manual-20220718.pdf) = 281168 commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 79dea9411750f2bc0826356d8de820a15af245f8 file + games/alephone/scenarios/marathon/pkg/PLIST --- games/alephone/scenarios/marathon/pkg/PLIST +++ games/alephone/scenarios/marathon/pkg/PLIST @@ -3,7 +3,6 @@ share/alephone/ share/alephone/Marathon/ share/alephone/Marathon/Map.scen share/alephone/Marathon/Marathon.appl -share/alephone/Marathon/Marathon_Manual.pdf share/alephone/Marathon/Music/ share/alephone/Marathon/Music/00.ogg share/alephone/Marathon/Music/01.ogg @@ -289,3 +288,5 @@ share/alephone/Marathon/Scripts/Default Preferences.xm share/alephone/Marathon/Scripts/Marathon.mml share/alephone/Marathon/Shapes.shps share/alephone/Marathon/Sounds.sndz +share/doc/alephone/ +share/doc/alephone/Marathon_Manual.pdf commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - d45a7400241a037a755c33abd82630ccc3f48999 file + games/alephone/scenarios/marathon2/Makefile --- games/alephone/scenarios/marathon2/Makefile +++ games/alephone/scenarios/marathon2/Makefile @@ -6,9 +6,12 @@ DISTNAME= marathon2-0.0.${V} PKGNAME= marathon2-0.0.${V} HOMEPAGE= https://alephone.lhowon.org/games/marathon2.html +REVISION = 0 + DISTFILES= DISTFILES.g= Marathon2-${V}-Data.zip -DISTFILES.e = Marathon_2_Manual.pdf +DISTFILES.e = Marathon_2_Manual-${M_V}{Marathon_2_Manual}.pdf +M_V = 20220720 # http://trilogyrelease.bungie.org/faq.html PERMIT_PACKAGE= YES @@ -16,14 +19,15 @@ PERMIT_PACKAGE= YES EXTRACT_ONLY = ${DISTFILES.g} INSTALL_LOC= ${PREFIX}/share/alephone INSTALL_M2= ${INSTALL_LOC}/Marathon2 +INSTALL_DOC= ${PREFIX}/share/doc/alephone - do-install: - @${INSTALL_DATA_DIR} ${INSTALL_M2} + @${INSTALL_DATA_DIR} ${INSTALL_M2} ${INSTALL_DOC} # Marathon 2 @cd ${WRKDIR}/"Marathon 2"/ && pax -rw . "${INSTALL_M2}" ${INSTALL_SCRIPT} ${FILESDIR}/marathon2.sh ${PREFIX}/bin/marathon2 - ${INSTALL_DATA} ${FULLDISTDIR}/Marathon_2_Manual.pdf ${INSTALL_M2} + ${INSTALL_DATA} ${FULLDISTDIR}/Marathon_2_Manual-${M_V}.pdf \ + ${INSTALL_DOC}/Marathon_2_Manual.pdf NO_BUILD= Yes NO_TEST= Yes commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 599ce471170940229b43c145ddc16735d5fcd983 file + games/alephone/scenarios/marathon2/distinfo --- games/alephone/scenarios/marathon2/distinfo +++ games/alephone/scenarios/marathon2/distinfo @@ -1,4 +1,4 @@ SHA256 (alephone/Marathon2-20200904-Data.zip) = +1WlTlZs6BZkl0xlhiE43McXL8BSgo7uqWl9hW5fQe0= -SHA256 (alephone/Marathon_2_Manual.pdf) = eoPhTHCoeDtVKX+bGbs75Zy6DFVSmMMYoSIIOSPweEY= +SHA256 (alephone/Marathon_2_Manual-20220720.pdf) = IvwQglMO+aRlS9FkzR46XmZOFghfjmD+RBI2bF4P1Lk= SIZE (alephone/Marathon2-20200904-Data.zip) = 83387380 -SIZE (alephone/Marathon_2_Manual.pdf) = 281123 +SIZE (alephone/Marathon_2_Manual-20220720.pdf) = 311248 commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 96fd29a18c8e9296d22541cec1a04c2fd20c5401 file + games/alephone/scenarios/marathon2/pkg/PLIST --- games/alephone/scenarios/marathon2/pkg/PLIST +++ games/alephone/scenarios/marathon2/pkg/PLIST @@ -8,7 +8,6 @@ share/alephone/ share/alephone/Marathon2/ share/alephone/Marathon2/Images.imgA share/alephone/Marathon2/Map.sceA -share/alephone/Marathon2/Marathon_2_Manual.pdf share/alephone/Marathon2/Music.ogg share/alephone/Marathon2/Physics Models/ share/alephone/Marathon2/Physics Models/Standard.phyA @@ -3589,3 +3588,5 @@ share/alephone/Marathon2/Scripts/Marathon 2.mml share/alephone/Marathon2/Scripts/Transparent_Liquids.mml share/alephone/Marathon2/Shapes.shpA share/alephone/Marathon2/Sounds.sndA +share/doc/alephone/ +share/doc/alephone/Marathon_2_Manual.pdf commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 44c6cb1f5ebb1688a46b539d7830258d949cf9f7 file + games/alephone/scenarios/marathoninfinity/Makefile --- games/alephone/scenarios/marathoninfinity/Makefile +++ games/alephone/scenarios/marathoninfinity/Makefile @@ -6,9 +6,12 @@ DISTNAME = marathoninfinity-0.0.${V} PKGNAME = marathoninfinity-0.0.${V} HOMEPAGE = https://alephone.lhowon.org/games/infinity.html +REVISION = 0 + DISTFILES = DISTFILES.g = MarathonInfinity-${V}-Data.zip -DISTFILES.e = Trilogy_Manual.pdf +DISTFILES.e = Trilogy_Manual-${M_V}{Trilogy_Manual}.pdf +M_V = 20220720 # http://trilogyrelease.bungie.org/faq.html PERMIT_PACKAGE = YES @@ -16,13 +19,15 @@ PERMIT_PACKAGE = YES EXTRACT_ONLY = ${DISTFILES.g} INSTALL_LOC = ${PREFIX}/share/alephone INSTALL_MI = ${INSTALL_LOC}/Infinity +INSTALL_DOC = ${PREFIX}/share/doc/alephone do-install: - ${INSTALL_DATA_DIR} ${INSTALL_MI} + ${INSTALL_DATA_DIR} ${INSTALL_MI} ${INSTALL_DOC} # Marathon Infinity @cd ${WRKDIR}/"Marathon Infinity"/ && pax -rw . ${INSTALL_MI} ${INSTALL_SCRIPT} ${FILESDIR}/marathoninfinity.sh ${PREFIX}/bin/marathoninfinity - ${INSTALL_DATA} ${FULLDISTDIR}/Trilogy_Manual.pdf ${INSTALL_MI} + ${INSTALL_DATA} ${FULLDISTDIR}/Trilogy_Manual-${M_V}.pdf \ + ${INSTALL_DOC}/Trilogy_Manual.pdf NO_BUILD = Yes NO_TEST = Yes commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - 8acecf3ed7ef87e96012b3da7e4a8e5b1fe82e7b file + games/alephone/scenarios/marathoninfinity/distinfo --- games/alephone/scenarios/marathoninfinity/distinfo +++ games/alephone/scenarios/marathoninfinity/distinfo @@ -1,4 +1,4 @@ SHA256 (alephone/MarathonInfinity-20200904-Data.zip) = mDLEliXEhocqD0vkLKegVQ28PW7WfXtbmnOqJXF0X9g= -SHA256 (alephone/Trilogy_Manual.pdf) = 0k3I6VXXw3BeIdBQ0Y7DQuLq6OOMb6SBrYvXa16rWMo= +SHA256 (alephone/Trilogy_Manual-20220720.pdf) = a3iR6cKzyFvzuTBcO4VHK8NVONNoI6YqJUWH/BC2cTQ= SIZE (alephone/MarathonInfinity-20200904-Data.zip) = 96703853 -SIZE (alephone/Trilogy_Manual.pdf) = 382658 +SIZE (alephone/Trilogy_Manual-20220720.pdf) = 440182 commit - 9ea9b80f3cbb3bfba66ca229734ed6146b2fdad9 blob - aec16648a2c55d61f8fe9b765c0119bfc3c2c9d5 file + games/alephone/scenarios/marathoninfinity/pkg/PLIST --- games/alephone/scenarios/marathoninfinity/pkg/PLIST +++ games/alephone/scenarios/marathoninfinity/pkg/PLIST @@ -605,4 +605,5 @@ share/alephone/Infinity/Scripts/Marathon Infinity.mml share/alephone/Infinity/Scripts/Transparent_Liquids.mml share/alephone/Infinity/Shapes.shpA share/alephone/Infinity/Sounds.sndA -share/alephone/Infinity/Trilogy_Manual.pdf +share/doc/alephone/ +share/doc/alephone/Trilogy_Manual.pdf