4 files changed, 15 insertions, 17 deletions

diff --git a/java/jboss71/Makefile b/java/jboss71/Makefile
index 5073d3b4936f..3423dcbfdb1e 100644
--- a/java/jboss71/Makefile
+++ b/java/jboss71/Makefile
@@ -7,8 +7,8 @@ PORTVERSION=	7.1.3
 #PORTEPOCH=	0
 CATEGORIES=	java www
 MASTER_SITES=	https://javaz.org/distfiles/
-DISTNAME=	${GH_PROJECT}-${GH_TAGNAME}
-DISTFILES=	m2-${DISTNAME}.tar.xz ${DISTNAME}.tar.gz
+DISTNAME2=	${GH_PROJECT}-${GH_TAGNAME}
+DISTFILES=	m2-${DISTNAME2}.tar.xz ${DISTNAME}.tar.gz
 
 MAINTAINER=	yerenkow@gmail.com
 COMMENT=	JBoss 7.1.3.Final
@@ -17,7 +17,6 @@ USE_GITHUB=	YES
 GH_ACCOUNT=	jbossas
 GH_PROJECT=	jboss-as
 GH_TAGNAME=	7.1.3.Final
-GH_COMMIT=	f1f5122
 
 USE_RC_SUBR=	jboss71
 USE_JAVA=	yes
@@ -28,13 +27,13 @@ VAR_DIR?=	/var
 LOG_DIR?=	${VAR_DIR}/log/${PORTNAME}
 DEPLOY_DIR?=	${VAR_DIR}/${PORTNAME}
 PID_FILE=	/var/run/${PORTNAME}.pid
-JBOSSOUTPUT=	${WRKSRC}/build/target/${DISTNAME}
+JBOSSOUTPUT=	${WRKSRC}/build/target/${DISTNAME2}
 
 SUB_LIST=	APP_SHORTNAME=${PORTNAME} \
 		LOG_DIR=${LOG_DIR} \
 		USER=${USER}\
 		PID_FILE=${PID_FILE} \
-		APP_HOME=${PREFIX}/${DISTNAME}
+		APP_HOME=${PREFIX}/${DISTNAME2}
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -50,6 +49,6 @@ do-build:
 	cd ${WRKSRC} && ./build.sh -Dmaven.test.skip=true -DskipTests
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${DISTNAME} && cd ${JBOSSOUTPUT} && ${FIND} . | ${CPIO} -pdmu -R ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/${DISTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${DISTNAME2} && cd ${JBOSSOUTPUT} && ${FIND} . | ${CPIO} -pdmu -R ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/${DISTNAME2}
 
 .include <bsd.port.mk>
diff --git a/java/jboss71/distinfo b/java/jboss71/distinfo
index fc57e48dd01c..3d0101f85fe6 100644
--- a/java/jboss71/distinfo
+++ b/java/jboss71/distinfo
@@ -1,4 +1,4 @@
-SHA256 (jboss-as-7.1.3.Final.tar.gz) = 9cefd3f082fac532fc2ab65ad093e48e8dcf0448339834ba55abce0f8ab7a5db
-SIZE (jboss-as-7.1.3.Final.tar.gz) = 11662847
 SHA256 (m2-jboss-as-7.1.3.Final.tar.xz) = 736834e6ea4db0179e4861234229e8ede75bc8e653aba37da5f3d4acd5e0051d
 SIZE (m2-jboss-as-7.1.3.Final.tar.xz) = 156590076
+SHA256 (jbossas-jboss-as-7.1.3-7.1.3.Final_GH0.tar.gz) = 15f32871b4b9262ece0492486cd2f2860201fbe45f314ae6296aefda6eb9cfdc
+SIZE (jbossas-jboss-as-7.1.3-7.1.3.Final_GH0.tar.gz) = 11663306
diff --git a/java/jboss72/Makefile b/java/jboss72/Makefile
index b77682f978a0..945c83b77ff3 100644
--- a/java/jboss72/Makefile
+++ b/java/jboss72/Makefile
@@ -7,8 +7,8 @@ PORTREVISION=	1
 #PORTEPOCH=	0
 CATEGORIES=	java www
 MASTER_SITES=	https://javaz.org/distfiles/
-DISTNAME=	${GH_PROJECT}-${GH_TAGNAME}
-DISTFILES=	m2-${DISTNAME}.tar.xz ${DISTNAME}.tar.gz
+DISTNAME2=	${GH_PROJECT}-${GH_TAGNAME}
+DISTFILES=	m2-${DISTNAME2}.tar.xz ${DISTNAME}.tar.gz
 
 MAINTAINER=	yerenkow@gmail.com
 COMMENT=	JBoss 7.2.0.Final
@@ -19,7 +19,6 @@ USE_GITHUB=	YES
 GH_ACCOUNT=	jbossas
 GH_PROJECT=	jboss-as
 GH_TAGNAME=	7.2.0.Final
-GH_COMMIT=	4ed76ce
 
 USE_RC_SUBR=	jboss72
 USE_JAVA=	yes
@@ -30,14 +29,14 @@ VAR_DIR?=	/var
 LOG_DIR?=	${VAR_DIR}/log/${PORTNAME}
 DEPLOY_DIR?=	${VAR_DIR}/${PORTNAME}
 PID_FILE=	/var/run/${PORTNAME}.pid
-JBOSSOUTPUT=	${WRKSRC}/build/target/${DISTNAME}
+JBOSSOUTPUT=	${WRKSRC}/build/target/${DISTNAME2}
 
 SUB_LIST=	APP_SHORTNAME=${PORTNAME} \
 		LOG_DIR=${LOG_DIR} \
 		USER=${USER}\
 		PID_FILE=${PID_FILE} \
-		APP_HOME=${PREFIX}/${DISTNAME}
-PLIST_SUB=	APP_HOME=${DISTNAME}
+		APP_HOME=${PREFIX}/${DISTNAME2}
+PLIST_SUB=	APP_HOME=${DISTNAME2}
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -53,6 +52,6 @@ do-build:
 	cd ${WRKSRC} && ./build.sh -Dmaven.test.skip=true -DskipTests
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${DISTNAME} && cd ${JBOSSOUTPUT} && ${FIND} . | ${CPIO} -pdmu -R ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/${DISTNAME}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${DISTNAME2} && cd ${JBOSSOUTPUT} && ${FIND} . | ${CPIO} -pdmu -R ${USER}:${GROUP} ${STAGEDIR}${PREFIX}/${DISTNAME2}
 
 .include <bsd.port.mk>
diff --git a/java/jboss72/distinfo b/java/jboss72/distinfo
index 2554e1b3f5eb..b2102f66454a 100644
--- a/java/jboss72/distinfo
+++ b/java/jboss72/distinfo
@@ -1,4 +1,4 @@
 SHA256 (m2-jboss-as-7.2.0.Final.tar.xz) = 64ec350d5ebb41d1fbe15f5ba18e37f94425007eba2dac407c2ad35128efa989
 SIZE (m2-jboss-as-7.2.0.Final.tar.xz) = 159788916
-SHA256 (jboss-as-7.2.0.Final.tar.gz) = 5fd993b358e1650f91293bcc04f4b72fa81c0d25c775d689e30ea69fad294c32
-SIZE (jboss-as-7.2.0.Final.tar.gz) = 14956639
+SHA256 (jbossas-jboss-as-7.2.0-7.2.0.Final_GH0.tar.gz) = d003ccc50c8bfc5cf8b441a363bf481dec52b060199d809ccd330e5da8419636
+SIZE (jbossas-jboss-as-7.2.0-7.2.0.Final_GH0.tar.gz) = 14957509