diff --git a/cad/py-cadquery/Makefile b/cad/py-cadquery/Makefile
index 68f755aa7212..ffa2a37387d2 100644
--- a/cad/py-cadquery/Makefile
+++ b/cad/py-cadquery/Makefile
@@ -1,27 +1,26 @@
-PORTNAME=	cadquery
+PORTNAME=	${GH_ACCOUNT:tl}
 DISTVERSION=	2.0.1
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Python module for building parametric 3D CAD models
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ezdxf/__init__.py:cad/py-ezdxf@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/OCP.so:cad/py-ocp@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/pyparsing.py:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/typing_extensions.py:devel/py-typing-extensions@${PY_FLAVOR}
 
 USES=		python:3.6+,run
 USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
-GH_PROJECT=	cadquery
 
 post-extract:
 # Move into a sub-directory so that we don't pollute site-packages.
 	${MV} ${WRKSRC}/tests ${WRKSRC}/cadquery/tests
 
 .include <bsd.port.mk>
diff --git a/cad/py-ezdxf/Makefile b/cad/py-ezdxf/Makefile
index 4a2230ba706f..f0b628d99a57 100644
--- a/cad/py-ezdxf/Makefile
+++ b/cad/py-ezdxf/Makefile
@@ -1,29 +1,28 @@
 PORTNAME=	ezdxf
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.3
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Create and modify DXF drawings
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}geomdl>0:graphics/py-geomdl@${PY_FLAVOR}
 
 USES=	python:3.6+
 USE_PYTHON=	concurrent distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mozman
-GH_PROJECT=	ezdxf
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile
index 5d978d5dc239..3c8243103655 100644
--- a/comms/apitran/Makefile
+++ b/comms/apitran/Makefile
@@ -1,41 +1,40 @@
 PORTNAME=	apitran
 PORTVERSION=	g20180926
 PORTREVISION=	4
 CATEGORIES=	comms astro hamradio python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Toolkit to handle the automatic picture transmission protocol
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PY_PILLOW} \
 		sox:audio/sox \
 		display:graphics/ImageMagick6
 
 USES=		python:3.6+,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsj56
-GH_PROJECT=	apitran
 GH_TAGNAME=	d209347
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 SHEBANG_FILES=	apitran
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/apitran ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in NOAA_APT_Frame_Format.gif README.md
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ex_1ch_11025.png ex_2ch_48000.png ex_2ch_48000.wav
 	${INSTALL_DATA} ${WRKSRC}/Examples/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/digiham/Makefile b/comms/digiham/Makefile
index 3f46c74ea8b3..5108fa6368dc 100644
--- a/comms/digiham/Makefile
+++ b/comms/digiham/Makefile
@@ -1,22 +1,21 @@
 PORTNAME=	digiham
 DISTVERSION=	0.3.0
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Tools for decoding digital ham communication
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmbe.so:comms/mbelib
 
 USES=		cmake
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	jketterl
-GH_PROJECT=	digiham
 
 post-install:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3750853e4312..302ff5595e9a 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -1,122 +1,119 @@
 PORTNAME=	gnuradio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.8.1.0
 PORTREVISION=	8
 CATEGORIES=	comms astro hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	volk>0:devel/volk \
 		doxygen>0:devel/doxygen \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click/__init__.py:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/click_plugins/__init__.py:devel/py-click-plugins@${PY_FLAVOR} \
 		aconnect:audio/alsa-utils \
 		cheetah:devel/py-cheetah3@${PY_FLAVOR} \
 		cppzmq>0:net/cppzmq \
 		guile:lang/guile \
 		minixmlto:textproc/minixmlto \
 		sdl-config:devel/sdl12 \
 		swig:devel/swig \
 		mpir>0:math/mpir \
 		xdg-open:devel/xdg-utils
 LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgmpxx.so:math/gmp \
 		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
 		libjack.so:audio/jack \
 		libasound.so:audio/alsa-lib \
 		libgsl.so:math/gsl \
 		libgsm.so:audio/gsm \
 		libboost_date_time.so:devel/boost-libs \
 		liborc-0.4.so:devel/orc \
 		libzmq.so:net/libzmq4
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info \
 		shebangfix
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	gnuradio
-GH_PROJECT=	gnuradio
-
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 		-DENABLE_GR_CTRLPORT="YES" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
 		-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DLOCALBASE:STRING="${LOCALBASE}" \
 		-DGR_PKG_DOC_DIR:STRING="${DOCSDIR}" \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \
 		-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig"\
 		-DXMLTO_EXECUTABLE:STRING=minixmlto \
 		-DENABLE_INTERNAL_VOLK:STRING="OFF"
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
+USE_GITHUB=	yes
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
 LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
 		filter pmt qtgui runtime trellis video-sdl\
 		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 # Unfortunately building docs on i386 fails
 ##OPTIONS_EXCLUDE_${i386}=	DOXYGEN
 # Yay. building docs is broken on 10 and HEAD too so turn them all off
 OPTIONS_EXCLUDE=	DOXYGEN
 OPTIONS_SUB=		yes
 UHD_DESC=	Include UHD support from Ettus
 TESTING_DESC=	Include testing support
 INSTALLS_ICONS=		yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 			dot:graphics/graphviz \
 			xmlto:textproc/xmlto \
 			freefont-ttf>0:x11-fonts/freefont-ttf
 DOXYGEN_CMAKE_ON=	-DENABLE_DOXYGEN:STRING="ON" \
 		-DENABLE_DOCS:STRING="ON"
 DOXYGEN_CMAKE_OFF=	-DENABLE_DOXYGEN:STRING="OFF" \
 		-DENABLE_DOCS:STRING="OFF"
 
 UHD_CMAKE_ON=	-DENABLE_GR_UHD:STRING="ON"
 UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MUHD}
 LIBSTRIP_FILES+=	uhd
 LIB_DEPENDS+=	libuhd.so:comms/uhd
 PLIST_SUB+=	UHD=""
 .else
 PLIST_SUB+=	UHD="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/qico/Makefile b/comms/qico/Makefile
