diff --git a/audio/sdl2_sound/Makefile b/audio/sdl2_sound/Makefile
index 7a300b02131e..daeb1a61dd34 100644
--- a/audio/sdl2_sound/Makefile
+++ b/audio/sdl2_sound/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	sdl2_sound
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0.1
 CATEGORIES=	audio
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Abstract SDL soundfile decoder
-WWW=		https://icculus.org/SDL_sound/
+WWW=		https://icculus.org/SDL_sound/ \
+		https://github.com/icculus/SDL_sound
 
 LICENSE=	ZLIB
 LICENSE_FILE_ZLIB=${WRKSRC}/LICENSE.txt
 
 USES=		cmake sdl
 USE_SDL=	sdl2
 USE_GITHUB=	yes
 GH_ACCOUNT=	icculus
 GH_PROJECT=	SDL_sound
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	MIDI DOCS EXAMPLES
 OPTIONS_DEFAULT=MIDI
 
 MIDI_DESC=	MIDI support
 MIDI_CMAKE_BOOL=SDLSOUND_DECODER_MIDI
 MIDI_VARS=	LICENSE+=ART10 \
 		LICENSE_COMB=multi \
 		LICENSE_FILE_ART10=${WRKSRC}/src/timidity/COPYING
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}/bin && ${MV} playsound playsound2
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} CHANGELOG.txt \
 		CREDITS.txt README.txt ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/sdl2_sound/pkg-descr b/audio/sdl2_sound/pkg-descr
index 0a69a6b39692..ba6c554371b0 100644
--- a/audio/sdl2_sound/pkg-descr
+++ b/audio/sdl2_sound/pkg-descr
@@ -1,13 +1,11 @@
 SDL_sound is a library that handles the decoding of several popular
 sound file formats, such as .WAV and .MP3. It is meant to make the
 programmer's sound playback tasks simpler. The programmer gives
 SDL_sound a filename, or feeds it data directly from one of many
 sources, and then reads the decoded waveform data back at her
 leisure. If resource constraints are a concern, SDL_sound can process
 sound data in programmer-specified blocks. Alternately, SDL_sound
 can decode a whole sound file and hand back a single pointer to the
 whole waveform. SDL_sound can also handle sample rate, audio format,
 and channel conversion on-the-fly and behind-the-scenes, if the
 programmer desires.
-
-See also: https://github.com/icculus/SDL_sound
diff --git a/devel/py-asttokens/Makefile b/devel/py-asttokens/Makefile
index 084493430c9b..50a7742637cd 100644
--- a/devel/py-asttokens/Makefile
+++ b/devel/py-asttokens/Makefile
@@ -1,23 +1,24 @@
 PORTNAME=	asttokens
 PORTVERSION=	2.0.8
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Annotate AST trees with source code positions
-WWW=		https://pypi.org/project/asttokens/
+WWW=		https://pypi.org/project/asttokens/ \
+		https://github.com/gristlabs/asttokens
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid253>=0:devel/py-astroid253@${PY_FLAVOR}
 
 USES=		python:3.6+ pytest
 USE_PYTHON=	autoplist distutils
 PYTEST_ARGS=	--ignore=tests/testdata
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-asttokens/pkg-descr b/devel/py-asttokens/pkg-descr
index f60589323018..e43ddf5e654f 100644
--- a/devel/py-asttokens/pkg-descr
+++ b/devel/py-asttokens/pkg-descr
@@ -1,9 +1,7 @@
 The asttokens module annotates Python abstract syntax trees (ASTs)
 with the positions of tokens and text in the source code that
 generated them.
 
 It makes it possible for tools that work with logical AST nodes to
 find the particular text that resulted in those nodes, for example
 for automated refactoring or highlighting.
-
-See also: https://github.com/gristlabs/asttokens
diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile
index a3471cec1ce1..db0cf7c57fe6 100644
--- a/devel/py-flake8/Makefile
+++ b/devel/py-flake8/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	flake8
 PORTVERSION=	5.0.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Code checking using pep8 and pyflakes
-WWW=		https://pypi.org/project/flake8/
+WWW=		https://pypi.org/project/flake8/ \
+		https://gitlab.com/pycqa/flake8
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
 
 USES=		python:3.8+ pytest
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 PYTEST_BROKEN_TESTS=	test_up_to_date test_all_pyflakes_messages_have_flake8_codes_assigned
 
 .include <bsd.port.mk>
diff --git a/devel/py-flake8/pkg-descr b/devel/py-flake8/pkg-descr
index 89b21733316f..1758053cb5ba 100644
--- a/devel/py-flake8/pkg-descr
+++ b/devel/py-flake8/pkg-descr
@@ -1,10 +1,8 @@
 Flake8 is a wrapper around these tools:
 
   - PyFlakes
   - pycodestyle
   - Ned Batchelder's McCabe script
 
 Flake8 runs all tools by launching the single 'flake8' script. It
 displays the warnings in a per-file, merged output
-
-See also: https://gitlab.com/pycqa/flake8
diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 9fa6e7ac9aac..9240ca91488b 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	lxml
 PORTVERSION=	4.9.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
