Index: head/security/openvpn-auth-ldap/Makefile
===================================================================
--- head/security/openvpn-auth-ldap/Makefile	(revision 525752)
+++ head/security/openvpn-auth-ldap/Makefile	(revision 525753)
@@ -1,80 +1,63 @@
 # Created by: Nick Barkas <snb@threerings.net>
 # $FreeBSD$
 
 PORTNAME=	openvpn-auth-ldap
-PORTVERSION=	2.0.4.0.s1379
-PORTREVISION=	3
+PORTVERSION=	2.0.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}
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	LDAP authentication plugin for OpenVPN
 
 LICENSE=	BSD3CLAUSE
 
 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
 # and https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235776
 # appears to document issues on some systems when --with-openssl
 # is missing.
 USES=		autoreconf objc ssl tar:xz
 
 GNU_CONFIGURE=	yes
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--with-openldap=${LOCALBASE} \
 			--with-openvpn=${LOCALBASE}/include \
 			--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
 OBJCFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include -fPIC
 CFLAGS+=	-fPIC
-MAKE_JOBS_UNSAFE=yes # work around missing deps in src/Makefile[.in]
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 CONFIGURE_ENV+=	OBJC="${CC}"
 
-post-patch:
-	${REINPLACE_CMD} 's|-export-dynamic|-Wl,-export-dynamic|' ${WRKSRC}/configure.ac
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn-auth-ldap.so
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/auth-ldap.conf ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.pre.mk>
 
 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: head/security/openvpn-auth-ldap/distinfo
===================================================================
--- head/security/openvpn-auth-ldap/distinfo	(revision 525752)
+++ head/security/openvpn-auth-ldap/distinfo	(revision 525753)
@@ -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