diff -ur jakarta-commons-logging.original/Makefile jakarta-commons-logging/Makefile
--- jakarta-commons-logging.original/Makefile	Mon Mar  8 01:51:36 2004
+++ jakarta-commons-logging/Makefile	Mon Mar  8 03:14:16 2004
@@ -15,18 +15,36 @@
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Generic logging wrapper library
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
-		${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/java/jakarta-log4j
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
-USE_JAVA=	1.2+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 
+OPTIONS=	LOG4J "Enable Jakarta Log4j log factory" on \
+			LOGKIT "Enable Avalon LogKit log factory" off \
+			JDK14LOG "Enable JDK 1.4 log factory" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_JDK14LOG)
+USE_JAVA=	1.4+
+.else
+USE_JAVA=	1.2+
+.endif
+
+.if defined(WITH_LOG4J)
+BUILD_DEPENDS+=	${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/java/jakarta-log4j
+.endif
+
+.if defined(WITH_LOGKIT)
+BUILD_DEPENDS+=	${LOCALBASE}/share/java/classes/logkit.jar:${PORTSDIR}/java/avalon-logkit
+.endif
+
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 ANT?=		${LOCALBASE}/bin/ant
-.if defined(NOPORTDOCS)
-ANT_TARGET=	dist
-.else
-ANT_TARGET=	dist
+ANT_TARGET=	compile
+.if !defined(NOPORTDOCS)
+ANT_TARGET=	javadoc
+PORTDOCS=	*
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
@@ -37,11 +55,11 @@
 	@${CP} ${PORTSDIR}/java/jakarta-commons-beanutils/files/LICENSE ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/
 
 do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+	@cd ${WRKSRC} && ${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
 
 do-install:
 	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/${DESTJARFILE}
+	@${CP} ${WRKSRC}/target/${JARFILE} ${JARDIR}/${DESTJARFILE}
 	@${ECHO} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
@@ -51,4 +69,4 @@
 	@${ECHO} " [ DONE ]"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ur jakarta-commons-logging.original/pkg-plist jakarta-commons-logging/pkg-plist
--- jakarta-commons-logging.original/pkg-plist	Mon Mar  8 01:51:36 2004
+++ jakarta-commons-logging/pkg-plist	Mon Mar  8 03:11:34 2004
@@ -1,37 +1 @@
-share/doc/commons-logging/org/apache/commons/logging/impl/SimpleLog.html
-share/doc/commons-logging/org/apache/commons/logging/impl/package-tree.html
-share/doc/commons-logging/org/apache/commons/logging/impl/package-frame.html
-share/doc/commons-logging/org/apache/commons/logging/impl/Jdk14Logger.html
-share/doc/commons-logging/org/apache/commons/logging/impl/Log4JCategoryLog.html
-share/doc/commons-logging/org/apache/commons/logging/impl/Log4jFactory.html
-share/doc/commons-logging/org/apache/commons/logging/impl/Log4JLogger.html
-share/doc/commons-logging/org/apache/commons/logging/impl/LogFactoryImpl.html
-share/doc/commons-logging/org/apache/commons/logging/impl/LogKitLogger.html
-share/doc/commons-logging/org/apache/commons/logging/impl/NoOpLog.html
-share/doc/commons-logging/org/apache/commons/logging/impl/package-summary.html
-share/doc/commons-logging/org/apache/commons/logging/package-tree.html
-share/doc/commons-logging/org/apache/commons/logging/package-frame.html
-share/doc/commons-logging/org/apache/commons/logging/Log.html
-share/doc/commons-logging/org/apache/commons/logging/LogFactory.html
-share/doc/commons-logging/org/apache/commons/logging/LogSource.html
-share/doc/commons-logging/org/apache/commons/logging/package-summary.html
-share/doc/commons-logging/org/apache/commons/logging/LogConfigurationException.html
-share/doc/commons-logging/serialized-form.html
-share/doc/commons-logging/packages.html
-share/doc/commons-logging/package-list
-share/doc/commons-logging/overview-tree.html
-share/doc/commons-logging/overview-summary.html
-share/doc/commons-logging/overview-frame.html
-share/doc/commons-logging/index.html
-share/doc/commons-logging/index-all.html
-share/doc/commons-logging/help-doc.html
-share/doc/commons-logging/deprecated-list.html
-share/doc/commons-logging/stylesheet.css
-share/doc/commons-logging/allclasses-frame.html
 share/java/classes/commons-logging.jar
-@dirrm share/doc/commons-logging/org/apache/commons/logging/impl
-@dirrm share/doc/commons-logging/org/apache/commons/logging
-@dirrm share/doc/commons-logging/org/apache/commons
-@dirrm share/doc/commons-logging/org/apache
-@dirrm share/doc/commons-logging/org
-@dirrm share/doc/commons-logging