Index: head/devel/android-tools-fastboot/Makefile
===================================================================
--- head/devel/android-tools-fastboot/Makefile
+++ head/devel/android-tools-fastboot/Makefile
@@ -5,8 +5,8 @@
 DISTVERSION?=	8.1.0_r2
 PORTREVISION?=	1
 CATEGORIES=	devel sysutils
-MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
-DISTFILES=	fastboot.1?id=706e754:manpage
+MASTER_SITES=	https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
+DISTFILES=	fastboot.1:manpage
 EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -63,7 +63,7 @@
 
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
-		${BUILD_WRKSRC}/${DISTFILES:M*\:manpage:C/\?.*//}
+		${BUILD_WRKSRC}
 # Adjust paths relative to core
 	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})
 
Index: head/devel/android-tools-fastboot/distinfo
===================================================================
--- head/devel/android-tools-fastboot/distinfo
+++ head/devel/android-tools-fastboot/distinfo
@@ -1,6 +1,6 @@
 TIMESTAMP = 1509048179
-SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
-SIZE (fastboot.1?id=706e754) = 5906
+SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
+SIZE (fastboot.1) = 5906
 SHA256 (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 29c58327e06c9c938f8f3c0d3e991339eb98c53026203fbafc564e85cb6538bc
 SIZE (aosp-mirror-platform_system_core-android-8.1.0_r2_GH0.tar.gz) = 5227210
 SHA256 (jbeich-platform_system_extras-android-8.1.0_r2_GH0.tar.gz) = 3ffa650a11b546928ffd9cf9688aea379151cb71f90fa6ef3d7ab4bf56a9dc67