-WWW=		https://lxml.de/
+WWW=		https://lxml.de/ \
+		https://github.com/lxml/lxml
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/licenses/BSD.txt
 
 USES=		compiler cpe gnome python:3.6+ uniquefiles:dirs
 USE_GNOME=	libxml2 libxslt
 USE_PYTHON=	autoplist concurrent cython distutils
 
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib
 
 DOCS_FILES=	CHANGES.txt CREDITS.txt TODO.txt README.rst
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 # needed for test to work
 PYDISTUTILS_BUILD_TARGET=	build_ext
 PYDISTUTILS_BUILDARGS=		--inplace
 
 # force regeneration of cython files
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.c" -delete
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
 		-name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
 
 # see upstream Makefile, test target
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} test.py -p -v
 
 .include <bsd.port.pre.mk>
 
 # if using gcc, force modern GCC due to use of #pragma
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-lxml/pkg-descr b/devel/py-lxml/pkg-descr
index 0ec414594d6f..176023a10992 100644
--- a/devel/py-lxml/pkg-descr
+++ b/devel/py-lxml/pkg-descr
@@ -1,9 +1,7 @@
 lxml is a Python binding for libxml2 and libxslt. Its aim:
 
   * Pythonic API.
   * Documented.
   * Use Python unicode strings in API.
   * Safe (no segfaults).
   * No manual memory management!
-
-See also: https://github.com/lxml/lxml
diff --git a/devel/py-objgraph/Makefile b/devel/py-objgraph/Makefile
index 3e70ac6fd02c..28639c59c7f7 100644
--- a/devel/py-objgraph/Makefile
+++ b/devel/py-objgraph/Makefile
@@ -1,23 +1,25 @@
 PORTNAME=	objgraph
 PORTVERSION=	3.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Draws Python object reference graphs with graphviz
-WWW=		https://pypi.org/project/objgraph/
+WWW=		https://mg.pov.lt/objgraph/ \
+		https://pypi.org/project/objgraph/ \
+		https://github.com/mgedmin/objgraph
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}graphviz>=0:graphics/py-graphviz@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 do-test:
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/devel/py-objgraph/pkg-descr b/devel/py-objgraph/pkg-descr
index 33ca6a4c27fc..0ae9cbce60b8 100644
--- a/devel/py-objgraph/pkg-descr
+++ b/devel/py-objgraph/pkg-descr
@@ -1,5 +1,2 @@
 objgraph is a module that lets you visually explore Python object
 graphs.
-
-See also: https://mg.pov.lt/objgraph/
-See also: https://github.com/mgedmin/objgraph
diff --git a/devel/py-pytest-canonical-data/Makefile b/devel/py-pytest-canonical-data/Makefile
index 090858c43f6c..e73badd5ce95 100644
--- a/devel/py-pytest-canonical-data/Makefile
+++ b/devel/py-pytest-canonical-data/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	pytest-canonical-data
 PORTVERSION=	0.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Plugin which compares results with canonical ones from previous runs
-WWW=		https://pypi.org/project/pytest-canonical-data/
+WWW=		https://pypi.org/project/pytest-canonical-data/ \
+		https://github.com/shuternay/pytest-canonical-data
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-canonical-data/pkg-descr b/devel/py-pytest-canonical-data/pkg-descr
index 17fa084520d1..f1794e255260 100644
--- a/devel/py-pytest-canonical-data/pkg-descr
+++ b/devel/py-pytest-canonical-data/pkg-descr
@@ -1,7 +1,5 @@
 A plugin which allows to compare results with canonical results,
 based on previous runs.
 
 Inspired by Yandex's canondata plugin, pytest-needle and
 pytest-regtest.
-
-See also: https://github.com/shuternay/pytest-canonical-data
diff --git a/devel/py-pytest-datadir/Makefile b/devel/py-pytest-datadir/Makefile
index 31598ea5a4ed..dc6f9bd48206 100644
--- a/devel/py-pytest-datadir/Makefile
+++ b/devel/py-pytest-datadir/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	pytest-datadir
 PORTVERSION=	1.3.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	pytest plugin for test data directories and files
-WWW=		https://pypi.org/project/pytest-datadir/
+WWW=		https://pypi.org/project/pytest-datadir/ \
+		https://github.com/gabrielcnr/pytest-datadir
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+ pytest
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-datadir/pkg-descr b/devel/py-pytest-datadir/pkg-descr
index 16db6adc7116..7351d3bffa26 100644
--- a/devel/py-pytest-datadir/pkg-descr
+++ b/devel/py-pytest-datadir/pkg-descr
@@ -1,3 +1 @@
 pytest plugin for manipulating test data directories and files.
-
-See also: https://github.com/gabrielcnr/pytest-datadir
diff --git a/devel/py-pytest-regtest/Makefile b/devel/py-pytest-regtest/Makefile
index ce7d017853ad..2a01aa5efe7c 100644
--- a/devel/py-pytest-regtest/Makefile
+++ b/devel/py-pytest-regtest/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	pytest-regtest
 PORTVERSION=	1.5.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Pytest plugin for regression tests
