Index: Makefile =================================================================== --- Makefile (revision 509159) +++ Makefile (working copy) @@ -2,48 +2,44 @@ # $FreeBSD$ PORTNAME= commons-pool -PORTVERSION= 1.6 +PORTVERSION= 2.7.0 CATEGORIES= java devel -MASTER_SITES= APACHE_COMMONS_SOURCE +MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= jakarta- -DISTNAME= ${PORTNAME}-${PORTVERSION}-src +DISTNAME= ${PORTNAME}2-${PORTVERSION}-bin MAINTAINER= ale@FreeBSD.org -COMMENT= Jakarta Object-pooling API +COMMENT= Apache Commons Object-pooling API LICENSE= APACHE20 OPTIONS_DEFINE= DOCS -USES= dos2unix -DOS2UNIX_GLOB= *.xml *.java USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 8+ +NO_BUILD= yes -USE_ANT= yes -ALL_TARGET= build-jar +WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} -PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar +JARFILE= ${PORTNAME}2-${PORTVERSION}.jar +DOCFILES= LICENSE.txt \ + NOTICE.txt \ + RELEASE-NOTES.txt PORTDOCS= * +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \ + ${JAVAJARDIR}/${JARFILE} .include -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= javadoc -.endif - do-install: - @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." - @${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar \ - ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - @${ECHO_MSG} " [ DONE ]" + ${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR} + ${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar .if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/dist/docs && ${FIND} api \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 - @${ECHO_MSG} " [ DONE ]" + cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR} +.for FILE in ${DOCFILES} + ${INSTALL_MAN} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} +.endfor .endif .include Index: distinfo =================================================================== --- distinfo (revision 509159) +++ distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (commons-pool-1.6-src.tar.gz) = 31d182e5dc857666dba640caf9529158c679075f4f137deceff128e268d9195a -SIZE (commons-pool-1.6-src.tar.gz) = 321409 +TIMESTAMP = 1566237947 +SHA256 (commons-pool2-2.7.0-bin.tar.gz) = 0edb9416e7f0e3d7cd99801209fdcae10f6ad6bda52a4ec1b12f92b1c6721f51 +SIZE (commons-pool2-2.7.0-bin.tar.gz) = 1218113 Index: files/patch-build.xml =================================================================== --- files/patch-build.xml (revision 509159) +++ files/patch-build.xml (nonexistent) @@ -1,11 +0,0 @@ ---- build.xml.orig 2016-06-20 15:05:02 UTC -+++ build.xml -@@ -40,7 +40,7 @@ - - - -- -+ - - - Property changes on: files/patch-build.xml ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property