Index: head/devel/flexjson/Makefile
===================================================================
--- head/devel/flexjson/Makefile	(revision 461357)
+++ head/devel/flexjson/Makefile	(revision 461358)
@@ -1,38 +1,34 @@
 # Created by: Nemo Liu <nemoliu@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flexjson
-PORTVERSION=	1.6
-PORTREVISION=	1
+DISTVERSION=	2.1
 CATEGORIES=	devel java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Flexjson%201.0
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/flexjson%20${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	amutu@amutu.com
 COMMENT=	Lightweight Java library to write JSON
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
-USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_ARCH=	yes
-NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
-PORTDOCS=	*
-
 OPTIONS_DEFINE=	DOCS
 
+PORTDOCS=	*
+
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar \
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/flexjson/distinfo
===================================================================
--- head/devel/flexjson/distinfo	(revision 461357)
+++ head/devel/flexjson/distinfo	(revision 461358)
@@ -1,2 +1,3 @@
-SHA256 (flexjson.zip) = 0242e6c6a022d568a8a4571297a500254bf01c9d2ff1f9238b5a39c5b7e4cc54
-SIZE (flexjson.zip) = 55229
+TIMESTAMP = 1497796307
+SHA256 (flexjson-2.1.tar.gz) = 9c841fbde84c6950b3ca46c0ecbb5089e294fa9d81cc1b3fb68ceba6e8f79775
+SIZE (flexjson-2.1.tar.gz) = 627012