From d2617ae58975ef316948a49d418de38f3c3fe528 Mon Sep 17 00:00:00 2001
From: abs <abs>
Date: Thu, 23 Aug 2001 18:06:16 +0000
Subject: Do not install a .orig file (also fixes binary package under Linux)

---
 www/jakarta-tomcat/Makefile  | 5 +++--
 www/jakarta-tomcat/pkg/PLIST | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'www/jakarta-tomcat')

diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 4714305eea9..76843412884 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/08/11 22:05:23 jwise Exp $
+# $NetBSD: Makefile,v 1.22 2001/08/23 18:06:16 abs Exp $
 
 DISTNAME=	${PKGNAME}-src
 PKGNAME=	jakarta-tomcat-3.2.3
@@ -29,8 +29,9 @@ post-patch:
 		-e "s|@JAVA_HOME@|${JAVA_HOME}|g"			\
 		${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp
 		${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties
-	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
 	${RM} -f ${WRKSRC}/src/etc/workers.properties.orig
+	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig
+	${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig
 
 post-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
diff --git a/www/jakarta-tomcat/pkg/PLIST b/www/jakarta-tomcat/pkg/PLIST
index 01d691a93f9..b9d58f78cb7 100644
--- a/www/jakarta-tomcat/pkg/PLIST
+++ b/www/jakarta-tomcat/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/08/11 22:05:24 jwise Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/08/23 18:06:17 abs Exp $
 etc/rc.d/tomcat
 tomcat/KEYS
 tomcat/LICENSE
@@ -225,7 +225,6 @@ tomcat/src/org/apache/tomcat/facade/HttpServletRequestFacade.java
 tomcat/src/org/apache/tomcat/facade/HttpServletResponseFacade.java
 tomcat/src/org/apache/tomcat/facade/HttpSessionFacade.java
 tomcat/src/org/apache/tomcat/facade/RequestDispatcherImpl.java
-tomcat/src/org/apache/tomcat/facade/RequestDispatcherImpl.java.orig
 tomcat/src/org/apache/tomcat/facade/ServletConfigImpl.java
 tomcat/src/org/apache/tomcat/facade/ServletContextFacade.java
 tomcat/src/org/apache/tomcat/facade/ServletInputStreamFacade.java
-- 
cgit v1.2.3