index 67dd06c022d2..117e0f064871 100644
--- a/comms/qico/Makefile
+++ b/comms/qico/Makefile
@@ -1,88 +1,86 @@
 # Created by: Denis Shaposhnikov <dsh@vlink.ru>
 
 PORTNAME=	qico
 PORTVERSION=	0.59.1
 CATEGORIES=	comms
 
 MAINTAINER=	admin@5034.ru
 COMMENT=	FidoNet Technology Network (FTN) compatible mailer for Unix systems
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	kosfango
-GH_PROJECT=	qico
 GH_TAGNAME=	15673bf
 
-GNU_CONFIGURE=	yes
-
 CONFDIR?=	${PREFIX}/etc/fido/qico
 QBASEDIR?=	/var/spool/fido/qico
 QLOGDIR?=	/var/log/fido/qico
 PLIST_SUB=	QBASEDIR=${QBASEDIR} QLOGDIR=${QLOGDIR}
 
 .if defined(WITH_OPENLOCK)
 CONFIGURE_ARGS+=	--with-lock-style=open
 .endif
 CONFIGURE_ARGS+=	--with-config=${CONFDIR}/qico.conf \
 			--with-default-speed=115200
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 DOCS=		Changes FAQ README
 EXAMPLES=	koi8r_866.cp onchat qhistory qico.xpm qlinks sfreq \
 		stat.run synctime test.pl tossing
 
 MANS=		qcc.8 qctl.8 qico.8
 OPTIONS_DEFINE=	QCC PERL HYDRA
 QCC_DESC=	Build Qico control center (qcc)
 PERL_DESC=	Enable Perl-hooks support
 HYDRA_DESC=	Enable Hydra 4K/8K/16K protocol extensions
 OPTIONS_DEFAULT=	PERL QCC
 
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MQCC}
 CONFIGURE_ARGS+=--disable-qcc
 PLIST_SUB+=	QCC="@comment "
 .else
 PLIST_SUB+=	QCC=""
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=--enable-perl
 USES+=		perl5
 .endif
 
 .if ${PORT_OPTIONS:MHYDRA}
 CONFIGURE_ARGS+=--enable-hydra8k
 .endif
 
 do-install:
 .for i in ${QLOGDIR} ${QBASEDIR}/fbox ${QBASEDIR}/inbound/unknown \
 		${QBASEDIR}/outbound ${QBASEDIR}/qstoutb
 	${MKDIR} ${STAGEDIR}${i}
 .endfor
 	${MKDIR} ${STAGEDIR}${CONFDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qico ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qctl ${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MQCC}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qcc ${STAGEDIR}${PREFIX}/bin/
 .endif
 	${INSTALL_DATA} ${WRKSRC}/qico.conf.sample ${STAGEDIR}${CONFDIR}/qico.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/qico.substs.sample ${STAGEDIR}${CONFDIR}/qico.substs.sample
 	${INSTALL_DATA} ${WRKSRC}/qico.passwd.sample ${STAGEDIR}${CONFDIR}/qico.passwd.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}.ru
 .endfor
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/stuff/${i} ${STAGEDIR}${EXAMPLESDIR}/${i}
 .endfor
 .for i in ${MANS}
 	${INSTALL_MAN} ${WRKSRC}/man/${i} ${STAGEDIR}${PREFIX}/man/man8/${i}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index dc4e9dfec03a..d4d2b09f4484 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -1,125 +1,124 @@
 # Created by: shurd
 
 PORTNAME?=	svxlink
 PORTVERSION=	19.09.1
 PORTREVISION=	2
 CATEGORIES=	comms hamradio
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT?=	General purpose ham radio voice services
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS?=	libgsm.so:audio/gsm \
 		libspeex.so:audio/speex \
 		libgpg-error.so:security/libgpg-error \
 		libgcrypt.so:security/libgcrypt \
 		libsigc-2.0.so:devel/libsigc++20 \
 		libpopt.so:devel/popt \
 		libopus.so:audio/opus \
 		librtlsdr.so:comms/rtl-sdr \
 		libcurl.so:ftp/curl
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
 USES+=		cmake:noninja compiler:c++11-lang groff pkgconfig tcl
 USE_GITHUB=	yes
 GH_ACCOUNT=	sm0svx
