Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 May 2015 18:00:59 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r385202 - head/java/junit
Message-ID:  <201505021800.t42I0xaa004772@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Sat May  2 18:00:59 2015
New Revision: 385202
URL: https://svnweb.freebsd.org/changeset/ports/385202

Log:
  java/junit: 4.11 -> 4.12
  
  Changes:
  https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.12.md
  
  Moved from building from source with ant to using the binary jar file,
  as the new build mechanism is based on maven. java/hamcrest was split
  from 4.12.
  
  PR:		192575
  Submitted by:	danilo (maintainer), kevin.bowling@kev009.com

Modified:
  head/java/junit/Makefile
  head/java/junit/distinfo

Modified: head/java/junit/Makefile
==============================================================================
--- head/java/junit/Makefile	Sat May  2 17:59:00 2015	(r385201)
+++ head/java/junit/Makefile	Sat May  2 18:00:59 2015	(r385202)
@@ -2,45 +2,31 @@
 # $FreeBSD$
 
 PORTNAME=	junit
-PORTVERSION=	4.11
-PORTREVISION=	1
+PORTVERSION=	4.12
 CATEGORIES=	java devel
-MASTER_SITES=	GHL
-DISTNAME=	${PORTNAME}${PORTVERSION}
+MASTER_SITES=	http://repo1.maven.org/maven2/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-${PORTVERSION}-sources.jar
+EXTRACT_ONLY=
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Regression testing utility for use with the Java(TM) Language
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	junit-team
-GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	r${PORTVERSION}
-GH_COMMIT=	c62e2df
+RUN_DEPENDS=	${JAVAJARDIR}/hamcrest.jar:${PORTSDIR}/java/hamcrest
 
-USES=		perl5
 USE_JAVA=	yes
-USE_ANT=	yes
+NO_BUILD=	yes
 
-PORTDOCS=	README.html cpl-v10.html doc javadoc
-PORTEXAMPLES=	*
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PLIST_FILES=	%%JAVAJARDIR%%/junit.jar \
 		%%JAVAJARDIR%%/junit4.jar \
 		%%DATADIR%%/src.jar
 
 do-install:
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/junit${PORTVERSION}-SNAPSHOT/junit-${PORTVERSION}-SNAPSHOT.jar \
+	${INSTALL_DATA} ${DISTDIR}/junit-${PORTVERSION}.jar \
 		 ${STAGEDIR}${JAVAJARDIR}/junit.jar
 	${LN} -sf junit.jar ${STAGEDIR}${JAVAJARDIR}/junit4.jar
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/junit${PORTVERSION}-SNAPSHOT/junit-${PORTVERSION}-SNAPSHOT-src.jar \
+	${INSTALL_DATA} ${DISTDIR}/junit-${PORTVERSION}-sources.jar \
 		${STAGEDIR}${DATADIR}/src.jar
-	cd ${INSTALL_WRKSRC}/junit${PORTVERSION}-SNAPSHOT/junit/samples \
-		&& ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/
-	cd ${INSTALL_WRKSRC} \
-		&& ${FIND} ${PORTDOCS:Njavadoc} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
-		&& ${FIND} ${PORTDOCS:Njavadoc} -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
-	cd ${INSTALL_WRKSRC}/junit${PORTVERSION}-SNAPSHOT \
-		&& ${FIND} javadoc -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
 
 .include <bsd.port.mk>

Modified: head/java/junit/distinfo
==============================================================================
--- head/java/junit/distinfo	Sat May  2 17:59:00 2015	(r385201)
+++ head/java/junit/distinfo	Sat May  2 18:00:59 2015	(r385202)
@@ -1,2 +1,4 @@
-SHA256 (junit4.11.tar.gz) = a9266060d72c43411c93d1bfae952134ad91f4115bf5769e9a0d17b3d51bd097
-SIZE (junit4.11.tar.gz) = 1974279
+SHA256 (junit-4.12.jar) = 59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a
+SIZE (junit-4.12.jar) = 314932
+SHA256 (junit-4.12-sources.jar) = 9f43fea92033ad82bcad2ae44cec5c82abc9d6ee4b095cab921d11ead98bf2ff
+SIZE (junit-4.12-sources.jar) = 200355



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505021800.t42I0xaa004772>