-WWW=		https://gitlab.com/uweschmitt/pytest-regtest
+WWW=		https://gitlab.com/uweschmitt/pytest-regtest \
+		https://pypi.org/project/pytest-regtest/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python pytest
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-pytest-regtest/pkg-descr b/devel/py-pytest-regtest/pkg-descr
index cd26d8d59fe3..b778e9f63bc7 100644
--- a/devel/py-pytest-regtest/pkg-descr
+++ b/devel/py-pytest-regtest/pkg-descr
@@ -1,9 +1,7 @@
 pytest-regtest is a pytest-plugin for implementing regression tests.
 Compared to functional testing a regression test does not test if
 software produces correct results, instead a regression test checks
 if software behaves the same way as it did before introduced changes.
 
 pytest-regtest allows capturing selected output which then can be
 compared to the captured output from former runs.
-
-See also: https://pypi.org/project/pytest-regtest/
diff --git a/devel/py-unittest2pytest/Makefile b/devel/py-unittest2pytest/Makefile
index f3833b8e0e33..3ee206387554 100644
--- a/devel/py-unittest2pytest/Makefile
+++ b/devel/py-unittest2pytest/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	unittest2pytest
 PORTVERSION=	0.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert unittest test-cases to pytest
-WWW=		https://pypi.org/project/unittest2pytest/
+WWW=		https://pypi.org/project/unittest2pytest/ \
+		https://github.com/pytest-dev/unittest2pytest
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING-GPLv3.txt
 
 USES=		python pytest
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-unittest2pytest/pkg-descr b/devel/py-unittest2pytest/pkg-descr
index 10449df729ce..32f559129630 100644
--- a/devel/py-unittest2pytest/pkg-descr
+++ b/devel/py-unittest2pytest/pkg-descr
@@ -1,12 +1,10 @@
 unittest2pytest is a tool that helps rewriting Python unittest
 test-cases into pytest test-cases.
 
 In contrast to other similar tools, this unittest2pytest
 
 * handles keyword arguments,
 * handles single-line test-cases and several tests on one line,
 * uses context-handlers where appropriate.
 
 This is done by using lib2to3 and Python's mighty inspect module.
-
-See also: https://github.com/pytest-dev/unittest2pytest
diff --git a/games/abbayedesmorts/Makefile b/games/abbayedesmorts/Makefile
index e6d64d12e0a7..3faa2e9abdd8 100644
--- a/games/abbayedesmorts/Makefile
+++ b/games/abbayedesmorts/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	abbayedesmorts
 PORTVERSION=	2.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Cross-platform port of l'Abbaye des Morts by Locomalito
-WWW=		https://locomalito.com/abbaye_des_morts.php
+WWW=		https://locomalito.com/abbaye_des_morts.php \
+		https://github.com/nevat/abbayedesmorts-gpl
 
 LICENSE=	GPLv3 CC-BY-3.0
 LICENSE_COMB=	multi
 
 USES=		sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	nevat
 GH_PROJECT=	${PORTNAME}-gpl
 
 PORTSCOUT=	skipv:v1.2,v1.13,v1.11 # git repo contains required portability fixes
 
 USE_SDL=	sdl2 mixer2 image2
 
 DATADIR=	${PREFIX}/share/abbayev2
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/abbayev2
 
 .include <bsd.port.mk>
diff --git a/games/abbayedesmorts/pkg-descr b/games/abbayedesmorts/pkg-descr
index 4302a2cc5cbb..b3bd3d14463c 100644
--- a/games/abbayedesmorts/pkg-descr
+++ b/games/abbayedesmorts/pkg-descr
@@ -1,12 +1,10 @@
 In the 13th century, the Cathars, who preach about good Christian
 beliefs, were being expelled by the Catholic Church out of the
 Languedoc region in France. One of them, called Jean Raymond, found
 an old church in which to hide, not knowing that beneath its ruins
 lay buried an ancient evil.
 
 A style close to Spectrum ZX, with its dark background and bright
 colors, proper fit with the story, because it does look old and
 somewhat horrifying. Also, the gameplay is direclty inspired by
 Manic Miner and Jet Set Willy.
-
-See also: https://github.com/nevat/abbayedesmorts-gpl
diff --git a/games/freebee/Makefile b/games/freebee/Makefile
index 36d4b872ed0b..2706d5bc53d8 100644
--- a/games/freebee/Makefile
+++ b/games/freebee/Makefile
@@ -1,30 +1,31 @@
 PORTNAME=	freebee
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	2.0
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Multi-platform ncurses-based console client for Free Bee
-WWW=		https://freebee.fun/
+WWW=		https://freebee.fun/ \
+		https://github.com/freebee-game/console-client
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebee-game
 GH_PROJECT=	console-client
 
 PORTDOCS=	README.md
 
 PLIST_FILES=	bin/freebee share/man/man6/freebee.6.gz
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/freebee/pkg-descr b/games/freebee/pkg-descr
index 8e68bbe6898d..098e4609b313 100644
--- a/games/freebee/pkg-descr
+++ b/games/freebee/pkg-descr
@@ -1,18 +1,16 @@
 Free Bee is an enhanced Free Software clone of The New York Times
 game Spelling Bee.
 
 In this game, your goal is to find as many words as you can with
 the seven letters you are given. You don't have to use any letter
 except the middle letter and letters can be used more than once in
 a word. Finding a word that uses all seven letters yields bonus
 points! Every game has at least one such word, and many games have
 multiple.
 
 Earning enough points to reach the rank of Queen Bee wins the game!
 
 You can play the daily challenge like the original game or try your
 hand at a nearly infinite number of computer-generated random
 challenges. Unlike the original game, you are not restricted to
 only a single game per day!
