3 files changed, 27 insertions, 73 deletions

diff --git a/devel/log4j/Makefile b/devel/log4j/Makefile
index c21540d13792..a0d9b5451897 100644
--- a/devel/log4j/Makefile
+++ b/devel/log4j/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	jakarta-log4j
-PORTVERSION=	1.2.8
-CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	log4j/binaries
+PORTNAME=	log4j
+PORTVERSION=	1.2.9
+CATEGORIES=	devel java
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	logging/${PORTNAME}/${PORTVERSION}
+DISTNAME=	logging-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	hq@FreeBSD.org
 COMMENT=	A fast and flexible logging library for Java
@@ -20,30 +21,33 @@ NO_BUILD=	YES
 PLIST_FILES=	%%JAVAJARDIR%%/log4j.jar
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	FAQ.html HISTORY TODO TROUBLESHOOT.html api contactUs.html \
-		contributors.html critique.html deepExtension.html \
-		documentation.html download.html earlier.html history.html \
-		images index.html lf5 manual.html od.gif overview.html \
-		plan.html praise.html srtw.html
+PORTDOCS=	*
 .endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/log4j.jar..."
+	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/dist/lib/log4j-${PORTVERSION}.jar ${JAVAJARDIR}/log4j.jar
+	@${INSTALL_DATA} ${WRKSRC}/dist/lib/log4j-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation..."
-	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
+	@cd ${WRKSRC}/docs \
+	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-
-	@${ECHO_MSG} -n ">> Installing examples..."
-	@${MKDIR} ${EXAMPLESDIR}
-	@cd ${WRKSRC}/examples && ${FIND} . \
-	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+	@${ECHO_MSG} -n ">> Installing examples in ${EXAMPLESDIR}/..."
+	@cd ${WRKSRC}/examples \
+	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
+.if !defined(NOPORTDOCS)
+post-install:
+	@${FIND} -s ${WRKSRC}/examples -not -type d \
+	  | ${SED} -ne 's,^${WRKSRC}/examples,${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -s -d ${WRKSRC}/examples -type d \
+	  | ${SED} -ne 's,^${WRKSRC}/examples,@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/log4j/distinfo b/devel/log4j/distinfo
index ff4f88683e28..2883d66cc5a1 100644
--- a/devel/log4j/distinfo
+++ b/devel/log4j/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta-log4j-1.2.8.tar.gz) = dfc8cd57a4f2b42177b14f147c9dab3d
-SIZE (jakarta-log4j-1.2.8.tar.gz) = 2513781
+MD5 (logging-log4j-1.2.9.tar.gz) = 8c2074c42bf2fb1da72e920689c59ad8
+SIZE (logging-log4j-1.2.9.tar.gz) = 2770729
diff --git a/devel/log4j/pkg-plist b/devel/log4j/pkg-plist
deleted file mode 100644
index 5b404f7ae060..000000000000
--- a/devel/log4j/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-%%PORTDOCS%%%%EXAMPLESDIR%%/customLevel/XLevel.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingDefaultConfigurator/InitUsingDefaultConfigurator.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingLog4JProperties/InitUsingLog4JProperties.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingLog4JProperties/log4j.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingMultipleAppenders/example.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingMultipleAppenders/InitUsingMultipleAppenders.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingPropertiesFile/example.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingPropertiesFile/InitUsingPropertiesFile.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingXMLPropertiesFile/example.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/InitUsingXMLPropertiesFile/InitUsingXMLPropertiesFile.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/OpeningLogFiles/sample.log
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/UsingLogMonitorAdapter/CustomizedLogLevels.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/UsingLogMonitorAdapter/UsingLogMonitorAdapter.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/UsingSocketAppenders/socketclient.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/UsingSocketAppenders/socketserver.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/UsingSocketAppenders/UsingSocketAppenders.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/lf5/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/subclass/MyLogger.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/subclass/MyLoggerFactory.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/subclass/MyLoggerTest.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/factor.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/factor.lcf
-%%PORTDOCS%%%%EXAMPLESDIR%%/mycat.bad
-%%PORTDOCS%%%%EXAMPLESDIR%%/mycat.good
-%%PORTDOCS%%%%EXAMPLESDIR%%/MyPatternLayout.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/MyPatternParser.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/NumberCruncher.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/NumberCruncherClient.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/NumberCruncherServer.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/package.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/rolling_log_file.log
-%%PORTDOCS%%%%EXAMPLESDIR%%/Sort.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/sort1.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/sort2.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/sort3.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/sort4.properties
-%%PORTDOCS%%%%EXAMPLESDIR%%/SortAlgo.java
-%%PORTDOCS%%%%EXAMPLESDIR%%/Trivial.java
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/customLevel
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/InitUsingDefaultConfigurator
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/InitUsingLog4JProperties
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/InitUsingMultipleAppenders
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/InitUsingPropertiesFile
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/InitUsingXMLPropertiesFile
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/OpeningLogFiles
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/UsingLogMonitorAdapter
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5/UsingSocketAppenders
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/subclass
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%