summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorHerve Quiroz <hq@FreeBSD.org>2010-11-29 21:27:55 +0000
committerHerve Quiroz <hq@FreeBSD.org>2010-11-29 21:27:55 +0000
commit82c889b88db03f41240c0d7c7ee28dae53e4e579 (patch)
treeeb7aef78a18babd7f78447d3089c883bdfa64f01 /java
parentUpgade from 0.8.2 to 0.8.3. Fix up the WWW. (diff)
- Update to 4.8.2
- Remove unnecessary include of bsd.port.pre.mk - Respect NOPORTEXAMPLES - Install examples with COPYTREE_SHARE PR: 152664 Submitted by: glewis
Notes
Notes: svn path=/head/; revision=265411
Diffstat (limited to 'java')
-rw-r--r--java/junit/Makefile24
-rw-r--r--java/junit/distinfo5
2 files changed, 11 insertions, 18 deletions
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 1b8aafc232cf..a2fe437f9317 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= junit
-PORTVERSION= 4.8.1
+PORTVERSION= 4.8.2
CATEGORIES= java devel
-MASTER_SITES= SF
-#MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= http://cloud.github.com/downloads/KentBeck/junit/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= hq@FreeBSD.org
@@ -19,11 +18,12 @@ USE_ZIP= yes
USE_JAVA= yes
NO_BUILD= yes
-.include <bsd.port.pre.mk>
-
.if !defined(NOPORTDOCS)
PORTDOCS= README.html cpl-v10.html doc javadoc
.endif
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES= *
+.endif
DATADIR= ${JAVASHAREDIR}/${PORTNAME}
PLIST_FILES= %%JAVAJARDIR%%/junit.jar %%DATADIR%%/src.jar
PLIST_DIRS= %%DATADIR%%
@@ -32,20 +32,14 @@ do-install:
${INSTALL_DATA} ${INSTALL_WRKSRC}/junit-${PORTVERSION}.jar ${JAVAJARDIR}/junit.jar
${MKDIR} ${DATADIR}
${INSTALL_DATA} ${INSTALL_WRKSRC}/junit-${PORTVERSION}-src.jar ${DATADIR}/src.jar
+.if !defined(NOPORTEXAMPLES)
cd ${INSTALL_WRKSRC}/junit/samples \
- && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/\{} \; \
- && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${EXAMPLESDIR}/\{} \;
+ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/
+.endif
.if !defined(NOPORTDOCS)
cd ${INSTALL_WRKSRC} \
&& ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \
&& ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
.endif
-post-install:
- @cd ${INSTALL_WRKSRC}/junit/samples \
- && ${FIND} -s . -type f \
- | ${SED} 's,^\.,${EXAMPLESDIR:S,^${PREFIX}/,,},' >>${TMPPLIST} \
- && ${FIND} -s -d . -type d \
- | ${SED} 's,^\.,@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},' >>${TMPPLIST}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/java/junit/distinfo b/java/junit/distinfo
index da1aba63b3af..a13b39d3b99e 100644
--- a/java/junit/distinfo
+++ b/java/junit/distinfo
@@ -1,3 +1,2 @@
-MD5 (junit4.8.1.zip) = 86aae1041d5f36ab9b2fd7f53fb531c6
-SHA256 (junit4.8.1.zip) = 9f7fd084244ab0dfffb94537ea43ab0b7a59b732508dd3e476fdc16d05eba671
-SIZE (junit4.8.1.zip) = 1590118
+SHA256 (junit4.8.2.zip) = c677cc9a08683848299f0e67fe313415de5cbaae5bfd7dee11f7d53bd8ae5107
+SIZE (junit4.8.2.zip) = 1594318