-
-See also: https://github.com/freebee-game/console-client
diff --git a/games/funnyboat/Makefile b/games/funnyboat/Makefile
index 4efd79a6cd98..feb5c2c029c7 100644
--- a/games/funnyboat/Makefile
+++ b/games/funnyboat/Makefile
@@ -1,40 +1,41 @@
 PORTNAME=	funnyboat
 PORTVERSION=	1.6
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Side scrolling shooter game starring a steamboat on the sea
-WWW=		https://github.com/AMDmi3/funnyboat
+WWW=		https://github.com/AMDmi3/funnyboat \
+		https://funnyboat.sourceforge.net/
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-CODE.txt
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MEDIA.txt
 
 RUN_DEPENDS=	${PYGAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	AMDmi3
 
 USES=		python:3.7-3.9,run  # version range inherited from numpy
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	funnyboat.sh
 SUB_LIST=	DATADIR="${DATADIR}" PYTHON_CMD="${PYTHON_CMD}"
 
 PORTDOCS=	*
 PORTDATA=	*
 PLIST_FILES=	bin/funnyboat
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.py data" ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/funnyboat.sh ${STAGEDIR}${PREFIX}/bin/funnyboat
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/funnyboat/pkg-descr b/games/funnyboat/pkg-descr
index 1f4b3866e49b..eaee3be96638 100644
--- a/games/funnyboat/pkg-descr
+++ b/games/funnyboat/pkg-descr
@@ -1,8 +1,6 @@
 Trip on the Funny Boat is side scrolling arcade shooter game on a
 steamboat equipped with a cannon and the ability to jump. The player
 will need to take advantage of waves to defeat the enemies and dodge
 hazards.
 This game was originally made for the second PyWeek competition
 during the week from 25.3.2006 to 2.4.2006.
-
-See also: https://funnyboat.sourceforge.net/
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 3fffd2aa2f7b..c8b0194a54a8 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	hyperrogue
 PORTVERSION=	12.0u
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Roguelike in a non-euclidean world
-WWW=		https://roguetemple.com/z/hyper/
+WWW=		https://roguetemple.com/z/hyper/ \
+		https://github.com/zenorogue/hyperrogue
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zenorogue
 
 USES=		compiler:c++11-lang gl gmake localbase:ldflags sdl xorg
 USE_SDL=	sdl mixer gfx ttf
 USE_GL=		gl glew
 ALL_TARGET=	hyperrogue
 
 # remove -O2, otherwise clang takes gigabytes of memory
 CXXFLAGS:=	${CXXFLAGS:C/-O[0-9]//} -DFHS -DHYPERPATH="\\\"${DATADIR}/\\\""
 
 PORTDOCS=	README.md
 PORTDATA=	*
 PLIST_FILES=	bin/hyperrogue share/pixmaps/hyperrogue.ico
 
 DESKTOP_ENTRIES="HyperRogue" \
 		"" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 		"${PORTNAME}" \
 		"Game;RolePlaying;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.ttf hyperrogue-music.txt sounds music" \
 		${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/hyperrogue/pkg-descr b/games/hyperrogue/pkg-descr
index bc41ad43245f..fabea937e01d 100644
--- a/games/hyperrogue/pkg-descr
+++ b/games/hyperrogue/pkg-descr
@@ -1,20 +1,18 @@
 You are a lone adventurer in a strange world, where geometry does
 not work in the expected way. Gather as much treasure as you can
 before the nasty monsters get you. Explore several different worlds,
 each with its own unique treasures, enemies, and terrain obstacles.
 Your quest is to find the legendary treasure, the Orbs of Yendor.
 Collect one of them to win! Or just ignore your quest and collect
 smaller treasures.
 
 The twist is the unique, unusual geometry of the world: it is one
 of just few games which takes place on the hyperbolic plane. Witness
 a grid composed of hexagons and heptagons, straight lines which
 seem to be parallel, but then they diverge and never cross, triangles
 whose angles add up to less than 180 degrees, how extremely unlikely
 is it to reach the same place twice, and how the world seems to be
 rotated when you do return. All this matters for the gameplay. The
 game is inspired by the roguelike genre (although in a very minimalist
 way), works of M. C. Escher, and by puzzle games such as Deadly
 Rooms of Death.
-
-See also: https://github.com/zenorogue/hyperrogue
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index e64203d20f8a..743682cea1bc 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,37 +1,39 @@
 PORTNAME=	ivan
 PORTVERSION=	0.59
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Graphical roguelike game
-WWW=		https://attnam.com/
+WWW=		https://attnam.com/ \
+		http://ivan.sourceforge.net/ \
+		https://github.com/Attnam/ivan
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libpcre.so:devel/pcre
 
 USES=		cmake pkgconfig sdl
 USE_SDL=	sdl2 mixer2
 USE_GITHUB=	yes
 GH_ACCOUNT=	Attnam
 GH_TAGNAME=	v${PORTVERSION:C/\.//}
 
 PLIST_FILES=	bin/ivan
 
 PORTSCOUT=	limit:^0\.[5-9]
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	WIZARD DOCS
 
 WIZARD_DESC=	Enable Wizard mode
 WIZARD_CMAKE_BOOL=	WIZARD
 
 post-install-DOCS-on:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md Doc MANUAL" \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/ivan/pkg-descr b/games/ivan/pkg-descr
index 190bf42f3612..77e865f63553 100644
--- a/games/ivan/pkg-descr
+++ b/games/ivan/pkg-descr
@@ -1,19 +1,16 @@
 Iter Vehemens ad Necem (IVAN) is a graphical roguelike game. It
 features advanced bodypart and material handling, multi-colored
 lighting and, above all, deep gameplay.
 
 "Fellow adventurer, turn back while you can! For here begins the
 roguelike Iter Vehemens ad Necem, a Violent Road to Death. If you
 choose to travel along it, you will dive into countless exciting
 adventures to gain items of great magic, attain powerful equipment
 made of mysterious materials, bathe in the blessings of mighty gods
 and recruit loyal allies of various shapes and sizes. Unfortunately,
 along the way you will also often be dangerously injured, poisoned,
 catch numerous diseases, lose several limbs and transform into
 manifold different kinds of pitiful creatures in the darkest depths
 of hostile dungeons. And, at the end of the road, you are bound to
 perish in a most gruesome and painful way. Don't say we didn't warn
 you."
-
-See also: http://ivan.sourceforge.net/
-See also: https://github.com/Attnam/ivan
diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
index 2ca755b4f5b4..9f3669ed3c41 100644
--- a/games/powder-toy/Makefile
+++ b/games/powder-toy/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	powder-toy
 PORTVERSION=	96.2.350
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	'Falling sand' physics sandbox with air pressure and velocity support
-WWW=		https://powdertoy.co.uk/
+WWW=		https://powdertoy.co.uk/ \
+		https://github.com/The-Powder-Toy/The-Powder-Toy
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 		libfftw3.so:math/fftw3 \
 		libluajit-5.1.so:lang/luajit-openresty \
 		libcurl.so:ftp/curl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	The-Powder-Toy
 GH_PROJECT=	The-Powder-Toy
 
 USES=		compiler:c++11-lang meson pkgconfig python:build sdl
 USE_SDL=	sdl2
 
 PORTDOCS=	README.md changelog.txt
 
 OPTIONS_DEFINE=		DOCS SSE
 OPTIONS_DEFAULT_amd64=	SSE
 
 SSE_DESC=		Enable SSE optimizations
 SSE_MESON_ON=		-Dx86_sse=auto
 SSE_MESON_OFF=		-Dx86_sse=none
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/meson.build
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/powder ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/resources/powder.desktop ${STAGEDIR}${PREFIX}/share/applications/powder-toy.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
 	${INSTALL_DATA} ${WRKSRC}/resources/powder.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/powder-toy.appdata.xml
 .for s in 16 24 32 48 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/resources/icon/powder-${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/powder-toy.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/resources/icon/powder-32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/powder-toy.png
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/powder-toy/pkg-descr b/games/powder-toy/pkg-descr
index 19b7c3b49395..3041f96be09e 100644
--- a/games/powder-toy/pkg-descr
+++ b/games/powder-toy/pkg-descr
@@ -1,17 +1,15 @@
 Have you ever wanted to blow something up? Or maybe you always
 dreamt of operating an atomic power plant? Do you have a will to
 develop your own CPU? The Powder Toy lets you to do all of these,
 and even more!
 
 The Powder Toy is a free physics sandbox game, which simulates air
 pressure and velocity, heat, gravity and a countless number of
 interactions between different substances! The game provides you
 with various building materials, liquids, gases and electronic
 components which can be used to construct complex machines, guns,
 bombs, realistic terrains and almost anything else. You can then
 mine them and watch cool explosions, add intricate wirings, play
 with little stickmen or operate your machine. You can browse and
 play thousands of different saves made by the community or upload
 your own - we welcome your creations!
-
-See also: https://github.com/The-Powder-Toy/The-Powder-Toy
diff --git a/games/sdl-sopwith/Makefile b/games/sdl-sopwith/Makefile
index f5acf0d7f7a3..ba268fbac5fa 100644
--- a/games/sdl-sopwith/Makefile
+++ b/games/sdl-sopwith/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	sdl-sopwith
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	2.1.0
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Classic WW1 biplane game
-WWW=		https://github.com/fragglet/sdl-sopwith
+WWW=		https://github.com/fragglet/sdl-sopwith \
+		http://sdl-sopwith.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.md
 
 USES=		autoreconf pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	fragglet
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl2
 
 PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/games/sdl-sopwith/pkg-descr b/games/sdl-sopwith/pkg-descr
index 97cdb145aa41..a92b3571db11 100644
--- a/games/sdl-sopwith/pkg-descr
+++ b/games/sdl-sopwith/pkg-descr
@@ -1,8 +1,6 @@
 This is a port of the classic computer game "Sopwith" to run on
 modern computers and operating systems. It is named "SDL Sopwith"
 as it was originally used the LibSDL graphics library. There is now
 also a port to Gtk+, the widget library used by GNOME and there is
 initial code written toward a backport allowing it to be run under
 DOS, like the original.
-
-See also: http://sdl-sopwith.sourceforge.net/
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 1d5cff842bd1..1411faacab08 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	stratagus
 PORTVERSION=	3.3.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free cross-platform real-time strategy gaming engine
-WWW=		https://stratagus.com/stratagus.html
+WWW=		https://stratagus.com/stratagus.html \
+		https://github.com/Wargus/stratagus
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtolua++-${LUA_VER}.so:lang/tolua++
 RUN_DEPENDS=	zenity:x11/zenity
 
 USES=		cmake compiler:c++17-lang lua:51 pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	Wargus
 USE_SDL=	sdl2 mixer2 image2
 CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
 		-DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \
 		-DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
 		-DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so"
 CMAKE_ON=	ENABLE_DEV
 CMAKE_OFF=	WITH_STACKTRACE  # not in ports
 
 PORTSCOUT=	limit:^[0-9]+\.
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	MNG THEORA VORBIS EAGER_LOAD DOCS
 OPTIONS_DEFAULT=MNG THEORA VORBIS
 .if exists(/usr/include/omp.h)
 OPTIONS_DEFINE+=OPENMP
 OPTIONS_DEFAULT+=OPENMP
 .endif
 
 MNG_DESC=		MNG image library support
 MNG_LIB_DEPENDS=	libmng.so:graphics/libmng
 MNG_CMAKE_BOOL=		WITH_MNG
 
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 THEORA_CMAKE_BOOL=	WITH_THEORA
 THEORA_IMPLIES=		VORBIS  # https://github.com/Wargus/stratagus/issues/396
 
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 			libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	WITH_OGGVORBIS
 
 EAGER_LOAD_DESC=	Load all game data at startup (more memory, less stutter)
 EAGER_LOAD_CMAKE_BOOL=	EAGER_LOAD
 
 OPENMP_CMAKE_BOOL=	WITH_OPENMP
 
 .include <bsd.port.mk>
diff --git a/games/stratagus/pkg-descr b/games/stratagus/pkg-descr
index d0a0204f9c40..5660bf53f1ce 100644
--- a/games/stratagus/pkg-descr
+++ b/games/stratagus/pkg-descr
@@ -1,7 +1,5 @@
 Stratagus is a free cross-platform real-time strategy gaming engine. It
 includes support for playing over the internet/LAN, or playing a computer
 opponent. The engine is configurable and can be used to create games with
 a wide-range of features specific to your needs. See the data sets page
 for a list of current games using the Stratagus engine.
-
-See also: https://github.com/Wargus/stratagus
diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile
index e3890f033b2c..b2eae9efec78 100644
--- a/games/teeworlds/Makefile
+++ b/games/teeworlds/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	teeworlds
 PORTVERSION=	0.7.5
 PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Platform game featuring buggers equipped with weapons
-WWW=		https://www.teeworlds.com/
+WWW=		https://www.teeworlds.com/ \
+		https://github.com/teeworlds/teeworlds
 
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USE_GITHUB=	yes
 GH_TUPLE=	teeworlds:teeworlds-translation:4ed69dd:translations/datasrc/languages \
 		teeworlds:teeworlds-maps:1d3401a:maps/datasrc/maps
 
 USES=		cmake cpe pkgconfig python ssl
 USE_CSTD=	c99
 CPE_VERSION=	${PORTVERSION:C/^0\.//}
 CMAKE_ARGS=	-DPYTHON_EXECUTABLE="${PYTHON_CMD}"
 
 PLIST_FILES=	bin/${PORTNAME}_srv
 PORTDATA=	*
 
 OPTIONS_DEFINE=		CLIENT TEST
 OPTIONS_DEFAULT=	CLIENT TEST
 
 CLIENT_DESC=		Build game client
 CLIENT_CMAKE_BOOL=	CLIENT
 CLIENT_USES=		gl sdl xorg
 CLIENT_USE=		GL=gl XORG=x11 SDL=sdl2
 CLIENT_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libwavpack.so:audio/wavpack \
 			libpnglite.so:graphics/pnglite
 CLIENT_PLIST_FILES=	bin/${PORTNAME}
 
 TEST_BUILD_DEPENDS=	googletest>=0:devel/googletest
 TEST_TEST_TARGET=	run_tests
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/engine/external/wavpack
 	@${RM} -r ${WRKSRC}/src/engine/external/pnglite
 	@${RM} -r ${WRKSRC}/src/engine/external/zlib
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package.*Git/ d' ${WRKSRC}/CMakeLists.txt
 
 post-patch-CLIENT-off:
 	@${REINPLACE_CMD} -e '/find_package.*Pnglite/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*Wavpack/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*SDL2/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*Freetype/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*OpenGL/ d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/find_package.*X11/ d' ${WRKSRC}/CMakeLists.txt
 
 post-patch-TEST-off:
 	@${REINPLACE_CMD} -e '/find_package.*GTest/ d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/games/teeworlds/pkg-descr b/games/teeworlds/pkg-descr
index 383558e046a7..7aa0774085f5 100644
--- a/games/teeworlds/pkg-descr
+++ b/games/teeworlds/pkg-descr
@@ -1,16 +1,14 @@
 Teeworlds is a freeware online multiplayer game, designed as a
 crossover between Quake and Worms. Set on platform-based maps,
 players control a cute little bugger with guns to take out as many
 opponents as possible. The characters can jump but move more quickly
 using a grappling hook, swinging through the levels. It can also
 be used to lock other players to keep them near. The available
 weapons include a pistol, shotgun, grenade launcher and a hammer.
 The shooting and grappling direction is shown through a cursor,
 controlled by the mouse. A special power-up temporarily provides a
 ninja sword, used to slash through enemies. Each character has an
 amount of health and shield. Items scattered around include additional
 ammo, and health and shield bonuses. Unlike Worms, all the action
 that happens is fast-paced and happens in real-time. It supports
 CTF mode.
-
-See also: https://github.com/teeworlds/teeworlds/
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 237a207a932d..bdf7fb1b9dc0 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	wargus
 PORTVERSION=	3.3.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Warcraft 2 mod for the Stratagus game engine
-WWW=		https://stratagus.com/
+WWW=		https://stratagus.com/ \
+		https://github.com/Wargus/wargus
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	stratagus:games/stratagus \
 		cdparanoia:audio/cdparanoia \
 		ffmpeg:multimedia/ffmpeg
 BUILD_DEPENDS=	stratagus:games/stratagus
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Wargus
 
 USES=		cmake compiler:c++11-lang pkgconfig
 CMAKE_ARGS=	-DGAMEDIR:STRING="bin" \
 		-DSHAREDIR:STRING="${DATADIR_REL}"
 SUB_FILES=	pkg-message
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS STORMLIB
 OPTIONS_DEFAULT=STORMLIB
 
 STORMLIB_DESC=		Support importing data from BattleNet (GoG) edition
 STORMLIB_CMAKE_BOOL=	WITH_STORMLIB StormLib_FIND_REQUIRED
 STORMLIB_LIB_DEPENDS=	libstorm.so:archivers/stormlib
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.6 ${STAGEDIR}${MAN6PREFIX}/share/man/man6/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/doc/changelog \
 		${WRKSRC}/doc/pud-specs.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/wargus/pkg-descr b/games/wargus/pkg-descr
index 130f71849d92..53ba9c533672 100644
--- a/games/wargus/pkg-descr
+++ b/games/wargus/pkg-descr
@@ -1,12 +1,10 @@
 Wargus is a Warcraft 2 Mod that allows you to play Warcraft 2 with the
 Stratagus engine. The mod is very similar to the original Warcraft 2, with
 enhancements towards Starcraft and other more modern real time strategy
 games.
 
 * Wargus is supported on multiple systems
 * Can be played high resolution, supports OpenGL including Shaders
 * Local or Internet multiplayer
 * Extensive game configuration using Lua
 * Extensive game configuration from the command line
-
-See also: https://github.com/Wargus/wargus
diff --git a/games/xtgyoretsu/Makefile b/games/xtgyoretsu/Makefile
index 92e596fe8775..708de7845df1 100644
--- a/games/xtgyoretsu/Makefile
+++ b/games/xtgyoretsu/Makefile
@@ -1,28 +1,29 @@
 PORTNAME=	xtgyoretsu
 PORTVERSION=	git20140822
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Extended ncurses version of "Renshu-cho gyoretsu"
-WWW=		https://saahriktu.org/games.html
+WWW=		https://saahriktu.org/games.html \
+		https://github.com/Penguinum/xtgyoretsu-forked
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Penguinum
 GH_PROJECT=	${PORTNAME}-forked
 GH_TAGNAME=	d052143
 
 USES=		ncurses
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/xtgyoretsu/pkg-descr b/games/xtgyoretsu/pkg-descr
index 57af589b3803..7bde25d8894e 100644
--- a/games/xtgyoretsu/pkg-descr
+++ b/games/xtgyoretsu/pkg-descr
@@ -1,8 +1,6 @@
 XT gyoretsu - extended ncurses version of "Renshu-cho gyoretsu"
 
 Goal of the game is to clear entire field by matching pairs of
 neighbouring (adjacent or on the same line/column without any other
 numbers in between) numbers, which must be either equal, or their
 sum must be equal to strike out sum.
-
-See also: https://github.com/Penguinum/xtgyoretsu-forked
diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile
index 9e8e9af82c50..bbddc31c99fa 100644
--- a/graphics/py-pyglet/Makefile
+++ b/graphics/py-pyglet/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	pyglet
 PORTVERSION=	1.5.26
 CATEGORIES=	graphics multimedia x11-toolkits python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Cross-platform windowing and multimedia library
-WWW=		https://pypi.org/project/pyglet/
+WWW=		https://pypi.org/project/pyglet/ \
+		https://github.com/pyglet/pyglet
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		display:test gl python:3.6+ pytest zip
 USE_GL=		gl glu
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pyglet/pkg-descr b/graphics/py-pyglet/pkg-descr
index 535a341a1c06..c04957dbce83 100644
--- a/graphics/py-pyglet/pkg-descr
+++ b/graphics/py-pyglet/pkg-descr
@@ -1,5 +1,3 @@
 pyglet provides an object-oriented programming interface for
 developing games and other visually-rich applications for Windows,
 Mac OS X and Linux.
-
-See also: https://github.com/pyglet/pyglet
diff --git a/textproc/difftastic/Makefile b/textproc/difftastic/Makefile
index 14557bbe06f2..8575a9e3b9b0 100644
--- a/textproc/difftastic/Makefile
+++ b/textproc/difftastic/Makefile
@@ -1,122 +1,123 @@
 PORTNAME=	difftastic
 DISTVERSION=	0.35.0
 CATEGORIES=	textproc
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Diff tool that compares files based on their syntax
-WWW=		https://difftastic.wilfred.me.uk/
+WWW=		https://difftastic.wilfred.me.uk/ \
+		https://github.com/Wilfred/difftastic
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo
 USE_GITHUB=	yes
 GH_ACCOUNT=	Wilfred
 
 PLIST_FILES=	bin/difft
 
 CARGO_CRATES=	aho-corasick-0.7.18 \
 		ansi_term-0.12.1 \
 		archery-0.4.0 \
 		atty-0.2.14 \
 		autocfg-1.1.0 \
 		bitflags-1.3.2 \
 		bumpalo-3.9.1 \
 		bytecount-0.6.2 \
 		cc-1.0.73 \
 		cfg-if-1.0.0 \
 		clap-3.1.18 \
 		clap_lex-0.2.0 \
 		const_format-0.2.23 \
 		const_format_proc_macros-0.2.22 \
 		crossbeam-channel-0.5.4 \
 		crossbeam-deque-0.8.1 \
 		crossbeam-epoch-0.9.8 \
 		crossbeam-utils-0.8.8 \
 		ctor-0.1.22 \
 		diff-0.1.12 \
 		either-1.6.1 \
 		env_logger-0.7.1 \
 		errno-0.2.8 \
 		errno-dragonfly-0.1.2 \
 		fixedbitset-0.4.1 \
 		fnv-1.0.7 \
 		hashbrown-0.11.2 \
 		hermit-abi-0.1.19 \
 		humantime-1.3.0 \
 		indexmap-1.7.0 \
 		io-lifetimes-0.7.3 \
 		itertools-0.10.3 \
 		lazy_static-1.4.0 \
 		libc-0.2.126 \
 		libmimalloc-sys-0.1.24 \
 		linux-raw-sys-0.0.46 \
 		log-0.4.17 \
 		memchr-2.5.0 \
 		memoffset-0.6.5 \
 		mimalloc-0.1.28 \
 		minimal-lexical-0.2.1 \
 		nom-7.1.1 \
 		num_cpus-1.13.1 \
 		once_cell-1.12.0 \
 		os_str_bytes-6.0.1 \
 		output_vt100-0.1.3 \
 		owo-colors-3.4.0 \
 		petgraph-0.6.1 \
 		pretty_assertions-1.2.1 \
 		pretty_env_logger-0.4.0 \
 		proc-macro2-1.0.39 \
 		quick-error-1.2.3 \
 		quote-1.0.18 \
 		radix-heap-0.4.2 \
 		rayon-1.5.3 \
 		rayon-core-1.9.3 \
 		regex-1.5.6 \
 		regex-syntax-0.6.26 \
 		rpds-0.10.0 \
 		rustc-hash-1.1.0 \
 		rustix-0.35.9 \
 		same-file-1.0.6 \
 		scopeguard-1.1.0 \
 		static_assertions-1.1.0 \
 		strsim-0.10.0 \
 		syn-1.0.95 \
 		term_size-0.3.2 \
 		termcolor-1.1.3 \
 		terminal_size-0.1.17 \
 		terminal_size-0.2.1 \
 		textwrap-0.15.0 \
 		tree-sitter-0.20.6 \
 		tree_magic_mini-3.0.3 \
 		typed-arena-2.0.1 \
 		unicode-ident-1.0.0 \
 		unicode-width-0.1.9 \
 		unicode-xid-0.2.3 \
 		version_check-0.9.4 \
 		walkdir-2.3.2 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		windows-sys-0.36.1 \
 		windows_aarch64_msvc-0.36.1 \
 		windows_i686_gnu-0.36.1 \
 		windows_i686_msvc-0.36.1 \
 		windows_x86_64_gnu-0.36.1 \
 		windows_x86_64_msvc-0.36.1 \
 		wu-diff-0.1.2
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/difft
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DOCSDIR}/
 	@cd ${WRKSRC}/manual/src && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/manual
 
 .include <bsd.port.mk>
diff --git a/textproc/difftastic/pkg-descr b/textproc/difftastic/pkg-descr
index fe4d8c9ceda1..c1e68e115369 100644
--- a/textproc/difftastic/pkg-descr
+++ b/textproc/difftastic/pkg-descr
@@ -1,4 +1,2 @@
 Difftastic is an experimental diff tool that compares files based
 on their syntax.
-
-See also: https://github.com/Wilfred/difftastic