Index: rubygem-rugged/Makefile
===================================================================
--- rubygem-rugged/Makefile	(revision 19)
+++ rubygem-rugged/Makefile	(revision 53)
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/rubygem-rugged/Makefile 380539 2015-03-05 17:29:12Z sunpoet $
 
 PORTNAME=	rugged
-PORTVERSION=	0.21.0
+PORTVERSION=	0.21.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -11,15 +11,23 @@
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake \
-		libgit2>=${PORTVERSION}:${PORTSDIR}/devel/libgit2
-LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
+OPTIONS_SINGLE=	SG1
+OPTIONS_SINGLE_SG1=	BUNDLEDGIT PORTGIT
+
+BUNDLEDGIT_DESC=	Use bundled git
+PORTGIT_DESC=	Use port devel/libgit2 instead of bundled lib
+
+OPTIONS_DEFAULT=	BUNDLEDGIT
+
+PORTGIT_BUILD_DEPENDS=	libgit2>=${PORTVERSION}:${PORTSDIR}/devel/libgit2
+PORTGIT_LIB_DEPENDS=	libgit2.so:${PORTSDIR}/devel/libgit2
+PORTGIT_CONFIGURE_ARGS=	--use-system-libraries
+
 USE_RUBY=	yes
 USES=		pkgconfig
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=yes
 
-CONFIGURE_ARGS=	--use-system-libraries
-
 .include <bsd.port.mk>
Index: rubygem-rugged/distinfo
===================================================================
--- rubygem-rugged/distinfo	(revision 19)
+++ rubygem-rugged/distinfo	(revision 53)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/rugged-0.21.0.gem) = e536ec53d7f08109960e159e5401e682dd03f6ab386f84f93ef71e1968817529
-SIZE (rubygem/rugged-0.21.0.gem) = 918528
+SHA256 (rubygem/rugged-0.21.4.gem) = 9be7a845ec402e7aa713af561a1dba47993fed3fd37376898d8067c955faa4a7
+SIZE (rubygem/rugged-0.21.4.gem) = 926208