6 files changed, 14 insertions, 10 deletions

diff --git a/devel/log4j/Makefile b/devel/log4j/Makefile
index 147063da2a82..fff899d7497f 100644
--- a/devel/log4j/Makefile
+++ b/devel/log4j/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-log4j
-PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTVERSION=	1.2.8
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/log4j/
 DIST_SUBDIR=	jakarta
@@ -19,6 +18,7 @@ USE_JAVA=	1.1+
 NO_BUILD=	YES
 
 PORT_JARFILE=		log4j-${PORTVERSION}.jar
+DEST_JARFILE=		log4j.jar
 JAVA_WRKLIBDIR=		${WRKSRC}/dist/lib
 JAVA_WRKDOCSDIR=	${WRKSRC}/docs
 JAVA_WRKEXAMPLESDIR=	${WRKSRC}/examples
@@ -30,7 +30,7 @@ INSTALL_JAR=		${INSTALL_DATA}
 do-install:
 	@${ECHO_CMD} -n ">> Installing JAR file..."
 	@${MKDIR} ${JAVA_LIBDIR}
-	@cd ${JAVA_WRKLIBDIR} && ${INSTALL_JAR} ${PORT_JARFILE} ${JAVA_LIBDIR}/${PORT_JARFILE}
+	@cd ${JAVA_WRKLIBDIR} && ${INSTALL_JAR} ${PORT_JARFILE} ${JAVA_LIBDIR}/${DEST_JARFILE}
 	@${ECHO_CMD} " [DONE]"
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/log4j/distinfo b/devel/log4j/distinfo
index 338f39583bf0..ba053efa10f0 100644
--- a/devel/log4j/distinfo
+++ b/devel/log4j/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-log4j-1.2.7.tar.gz) = b1459bceeff5a42775c9826502130120
+MD5 (jakarta/jakarta-log4j-1.2.8.tar.gz) = dfc8cd57a4f2b42177b14f147c9dab3d
diff --git a/devel/log4j/pkg-plist b/devel/log4j/pkg-plist
index c25409766cba..e32507a733d8 100644
--- a/devel/log4j/pkg-plist
+++ b/devel/log4j/pkg-plist
@@ -273,6 +273,7 @@ share/doc/jakarta-log4j/api/org/apache/log4j/varia/ReloadingPropertyConfigurator
 share/doc/jakarta-log4j/api/org/apache/log4j/varia/Roller.html
 share/doc/jakarta-log4j/api/org/apache/log4j/varia/StringMatchFilter.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/DOMConfigurator.html
+share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/Log4jEntityResolver.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/SAXErrorHandler.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/XMLLayout.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/class-use/ReportParserError.html
@@ -284,6 +285,7 @@ share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/package-use.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/ReportParserError.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/XMLSample.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/DOMConfigurator.html
+share/doc/jakarta-log4j/api/org/apache/log4j/xml/Log4jEntityResolver.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-frame.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-summary.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-tree.html
@@ -427,7 +429,7 @@ share/examples/jakarta-log4j/sort3.properties
 share/examples/jakarta-log4j/sort4.properties
 share/examples/jakarta-log4j/SortAlgo.java
 share/examples/jakarta-log4j/Trivial.java
-share/java/classes/log4j-1.2.7.jar
+share/java/classes/log4j.jar
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw/class-use
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw/doc-files
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw
diff --git a/java/jakarta-log4j/Makefile b/java/jakarta-log4j/Makefile
index 147063da2a82..fff899d7497f 100644
--- a/java/jakarta-log4j/Makefile
+++ b/java/jakarta-log4j/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	jakarta-log4j
-PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTVERSION=	1.2.8
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/log4j/
 DIST_SUBDIR=	jakarta
@@ -19,6 +18,7 @@ USE_JAVA=	1.1+
 NO_BUILD=	YES
 
 PORT_JARFILE=		log4j-${PORTVERSION}.jar
+DEST_JARFILE=		log4j.jar
 JAVA_WRKLIBDIR=		${WRKSRC}/dist/lib
 JAVA_WRKDOCSDIR=	${WRKSRC}/docs
 JAVA_WRKEXAMPLESDIR=	${WRKSRC}/examples
@@ -30,7 +30,7 @@ INSTALL_JAR=		${INSTALL_DATA}
 do-install:
 	@${ECHO_CMD} -n ">> Installing JAR file..."
 	@${MKDIR} ${JAVA_LIBDIR}
-	@cd ${JAVA_WRKLIBDIR} && ${INSTALL_JAR} ${PORT_JARFILE} ${JAVA_LIBDIR}/${PORT_JARFILE}
+	@cd ${JAVA_WRKLIBDIR} && ${INSTALL_JAR} ${PORT_JARFILE} ${JAVA_LIBDIR}/${DEST_JARFILE}
 	@${ECHO_CMD} " [DONE]"
 
 .if !defined(NOPORTDOCS)
diff --git a/java/jakarta-log4j/distinfo b/java/jakarta-log4j/distinfo
index 338f39583bf0..ba053efa10f0 100644
--- a/java/jakarta-log4j/distinfo
+++ b/java/jakarta-log4j/distinfo
@@ -1 +1 @@
-MD5 (jakarta/jakarta-log4j-1.2.7.tar.gz) = b1459bceeff5a42775c9826502130120
+MD5 (jakarta/jakarta-log4j-1.2.8.tar.gz) = dfc8cd57a4f2b42177b14f147c9dab3d
diff --git a/java/jakarta-log4j/pkg-plist b/java/jakarta-log4j/pkg-plist
index c25409766cba..e32507a733d8 100644
--- a/java/jakarta-log4j/pkg-plist
+++ b/java/jakarta-log4j/pkg-plist
@@ -273,6 +273,7 @@ share/doc/jakarta-log4j/api/org/apache/log4j/varia/ReloadingPropertyConfigurator
 share/doc/jakarta-log4j/api/org/apache/log4j/varia/Roller.html
 share/doc/jakarta-log4j/api/org/apache/log4j/varia/StringMatchFilter.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/DOMConfigurator.html
+share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/Log4jEntityResolver.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/SAXErrorHandler.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/class-use/XMLLayout.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/class-use/ReportParserError.html
@@ -284,6 +285,7 @@ share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/package-use.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/ReportParserError.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/examples/XMLSample.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/DOMConfigurator.html
+share/doc/jakarta-log4j/api/org/apache/log4j/xml/Log4jEntityResolver.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-frame.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-summary.html
 share/doc/jakarta-log4j/api/org/apache/log4j/xml/package-tree.html
@@ -427,7 +429,7 @@ share/examples/jakarta-log4j/sort3.properties
 share/examples/jakarta-log4j/sort4.properties
 share/examples/jakarta-log4j/SortAlgo.java
 share/examples/jakarta-log4j/Trivial.java
-share/java/classes/log4j-1.2.7.jar
+share/java/classes/log4j.jar
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw/class-use
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw/doc-files
 @dirrm share/doc/jakarta-log4j/api/org/apache/log4j/chainsaw