Index: head/lang/libobjc2/Makefile
===================================================================
--- head/lang/libobjc2/Makefile	(revision 546145)
+++ head/lang/libobjc2/Makefile	(revision 546146)
@@ -1,44 +1,44 @@
 # Created by: Pete French <pete@twisted.org.uk>
 # $FreeBSD$
 
 PORTNAME=	libobjc2
-PORTVERSION=	2.1
+DISTVERSIONPREFIX=v
+DISTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	lang devel gnustep
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Replacement Objective-C runtime supporting modern Objective-C features
 
 LICENSE=	MIT
 
 BROKEN_sparc64=		Does not compile on sparc64: Cannot configure clang properly
 USES=		cmake compiler objc:compiler
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gnustep
-GH_TAGNAME=	0db500a
+GH_TUPLE=	Tessil:robin-map:757de82:robin_map/third_party/robin-map
 
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DLIB_INSTALL_PATH=lib
 CMAKE_ARGS+=	-DTESTS=OFF
-
-CFLAGS+=	-fcommon
 
 LDFLAGS_armv7=	-Wl,-znotext
 SSP_UNSAFE=	yes
 
 PLIST_SUB+=	SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	6
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 CXXFLAGS+=	-stdlib=libstdc++
 .endif
 
 post-install:
 	${LN} -sf libobjc.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${STAGEDIR}${PREFIX}/lib/libobjc.so.${SHLIB_MAJOR}
 
 .include <bsd.port.post.mk>
Index: head/lang/libobjc2/distinfo
===================================================================
--- head/lang/libobjc2/distinfo	(revision 546145)
+++ head/lang/libobjc2/distinfo	(revision 546146)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1598288531
-SHA256 (gnustep-libobjc2-2.1-0db500a_GH0.tar.gz) = c7cb753314f6b2b90d5b1b88b2a17f61930f329c8377b209b93c1c703ed9530e
-SIZE (gnustep-libobjc2-2.1-0db500a_GH0.tar.gz) = 188841
+TIMESTAMP = 1598301863
+SHA256 (gnustep-libobjc2-v2.1_GH0.tar.gz) = 78fc3711db14bf863040ae98f7bdca08f41623ebeaf7efaea7dd49a38b5f054c
+SIZE (gnustep-libobjc2-v2.1_GH0.tar.gz) = 200290
+SHA256 (Tessil-robin-map-757de82_GH0.tar.gz) = b365d847a23ce48a4e5c76c4a8194693f18323bf7cacdc0f57ada92ee275bd45
+SIZE (Tessil-robin-map-757de82_GH0.tar.gz) = 63288
Index: head/lang/libobjc2/pkg-plist
===================================================================
--- head/lang/libobjc2/pkg-plist	(revision 546145)
+++ head/lang/libobjc2/pkg-plist	(revision 546146)
@@ -1,25 +1,26 @@
 include/objc/Availability.h
 include/objc/Object.h
 include/objc/Protocol.h
 include/objc/blocks_private.h
 include/objc/blocks_runtime.h
 include/objc/capabilities.h
 include/objc/developer.h
 include/objc/encoding.h
 include/objc/hooks.h
 include/objc/message.h
 include/objc/objc-api.h
 include/objc/objc-arc.h
 include/objc/objc-auto.h
 include/objc/objc-class.h
 include/objc/objc-runtime.h
 include/objc/objc-visibility.h
 include/objc/objc.h
 include/objc/runtime.h
 include/objc/runtime-deprecated.h
 include/objc/slot.h
 include/Block.h
 include/Block_private.h
 lib/libobjc.so
 lib/libobjc.so.%%SHLIB_MAJOR%%
 lib/libobjc.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+libdata/pkgconfig/libobjc.pc