- Fixed MASTER_SITE_SUBDIR (binary and source releases are the same so this is

  not really a fix)
- Now bsd.java.mk 2.0 compliant
- Cosmetic changes: ECHO_CMD -> ECHO_MSG and removed unnecessary variables
- Use CPIO rather than MKDIR/INSTALL_MAN/INSTALL_DATA
- Removed JAR file for pkg-plist
- Added 'devel' category
- Removed unnecessary 'post-install' target
- Updated homepage in pkg-descr
- Use my FreeBSD address for maintainership purposes

Approved by:	glewis (mentor)

3 files changed, 21 insertions, 32 deletions

diff --git a/devel/log4j/Makefile b/devel/log4j/Makefile
index 3bdf9213283b..c21540d13792 100644
--- a/devel/log4j/Makefile
+++ b/devel/log4j/Makefile
@@ -7,23 +7,17 @@
 
 PORTNAME=	jakarta-log4j
 PORTVERSION=	1.2.8
-CATEGORIES=	java
+CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	log4j/source
+MASTER_SITE_SUBDIR=	log4j/binaries
 
-MAINTAINER=	herve.quiroz@esil.univ-mrs.fr
-COMMENT=	Log4J, a fast and flexible logging library for Java
+MAINTAINER=	hq@FreeBSD.org
+COMMENT=	A fast and flexible logging library for Java
 
-USE_JAVA=	1.1+
+USE_JAVA=	YES
 NO_BUILD=	YES
 
-PORT_JARFILE=		log4j-${PORTVERSION}.jar
-DEST_JARFILE=		log4j.jar
-JAVA_WRKJARDIR=		${WRKSRC}/dist/lib
-JAVA_WRKDOCSDIR=	${WRKSRC}/docs
-JAVA_WRKEXAMPLESDIR=	${WRKSRC}/examples
-
-PLIST_SUB+=		JAVAJARDIR=${JAVAJARDIR:S/^${PREFIX}\///}
+PLIST_FILES=	%%JAVAJARDIR%%/log4j.jar
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	FAQ.html HISTORY TODO TROUBLESHOOT.html api contactUs.html \
@@ -34,23 +28,22 @@ PORTDOCS=	FAQ.html HISTORY TODO TROUBLESHOOT.html api contactUs.html \
 .endif
 
 do-install:
-	@${ECHO_CMD} -n ">> Installing JAR file..."
+	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/log4j.jar..."
 	@${MKDIR} ${JAVAJARDIR}
-	@cd ${JAVA_WRKJARDIR} && ${INSTALL_DATA} ${PORT_JARFILE} ${JAVAJARDIR}/${DEST_JARFILE}
-	@${ECHO_CMD} " [DONE]"
+	@${INSTALL_DATA} ${WRKSRC}/dist/lib/log4j-${PORTVERSION}.jar ${JAVAJARDIR}/log4j.jar
+	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation..."
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} ";"
-	@cd ${JAVA_WRKDOCSDIR} && ${FIND} . -type f -exec ${INSTALL_MAN} ${JAVA_WRKDOCSDIR}/{} ${DOCSDIR}/{} ";"
-	@${ECHO_CMD} " [DONE]"
-
-	@${ECHO_CMD} -n ">> Installing examples..."
-	@cd ${JAVA_WRKEXAMPLESDIR} && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/{} ";"
-	@cd ${JAVA_WRKEXAMPLESDIR} && ${FIND} . -type f -exec ${INSTALL_DATA} ${JAVA_WRKEXAMPLESDIR}/{} ${EXAMPLESDIR}/{} ";"
-	@${ECHO_CMD} " [DONE]"
+	@${ECHO_MSG} -n ">> Installing documentation..."
+	@${MKDIR} ${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${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} " [ DONE ]"
 .endif
 
-post-install:
-	@${ECHO_CMD} "${PORTNAME}-${PORTVERSION} installed as ${JAVAJARDIR}/${DEST_JARFILE}"
-
 .include <bsd.port.mk>
diff --git a/devel/log4j/pkg-descr b/devel/log4j/pkg-descr
index 61c9ac968107..d07a5f1f0573 100644
--- a/devel/log4j/pkg-descr
+++ b/devel/log4j/pkg-descr
@@ -7,7 +7,4 @@ using external configuration files. Best of all, Log4J has a gentle
 learning curve. Beware: judging from user feedback, it is also quite
 addictive.
 
-WWW: http://jakarta.apache.org/log4j/
-
-- Herve Quiroz
-herve.quiroz@esil.univ-mrs.fr
+WWW: http://logging.apache.org/log4j/
diff --git a/devel/log4j/pkg-plist b/devel/log4j/pkg-plist
index e791390c6d46..5b404f7ae060 100644
--- a/devel/log4j/pkg-plist
+++ b/devel/log4j/pkg-plist
@@ -48,4 +48,3 @@
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/lf5
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/subclass
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-%%JAVAJARDIR%%/log4j.jar