-GH_PROJECT=	svxlink
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR:FILEPATH=${PREFIX}/share/man \
 		-DLOCAL_STATE_DIR=/var \
 		-DLOCALBASE:STRING="${LOCALBASE}"
 
 .if ${PORTNAME}==svxlink
 CMAKE_ARGS+=	-DUSE_QT:BOOL=NO
 .endif
 USE_LDCONFIG=	yes
 
 ALL_TARGET?=	all man
 OPTIONS_DEFINE=	DOXYGEN STATIC DOCS
 STATIC_DESC=	Build and install static libraries
 STATIC_CMAKE_ON=	-DBUILD_STATIC_LIBS=YES
 .if ${PORTNAME}==svxlink
 OPTIONS_DEFAULT=OSS ALSA
 OPTIONS_MULTI=	SOUND
 OPTIONS_MULTI_SOUND=	ALSA OSS
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_OFF=	-DUSE_ALSA:BOOL=OFF
 ALSA_CMAKE_ON=	-DUSE_ALSA:BOOL=ON
 OSS_CMAKE_OFF=	-DUSE_OSS:BOOL=OFF
 OSS_CMAKE_ON=	-DUSE_OSS:BOOL=ON
 .endif
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_ALL_TARGET=doc
 DOXYGEN_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen:BOOL=TRUE
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			dot:graphics/graphviz
 OPTIONS_SUB=	yes
 PORTDOCS=	*
 
 post-patch:
 	@${GREP} -lr /dev/ttyS0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/dev/ttyS0|/dev/ttyu0|'
 	@${REINPLACE_CMD} -e 's|/usr/share/icons|${PREFIX}/share/icons|' \
 		${WRKSRC}/src/qtel/qtel.desktop
 	@${REINPLACE_CMD} -e 's|/usr/share/svxlink|${DOCSDIR}|' \
 		${WRKSRC}/src/doc/man/svxlink.conf.5
 	@${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|' ${WRKSRC}/src/qtel/qtel.desktop \
 		${WRKSRC}/src/doc/man/svxlink.conf.5 \
 		${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in
 	@${REINPLACE_CMD} -e 's|/usr/lib|${PREFIX}/lib|' \
 		${WRKSRC}/src/doc/man/svxlink.conf.5 \
 		${WRKSRC}/src/svxlink/svxlink/svxlink.conf.in
 post-patch-OSS-on:
 	@${GREP} -lr alsa:default ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:default|oss:/dev/dsp|'
 	@${GREP} -lr alsa:plughw:0 ${WRKSRC} | ${GREP} -v .bak | ${GREP} -v .orig | ${XARGS} \
 		${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|'
 
 .if ${PORTNAME}==svxlink
 post-install:
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc \
 		${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/gpio.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/gpio.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/TclVoiceMail.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/TclVoiceMail.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/remotetrx.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/remotetrx.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxreflector.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxreflector.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleDtmfRepeater.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleEchoLink.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleEchoLink.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleFrn.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleFrn.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleHelp.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleHelp.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleMetarInfo.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleMetarInfo.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleParrot.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleParrot.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModulePropagationMonitor.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModulePropagationMonitor.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleSelCallEnc.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleSelCallEnc.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTclVoiceMail.conf.sample
 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf \
 		${STAGEDIR}${PREFIX}/etc/svxlink/svxlink.d/ModuleTrx.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/doc/README-19.09.adoc ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORTNAME}==qtel
 post-install:
 	${RM}	${STAGEDIR}${PREFIX}/include/svxlink/CppStdCompat.h
 	${RM}	${STAGEDIR}${PREFIX}/include/svxlink/common.h
 	${RM}	${STAGEDIR}${PREFIX}/lib/libsvxmisc.a
 .endif
 .include <bsd.port.mk>