Remove leftovers and fix PKGNAMEPREFIX.

4 files changed, 1 insertions, 72 deletions

diff --git a/textproc/apache-commons-digester/Makefile b/textproc/apache-commons-digester/Makefile
index 071043fa930a..6e16b00ac144 100644
--- a/textproc/apache-commons-digester/Makefile
+++ b/textproc/apache-commons-digester/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.1
 PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/apache-commons-digester/jakarta-commons-digester/Makefile b/textproc/apache-commons-digester/jakarta-commons-digester/Makefile
deleted file mode 100644
index a69cb3021cb1..000000000000
--- a/textproc/apache-commons-digester/jakarta-commons-digester/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: Herve Quiroz <hq@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	commons-digester
-PORTVERSION=	2.1
-CATEGORIES=	textproc java devel
-MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	XML-to-Java-object mapping utility package
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-BUILD_DEPENDS=	${JAR_DEPENDS}
-RUN_DEPENDS=	${JAR_DEPENDS}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-NO_BUILD=	yes
-NO_ARCH=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.6+
-
-JARFILE=	${PORTNAME}.jar
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
-
-OPTIONS_DEFINE=	DOCS
-
-OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-PORTDOCS=	*
-
-.include <bsd.port.pre.mk>
-
-JAR_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
-		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections \
-		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
-
-do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
-	@${ECHO_MSG} " [ DONE ]"
-
-do-install-DOCS-on:
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/apidocs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
-	@${ECHO_MSG} " [ DONE ]"
-
-.include <bsd.port.post.mk>
diff --git a/textproc/apache-commons-digester/jakarta-commons-digester/distinfo b/textproc/apache-commons-digester/jakarta-commons-digester/distinfo
deleted file mode 100644
index a11eada91075..000000000000
--- a/textproc/apache-commons-digester/jakarta-commons-digester/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (commons-digester-2.1-bin.tar.gz) = c739162c5eafbbaecfe3ae9e3733221781def20c6603972a124b7ebb552a1af1
-SIZE (commons-digester-2.1-bin.tar.gz) = 2308650
diff --git a/textproc/apache-commons-digester/jakarta-commons-digester/pkg-descr b/textproc/apache-commons-digester/jakarta-commons-digester/pkg-descr
deleted file mode 100644
index 3e724396c667..000000000000
--- a/textproc/apache-commons-digester/jakarta-commons-digester/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The Digester package lets you configure an XML -> Java object mapping module,
-which triggers certain actions called rules whenever a particular pattern of
-nested XML elements is recognized. A rich set of predefined rules is available
-for your use, or you can also create your own. Advanced features of Digester
-include:
-
-  - Ability to plug in your own pattern matching engine, if the standard one is
-    not sufficient for your requirements.
-  - Optional namespace-aware processing, so that you can define rules that are
-    relevant only to a particular XML namespace.
-  - Encapsulation of Rules into RuleSets that can be easily and conveniently
-    reused in more than one application that requires the same type of
-    processing
-
-WWW: http://jakarta.apache.org/commons/digester/