Index: security/openvpn-auth-ldap/Makefile
===================================================================
--- security/openvpn-auth-ldap/Makefile	(revision 525670)
+++ security/openvpn-auth-ldap/Makefile	(working copy)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	openvpn-auth-ldap
-PORTVERSION=	2.0.4.0.s1379
-PORTREVISION=	3
+PORTVERSION=	2.0.4
+PORTREVISION=	4
 CATEGORIES=	security net-vpn
-MASTER_SITES=	LOCAL/mandree # figure out proper GitHub commit and use that.
-# https://github.com/threerings/openvpn-auth-ldap/
-DISTNAME=	auth-ldap-${PORTVERSION}
+#DISTNAME=	auth-ldap-${PORTVERSION}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	LDAP authentication plugin for OpenVPN
@@ -16,6 +14,7 @@
 
 BUILD_DEPENDS=	re2c:devel/re2c \
 		check>=0:devel/check \
+		libobjc2>=0:lang/libobjc2 \
 		${LOCALBASE}/include/openvpn-plugin.h:security/openvpn
 
 # this port doesn't require ssl itself, but OpenLDAP needs it
@@ -31,6 +30,11 @@
 			--with-objc-runtime=GNU \
 			--with-openssl=${OPENSSLBASE}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	threerings
+GH_PROJECT=	openvpn-auth-ldap
+GH_TAGNAME=	auth-ldap-${PORTVERSION}
+
 PORTDOCS=	README
 PORTEXAMPLES=	auth-ldap.conf
 PLIST_FILES=	lib/openvpn-auth-ldap.so
@@ -62,19 +66,4 @@
 
 CC+=		${DEBUG_FLAGS}
 
-# this is a local target to build a tarball from SVN
-# and another target to upload it
-# Note that googlecode.com is gone. Apparently someone exported the code
-# to Github:  https://github.com/threerings/openvpn-auth-ldap/
-build-tarball: ${DISTFILES}
-${DISTFILES}:
-	${RM} -r ${WRKSRC}
-	svn export -r${PORTVERSION:E:C/^s//} \
-	    http://openvpn-auth-ldap.googlecode.com/svn/trunk/ ${WRKSRC}
-	tar -C ${WRKSRC}/.. -cvf - ${WRKSRC:T} | ${XZ_CMD} -vvc >${DISTFILES} || \
-	    { ${RM} ${DISTFILES} ; exit 1 ; }
-
-upload-tarball: build-tarball
-	scp ${DISTFILES} freefall.freebsd.org:public_distfiles/
-
 .include <bsd.port.post.mk>
Index: security/openvpn-auth-ldap/distinfo
===================================================================
--- security/openvpn-auth-ldap/distinfo	(revision 525670)
+++ security/openvpn-auth-ldap/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (auth-ldap-2.0.4.0.s1379.tar.xz) = 8d35eb540482d8d2bf36d0d310241b69633691f28477867ecee28c76912476cc
-SIZE (auth-ldap-2.0.4.0.s1379.tar.xz) = 163724
+TIMESTAMP = 1581341930
+SHA256 (threerings-openvpn-auth-ldap-2.0.4-auth-ldap-2.0.4_GH0.tar.gz) = 81f600cdc88adb2258f57df1ed2d87f0afa945f66cbf8897ad50e76f42509168
+SIZE (threerings-openvpn-auth-ldap-2.0.4-auth-ldap-2.0.4_GH0.tar.gz) = 209800