2 files changed, 15 insertions, 40 deletions

diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index b48fb07807f2..55afd8d268b1 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -6,62 +6,37 @@
 #
 
 PORTNAME=	commons-logging
-PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
+MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	Generic logging wrapper library
 
-OPTIONS=	LOG4J "Enable Jakarta Log4j log factory" on \
-		LOGKIT "Enable Avalon LogKit log factory" off \
-		JDK14LOG "Enable JDK 1.4 log factory" off
-
 USE_JAVA=	yes
-USE_ANT=	yes
-MAKE_ENV+=	ANT_INCLUDE_SHARED_JARS=YES
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JDK14LOG)
-JAVA_VERSION=	1.4+
-.else
 JAVA_VERSION=	1.2+
-.endif
+NO_BUILD=	yes
 
-.if defined(WITH_LOG4J)
-BUILD_DEPENDS+=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j
-.endif
-
-.if defined(WITH_LOGKIT)
-BUILD_DEPENDS+=	${JAVALIBDIR}/logkit.jar:${PORTSDIR}/java/avalon-logkit
-.endif
+.include <bsd.port.pre.mk>
 
-ALL_TARGET=	compile
 .if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-PORTDOCS=	api ${OTHERDOCS}
+PORTDOCS=	*
 .endif
-JARFILE=	${PORTNAME}.jar ${PORTNAME}-api.jar
-PLIST_FILES=	${JARFILE:S|^|%%JAVAJARDIR%%/|}
+PLIST_FILES=	%%JAVAJARDIR%%/commons-logging.jar
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JARFILE:S|^|${JAVAJARDIR}/|}..."
-	@${INSTALL_DATA} ${JARFILE:S|^|${WRKSRC}/target/|} ${JAVAJARDIR}
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/dist/docs \
-	  && ${FIND} api -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} api -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
-	@${ECHO_MSG} " ${PORTDOCS} [ DONE ]"
+	@cd ${WRKSRC}/docs \
+	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/java/jakarta-commons-logging/distinfo b/java/jakarta-commons-logging/distinfo
index 669bd3b3f6a9..197569ef1eb7 100644
--- a/java/jakarta-commons-logging/distinfo
+++ b/java/jakarta-commons-logging/distinfo
@@ -1,3 +1,3 @@
-MD5 (commons-logging-1.0.4-src.tar.gz) = db5dc75c89e794f794be92d10df6be1b
-SHA256 (commons-logging-1.0.4-src.tar.gz) = 0752546b1c60e42c4d98cf36354872e22626368bfce252625ea91f1885aa9482
-SIZE (commons-logging-1.0.4-src.tar.gz) = 101017
+MD5 (commons-logging-1.1.tar.gz) = c2bd7cc1fa08d78ec5aa80632c21152b
+SHA256 (commons-logging-1.1.tar.gz) = 04715a1953c36b5a9503c71030187bdddbe0d4280b1e7d78f670996bde1e22ec
+SIZE (commons-logging-1.1.tar.gz) = 680426