Index: java/Makefile
===================================================================
--- java/Makefile	(revision 523977)
+++ java/Makefile	(working copy)
@@ -8,6 +8,7 @@
     SUBDIR += apache-commons-codec
     SUBDIR += apache-commons-collections
     SUBDIR += apache-commons-dbcp
+    SUBDIR += apache-commons-discovery
     SUBDIR += apache-commons-httpclient
     SUBDIR += apache-commons-lang
     SUBDIR += apache-commons-lang3
@@ -47,7 +48,6 @@
     SUBDIR += jad
     SUBDIR += jai
     SUBDIR += jakarta-commons-beanutils
-    SUBDIR += jakarta-commons-discovery
     SUBDIR += jakarta-oro
     SUBDIR += jakarta-regexp
     SUBDIR += jasmin
Index: java/apache-commons-discovery/Makefile
===================================================================
--- java/apache-commons-discovery/Makefile	(revision 523977)
+++ java/apache-commons-discovery/Makefile	(working copy)
@@ -5,12 +5,14 @@
 PORTVERSION=	0.5
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Java library for locating resources (including classes)
 
+LICENSE=        APACHE20
+
 USE_JAVA=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -19,7 +21,7 @@
 
 PORTDOCS=	*
 JARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES+=	${JAVAJARDIR}/${JARFILE}
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
Index: java/apache-commons-discovery/distinfo
===================================================================
Index: java/apache-commons-discovery/pkg-descr
===================================================================
--- java/apache-commons-discovery/pkg-descr	(revision 523977)
+++ java/apache-commons-discovery/pkg-descr	(working copy)
@@ -1,3 +1,5 @@
+Commons Discovery: Service Discovery component
+
 The Discovery Component is about discovering, or finding, implementations for
 pluggable interfaces. It provides facilities instantiating classes in general,
 and for lifecycle management of singleton (factory) classes.
Index: java/jakarta-commons-discovery/Makefile
===================================================================
--- java/jakarta-commons-discovery/Makefile	(revision 523977)
+++ java/jakarta-commons-discovery/Makefile	(nonexistent)
@@ -1,29 +0,0 @@
-# Created by: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
-# $FreeBSD$
-
-PORTNAME=	commons-discovery
-PORTVERSION=	0.5
-CATEGORIES=	java devel
-MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
-
-MAINTAINER=	olgeni@FreeBSD.org
-COMMENT=	Java library for locating resources (including classes)
-
-USE_JAVA=	YES
-NO_BUILD=	YES
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
-JARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
-	cd ${WRKSRC}/apidocs && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
-	cd ${WRKSRC}/apidocs && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-
-.include <bsd.port.mk>

Property changes on: java/jakarta-commons-discovery/Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: java/jakarta-commons-discovery/distinfo
===================================================================
--- java/jakarta-commons-discovery/distinfo	(revision 523977)
+++ java/jakarta-commons-discovery/distinfo	(nonexistent)
@@ -1,2 +0,0 @@
-SHA256 (commons-discovery-0.5-bin.tar.gz) = 05637d67e5025ea37fb2de4ef4f5a5489bcca31555fadadfeb5e59f0481b0204
-SIZE (commons-discovery-0.5-bin.tar.gz) = 714772

Property changes on: java/jakarta-commons-discovery/distinfo
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: java/jakarta-commons-discovery/pkg-descr
===================================================================
--- java/jakarta-commons-discovery/pkg-descr	(revision 523977)
+++ java/jakarta-commons-discovery/pkg-descr	(nonexistent)
@@ -1,16 +0,0 @@
-The Discovery Component is about discovering, or finding, implementations for
-pluggable interfaces. It provides facilities instantiating classes in general,
-and for lifecycle management of singleton (factory) classes.
-
-Fundamentally, Discovery locates classes that implement a given Java interface.
-The discovery pattern, though not necessarily this package, is used in many
-projects including JAXP (SaxParserFactory and others) and commons-logging
-(LogFactory). By extracting this pattern, other projects can (re)use it and
-take advantage of improvements to the pattern as Discovery evolves.
-
-Discovery improves over previous implementations by establishing facilities for
-working within managed environments. These allow configuration and property
-overrides without appealing to the global System properties (which are scoped
-across an entire JVM).
-
-WWW: http://commons.apache.org/discovery/

Property changes on: java/jakarta-commons-discovery/pkg-descr
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property