Index: Makefile
===================================================================
--- Makefile	(revision 550032)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	s3cmd
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	SF/s3tools/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,9 +14,19 @@
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR}
+OPTIONS_SINGLE=	SG1
+OPTIONS_SINGLE_SG1=	MAGIC PYTHON_MAGIC
 
+OPTIONS_DEFAULT=	MAGIC
+
+MAGIC_DESC=		Use devel/py-magic
+PYTHON_MAGIC_DESC=	Use devel/py-python-magic
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}
+
+MAGIC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${PY_FLAVOR}
+PYTHON_MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-magic>0:devel/py-python-magic@${PY_FLAVOR}
+
 USES=		python
 USE_PYTHON=	autoplist distutils