summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comms/Makefile3
-rw-r--r--comms/synce-dccm/DESCR4
-rw-r--r--comms/synce-dccm/Makefile18
-rw-r--r--comms/synce-dccm/PLIST5
-rw-r--r--comms/synce-dccm/distinfo5
-rw-r--r--devel/Makefile3
-rw-r--r--devel/newt/DESCR10
-rw-r--r--devel/newt/Makefile24
-rw-r--r--devel/newt/Makefile.common25
-rw-r--r--devel/newt/PLIST4
-rw-r--r--devel/newt/TODO1
-rw-r--r--devel/newt/buildlink3.mk15
-rw-r--r--devel/newt/distinfo6
-rw-r--r--devel/newt/patches/patch-aa159
-rw-r--r--emulators/Makefile4
-rw-r--r--emulators/doscmd/DESCR7
-rw-r--r--emulators/doscmd/Makefile27
-rw-r--r--emulators/doscmd/PLIST6
-rw-r--r--emulators/doscmd/distinfo14
-rw-r--r--emulators/doscmd/patches/patch-aa24
-rw-r--r--emulators/doscmd/patches/patch-ab59
-rw-r--r--emulators/doscmd/patches/patch-ac20
-rw-r--r--emulators/doscmd/patches/patch-ae13
-rw-r--r--emulators/doscmd/patches/patch-af40
-rw-r--r--emulators/doscmd/patches/patch-ag20
-rw-r--r--emulators/doscmd/patches/patch-ah74
-rw-r--r--emulators/doscmd/patches/patch-ai27
-rw-r--r--emulators/doscmd/patches/patch-aj33
-rw-r--r--emulators/linuxppc_lib/DESCR5
-rw-r--r--emulators/linuxppc_lib/Makefile83
-rw-r--r--emulators/linuxppc_lib/distinfo48
-rw-r--r--emulators/linuxppc_lib/files/ld.so.conf3
-rw-r--r--emulators/linuxppc_lib/patches/patch-aa8
-rw-r--r--mail/Makefile3
-rw-r--r--mail/mailscanner/DESCR22
-rw-r--r--mail/mailscanner/MESSAGE23
-rw-r--r--mail/mailscanner/Makefile144
-rw-r--r--mail/mailscanner/PLIST3
-rw-r--r--mail/mailscanner/distinfo5
-rw-r--r--mail/mailscanner/files/mailscanner.sh17
-rw-r--r--misc/Makefile4
-rw-r--r--misc/openoffice2-bin/DEINSTALL15
-rw-r--r--misc/openoffice2-bin/DESCR14
-rw-r--r--misc/openoffice2-bin/INSTALL18
-rw-r--r--misc/openoffice2-bin/Makefile79
-rw-r--r--misc/openoffice2-bin/PLIST.proglinks8
-rw-r--r--misc/openoffice2-bin/distinfo5
-rw-r--r--misc/openoffice2-bin/files/soffice17
-rw-r--r--misc/openoffice2-bin/options.mk12
-rw-r--r--misc/openoffice2/DESCR14
-rw-r--r--misc/openoffice2/MESSAGE10
-rw-r--r--misc/openoffice2/Makefile212
-rw-r--r--misc/openoffice2/Makefile.FreeBSD17
-rw-r--r--misc/openoffice2/Makefile.NetBSD24
-rw-r--r--misc/openoffice2/PLIST300
-rw-r--r--misc/openoffice2/distinfo79
-rw-r--r--misc/openoffice2/options.mk93
-rw-r--r--misc/openoffice2/patches/patch-ac22
-rw-r--r--misc/openoffice2/patches/patch-ad47
-rw-r--r--misc/openoffice2/patches/patch-ag21
-rw-r--r--misc/openoffice2/patches/patch-ah94
-rw-r--r--misc/openoffice2/patches/patch-ai13
-rw-r--r--misc/openoffice2/patches/patch-ak105
-rw-r--r--misc/openoffice2/patches/patch-am13
-rw-r--r--misc/openoffice2/patches/patch-an22
-rw-r--r--misc/openoffice2/patches/patch-ao19
-rw-r--r--misc/openoffice2/patches/patch-ap82
-rw-r--r--misc/openoffice2/patches/patch-aq22
-rw-r--r--misc/openoffice2/patches/patch-ar24
-rw-r--r--misc/openoffice2/patches/patch-as46
-rw-r--r--misc/openoffice2/patches/patch-aw23
-rw-r--r--misc/openoffice2/patches/patch-ba188
-rw-r--r--misc/openoffice2/patches/patch-bb22
-rw-r--r--misc/openoffice2/patches/patch-bc13
-rw-r--r--misc/openoffice2/patches/patch-bd15
-rw-r--r--misc/openoffice2/patches/patch-bf13
-rw-r--r--misc/openoffice2/patches/patch-bg15
-rw-r--r--misc/openoffice2/patches/patch-bh12
-rw-r--r--misc/openoffice2/patches/patch-bi13
-rw-r--r--misc/openoffice2/patches/patch-bj20
-rw-r--r--misc/openoffice2/patches/patch-bk18
-rw-r--r--misc/openoffice2/patches/patch-bl12
-rw-r--r--misc/openoffice2/patches/patch-bm18
-rw-r--r--misc/openoffice2/patches/patch-bn15
-rw-r--r--misc/openoffice2/patches/patch-bo13
-rw-r--r--misc/openoffice2/patches/patch-bp13
-rw-r--r--misc/openoffice2/patches/patch-bq59
-rw-r--r--misc/openoffice2/patches/patch-bs36
-rw-r--r--misc/openoffice2/patches/patch-bt27
-rw-r--r--misc/openoffice2/patches/patch-bv29
-rw-r--r--misc/openoffice2/patches/patch-bw16
-rw-r--r--misc/openoffice2/patches/patch-bx14
-rw-r--r--misc/openoffice2/patches/patch-by23
-rw-r--r--misc/openoffice2/patches/patch-ch183
-rw-r--r--misc/openoffice2/patches/patch-ci19
-rw-r--r--misc/openoffice2/patches/patch-cj19
-rw-r--r--misc/openoffice2/patches/patch-cn17
-rw-r--r--misc/openoffice2/patches/patch-cp12
-rw-r--r--misc/openoffice2/patches/patch-cq13
-rw-r--r--misc/openoffice2/patches/patch-cr22
-rw-r--r--misc/openoffice2/patches/patch-cs183
-rw-r--r--misc/openoffice2/patches/patch-ct21
-rw-r--r--misc/openoffice2/patches/patch-cu13
-rw-r--r--misc/openoffice2/patches/patch-cv12
-rw-r--r--misc/openoffice2/patches/patch-cw30
-rw-r--r--misc/openoffice2/patches/patch-cx16
-rw-r--r--misc/openoffice2/patches/patch-cy24
-rw-r--r--misc/openoffice2/patches/patch-dc35
-rw-r--r--misc/openoffice2/patches/patch-dd35
-rw-r--r--misc/openoffice2/patches/patch-de39
-rw-r--r--misc/openoffice2/patches/patch-dt13
-rw-r--r--misc/openoffice2/patches/patch-du35
-rw-r--r--misc/openoffice2/patches/patch-dy118
-rw-r--r--misc/openoffice2/patches/patch-ed26
-rw-r--r--misc/openoffice2/patches/patch-ef111
-rw-r--r--misc/openoffice2/patches/patch-eg8
-rw-r--r--misc/openoffice2/patches/patch-eh9
-rw-r--r--misc/openoffice2/patches/patch-ei48
-rw-r--r--misc/openoffice2/patches/patch-ej16
-rw-r--r--misc/openoffice2/patches/patch-ga16
-rw-r--r--misc/openoffice2/patches/patch-gb16
-rw-r--r--misc/openoffice2/patches/patch-gc25
-rw-r--r--multimedia/Makefile3
-rw-r--r--multimedia/RealPlayerGold/DESCR5
-rw-r--r--multimedia/RealPlayerGold/Makefile70
-rw-r--r--multimedia/RealPlayerGold/distinfo5
-rw-r--r--multimedia/RealPlayerGold/files/realplay.sh7
-rw-r--r--net/Makefile4
-rw-r--r--net/ctorrent/DESCR6
-rw-r--r--net/ctorrent/Makefile20
-rw-r--r--net/ctorrent/PLIST2
-rw-r--r--net/ctorrent/distinfo9
-rw-r--r--net/ctorrent/patches/patch-aa22
-rw-r--r--net/ctorrent/patches/patch-ab12
-rw-r--r--net/ctorrent/patches/patch-ac12
-rw-r--r--net/ctorrent/patches/patch-ad13
-rw-r--r--net/ntop1/DESCR10
-rw-r--r--net/ntop1/Makefile24
-rw-r--r--net/ntop1/PLIST3
-rw-r--r--net/ntop1/distinfo9
-rw-r--r--net/ntop1/patches/patch-aa22
-rw-r--r--net/ntop1/patches/patch-ab108
-rw-r--r--net/ntop1/patches/patch-ac28
-rw-r--r--net/ntop1/patches/patch-ad80
-rw-r--r--print/Makefile5
-rw-r--r--print/acroread/ALTERNATIVES1
-rw-r--r--print/acroread/DESCR6
-rw-r--r--print/acroread/Makefile91
-rw-r--r--print/acroread/PLIST.common44
-rw-r--r--print/acroread/PLIST.common_end2
-rw-r--r--print/acroread/PLIST.linux-i38611
-rw-r--r--print/acroread/PLIST.osf1-alpha28
-rw-r--r--print/acroread/PLIST.solaris-i38618
-rw-r--r--print/acroread/PLIST.solaris-sparc31
-rw-r--r--print/acroread/distinfo15
-rw-r--r--print/acroread/files/acroread.diff33
-rw-r--r--print/acroread/patches/patch-aa49
-rw-r--r--print/acroread5/ALTERNATIVES1
-rw-r--r--print/acroread5/DESCR6
-rw-r--r--print/acroread5/Makefile65
-rw-r--r--print/acroread5/PLIST.common55
-rw-r--r--print/acroread5/PLIST.solaris-sparc16
-rw-r--r--print/acroread5/distinfo9
-rw-r--r--print/acroread5/files/acroread.diff24
-rw-r--r--print/acroread5/patches/patch-aa52
-rw-r--r--print/mgv/DESCR3
-rw-r--r--print/mgv/Makefile32
-rw-r--r--print/mgv/PLIST101
-rw-r--r--print/mgv/distinfo8
-rw-r--r--print/mgv/patches/patch-aa12
-rw-r--r--print/mgv/patches/patch-ab13
-rw-r--r--print/mgv/patches/patch-ad13
-rw-r--r--www/Makefile16
-rw-r--r--www/firefox-bin-acroread/DEINSTALL8
-rw-r--r--www/firefox-bin-acroread/DESCR2
-rw-r--r--www/firefox-bin-acroread/INSTALL9
-rw-r--r--www/firefox-bin-acroread/Makefile17
-rw-r--r--www/firefox-bin-acroread/Makefile.common30
-rw-r--r--www/firefox-bin-acroread5/DESCR2
-rw-r--r--www/firefox-bin-acroread5/Makefile17
-rw-r--r--www/firefox-bin-acroread7/DESCR2
-rw-r--r--www/firefox-bin-acroread7/Makefile18
-rw-r--r--www/firefox-bin-flash/DESCR2
-rw-r--r--www/firefox-bin-flash/Makefile9
-rw-r--r--www/firefox-bin-flash/Makefile.common46
-rw-r--r--www/firefox-bin-flash/PLIST2
-rw-r--r--www/firefox-bin-flash/distinfo5
-rw-r--r--www/firefox-bin-java/DESCR2
-rw-r--r--www/firefox-bin-java/Makefile7
-rw-r--r--www/firefox-bin-java/Makefile.common41
-rw-r--r--www/firefox-bin-java/PLIST2
-rw-r--r--www/firefox-bin-realplayer/DESCR2
-rw-r--r--www/firefox-bin-realplayer/Makefile29
-rw-r--r--www/firefox-bin-realplayer/PLIST2
-rw-r--r--www/firefox-bin/DESCR9
-rw-r--r--www/firefox-bin/Makefile18
-rw-r--r--www/firefox-bin/Makefile.linux-i3867
-rw-r--r--www/firefox-bin/Makefile.solaris-i38616
-rw-r--r--www/firefox-bin/Makefile.solaris-sparc16
-rw-r--r--www/firefox-bin/distinfo14
-rw-r--r--www/instiki/DESCR5
-rw-r--r--www/instiki/Makefile50
-rw-r--r--www/instiki/PLIST86
-rw-r--r--www/instiki/distinfo5
-rw-r--r--www/instiki/files/instiki.sh24
-rw-r--r--www/jakarta-tomcat4/DESCR4
-rw-r--r--www/jakarta-tomcat4/MESSAGE18
-rw-r--r--www/jakarta-tomcat4/Makefile58
-rw-r--r--www/jakarta-tomcat4/PLIST1473
-rw-r--r--www/jakarta-tomcat4/distinfo5
-rw-r--r--www/jakarta-tomcat4/files/tomcat4.sh92
-rw-r--r--www/jakarta-tomcat5/DESCR9
-rw-r--r--www/jakarta-tomcat5/MESSAGE18
-rw-r--r--www/jakarta-tomcat5/Makefile77
-rw-r--r--www/jakarta-tomcat5/PLIST1752
-rw-r--r--www/jakarta-tomcat5/distinfo5
-rw-r--r--www/jakarta-tomcat5/files/tomcat5.sh92
-rw-r--r--www/sarg/DESCR4
-rw-r--r--www/sarg/Makefile101
-rw-r--r--www/sarg/PLIST55
-rw-r--r--www/sarg/distinfo20
-rw-r--r--www/sarg/patches/patch-aa20
-rw-r--r--www/sarg/patches/patch-ab13
-rw-r--r--www/sarg/patches/patch-ac22
-rw-r--r--www/sarg/patches/patch-ad16
-rw-r--r--www/sarg/patches/patch-ae31
-rw-r--r--www/sarg/patches/patch-af13
-rw-r--r--www/sarg/patches/patch-ag49
-rw-r--r--www/sarg/patches/patch-ah99
-rw-r--r--www/sarg/patches/patch-ai13
-rw-r--r--www/seamonkey-bin-flash/DESCR2
-rw-r--r--www/seamonkey-bin-flash/Makefile13
-rw-r--r--www/seamonkey-bin-flash/PLIST2
-rw-r--r--www/seamonkey-bin-java/DESCR2
-rw-r--r--www/seamonkey-bin-java/Makefile11
-rw-r--r--www/seamonkey-bin/DESCR7
-rw-r--r--www/seamonkey-bin/Makefile16
-rw-r--r--www/seamonkey-bin/Makefile.common128
-rw-r--r--www/seamonkey-bin/Makefile.linux-i3868
-rw-r--r--www/seamonkey-bin/distinfo5
-rw-r--r--www/seamonkey-bin/files/mozilla.sh7
-rw-r--r--x11/Makefile3
-rw-r--r--x11/tkman/DESCR16
-rw-r--r--x11/tkman/MESSAGE10
-rw-r--r--x11/tkman/Makefile33
-rw-r--r--x11/tkman/PLIST4
-rw-r--r--x11/tkman/distinfo9
-rw-r--r--x11/tkman/files/mkindex26
-rw-r--r--x11/tkman/patches/patch-aa101
-rw-r--r--x11/tkman/patches/patch-ab33
-rw-r--r--x11/tkman/patches/patch-ac15
-rw-r--r--x11/tkman/patches/patch-ad22
252 files changed, 10 insertions, 10486 deletions
diff --git a/comms/Makefile b/comms/Makefile
index ec112410289..5417ede08a4 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2011/08/28 06:46:56 dsainty Exp $
+# $NetBSD: Makefile,v 1.85 2011/10/02 14:11:51 wiz Exp $
#
COMMENT= Communication utilities
@@ -64,7 +64,6 @@ SUBDIR+= ruby-termios
SUBDIR+= scmxx
SUBDIR+= snooper
SUBDIR+= spandsp
-SUBDIR+= synce-dccm
SUBDIR+= synce-librapi2
SUBDIR+= synce-libsynce
SUBDIR+= synce-rra
diff --git a/comms/synce-dccm/DESCR b/comms/synce-dccm/DESCR
deleted file mode 100644
index 97dd91e32bd..00000000000
--- a/comms/synce-dccm/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-DCCM is part of the SynCE project.
-
-This daemon is required to be able to communicate with a handheld
-device.
diff --git a/comms/synce-dccm/Makefile b/comms/synce-dccm/Makefile
deleted file mode 100644
index c2ec4ab8b7e..00000000000
--- a/comms/synce-dccm/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:09 joerg Exp $
-#
-
-DISTNAME= synce-dccm-0.9.1
-CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=synce/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://synce.sourceforge.net/
-COMMENT= Listener daemon for connections from WinCE devices
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-.include "../../comms/synce-libsynce/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/comms/synce-dccm/PLIST b/comms/synce-dccm/PLIST
deleted file mode 100644
index 479c1a0b785..00000000000
--- a/comms/synce-dccm/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/13 15:05:16 wiz Exp $
-bin/dccm
-bin/synce-sound
-man/man1/dccm.1
-man/man1/synce-sound.1
diff --git a/comms/synce-dccm/distinfo b/comms/synce-dccm/distinfo
deleted file mode 100644
index 6f1454e5ad7..00000000000
--- a/comms/synce-dccm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/13 15:05:16 wiz Exp $
-
-SHA1 (synce-dccm-0.9.1.tar.gz) = d43a89844ae7031b1eac0ebbe34ef910c964fc5f
-RMD160 (synce-dccm-0.9.1.tar.gz) = 80475bdf2cc7fa5869b3cc18872f4c0782643200
-Size (synce-dccm-0.9.1.tar.gz) = 292930 bytes
diff --git a/devel/Makefile b/devel/Makefile
index 6114906c8e3..f68ff100923 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1493 2011/09/15 09:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.1494 2011/10/02 14:11:51 wiz Exp $
#
COMMENT= Development utilities
@@ -456,7 +456,6 @@ SUBDIR+= netbeans-ide
SUBDIR+= netbsd-iscsi-lib
SUBDIR+= netcdf
SUBDIR+= newfile
-SUBDIR+= newt
SUBDIR+= noweb
SUBDIR+= nqc
SUBDIR+= nsis
diff --git a/devel/newt/DESCR b/devel/newt/DESCR
deleted file mode 100644
index dc36ca3435c..00000000000
--- a/devel/newt/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Newt is a windowing toolkit for text mode built from the slang
-library. It allows color text mode applications to easily use
-stackable windows, push buttons, check boxes, radio buttons, lists,
-entry fields, labels, and displayable text. Scrollbars are supported,
-and forms may be nested to provide extra functionality.
-
-Besides the newt library, this package provides whiptail, which may
-be used from shell scripts similarly to Savio Lam's "dialog". Newt
-provides the textual interface for the Red Hat and Debian boot
-disks.
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
deleted file mode 100644
index fadb20c4149..00000000000
--- a/devel/newt/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2011/04/22 13:43:21 obache Exp $
-
-.include "Makefile.common"
-
-PKGREVISION= 4
-COMMENT= Windowing toolkit based on libslang
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LIBTOOL= yes
-NO_EXPORT_CPP= yes
-GNU_CONFIGURE= yes
-
-INSTALLATION_DIRS= bin include lib
-
-do-install:
- cd ${WRKSRC}; \
- ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} libnewt.la ${DESTDIR}${PREFIX}/lib;\
- ${INSTALL_DATA} newt.h ${DESTDIR}${PREFIX}/include; \
- ${LIBTOOL} --mode=install ${INSTALL} whiptail ${DESTDIR}${PREFIX}/bin
-
-.include "../../devel/libslang/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/newt/Makefile.common b/devel/newt/Makefile.common
deleted file mode 100644
index f32f675356b..00000000000
--- a/devel/newt/Makefile.common
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile.common,v 1.2 2011/04/02 08:45:43 obache Exp $
-# used by devel/py-newt/Makefile
-
-DISTNAME= newt-${VERSION}-5.src.rpm
-PKGNAME= newt-${VERSION}
-VERSION= 0.51.6
-CATEGORIES= devel
-MASTER_SITES= http://download.fedora.redhat.com/pub/fedora/linux/core/3/SRPMS/
-EXTRACT_SUFX= # empty
-
-MAINTAINER= riz@NetBSD.org
-HOMEPAGE= https://fedorahosted.org/newt/wiki
-
-BUILD_DEPENDS+= rpm2pkg>=2.0:../../pkgtools/rpm2pkg
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/newt/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/newt/patches
-
-USE_TOOLS+= gmake gzcat tar
-
-WRKSRC= ${WRKDIR}/newt-${VERSION}
-
-do-extract:
- ${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DISTNAME}
- cd ${WRKDIR} ; ${GZCAT} ${WRKSRC}.tar.gz | ${TAR} -xf -
diff --git a/devel/newt/PLIST b/devel/newt/PLIST
deleted file mode 100644
index e79ef2679d5..00000000000
--- a/devel/newt/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/08 02:47:24 riz Exp $
-bin/whiptail
-include/newt.h
-lib/libnewt.la
diff --git a/devel/newt/TODO b/devel/newt/TODO
deleted file mode 100644
index 28fc5b81f57..00000000000
--- a/devel/newt/TODO
+++ /dev/null
@@ -1 +0,0 @@
-- Add TCL support options
diff --git a/devel/newt/buildlink3.mk b/devel/newt/buildlink3.mk
deleted file mode 100644
index 9a9eacb84d5..00000000000
--- a/devel/newt/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:25 joerg Exp $
-
-BUILDLINK_TREE+= newt
-
-.if !defined(NEWT_BUILDLINK3_MK)
-NEWT_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.newt+= newt>=0.51.6
-BUILDLINK_ABI_DEPENDS.newt?= newt>=0.51.6nb2
-BUILDLINK_PKGSRCDIR.newt?= ../../devel/newt
-
-.include "../../devel/libslang/buildlink3.mk"
-.endif # NEWT_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -newt
diff --git a/devel/newt/distinfo b/devel/newt/distinfo
deleted file mode 100644
index a21906625fb..00000000000
--- a/devel/newt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2008/04/13 09:54:42 wiz Exp $
-
-SHA1 (newt-0.51.6-5.src.rpm) = 69f705b6593ba48169219c11259704467811a321
-RMD160 (newt-0.51.6-5.src.rpm) = b5791cb36a7209da132ce7cd24c6d93d976ddf1e
-Size (newt-0.51.6-5.src.rpm) = 174867 bytes
-SHA1 (patch-aa) = f81b1879a7d1a6b2fa5ce58ffaf4ada4d8b1003c
diff --git a/devel/newt/patches/patch-aa b/devel/newt/patches/patch-aa
deleted file mode 100644
index d650df341dc..00000000000
--- a/devel/newt/patches/patch-aa
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2008/04/13 09:54:42 wiz Exp $
---- Makefile.in.orig 2003-11-06 06:56:47.000000000 +0000
-+++ Makefile.in
-@@ -1,18 +1,16 @@
--LIBS = -lslang -lm #-lefence
--SHLIBS = -lslang -lm -lc
-+LIBS = libnewt.la -lslang -lm -lpopt #-lefence
-+SHLIBS = -lslang -lm -lc -lpopt
-
- GPM_SUPPORT=@gpm_support@
-
--CFLAGS = $(RPM_OPT_FLAGS) -Wall -I/usr/include/slang -D_GNU_SOURCE
--ifeq ($(RPM_OPT_FLAGS),)
--CFLAGS += -g
--endif
-+CFLAGS += -I${PREFIX}/include
-+#LDFLAGS += -L${PREFIX}/lib -R${PREFIX}/lib
-
- VERSION = @VERSION@
- CVSTAG = r$(subst .,-,$(VERSION))
- SONAME = @SONAME@
-
--PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
-+#PYTHONVERS = $(shell ls /usr/include/python*/Python.h | sed "s|/usr/include/||g"| sed "s|/Python.h||g")
-
- WHIPTCLSO=
- #WHIPTCLSO=whiptcl.so
-@@ -21,16 +19,16 @@ PROGS = test whiptail $(WHIPTCLSO) testg
- TESTOBJS = test.o
- NDIALOGOBJS = whiptail.o dialogboxes.o
- WHIPTCLOBJS = whiptcl.o dialogboxes.o
--LIBNEWT = libnewt.a
-+LIBNEWT = libnewt.la
- LIBNEWTSH = libnewt.so.$(VERSION)
- LIBNEWTSONAME = libnewt.so.$(SONAME)
--LIBOBJS = newt.o button.o form.o checkbox.o entry.o label.o listbox.o \
-+LIBOBJS = button.o form.o checkbox.o entry.o label.o listbox.o \
- scrollbar.o textbox.o scale.o grid.o windows.o buttonbar.o \
- checkboxtree.o
-
--SHCFLAGS = -fPIC
-+#SHCFLAGS = ${CFLAGS} -fPIC
-
--prefix = /usr
-+prefix = ${PREFIX}
- includedir = $(prefix)/include
- libdir = $(prefix)/lib
- bindir = $(prefix)/bin
-@@ -38,6 +36,7 @@ ARCHNAME = $(shell uname -m | sed 's/i.8
-
- #--------------------------------------
-
-+LIBSOURCES = $(subst .o,.c,$(LIBOBJS))
- SOURCES = $(subst .o,.c,$(TESTOBJS) $(NDIALOGOBJS) $(LIBOBJS))
-
- SHAREDDIR = shared
-@@ -49,43 +48,49 @@ else
- TARGET=depend $(PROGS)
- endif
-
--all: $(TARGET) _snackmodule.so
-+all: $(TARGET)
-+#all: $(TARGET) _snackmodule.so
-
- test: $(TESTOBJS) $(LIBNEWT)
-- gcc -g -o test $(TESTOBJS) $(LIBNEWT) $(LIBS) -static
-+ ${LIBTOOL} --mode=link ${CC} -g -o test $(TESTOBJS) $(LIBS) -static
-
- testgrid: testgrid.o $(LIBNEWT)
-- gcc -g -o testgrid testgrid.o $(LIBNEWT) $(LIBS)
-+ ${LIBTOOL} --mode=link ${CC} -g -o testgrid testgrid.o $(LIBS)
-
- testtree: testtree.o $(LIBNEWT)
-- gcc -g -o testtree testtree.o $(LIBNEWT) $(LIBS)
-+ ${LIBTOOL} --mode=link ${CC} -g -o testtree testtree.o $(LIBS)
-
- showchars: showchars.o $(LIBNEWT)
-- gcc -g -o showchars showchars.o $(LIBNEWT) $(LIBS)
-+ ${LIBTOOL} --mode=link ${CC} -g -o showchars showchars.o $(LIBS)
-
- showkey: showkey.o $(LIBNEWT)
-- gcc -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
-+ ${LIBTOOL} --mode=link ${CC} -g -o showkey showkey.o $(LIBS)
-
- _snackmodule.so: snackmodule.c $(LIBNEWTSH)
- for ver in $(PYTHONVERS) ; do \
- if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
- mkdir -p $$ver ;\
-- gcc $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-- gcc --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
-+ ${CC} $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-+ ${CC} --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
- fi ; \
- done
-
--whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
-- gcc -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
--
--whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
-- gcc -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) -ltcl -lslang -lpopt -lm
-+whiptail: $(NDIALOGOBJS) $(LIBNEWT)
-+ ${LIBTOOL} --mode=link ${CC} -g -o whiptail $(NDIALOGOBJS) $(LIBS)
-
--$(LIBNEWT): $(LIBOBJS)
-- ar rv $@ $^
-+whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWT)
-+ ${LIBTOOL} --mode=link ${CC} -shared $(SHCFLAGS) -o whiptcl.so \
-+ $(WHIPTCLOBJS) -ltcl ${LIBS}
-+
-+$(LIBNEWT): $(LIBOBJS) newt.o
-+ ${LIBTOOL} --mode=link ${CC} -o ${LIBNEWT} ${LIBOBJS:.o=.lo} \
-+ newt.lo -rpath ${PREFIX}/lib -version-number 0:51:6 ${SHLIBS}
-
- newt.o: newt.c Makefile
-- $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+
-+%.o: %.c
-+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -c -o $@ $<
-
- veryclean: clean
- rm -f .depend
-@@ -97,19 +102,19 @@ clean:
- depend:
- $(CPP) $(CFLAGS) -M $(SOURCES) > .depend
-
--$(SHAREDDIR):
-- mkdir -p $(SHAREDDIR)
-+#$(SHAREDDIR):
-+# mkdir -p $(SHAREDDIR)
-
--sharedlib: $(LIBNEWTSH)
-+#sharedlib: $(LIBNEWTSH)
-
--$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
-- gcc -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
-+#$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
-+# ${CC} -shared -o $(LIBNEWTSH) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
-
--$(SHAREDDIR)/%.o : %.c
-- $(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-+#$(SHAREDDIR)/%.o : %.c
-+# $(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
-
--$(SHAREDDIR)/newt.o: newt.c Makefile
-- $(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-+#$(SHAREDDIR)/newt.o: newt.c Makefile
-+# $(CC) $(SHCFLAGS) $(CFLAGS) -DVERSION=\"$(VERSION)\" -c -o $@ $<
-
-
- install: $(LIBNEWT) install-sh whiptail
-@@ -147,7 +152,3 @@ archive: configure
- @rm -f /tmp/newt-$(VERSION).tar.gz
- @echo " "
- @echo "The final archive is ./newt-$(VERSION).tar.gz."
--
--ifeq (.depend,$(wildcard .depend))
--include .depend
--endif
diff --git a/emulators/Makefile b/emulators/Makefile
index ef0d669074f..b713b155306 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2011/08/15 09:08:32 wiz Exp $
+# $NetBSD: Makefile,v 1.191 2011/10/02 14:11:51 wiz Exp $
#
COMMENT= Emulators for other operating systems
@@ -42,7 +42,6 @@ SUBDIR+= darwin_lib
SUBDIR+= dega
SUBDIR+= dgen
SUBDIR+= dosbox
-SUBDIR+= doscmd
SUBDIR+= dynagen
SUBDIR+= dynamips
SUBDIR+= e-uae
@@ -72,7 +71,6 @@ SUBDIR+= ia64sim
SUBDIR+= kegs
SUBDIR+= kenigma
SUBDIR+= libspectrum
-SUBDIR+= linuxppc_lib
SUBDIR+= lrmi
SUBDIR+= m1
SUBDIR+= makeppf
diff --git a/emulators/doscmd/DESCR b/emulators/doscmd/DESCR
deleted file mode 100644
index 191d0f038aa..00000000000
--- a/emulators/doscmd/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-doscmd, an MS-DOS emulator (NetBSD/i386 only)
-
-Doscmd simulates an MS-DOS environment for running DOS software. Rather
-than provide a software emulation of the 8086 CPU, it uses the
-NetBSD/i386 system call i386_vm86() call to access the VM86 mode of i386
-and later CPUs. It therefore runs much more quickly, at the cost of not
-running on other architectures.
diff --git a/emulators/doscmd/Makefile b/emulators/doscmd/Makefile
deleted file mode 100644
index d43e7a6b0f6..00000000000
--- a/emulators/doscmd/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:34 jlam Exp $
-#
-
-DISTNAME= doscmd-19960502-2
-PKGNAME= doscmd-19960502.2
-CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/arch/i386/doscmd/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= MS-DOS emulator (NetBSD/i386 only)
-
-# mmap() portability (no MAP_FIXED), and objcopy problems on NetBSD-1.6-i386 and later
-ONLY_FOR_PLATFORM= NetBSD-1.[345]*-i386
-
-WRKSRC= ${WRKDIR}/doscmd
-MAKE_ENV+= X11BASE=${X11BASE:Q}
-
-MANCOMPRESSED_IF_MANZ= yes
-
-do-configure:
- @cd ${WRKSRC} && \
- ${SED} "s=%PREFIX%=${PREFIX}=" < doscmd.1 >doscmd.1.new && \
- ${MV} doscmd.1.new doscmd.1 && \
- ${SED} "s=%PREFIX%=${PREFIX}=" < doscmd_loader.c >dl.new && \
- ${MV} dl.new doscmd_loader.c
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/doscmd/PLIST b/emulators/doscmd/PLIST
deleted file mode 100644
index f46155d7e4a..00000000000
--- a/emulators/doscmd/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:33 zuntum Exp $
-bin/doscmd
-man/man1/doscmd.1
-man/cat1/doscmd.0
-libexec/doscmd.kernel
-libexec/instbsdi.exe
diff --git a/emulators/doscmd/distinfo b/emulators/doscmd/distinfo
deleted file mode 100644
index 18e487b474e..00000000000
--- a/emulators/doscmd/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:49:18 agc Exp $
-
-SHA1 (doscmd-19960502-2.tar.gz) = 85ec8e478d32d0f2861084d6d19186b5e1f0fc95
-RMD160 (doscmd-19960502-2.tar.gz) = e4eb842d7d765f6f608bdc0d08c7e2f1b4edb469
-Size (doscmd-19960502-2.tar.gz) = 109791 bytes
-SHA1 (patch-aa) = 56e3f9951ac3dcb6e07cd1f76c665286a694d67b
-SHA1 (patch-ab) = c83d7e5b8b514ca7f88b0bd3a0be963b7f77d3a4
-SHA1 (patch-ac) = 09757f9522e52b7491c3052dbb856a9b3828ce45
-SHA1 (patch-ae) = 6a33c0eff738caab4e30513dbe9b9f57d7b21d09
-SHA1 (patch-af) = b0091e54d0ffe8a2ebcae28a924fad24888ed20e
-SHA1 (patch-ag) = bbbca5339d66cb52b93019b712d21301d910d32b
-SHA1 (patch-ah) = 65e9a252e27b8ea339048d20df2d5f23977b5f66
-SHA1 (patch-ai) = e72e42897f221929aa269800a11e37ea2dd4419c
-SHA1 (patch-aj) = c400eb5ec1f46def1105ddb6e6a2a1397f8ec54e
diff --git a/emulators/doscmd/patches/patch-aa b/emulators/doscmd/patches/patch-aa
deleted file mode 100644
index 53a01de6491..00000000000
--- a/emulators/doscmd/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/11/29 23:39:30 sommerfe Exp $
-
---- signal.c.orig Thu May 2 16:03:39 1996
-+++ signal.c Sun Nov 29 18:27:37 1998
-@@ -98,11 +98,18 @@
- if (s >= 0 && s < NSIG) {
- handler[s] = h;
-
-- sa.sa_handler = generichandler;
-+ sa.sa_handler = (void (*)())generichandler;
-+#if defined(__LIBC12_SOURCE__)
- sa.sa_mask = sigmask(SIGIO) | sigmask(SIGALRM);
-+#else
-+ sigemptyset(&sa.sa_mask);
-+ sigaddset(&sa.sa_mask, SIGIO);
-+ sigaddset(&sa.sa_mask, SIGALRM);
-+#endif
- sa.sa_flags = SA_ONSTACK;
- sigaction(s, &sa, NULL);
-
-+ sigemptyset(&set);
- sigaddset(&set, s);
- sigprocmask(SIG_UNBLOCK, &set, 0);
- }
diff --git a/emulators/doscmd/patches/patch-ab b/emulators/doscmd/patches/patch-ab
deleted file mode 100644
index 2bc70622146..00000000000
--- a/emulators/doscmd/patches/patch-ab
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ab,v 1.6 1999/12/18 22:10:02 christos Exp $
-
---- Makefile.orig Thu May 2 13:55:19 1996
-+++ Makefile Sat Dec 18 17:02:32 1999
-@@ -8,30 +8,45 @@
- int1a.c int2f.c intff.c \
- mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c
-
-+BINDIR= ${PREFIX}/bin
-+MANDIR= ${PREFIX}/man
-+
- BINGRP= kmem
- EXEGRP= bin
- BINMODE=2555
- EXEMODE=444
--CFLAGS+=-I/usr/X11/include -DDISASSEMBLER -g
--LDFLAGS+=-L/usr/X11/lib
-+START_ADDRESS=0x110000
-+CFLAGS+=-I${X11BASE}/include -DDISASSEMBLER -g -DSTART_ADDRESS=${START_ADDRESS}
-+LDFLAGS+=-L${X11BASE}/lib -R${X11BASE}/lib
- LDADD+= -lX11 -li386 -lgcc -lc -lgcc
--DPADD+= /usr/X11/lib/libX11.a ${LIBC} ${LIBGCC}
-+DPADD+= ${X11BASE}/lib/libX11.a ${LIBC} ${LIBGCC}
-+
-+.include <bsd.prog.mk>
-+.if ${OBJECT_FMT} == "ELF"
-+TEXT=-e start -Ttext ${START_ADDRESS}
-+CRTBEGIN=/usr/lib/crtbegin.o
-+.else
-+TEXT=-e _start -T ${START_ADDRESS}
-+CRTBEGIN=
-+.endif
-+
-
- afterinstall:
- install ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
-- doscmd.kernel ${DESTDIR}/usr/libexec/doscmd.kernel
-+ doscmd.kernel ${PREFIX}/libexec/doscmd.kernel
- install -c -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
-- ${.CURDIR}/instbsdi.exe ${DESTDIR}/usr/dos/
-+ ${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/
-
--doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o
-- ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD}
-+doscmd: doscmd.kernel ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o
-+ ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} ${CRTBEGIN} doscmd_loader.o ${LDADD}
-
--.include <bsd.prog.mk>
-
- .depend: doscmd_loader.c
-
- doscmd.kernel: crt0.o ${OBJS}
-- ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD}
-+ ld -N -Bstatic ${TEXT} -o doscmd.bin ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD}
-+ objcopy -O binary doscmd.bin $@
-+ @rm -f doscmd.bin
-
- doscmd.0: doscmd.1
- tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET}
diff --git a/emulators/doscmd/patches/patch-ac b/emulators/doscmd/patches/patch-ac
deleted file mode 100644
index 3571c88e6ca..00000000000
--- a/emulators/doscmd/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/02/27 17:20:10 wiz Exp $
-
---- doscmd.1.orig Wed Apr 10 09:38:59 1996
-+++ doscmd.1 Tue Feb 27 18:17:16 2001
-@@ -305,13 +305,13 @@
- .Fl ro
- flag is specified, it is a read only file system.
- These assignments will not take place when booting DOS until the
--.Pa /usr/dos/instbsdi.exe
-+.Pa %PREFIX%/libexec/instbsdi.exe
- binary is run.
- .\"
- .\"
- .\"
- .It Cm assign Xo
--.Cm lpt Ns Op Cm 0-4 :
-+.Cm lpt Ns Op Cm 1-4 :
- .Op Cm direct
- .Ar path
- .Op Ar timeout
diff --git a/emulators/doscmd/patches/patch-ae b/emulators/doscmd/patches/patch-ae
deleted file mode 100644
index 5727c6b5bd3..00000000000
--- a/emulators/doscmd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/10/28 01:29:16 hubertf Exp $
-
---- doscmd.h.BAK Wed Oct 28 01:48:56 1998
-+++ doscmd.h Wed Oct 28 01:49:02 1998
-@@ -58,7 +58,7 @@
-
- #define MAX_AVAIL_SEG 0xa000
- char *dosmem;
--char cmdname[];
-+char cmdname[256];
- int dosmem_size;
-
- int pspseg; /* segment # of PSP */
diff --git a/emulators/doscmd/patches/patch-af b/emulators/doscmd/patches/patch-af
deleted file mode 100644
index abdce1307e0..00000000000
--- a/emulators/doscmd/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/03/16 13:58:58 wiz Exp $
-
---- doscmd.c.orig Thu May 2 21:37:33 1996
-+++ doscmd.c
-@@ -100,7 +100,7 @@
- char *dos_path = 0;
- char cmdname[256];
-
--char *memfile = "/tmp/doscmd.XXXXXX";
-+char memfile[] = "/tmp/doscmd.XXXXXX";
-
- int
- main(int argc, char **argv)
-@@ -133,6 +133,14 @@
- if (fd != 3 && fd != 4)
- close (fd);
-
-+#ifdef __ELF__
-+ if (mmap((void *)4096, 1024 * 1024, PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, (off_t)0) == MAP_FAILED) {
-+ perror("mmap botch");
-+ quit(1);
-+ }
-+#endif
-+
- fd = -1;
-
- debug_set(0); /* debug any D_TRAPS without intnum */
-@@ -581,7 +589,11 @@
- SET16(sc.sc_fs, 0x0000);
- SET16(sc.sc_gs, 0x0000);
-
-+#if defined(__LIBC12_SOURCE__)
- sc.sc_mask = 0;
-+#else
-+ sigemptyset(&sc.sc_mask);
-+#endif
- sc.sc_onstack = 0;
-
- if (tflag) {
diff --git a/emulators/doscmd/patches/patch-ag b/emulators/doscmd/patches/patch-ag
deleted file mode 100644
index 8974ccacb0f..00000000000
--- a/emulators/doscmd/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/03/16 13:58:58 wiz Exp $
-
---- AsyncIO.c.orig Thu May 2 08:51:00 1996
-+++ AsyncIO.c
-@@ -320,6 +320,7 @@
- abort();
- }
- if (stackp++ == 0) {
-+ sigemptyset(&set);
- sigaddset(&set, SIGIO);
- sigprocmask(SIG_BLOCK, &set, 0);
- }
-@@ -335,6 +336,7 @@
- abort();
- }
- if (--stackp == 0) {
-+ sigemptyset(&set);
- sigaddset(&set, SIGIO);
- sigprocmask(SIG_UNBLOCK, &set, 0);
- }
diff --git a/emulators/doscmd/patches/patch-ah b/emulators/doscmd/patches/patch-ah
deleted file mode 100644
index 81ddec5d65a..00000000000
--- a/emulators/doscmd/patches/patch-ah
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/06/06 11:55:07 jmmv Exp $
-
---- doscmd_loader.c.orig 2003-06-06 14:00:18.000000000 +0200
-+++ doscmd_loader.c
-@@ -31,38 +31,50 @@
- */
-
- #include <stdio.h>
--#include <a.out.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
-
- /*
- * reserve space in "low" memory for the interrupt vector table
- */
- static const char filler[4096] = { 0, };
-
--#define _PATH_DOS_KERNEL_DIR "/usr/libexec/"
-+#define _PATH_DOS_KERNEL_DIR "%PREFIX%/libexec/"
- #define _PATH_DOS_KERNEL "doscmd.kernel"
-
--int
-+static char *locations[] = {
-+ _PATH_DOS_KERNEL,
-+ "obj/" _PATH_DOS_KERNEL,
-+ _PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL,
-+ NULL
-+};
-+
-+u_long
- load_kernel(void)
- {
-- FILE *fp;
-- struct exec exec;
-- int start_address;
--
-- if ((fp = fopen(_PATH_DOS_KERNEL, "r")) == NULL &&
-- (fp = fopen("obj/" _PATH_DOS_KERNEL, "r")) == NULL &&
-- (fp = fopen(_PATH_DOS_KERNEL_DIR _PATH_DOS_KERNEL, "r")) == NULL)
-+ int i, fd;
-+ size_t size;
-+ struct stat st;
-+
-+ for (i = 0; locations[i] != NULL; i++) {
-+ if ((fd = open(locations[i], O_RDONLY)) != -1)
-+ break;
-+ }
-+ if (locations[i] == NULL)
- err(1, "load_kernel");
-
-- if (fread(&exec, sizeof(exec), 1, fp) != 1 || N_GETMAGIC(exec) != OMAGIC)
-- errx(1, "bad kernel file format");
-+ if (fstat(fd, &st) == -1)
-+ err(1, "fstat");
-
-- start_address = exec.a_entry & (~(getpagesize() - 1));
-- if (brk(start_address + exec.a_text + exec.a_data + exec.a_bss) < 0)
-- err(1, "load_kernel");
-- fread((char *)start_address, exec.a_text + exec.a_data, 1, fp);
-- bzero((char *)(start_address + exec.a_text + exec.a_data), exec.a_bss);
-- fclose(fp);
-- return(exec.a_entry);
-+ size = st.st_size + START_ADDRESS;
-+
-+ if (mmap((void *)START_ADDRESS, st.st_size,
-+ PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE, fd, 0) == MAP_FAILED)
-+ err(1, "mmap");
-+
-+ return(START_ADDRESS);
- }
-
- void
diff --git a/emulators/doscmd/patches/patch-ai b/emulators/doscmd/patches/patch-ai
deleted file mode 100644
index f9ff5fc3eeb..00000000000
--- a/emulators/doscmd/patches/patch-ai
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/12/18 01:46:29 christos Exp $
-
---- int13.c.orig Thu May 2 16:49:57 1996
-+++ int13.c Fri Dec 17 20:36:23 1999
-@@ -296,7 +296,7 @@
- di->secsize = 512;
- di->path = strdup(file);
-
-- di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+ di->location = ((htable & 0xf0000) << 12) | (htable & 0xffff);
-
- if (drive == 0) {
- ivec[0x41] = di->location;
-@@ -413,11 +413,11 @@
- di->path = strdup(file);
- }
- di->fd = -1;
-- di->location = ((table & 0xf0000) << 12) | (table & 0xffff);
-+ di->location = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
- di->sector0 = 0;
- di->offset = 0;
-
-- ivec[0x1e] = ((ftable & 0xf0000) << 12) | (ftable & 0xffff);
-+ ivec[0x1e] = di->location;
-
- table = ftable + drive * 0x0a;
-
diff --git a/emulators/doscmd/patches/patch-aj b/emulators/doscmd/patches/patch-aj
deleted file mode 100644
index 720af782e19..00000000000
--- a/emulators/doscmd/patches/patch-aj
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/03/16 13:59:54 wiz Exp $
-
---- port.c.orig Wed Apr 10 12:52:15 1996
-+++ port.c
-@@ -63,7 +63,7 @@
- goto bad;
- }
- while (cnt--) {
-- ioports[port/32] |= (1 << (port%32));
-+ ioports[port/32] &= ~(1 << (port%32));
- port++;
- }
- if (i386_set_ioperm(ioports) < 0) {
-@@ -82,7 +82,7 @@
- goto bad;
- }
- while (cnt--) {
-- ioports[port/32] &= ~(1 << (port%32));
-+ ioports[port/32] |= (1 << (port%32));
- port++;
- }
- if (i386_set_ioperm(ioports) < 0) {
-@@ -169,6 +169,10 @@
- portsw[i].p_inb = inb_nullport;
- if (portsw[i].p_outb == 0)
- portsw[i].p_outb = outb_nullport;
-+ }
-+
-+ for (i = 0; i < MAXPORT/32; i++) {
-+ ioports[i] = 0xffffffff;
- }
- }
-
diff --git a/emulators/linuxppc_lib/DESCR b/emulators/linuxppc_lib/DESCR
deleted file mode 100644
index 36175e17af1..00000000000
--- a/emulators/linuxppc_lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-These libraries are part of the Linux compatibility options
-for NetBSD/powerpc.
-
-The kernel option `COMPAT_LINUX' needs to be in your kernel config
-file for this to work as well.
diff --git a/emulators/linuxppc_lib/Makefile b/emulators/linuxppc_lib/Makefile
deleted file mode 100644
index 7f2cd053a8e..00000000000
--- a/emulators/linuxppc_lib/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2009/03/22 04:53:38 manu Exp $
-
-DISTNAME= linuxppc_lib-2000.4.6
-PKGREVISION= 1
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-RPMFILES= glibc-2.1.3-15f.ppc.rpm glib-1.2.8-3.ppc.rpm \
- libjpeg-6b-13.ppc.rpm libpng-1.0.5-3.ppc.rpm \
- libstdc++-2.10.0-2n.ppc.rpm libtermcap-2.0.8-20.ppc.rpm \
- libtiff-3.5.5-2.ppc.rpm XFree86-libs-3.3.6-20b.ppc.rpm \
- zlib-1.1.3-6.ppc.rpm ldconfig-1.9.5-16.ppc.rpm \
- libjpeg6a-6a-5.ppc.rpm xpm-3.4k-1.ppc.rpm \
- ncurses-5.0-12.ppc.rpm readline-2.2.1-7a.ppc.rpm
-DISTFILES+= ${RPMFILES}
-DISTFILES+= openmotif-2.1.30-3_MLI_jdk.tar.gz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Libraries to run Linux binaries on NetBSD/powerpc (includes X11)
-
-BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg
-
-CONFLICTS= suse_base-[0-9]*
-
-ONLY_FOR_PLATFORM= NetBSD-1.5[U-Z]-powerpc NetBSD-1.5Z[A-Z]-powerpc \
- NetBSD-1.6*-powerpc NetBSD-[2-9]*-powerpc
-
-WRKSRC= ${WRKDIR}/${DISTNAME}
-CHECK_SHLIBS_SUPPORTED= no
-DIST_SUBDIR= linuxppc_lib
-PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-
-USE_TOOLS+= gtar
-
-EMUL_LINUX= emul/linux
-LINUX_LDCONFIG= ${PREFIX}/${EMUL_LINUX}/sbin/ldconfig
-RPM2PKG= rpm2pkg
-SORT= sort
-RPMARGS+= -i usr/man -i usr/doc -i usr/info
-.for TEMP in ${RPMFILES}
-RPMARGS+= ${DISTDIR}/${DIST_SUBDIR}/${TEMP}
-.endfor
-
-do-extract:
- ${MKDIR} ${WRKSRC}
-
-do-build: #do nothing
-
-do-install:
- ${RM} -f ${WRKDIR}/PLIST_DYNAMIC
- ${INSTALL_DATA_DIR} ${PREFIX}/${EMUL_LINUX}
- ${INSTALL_DATA_DIR} /${EMUL_LINUX}
- ${RPM2PKG} -d ${PREFIX} -f ${WRKDIR}/PLIST_DYNAMIC -p emul/linux ${RPMARGS}
-
- # Fix Linux's ldd paths (ldd is a shell script on Linux)
- ${SED} 's|^\(TEXTDOMAINDIR=\)\(/usr/share/locale\)|\1${PREFIX}/${EMUL_LINUX}\2|; \
- s|^\(RTLD=\)\(/lib/ld.so.1\)|\1${PREFIX}/${EMUL_LINUX}\2|' \
- ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd > \
- ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new
- ${MV} ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd.new \
- ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
- ${CHMOD} 755 ${PREFIX}/${EMUL_LINUX}/usr/bin/ldd
-
- # Unpack shared libraries for OpenMotif
- cd ${PREFIX}/${EMUL_LINUX}/usr/X11R6 ; ${GTAR} -x 'lib/*.so*' \
- -zvf ${DISTDIR}/${DIST_SUBDIR}/openmotif-2.1.30-3_MLI_jdk.tar.gz | \
- ${SED} -e "s|^|${EMUL_LINUX}/usr/X11R6/|" >> ${WRKDIR}/PLIST_DYNAMIC
-
- # Make the link /usr/pkg/emul/linux -> /emul/linux
- ${TEST} -f /emul/linux/lib/ld.so.1 || ( ${RMDIR} /${EMUL_LINUX} && \
- ${LN} -sf ${PREFIX}/${EMUL_LINUX} /${EMUL_LINUX} )
-
- # Create ld.so.conf and ld.so.cache. (uses Linux's ldconfig)
- ${TOUCH} ${PREFIX}/${EMUL_LINUX}/etc/ld.so.cache~
- ${CP} ${FILESDIR}/ld.so.conf ${PREFIX}/${EMUL_LINUX}/etc/ld.so.conf
- ${LINUX_LDCONFIG} -r ${PREFIX}/${EMUL_LINUX} -v | \
- ${SED} -n '/^\/.*:$$/h; /(changed)$$/{G; \
- s|[[:blank:]]\([^ ]\{1,\}\) =>.*\n/\(.*\):$$|${EMUL_LINUX}/\2/\1|p;}' \
- >> ${WRKDIR}/PLIST_DYNAMIC
- ${ECHO} "${EMUL_LINUX}/etc/ld.so.conf" >> ${WRKDIR}/PLIST_DYNAMIC
- ${SORT} -r ${WRKDIR}/PLIST_DYNAMIC > ${WRKDIR}/PLIST_DYNAMIC.sorted
- ${MV} ${WRKDIR}/PLIST_DYNAMIC.sorted ${WRKDIR}/PLIST_DYNAMIC
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/linuxppc_lib/distinfo b/emulators/linuxppc_lib/distinfo
deleted file mode 100644
index 04664f01a67..00000000000
--- a/emulators/linuxppc_lib/distinfo
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 8a73a18041c6b1f41556dc974752dab55f2e125c
-RMD160 (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 7b6a7e784d9aac080abfaa83b3ef2665fd749da0
-Size (linuxppc_lib/glibc-2.1.3-15f.ppc.rpm) = 9503167 bytes
-SHA1 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = f067429860346dafb3c348eed8d59d370feb671b
-RMD160 (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = d67d41fd8a72a19dd077995d5d6129eb5f9877e1
-Size (linuxppc_lib/glib-1.2.8-3.ppc.rpm) = 142829 bytes
-SHA1 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = a6b91fcc3348bb6625a70c843478d73dc2032e41
-RMD160 (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 8454c628897a303eeb1b5500352855555590bb48
-Size (linuxppc_lib/libjpeg-6b-13.ppc.rpm) = 125558 bytes
-SHA1 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 92a88a28142bf0698c3a71f82d40ebf86b8d97dc
-RMD160 (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = f1a15dda95fca48d0bb05807c6dab5e52d8fbaeb
-Size (linuxppc_lib/libpng-1.0.5-3.ppc.rpm) = 116067 bytes
-SHA1 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a8cb630e24a180a0c2fce1fa13e444dab9660fc3
-RMD160 (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = a63fa3107f393a10e9881d0fc46ea49fe382d2c7
-Size (linuxppc_lib/libstdc++-2.10.0-2n.ppc.rpm) = 1110869 bytes
-SHA1 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 84673baa788a90c00ce4a6f52a5bcba80cf9a19c
-RMD160 (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = d0437e1b8598d02f3c5630fb4faf2ede17a61d76
-Size (linuxppc_lib/libtermcap-2.0.8-20.ppc.rpm) = 57125 bytes
-SHA1 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = d406ae6353300a0b21c01282a5d2148c63ec05aa
-RMD160 (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 483c61188a6cd2e7aeaf11c14fac87072585456e
-Size (linuxppc_lib/libtiff-3.5.5-2.ppc.rpm) = 204823 bytes
-SHA1 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 3ed6da7dca7b4fc5ac81acbbbefd0ccfd7b8472a
-RMD160 (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = d91efda504df84ceeeebd01be4e332638904b3b2
-Size (linuxppc_lib/XFree86-libs-3.3.6-20b.ppc.rpm) = 939474 bytes
-SHA1 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 9a813540e080c5c621b2abb0ada4f48ea274bf09
-RMD160 (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 0da794b1ee885717ff541ffc562c012156c42d42
-Size (linuxppc_lib/zlib-1.1.3-6.ppc.rpm) = 30894 bytes
-SHA1 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 785b2e72bc8cc51ddded7f746f1e4712aeca773b
-RMD160 (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = a92546b1b4d990f7a91743cf79fee7ca415b5bd2
-Size (linuxppc_lib/ldconfig-1.9.5-16.ppc.rpm) = 124309 bytes
-SHA1 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 633da2a887d03c43acb7ddf9d66b6139c240cccd
-RMD160 (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 39da6439cd0058cfa7184d3b420d3e7fe57f0c11
-Size (linuxppc_lib/libjpeg6a-6a-5.ppc.rpm) = 62388 bytes
-SHA1 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 94e080372f65d3dc91570175334d43273e1c216a
-RMD160 (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = e66c42fc168a9b7ea2e388e6505d78d2f758a42f
-Size (linuxppc_lib/xpm-3.4k-1.ppc.rpm) = 73072 bytes
-SHA1 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 1d5863dfc29473472bda89d237bafd84de602df4
-RMD160 (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 987b45dec71db60bbdefddb45aabfeb6dc8c8fa7
-Size (linuxppc_lib/ncurses-5.0-12.ppc.rpm) = 808456 bytes
-SHA1 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 29458422f6991affc2d88c5eba9c0f7f2c9d796b
-RMD160 (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 91b32ac137fd03353931fa1768a917430a026c73
-Size (linuxppc_lib/readline-2.2.1-7a.ppc.rpm) = 145051 bytes
-SHA1 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = b9af158b947829d0bbe2831842ff4f4b4a7313a0
-RMD160 (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = d6aea78941bbffc662c6d540908e3fbf986f684c
-Size (linuxppc_lib/openmotif-2.1.30-3_MLI_jdk.tar.gz) = 2631074 bytes
-SHA1 (patch-aa) = 04840c534103f659fce4c00b5a6d63f79e03bf08
diff --git a/emulators/linuxppc_lib/files/ld.so.conf b/emulators/linuxppc_lib/files/ld.so.conf
deleted file mode 100644
index eb2ad0fd4f7..00000000000
--- a/emulators/linuxppc_lib/files/ld.so.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-/lib
-/usr/lib
-/usr/X11R6/lib
diff --git a/emulators/linuxppc_lib/patches/patch-aa b/emulators/linuxppc_lib/patches/patch-aa
deleted file mode 100644
index d9934bc5e88..00000000000
--- a/emulators/linuxppc_lib/patches/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/23 22:29:48 manu Exp $
---- etc/ld.so.conf.orig Sun Jan 14 22:29:50 2001
-+++ etc/ld.so.conf Sun Jan 14 22:30:05 2001
-@@ -0,0 +1,4 @@
-+/lib
-+/usr/lib
-+/usr/local/lib
-+/usr/X11R6/lib
diff --git a/mail/Makefile b/mail/Makefile
index 3726e1b8728..d9e45a6051d 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.413 2011/09/16 12:07:32 obache Exp $
+# $NetBSD: Makefile,v 1.414 2011/10/02 14:11:51 wiz Exp $
#
COMMENT= Electronic mail utilities
@@ -137,7 +137,6 @@ SUBDIR+= mailfront
SUBDIR+= mailgraph
SUBDIR+= mailhops
SUBDIR+= mailman
-SUBDIR+= mailscanner
SUBDIR+= mailserv
SUBDIR+= mailsync
SUBDIR+= mailwrapper
diff --git a/mail/mailscanner/DESCR b/mail/mailscanner/DESCR
deleted file mode 100644
index 39038a926d5..00000000000
--- a/mail/mailscanner/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-MailScanner is a complete e-mail security system designed for use on
-e-mail gateways. It protects against viruses, and detects attacks against
-e-mail client packages (such as Outlook, Outlook Express, Eudora). It
-can also detect almost all unsolicited commercial e-mail (spam) passing
-through it and respond to all incidents in a wide variety of ways.
-
-Not only can it scan for known viruses, but it can also protect against
-unknown viruses hidden inside e-mail attachments by refusing entry to
-attachments whose filenames match any given pattern. This can include
-generic patterns that trap filenames attempting to hide the true filename
-extension (e.g. ".txt.vbs").
-
-It is superior to many commercial packages in its ability to handle
-attacks against itself, such as Denial Of Service attacks caused by
-messages containing the "Zip of Death". It is easy to install into an
-existing e-mail gateway, requiring very little knowledge of sendmail
-and no change to an existing sendmail configuration.
-
-MailScanner itself is entirely open source, but it uses widely known
-commercial virus scanning packages at its core. The other software it
-uses is all high quality open source software, leading to a system that
-can be trusted for performance and reliability.
diff --git a/mail/mailscanner/MESSAGE b/mail/mailscanner/MESSAGE
deleted file mode 100644
index e3b5c2ee617..00000000000
--- a/mail/mailscanner/MESSAGE
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/09/25 04:18:06 grant Exp $
-
-See ${PREFIX}/share/doc/MailScanner/README and the MailScanner(8) and
-MailScanner.conf(5) man pages for further instructions.
-
-As MailScanner supports a wide variety of external 3rd party software,
-you must install other packages separately to achieve your desired
-MailScanner functionality.
-
-You need at the very least an MTA. You will probably also want SpamAssassin
-and/or a virus scanner. Some suggested packages are:
-
- mail/spamassassin
- mail/clamav
- mail/p5-Mail-ClamAV
-
-You will need to edit at least the following config file before MailScanner
-will work correctly:
-
- ${PKG_SYSCONFDIR}/MailScanner.conf
-
-===========================================================================
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
deleted file mode 100644
index 07ea555f947..00000000000
--- a/mail/mailscanner/Makefile
+++ /dev/null
@@ -1,144 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2010/11/20 20:51:51 gls Exp $
-#
-
-DISTNAME= MailScanner-4.30.3-2
-PKGNAME= mailscanner-4.30.3.2
-PKGREVISION= 3
-CATEGORIES= mail
-MASTER_SITES= http://www.mailscanner.info/files/4/tar/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mailscanner.info/
-COMMENT= Powerful spam/virus filter with many options
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/MailScanner-4.30.3
-
-PKG_SYSCONFSUBDIR= MailScanner
-
-DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-DEPENDS+= p5-Convert-BinHex-[0-9]*:../../converters/p5-Convert-BinHex
-DEPENDS+= p5-Net-CIDR>=0.09:../../devel/p5-Net-CIDR
-DEPENDS+= p5-MIME-tools>=0:../../mail/p5-MIME-tools
-DEPENDS+= tnef>=1.0:../../mail/tnef
-
-NO_BUILD= YES
-USE_TOOLS+= perl:run bash:run
-REPLACE_BASH+= bin/update_virus_scanners
-REPLACE_PERL+= bin/MailScanner
-REPLACE_PERL+= lib/panda-wrapper lib/rav-wrapper lib/*-autoupdate
-
-DOCSDIR= ${LOCALBASE}/share/doc/MailScanner
-EGDIR= ${LOCALBASE}/share/examples/MailScanner
-LIBDIR= ${LOCALBASE}/lib/MailScanner
-LIBEXECDIR= ${LOCALBASE}/libexec/MailScanner
-
-OWN_DIRS= ${PKG_SYSCONFDIR}/CustomFunctions
-OWN_DIRS+= ${PKG_SYSCONFDIR}/rules
-
-PLIST_SUBST+= DOCSDIR=${DOCSDIR:Q}
-PLIST_SUBST+= EGDIR=${EGDIR:Q}
-PLIST_SUBST+= LIBDIR=${LIBDIR:Q}
-PLIST_SUBST+= LIBEXECDIR=${LIBEXECDIR:Q}
-
-PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-
-MS_CONFIG_FILES= filename.rules.conf \
- filetype.rules.conf spam.assassin.prefs.conf \
- spam.lists.conf virus.scanners.conf \
- rules/bounce.rules rules/spam.whitelist.rules
-
-CONF_FILES+= ${EGDIR}/MailScanner.conf ${PKG_SYSCONFDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
-CONF_FILES+= ${EGDIR}/${_f_} ${PKG_SYSCONFDIR}/${_f_}
-.endfor
-
-RCD_SCRIPTS= mailscanner
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-patch
-SUBST_FILES.paths= bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.paths+= etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.paths+= lib/MailScanner/ConfigDefs.pl
-SUBST_SED.paths= -e s,/opt/MailScanner/lib/MailScanner/CustomFunctions,${PKG_SYSCONFDIR}/CustomFunctions,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/lib,${LIBDIR},g
-SUBST_SED.paths+= -e s,/opt/MailScanner/etc/reports,${EGDIR}/reports,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/etc,${PKG_SYSCONFDIR},g
-SUBST_SED.paths+= -e s,/opt/MailScanner/var/MailScanner.pid,/var/run/MailScanner.pid,g
-SUBST_SED.paths+= -e s,/opt/MailScanner/bin,${PREFIX}/bin,g
-
-.include "../../mk/bsd.prefs.mk"
-
-# XXX this could use some improvement
-.if ${OPSYS} == "NetBSD"
-SUBST_CLASSES+= sendmail
-SUBST_STAGE.sendmail= post-patch
-SUBST_FILES.sendmail= bin/MailScanner etc/MailScanner.conf
-SUBST_FILES.sendmail+= etc/virus.scanners.conf bin/update_virus_scanners
-SUBST_FILES.sendmail+= lib/MailScanner/ConfigDefs.pl
-SUBST_SED.sendmail= -e s,/usr/lib/sendmail,/usr/sbin/mailwrapper,g
-.endif
-
-SUBST_CLASSES+= systemdefs
-SUBST_STAGE.systemdefs= post-patch
-SUBST_FILES.systemdefs= lib/MailScanner/SystemDefs.pm
-SUBST_SED.systemdefs= -e s,/bin/cat,${CAT},g
-SUBST_SED.systemdefs= -e s,/bin/cp,${CP},g
-SUBST_SED.systemdefs= -e s,/bin/rm,${RM},g
-# we can't use sed from pkgsrc as it won't be registered as a
-# dependency. XXX tools.mk needs a way to tell us about this dependency.
-.if empty(SED:M${LOCALBASE}*)
-SUBST_SED.systemdefs= -e s,/bin/sed,${SED},g
-.endif
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
-
-# get rid of CVS backup files
-post-extract:
- cd ${WRKSRC} && ${RM} -f */.#*
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/rules
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/MailScanner ${DESTDIR}${PREFIX}/bin
-
- ${INSTALL_LIB_DIR} ${DESTDIR}${LIBEXECDIR}
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/update_virus_scanners ${DESTDIR}${LIBEXECDIR}
- cd ${WRKSRC}/lib && ${FIND} . -name "*-autoupdate" -exec ${INSTALL_SCRIPT} '{}' ${DESTDIR}${LIBEXECDIR} \;
- cd ${WRKSRC}/lib && ${FIND} . -name "*-wrapper" -exec ${INSTALL_SCRIPT} '{}' ${DESTDIR}${LIBEXECDIR} \;
-
- ${INSTALL_DATA} ${WRKSRC}/etc/MailScanner.conf ${DESTDIR}${EGDIR}/MailScanner.conf
-.for _f_ in ${MS_CONFIG_FILES}
- ${INSTALL_DATA} ${WRKSRC}/etc/${_f_} ${DESTDIR}${EGDIR}
-.endfor
- cd ${WRKSRC}/etc/rules && ${INSTALL_DATA} \
- EXAMPLES README spam.whitelist.rules bounce.rules \
- ${DESTDIR}${EGDIR}/rules
- cd ${WRKSRC}/etc && ${FIND} reports -type d -exec ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/'{}' \;
- cd ${WRKSRC}/etc && ${FIND} reports -type f ! -name "*.orig" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${EGDIR}/'{}' \;
-
- ${INSTALL_LIB_DIR} ${DESTDIR}${LIBDIR}
- ${INSTALL_LIB_DIR} ${DESTDIR}${LIBDIR}/MailScanner
- ${INSTALL_SCRIPT} ${WRKSRC}/lib/MailScanner.pm ${DESTDIR}${LIBDIR}
- cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pm" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${LIBDIR}/MailScanner \;
- cd ${WRKSRC}/lib/MailScanner && ${FIND} . -name "*.pl" -exec ${INSTALL_DATA} '{}' ${DESTDIR}${LIBDIR}/MailScanner \;
-
- ${INSTALL_DATA_DIR} ${DESTDIR}${DOCSDIR}
- cd ${WRKSRC}/docs && ${FIND} * -type d -exec ${INSTALL_DATA_DIR} ${DESTDIR}${DOCSDIR}'/{}' \;
- cd ${WRKSRC}/docs && ${FIND} * -type f -exec ${INSTALL_DATA} '{}' ${DESTDIR}${DOCSDIR} \;
- cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
- cd ${WRKSRC}/docs/man && ${INSTALL_MAN} MailScanner.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-
-post-install:
- ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
- ${ECHO} bin/MailScanner >> ${PLIST_SRC}
- ${ECHO} man/man5/MailScanner.conf.5 >> ${PLIST_SRC}
- ${ECHO} man/man8/MailScanner.8 >> ${PLIST_SRC}
-.for _dir_ in ${DOCSDIR} ${EGDIR} ${LIBDIR} ${LIBEXECDIR}
- ${FIND} ${DESTDIR}${_dir_} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g" \
- >> ${PLIST_SRC}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailscanner/PLIST b/mail/mailscanner/PLIST
deleted file mode 100644
index e7070f1ddbd..00000000000
--- a/mail/mailscanner/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/02 20:34:00 reed Exp $
-@comment this PLIST automatically generated
-share/examples/rc.d/mailscanner
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
deleted file mode 100644
index 3798bb87b2e..00000000000
--- a/mail/mailscanner/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 09:59:24 agc Exp $
-
-SHA1 (MailScanner-4.30.3-2.tar.gz) = ef9503dc57ec6d6f97a7333fce2b3e283d972498
-RMD160 (MailScanner-4.30.3-2.tar.gz) = f6dbe8acb329068e342d2cbfb16f3309d4db1a7a
-Size (MailScanner-4.30.3-2.tar.gz) = 996850 bytes
diff --git a/mail/mailscanner/files/mailscanner.sh b/mail/mailscanner/files/mailscanner.sh
deleted file mode 100644
index 044f5730ef1..00000000000
--- a/mail/mailscanner/files/mailscanner.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: mailscanner.sh,v 1.1.1.1 2004/09/25 00:33:19 grant Exp $
-#
-# PROVIDE: mailscanner
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-name="MailScanner"
-rcvar="mailscanner"
-start_cmd="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/misc/Makefile b/misc/Makefile
index a38ee64110b..f3927c396c1 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.361 2011/06/12 09:08:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.362 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Miscellaneous utilities
@@ -165,8 +165,6 @@ SUBDIR+= multitail
SUBDIR+= nxtvepg
SUBDIR+= open2300
SUBDIR+= open2300-mysql
-SUBDIR+= openoffice2
-SUBDIR+= openoffice2-bin
SUBDIR+= openoffice3
SUBDIR+= openoffice3-bin
SUBDIR+= orca
diff --git a/misc/openoffice2-bin/DEINSTALL b/misc/openoffice2-bin/DEINSTALL
deleted file mode 100644
index f28fe9f7268..00000000000
--- a/misc/openoffice2-bin/DEINSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2006/06/15 20:40:16 jlam Exp $
-#
-# This file contains the contents of the OOo rpm pre-uninstall,
-# post-uninstall scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@
-
-case ${STAGE} in
-DEINSTALL)
- if [ -h $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
- then
- ${RM} $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
- fi
- ;;
-esac
diff --git a/misc/openoffice2-bin/DESCR b/misc/openoffice2-bin/DESCR
deleted file mode 100644
index 0eecb8e7ef8..00000000000
--- a/misc/openoffice2-bin/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
- * A universal word processing application for creating business
- letters, extensive text documents, professional layouts, and HTML
- documents.
- * A sophisticated application for performing advanced spreadsheet
- functions, such as analyzing figures, creating lists, and viewing data.
- * A tool for creating effective eye-catching presentations.
- * A vector-oriented draw module that enables the creation of 3D
- illustrations.
diff --git a/misc/openoffice2-bin/INSTALL b/misc/openoffice2-bin/INSTALL
deleted file mode 100644
index 067ac40aae9..00000000000
--- a/misc/openoffice2-bin/INSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2006/06/15 20:40:16 jlam Exp $
-#
-# This file contains the contents of the OOo rpm pre-install, post-install
-# scripts.
-
-PRODUCTINSTALLLOCATION=${PKG_PREFIX}/openoffice.org@VER@
-
-case ${STAGE} in
-POST-INSTALL)
- if [ ! -f $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 ]
- then
- if [ -f $PRODUCTINSTALLLOCATION/program/filter/libfreetype.so.6 ]
- then
- ${LN} -s $PRODUCTINSTALLLOCATION/program/filter/libfreetype.so.6 $PRODUCTINSTALLLOCATION/program/libfreetype.so.6 >/dev/null 2>&1
- fi
- fi
- ;;
-esac
diff --git a/misc/openoffice2-bin/Makefile b/misc/openoffice2-bin/Makefile
deleted file mode 100644
index 5ad2adb17be..00000000000
--- a/misc/openoffice2-bin/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2011/03/08 12:10:01 obache Exp $
-
-DISTNAME= openoffice2-bin # overridden below
-PKGNAME= openoffice2-bin-${OO_RELEASE}
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_RELEASE}/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.openoffice.org/
-COMMENT= Integrated office productivity suite (binary pkg)
-
-CONFLICTS+= staroffice-[0-9]*
-CONFLICTS+= openoffice-[0-9]*
-CONFLICTS+= openoffice-bin-[0-9]*
-CONFLICTS+= openoffice3-bin-[0-9]*
-CONFLICTS+= openoffice2-[0-9]*
-CONFLICTS+= openoffice3-[0-9]*
-CONFLICTS+= openoffice-linux-[0-9]*
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-OO_VER= 2.4
-OO_RELEASE= 2.4.3
-PLIST_SUBST+= VER=${OO_VER:Q}
-MESSAGE_SUBST+= VER=${OO_VER:Q}
-FILES_SUBST+= VER=${OO_VER:Q}
-
-TEMP?= ${WRKSRC}
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-BUILD_DIRS= # empty
-
-PLIST_SRC= ${PKGDIR}/PLIST.proglinks
-PLIST_SRC+= ${WRKDIR}/PLIST
-
-EMUL_PLATFORMS= linux-i386
-#EMUL_PLATFORMS+= solaris-i386 solaris-sparc
-EMUL_MODULES.linux= compat freetype2 x11
-EMUL_REQD= suse>=10.0
-
-EMUL_PKG_FMT= rpm
-RPMFILES= ${WRKSRC}/RPMS/*.rpm
-RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
-RPM2PKG_SUBPREFIX= # empty
-RPM2PKG_STAGE= do-install
-RUN_LDCONFIG= no
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME= OOo_${OO_RELEASE}_LinuxIntel_install_en-US
-WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-2_en-US.9421
-.elif ${EMUL_PLATFORM} == "solaris-i386"
-DISTNAME= OOo_${OO_RELEASE}_Solarisx86_install_en-US
-WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME= OOo_${OO_RELEASE}_SolarisSparc_install_en-US
-WRKSRC= ${WRKDIR}/OOH680_m21_native_packed-1_en-US.9421/packages
-.endif
-
-INSTALLATION_DIRS= bin
-
-.include "options.mk"
-
-do-install:
- uniq ${RPM2PKG_PLIST} > ${WRKDIR}/PLIST
-.if defined(PKG_JVM) && !empty(PKG_JVM)
- ${RM} -f ${DESTDIR}${PREFIX}/bin/soffice
- ${SED} -e "s|@@PREFIX@@|${PREFIX}|g" -e "s|@@OO_VER@@|${OO_VER}|g" \
- -e "s|@@JAVA_HOME@@|${PKG_JAVA_HOME}|g" \
- < ${FILESDIR}/soffice > ${DESTDIR}${PREFIX}/bin/soffice
- ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/soffice
-.else
- ${LN} -sf ../openoffice.org${OO_VER}/program/soffice ${DESTDIR}${PREFIX}/bin/soffice
-.endif
-.for i in scalc sdraw simpress smath spadmin swriter
- ${LN} -sf ../openoffice.org${OO_VER}/program/${i} ${DESTDIR}${PREFIX}/bin/${i}
-.endfor
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice2-bin/PLIST.proglinks b/misc/openoffice2-bin/PLIST.proglinks
deleted file mode 100644
index 588682e7281..00000000000
--- a/misc/openoffice2-bin/PLIST.proglinks
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.proglinks,v 1.2 2009/01/31 21:56:32 bad Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/smath
-bin/soffice
-bin/spadmin
-bin/swriter
diff --git a/misc/openoffice2-bin/distinfo b/misc/openoffice2-bin/distinfo
deleted file mode 100644
index f3e8adc86d0..00000000000
--- a/misc/openoffice2-bin/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.17 2009/12/05 15:00:16 bad Exp $
-
-SHA1 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 104df4d0f6bdc17eff57ba79f07b232f30d247fd
-RMD160 (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = aec3ea23b5f468f550eaa5194c7c32dc1a0c0052
-Size (OOo_2.4.3_LinuxIntel_install_en-US.tar.gz) = 154263012 bytes
diff --git a/misc/openoffice2-bin/files/soffice b/misc/openoffice2-bin/files/soffice
deleted file mode 100644
index 1a9723a1460..00000000000
--- a/misc/openoffice2-bin/files/soffice
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: soffice,v 1.3 2005/10/26 18:26:52 mrauch Exp $
-#
-SOINST=@@PREFIX@@/openoffice.org@@OO_VER@@
-
-# make sure we can find `whoami` on solaris
-PATH=${PATH}:/usr/ucb
-
-# add the chosen java directory to $PATH to allow OOo to
-# automatically find it
-PATH=${PATH}:@@JAVA_HOME@@
-
-# default data seg size is too small for java
-ulimit -d `ulimit -H -d`
-
-exec ${SOINST}/program/soffice "$@"
diff --git a/misc/openoffice2-bin/options.mk b/misc/openoffice2-bin/options.mk
deleted file mode 100644
index dc0ac8ee960..00000000000
--- a/misc/openoffice2-bin/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2005/10/23 20:11:47 rillig Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice-bin
-PKG_SUPPORTED_OPTIONS= java
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mjava)
-PKG_JVMS_ACCEPTED= blackdown-jdk13 sun-jdk13 sun-jdk14 sun-jdk15
-USE_JAVA= run
-.include "../../mk/java-vm.mk"
-.endif
diff --git a/misc/openoffice2/DESCR b/misc/openoffice2/DESCR
deleted file mode 100644
index 0eecb8e7ef8..00000000000
--- a/misc/openoffice2/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-OpenOffice.org is an Open Source, community-developed, multi-platform office
-productivity suite. It includes the key desktop applications, such as a
-word processor, spreadsheet, presentation manager, and drawing program,
-with a user interface and feature set similar to other office suites.
-
-Components include:
- * A universal word processing application for creating business
- letters, extensive text documents, professional layouts, and HTML
- documents.
- * A sophisticated application for performing advanced spreadsheet
- functions, such as analyzing figures, creating lists, and viewing data.
- * A tool for creating effective eye-catching presentations.
- * A vector-oriented draw module that enables the creation of 3D
- illustrations.
diff --git a/misc/openoffice2/MESSAGE b/misc/openoffice2/MESSAGE
deleted file mode 100644
index b6bfa685cca..00000000000
--- a/misc/openoffice2/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2008/11/19 01:54:25 hira Exp $
-
- OpenOffice has now been installed in ${OO_PREFIX}.
-
- Before using this package for the first time, each user has to run
- a setup program, which is automatically invoked at the first start.
- Thereafter, OpenOffice can be started using the
- ${PREFIX}/bin/soffice command.
-===========================================================================
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
deleted file mode 100644
index fece5306d82..00000000000
--- a/misc/openoffice2/Makefile
+++ /dev/null
@@ -1,212 +0,0 @@
-# $NetBSD: Makefile,v 1.88 2011/07/21 13:05:59 obache Exp $
-#
-
-OO_VER= 2.4.3
-DISTNAME= openoffice-${OO_VER}
-PKGNAME= openoffice2-${OO_VER}
-PKGREVISION= 12
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
-DIST_SUBDIR= ${DISTNAME}
-
-DISTFILES= OOo_${OO_VER}_src_core.tar.bz2
-DISTFILES+= OOo_${OO_VER}_src_binfilter.tar.bz2
-DISTFILES+= OOo_${OO_VER}_src_l10n.tar.bz2
-#DISTFILES+= OOo_${OO_VER}_src_sdk.tar.bz2
-DISTFILES+= OOo_${OO_VER}_src_system.tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.openoffice.org/
-COMMENT= Integrated office productivity suite (version 2)
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
-
-DEPENDS+= libpaper-[0-9]*:../../print/libpaper
-
-.include "../../mk/bsd.prefs.mk"
-
-WRKSRC= ${WRKDIR}/OOH680_m21
-CONFIGURE_DIRS= config_office
-
-# Cannot compile with 3.3.x (GCC Bugzilla Bug 16879).
-GCC_REQD+= 3.4
-USE_LANGUAGES+= c c++
-
-USE_TOOLS+= bash gmake imake perl pkg-config tar
-PTHREAD_OPTS+= require
-PTHREAD_AUTO_VARS= yes
-
-CONFLICTS+= staroffice-[0-9]*
-CONFLICTS+= openoffice-[0-9]*
-CONFLICTS+= openoffice3-[0-9]*
-CONFLICTS+= openoffice-bin-[0-9]*
-CONFLICTS+= openoffice2-bin-[0-9]*
-CONFLICTS+= openoffice3-bin-[0-9]*
-CONFLICTS+= openoffice-linux-[0-9]*
-
-ONLY_FOR_PLATFORM= FreeBSD-*-i386 FreeBSD-*-x86_64
-ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-i386 NetBSD-[2-9]*-i386
-ONLY_FOR_PLATFORM+= NetBSD-1.6Z[G-Z]*-x86_64 NetBSD-[2-9]*-x86_64
-
-GNU_CONFIGURE= yes
-
-REPLACE_PERL+= sd/res/webview/editpic.pl \
- sd/res/webview/poll.pl \
- sd/res/webview/savepic.pl \
- sd/res/webview/show.pl \
- sd/res/webview/webview.pl
-REPLACE_PYTHON+= scripting/source/pyprov/mailmerge.py
-
-SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix= post-patch
-SUBST_MESSAGE.prefix= Fixing prefix
-SUBST_FILES.prefix= sysui/desktop/share/openoffice.sh
-SUBST_FILES.prefix+= sysui/desktop/share/printeradmin.sh
-SUBST_SED.prefix= -e 's|@OO_PREFIX@|${OO_PREFIX}|g'
-
-SUBST_CLASSES+= lib
-SUBST_STAGE.lib= post-patch
-SUBST_MESSAGE.lib= Adding library paths
-SUBST_FILES.lib= solenv/inc/pkgsrc.mk
-SUBST_SED.lib+= -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g'
-SUBST_SED.lib+= -e 's|@OO_LIBDIR@|${OO_PREFIX}/program|g'
-.for pkg in db4 expat icu jpeg zlib
-LIB.${pkg}= -L${BUILDLINK_PREFIX.${pkg}}/lib
-LIB.${pkg}+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.${pkg}}/lib
-SUBST_SED.lib+= -e 's|@LIB_${pkg}@|${LIB.${pkg}}|g'
-LIBS+= ${LIB.${pkg}}
-.endfor
-
-CONFIGURE_ENV+= LIBS=${LIBS:O:u:Q}
-CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:M*:Q}
-CONFIGURE_ENV+= BLNK_PREFIX_db4=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ENV+= BLNK_PREFIX_nas=${BUILDLINK_PREFIX.nas}
-CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENBRK=${PREFIX}/bin/genbrk
-CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCCODE=${PREFIX}/sbin/genccode
-CONFIGURE_ENV+= ac_cv_path_SYSTEM_GENCMN=${PREFIX}/sbin/gencmn
-
-CONFIGURE_ARGS+= --with-use-shell=bash
-CONFIGURE_ARGS+= --enable-binfilter
-CONFIGURE_ARGS+= --enable-cairo
-CONFIGURE_ARGS+= --disable-ldap
-CONFIGURE_ARGS+= --disable-vba
-CONFIGURE_ARGS+= --with-system-stdlibs
-CONFIGURE_ARGS+= --with-system-curl
-CONFIGURE_ARGS+= --with-system-db
-CONFIGURE_ARGS+= --with-system-expat
-CONFIGURE_ARGS+= --with-system-freetype
-CONFIGURE_ARGS+= --with-system-icu
-CONFIGURE_ARGS+= --with-system-jpeg
-CONFIGURE_ARGS+= --with-system-libxml2
-CONFIGURE_ARGS+= --with-system-libxslt
-CONFIGURE_ARGS+= --with-system-python
-CONFIGURE_ARGS+= --with-system-zlib
-CONFIGURE_ARGS+= --with-dynamic-xinerama
-
-# `portable' supports all platforms.
-CONFIGURE_ARGS+= --enable-epm --with-package-format=portable
-
-# XXX: Error in OOo internal libsndfile.
-CONFIGURE_ARGS+= --disable-pasf
-
-# Disable Java.
-CONFIGURE_ARGS+= --without-java --disable-odk --disable-gcjaot
-
-# NOTE: In this version, this value should be separated by space (comma
-# causes build error).
-CONFIGURE_ARGS+= --with-lang=${OO_LANGS:Q}
-
-.include "options.mk"
-
-UNLIMIT_RESOURCES+= datasize
-
-OO_RELEASE= OpenOffice.org${OO_VER}
-PLIST_SRC= ${PKGDIR}/PLIST
-PLIST_SRC+= ${WRKDIR}/PLIST
-PLIST_SUBST+= OO_UNXNAME=${OO_UNXNAME}
-PLIST_SUBST+= OO_ICON_PREFIX=openofficeorg24
-MESSAGE_SUBST+= OO_PREFIX=${OO_PREFIX}
-INSTALLATION_DIRS= bin lib/${OO_RELEASE} share/applications \
- share/application-registry share/mime-info \
- share/packages share/mime/packages
-
-OO_UNXNAME= openoffice.org2.4
-OO_PKGPATH= ${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice/portable/install
-OO_LANGPACKPATH=${WRKSRC}/instsetoo_native/${OPENOFFICE_OUTPATH}.pro/OpenOffice_languagepack/portable/install
-OO_PROGRAMS= scalc sdraw simpress soffice swriter unopkg
-OO_PREFIX= ${PREFIX}/lib/${OO_RELEASE}
-
-post-extract:
- cd ${WRKSRC}/bridges/source/cpp_uno && \
- mv gcc3_netbsd_intel gcc3_netbsd_intel.orig && \
- cp -Rp gcc3_freebsd_intel gcc3_netbsd_intel && \
- cp -Rp gcc3_freebsd_x86-64 gcc3_netbsd_x86-64
-
-do-build:
- ${_ULIMIT_CMD} ${SETENV} ${MAKE_ENV} bash -c "cd ${WRKSRC} && ./bootstrap && source ${OPENOFFICE_SETFILE}Env.Set.sh && cd instsetoo_native && build.pl --checkmodules && build.pl -P${MAKE_JOBS:U1} --all product=full && cd util && dmake openoffice_${OO_BASELANG} && dmake ooolanguagepack"
-
-do-install:
- cd ${DESTDIR}${OO_PREFIX} && \
- for f in ${OO_PKGPATH:Q}/${OO_BASELANG}/*/*.sw; do \
- tar xpf $$f; \
- done; \
- for lang in ${OO_LANGPACKS}; do \
- for f in ${OO_LANGPACKPATH:Q}/$$lang/*/*.sw; do \
- tar xpf $$f; \
- done; \
- done
- cd ${DESTDIR}${OO_PREFIX}/program && \
- chmod ${SHAREMODE} hid.lst testtoolrc
- for f in ${OO_PROGRAMS}; do \
- ln -sf ${DESTDIR}${OO_PREFIX}/program/$$f \
- ${DESTDIR}${PREFIX}/bin/$$f; \
- done
- cd ${WRKSRC}/sysui/${OPENOFFICE_OUTPATH}.pro/misc/openoffice.org && \
- ${SETENV} ${MAKE_ENV} DESTDIR=${DESTDIR} _PREFIX=${PREFIX} \
- GNOME=${PKG_OPTIONS:Mgnome} KDE=${PKG_OPTIONS:Mkde} \
- OO_PREFIX=${OO_PREFIX} ${SH} create_tree.sh
-
-post-install:
- cd ${DESTDIR}${PREFIX} && \
- find lib/${OO_RELEASE} \! -type d -print | \
- sort > ${WRKDIR}/PLIST
-
-# OS specific Makefile
-.if exists(Makefile.${OPSYS})
-. include "Makefile.${OPSYS}"
-.endif
-
-.include "../../mk/compiler.mk"
-
-.include "../../databases/db4/buildlink3.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../www/curl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/misc/openoffice2/Makefile.FreeBSD b/misc/openoffice2/Makefile.FreeBSD
deleted file mode 100644
index 9fddcf8a909..00000000000
--- a/misc/openoffice2/Makefile.FreeBSD
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.FreeBSD,v 1.3 2008/02/06 16:41:07 hira Exp $
-#
-
-BUILD_DEPENDS+= coreutils>=*:../../sysutils/coreutils
-BUILD_DEPENDS+= patch>=*:../../devel/patch
-CONFIGURE_ARGS+= --with-gnu-cp=${PREFIX}/bin/gcp
-CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/gpatch
-
-.if ${MACHINE_ARCH} == "i386"
-#OPENOFFICE_DLLSUFFIX= fi
-OPENOFFICE_OUTPATH= unxfbsdi
-OPENOFFICE_SETFILE= FreeBSDX86
-.elif ${MACHINE_ARCH} == "x86_64"
-#OPENOFFICE_DLLSUFFIX= fx
-OPENOFFICE_OUTPATH= unxfbsdx
-OPENOFFICE_SETFILE= FreeBSDAMD
-.endif
diff --git a/misc/openoffice2/Makefile.NetBSD b/misc/openoffice2/Makefile.NetBSD
deleted file mode 100644
index d341633960b..00000000000
--- a/misc/openoffice2/Makefile.NetBSD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile.NetBSD,v 1.2 2008/10/05 21:36:35 cube Exp $
-#
-
-# systray quickstarter is broken with mutex handling?
-CONFIGURE_ARGS+= --disable-systray
-
-# *.pc files are required, but these don't exist on NetBSD.
-.if defined(X11_TYPE) && !empty(X11_TYPE:Mnative)
-. for _pkg_ in freetype2 Xfixes Xrandr Xrender
-. if !exists(${X11BASE}/lib/pkgconfig/${_pkg_:tl}.pc)
-USE_BUILTIN.${_pkg_}= no
-. endif
-. endfor
-.endif
-
-.if ${MACHINE_ARCH} == "i386"
-#OPENOFFICE_DLLSUFFIX= bi
-OPENOFFICE_OUTPATH= unxbsdi3
-OPENOFFICE_SETFILE= NetBSDX86
-.elif ${MACHINE_ARCH} == "x86_64"
-#OPENOFFICE_DLLSUFFIX= bx
-OPENOFFICE_OUTPATH= unxbsdx3
-OPENOFFICE_SETFILE= NetBSDX86-64
-.endif
diff --git a/misc/openoffice2/PLIST b/misc/openoffice2/PLIST
deleted file mode 100644
index b698bd49807..00000000000
--- a/misc/openoffice2/PLIST
+++ /dev/null
@@ -1,300 +0,0 @@
-@comment $NetBSD: PLIST,v 1.9 2009/01/26 15:39:05 hira Exp $
-bin/scalc
-bin/sdraw
-bin/simpress
-bin/soffice
-bin/swriter
-bin/unopkg
-bin/${OO_UNXNAME}
-bin/${OO_UNXNAME}-printeradmin
-share/applications/${OO_UNXNAME}-base.desktop
-share/applications/${OO_UNXNAME}-calc.desktop
-share/applications/${OO_UNXNAME}-draw.desktop
-share/applications/${OO_UNXNAME}-extension.desktop
-share/applications/${OO_UNXNAME}-impress.desktop
-share/applications/${OO_UNXNAME}-math.desktop
-share/applications/${OO_UNXNAME}-printeradmin.desktop
-share/applications/${OO_UNXNAME}-writer.desktop
-share/application-registry/${OO_UNXNAME}.applications
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-base.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-calc.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-draw.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-impress.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-math.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
-share/icons/hicolor/48x48/apps/${OO_ICON_PREFIX}-writer.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
-share/icons/hicolor/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.kde}share/icons/locolor/16x16/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.kde}share/icons/locolor/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.kde}share/icons/locolor/32x32/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.kde}share/icons/locolor/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/16x16/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/16x16/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/32x32/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/32x32/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-base.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-calc.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-draw.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-impress.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-math.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-printeradmin.png
-${PLIST.gnome}share/icons/gnome/48x48/apps/${OO_ICON_PREFIX}-writer.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-database.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-drawing.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-extension.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-formula.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-master-document.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-database.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-drawing.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-formula.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-master-document.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-presentation.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-text.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-oasis-web-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-presentation.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-spreadsheet.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text-template.png
-${PLIST.gnome}share/icons/gnome/48x48/mimetypes/${OO_ICON_PREFIX}-text.png
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-drawing.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-extension.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-formula.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-master-document.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-database.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-drawing.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-formula.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-master-document.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-presentation.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-spreadsheet.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-text.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-oasis-web-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-presentation.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-spreadsheet.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text-template.desktop
-${PLIST.kde}share/kde/mimelnk/application/${OO_UNXNAME}-text.desktop
-share/mime/packages/openoffice.org.xml
-share/mime-info/${OO_UNXNAME}.mime
-share/mime-info/${OO_UNXNAME}.keys
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
deleted file mode 100644
index 758fd69a2cc..00000000000
--- a/misc/openoffice2/distinfo
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: distinfo,v 1.55 2009/09/13 03:54:13 hira Exp $
-
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 8c5175b933df18fa88adec59d366e5b191555d22
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = be6e0215d00ff78ecfd35ba51c86b37e9c2ba899
-Size (openoffice-2.4.3/OOo_2.4.3_src_binfilter.tar.bz2) = 6738021 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 40193da67ec5f76d7528e03c94599f4db8e61dfb
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 44fde99dbd4991c893dd18816f8e98e54fb0aacd
-Size (openoffice-2.4.3/OOo_2.4.3_src_core.tar.bz2) = 152311420 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 89c3420231808b0492dc07c83f5dc0421a3c5836
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 540dd0fdae81b1f434db73882691b5d62cd0c75d
-Size (openoffice-2.4.3/OOo_2.4.3_src_l10n.tar.bz2) = 81490942 bytes
-SHA1 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = a250d4327bb4bcf8e025fbe7c706121044cfc949
-RMD160 (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 01441eeaa0785b8988f1d464974119b54572f009
-Size (openoffice-2.4.3/OOo_2.4.3_src_system.tar.bz2) = 41621781 bytes
-SHA1 (patch-ac) = ed6d84d40c3543eed754d74a5e65caf137f31c3d
-SHA1 (patch-ad) = f26b60c05bf061c9d1f245826954cb642861dd98
-SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
-SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
-SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
-SHA1 (patch-ak) = 3bb19e2c8e606a66609024a49ec311161b375f10
-SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
-SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
-SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
-SHA1 (patch-ap) = cf32f3205e7f8f6ff90518f262374b6c7260b431
-SHA1 (patch-aq) = e4f2a84598a6a09b4bedc430cd24921f87f822e5
-SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
-SHA1 (patch-as) = 55e38c869518e673e8554b2645c1adfb28f6faec
-SHA1 (patch-aw) = fdd1665c729cd17d8381ab39f2e6672164a058ad
-SHA1 (patch-ba) = 86d4f2fa8554ba69cb026197543494750ef8add7
-SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
-SHA1 (patch-bc) = a97ec5574d4ef2f2fbdf411ae2c8d49d9f434077
-SHA1 (patch-bd) = f206fef46a0741139ae776f95d2a01f794989fb5
-SHA1 (patch-bf) = d2e2363e7e08d675e3a6b9356d1ffac6d10148de
-SHA1 (patch-bg) = 0eeb3e521b3d7c47efa67bf38a1ec598056ab32a
-SHA1 (patch-bh) = c5fdc5597895c6ea4034355dc225f9e72ed1d218
-SHA1 (patch-bi) = f9d286d8dd93c7ba99fd0ca809c6dfac5e763464
-SHA1 (patch-bj) = 80685500062b9a17e16732a9a6da7a7d1d1ed1f6
-SHA1 (patch-bk) = 5a5c03a0c965edb32e95ad342f330e2b0eaf3d9c
-SHA1 (patch-bl) = d9d6860e4491863dd5b2f09eeff97e4023dbd23d
-SHA1 (patch-bm) = 0f7367782155c1d0f0459912aac69a1c759ad7fa
-SHA1 (patch-bn) = a891c1620a53d9c25cf414232a80a4cdb54e0e27
-SHA1 (patch-bo) = 3e4bcccd0a7cea535e443d750039fa844380f8bc
-SHA1 (patch-bp) = 9005edd4a24bfa32b5e5a731ed626fb35d0b675e
-SHA1 (patch-bq) = 486c7e8198e2d8342e4472871bb31fc0b1321286
-SHA1 (patch-bs) = ede4ffcb762e89efbf95b6e4b644eb268534f1ca
-SHA1 (patch-bt) = f52b0fa4453a580ac256accf221aef0f2c059661
-SHA1 (patch-bv) = bc035bdbc8420666a52417f2226e3e687d199e33
-SHA1 (patch-bw) = e0d438f886e97c0342f56ba155ebb6a7e9414093
-SHA1 (patch-bx) = 157878e1fb4297f118ed0bbf06009506666fbc1c
-SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
-SHA1 (patch-ch) = 751f14379d9274690c3f6aa0fe30322af2822e1f
-SHA1 (patch-ci) = 4743cee1c391e04a53bd83f6ae7e58e737d08d1e
-SHA1 (patch-cj) = 45ff359ec795e5ef5c692e954d88912c74017162
-SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
-SHA1 (patch-cp) = 35151ba658859c9d116ccdf44ec372c9e66435b1
-SHA1 (patch-cq) = 6691fd7fa330db000ec5a9319bf9030b83aa593d
-SHA1 (patch-cr) = aa797461919635c3e6aaa30678a7585d5640dedd
-SHA1 (patch-cs) = 01e2cb3ac9eab523540bd6d388081cccc425e204
-SHA1 (patch-ct) = a06c5cbc543acecb4f18e858cd844302bbdb50b4
-SHA1 (patch-cu) = b930fd94413c2bdf23ea94b074e3bb5e93784009
-SHA1 (patch-cv) = 2e14a54d369a255ee39fcec7d4f1d2b11a8f4d2e
-SHA1 (patch-cw) = 9c122919fed1b77bfc2edeb5297a7f6bdf4d45ae
-SHA1 (patch-cx) = b718aa55917eaf42d4d4868cab46503e6c8c538d
-SHA1 (patch-cy) = 8d47bcf1da6f351f4f0cbf6a8355903094b0baee
-SHA1 (patch-dc) = 2a6b826ca2849110f33c612a4c4beba8f7e27e67
-SHA1 (patch-dd) = d733d6e54db93bbb7be5382ddf96cf83731a6176
-SHA1 (patch-de) = 138fbea73fec80c744c3eede57dfe5f1cddef573
-SHA1 (patch-dt) = 0b3c91b128b2b0dbe7492665b44f4383379e2067
-SHA1 (patch-du) = 6aac97b36a36c2200ed56429e7a03b88481c4858
-SHA1 (patch-dy) = 4af56ef04180ab3dec7d0051e4075e84b62c8405
-SHA1 (patch-ed) = 37a3a9527c74500dbcd047f90f218f57d059548f
-SHA1 (patch-ef) = 03c1e3fb27e0ba12dec92866fb592f66442a0c1a
-SHA1 (patch-eg) = 0c6119bd2a91c91ab71348558b8c75224ffa90dc
-SHA1 (patch-eh) = bb09b068066309ccdc1dc707b8d97e2dd9bf64e5
-SHA1 (patch-ei) = b8b0ca35c15cff58cc53a937f8f3a127e4cd0d03
-SHA1 (patch-ej) = 1300efe96fb675b89df2c345cc68f1fc79a8bd69
-SHA1 (patch-ga) = ba2ecca04fa39f37180080338fe9107f854ceb95
-SHA1 (patch-gb) = adabfee3d06e31741b462f5f9ab6dab26a243688
-SHA1 (patch-gc) = 91865d8bd5cdb0499f4b63d626b6ef22ef0c37b2
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
deleted file mode 100644
index 148e4fcccec..00000000000
--- a/misc/openoffice2/options.mk
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: options.mk,v 1.28 2010/12/02 07:35:05 dholland Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice2
-PKG_SUPPORTED_OPTIONS= cups gnome gtk2 kde nas ooo-external-libwpd # xulrunner
-# The list from completelangiso in solenv/inc/postset.mk.
-OO_SUPPORTED_LANGUAGES= af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca \
- cs cy da de dz el en-GB en-US en-ZA eo es et \
- eu fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka km kn ko ku lo lt lv mk ms ml-IN mr-IN ne \
- nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru \
- rw sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER \
- ta-IN th tn tr ts tg ur-IN uk ve vi xh zh-CN \
- zh-TW zu all
-.for l in ${OO_SUPPORTED_LANGUAGES}
-PKG_SUPPORTED_OPTIONS+= lang-${l}
-.endfor
-PKG_SUGGESTED_OPTIONS= gtk2 lang-en-US
-PKG_OPTIONS_LEGACY_OPTS+= gnome-vfs:gnome
-
-.include "../../mk/bsd.options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(PKG_OPTIONS:Mlang-all)
-OO_LANGS= ALL
-OO_BASELANG= en-US
-OO_LANGPACKS= ${OO_SUPPORTED_LANGUAGES:S/en-US//1:S/all//1}
-.else
-. for lang in ${PKG_OPTIONS:Mlang-*:S/lang-//g}
-OO_LANGS+= ${lang}
-OO_BASELANG?= ${lang} # Get first one.
-. endfor
-.endif
-OO_LANGS?= en-US
-OO_BASELANG?= en-US
-OO_LANGPACKS?= ${OO_LANGS:S/${OO_BASELANG}//1}
-
-.if !empty(PKG_OPTIONS:Mxulrunner)
-CONFIGURE_ARGS+= --with-system-mozilla=mozilla
-.include "../../devel/xulrunner/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-mozilla
-.endif
-
-.if !empty(PKG_OPTIONS:Mooo-external-libwpd)
-CONFIGURE_ARGS+= --with-system-libwpd
-.include "../../converters/libwpd/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mcups)
-CONFIGURE_ARGS+= --enable-cups
-.include "../../print/cups/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-cups
-.endif
-
-PLIST_VARS+= gnome
-.if !empty(PKG_OPTIONS:Mgnome)
-PLIST.gnome= yes
-CONFIGURE_ARGS+= --enable-gnome-vfs --enable-evolution2
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gnome-vfs --disable-evolution2
-.endif
-
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+= --enable-gtk
-.include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-gtk
-.endif
-
-PLIST_VARS+= kde
-.if !empty(PKG_OPTIONS:Mkde)
-PLIST.kde= yes
-CONFIGURE_ENV+= KDEDIR=${BUILDLINK_PREFIX.kdelibs:Q}
-CONFIGURE_ARGS+= --enable-kde --enable-kdeab
-.include "../../x11/kdelibs3/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-kde --disable-kdeab
-.endif
-
-.if !empty(PKG_OPTIONS:Mnas)
-CONFIGURE_ARGS+= --with-system-nas
-# Build error with nas<=1.9.
-BUILDLINK_API_DEPENDS.nas+= nas>=1.9nb1
-.include "../../audio/nas/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-nas
-.endif
diff --git a/misc/openoffice2/patches/patch-ac b/misc/openoffice2/patches/patch-ac
deleted file mode 100644
index 71e358f64c4..00000000000
--- a/misc/openoffice2/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2007/03/04 13:11:18 hira Exp $
-
---- sal/inc/osl/endian.h.orig 2007-02-17 23:15:28.000000000 +0900
-+++ sal/inc/osl/endian.h 2007-02-17 23:16:59.000000000 +0900
-@@ -76,11 +76,14 @@
- #ifdef NETBSD
- # include <machine/endian.h>
- # if BYTE_ORDER == LITTLE_ENDIAN
--# define _LITTLE_ENDIAN
-+# undef _BIG_ENDIAN
-+# undef _PDP_ENDIAN
- # elif BYTE_ORDER == BIG_ENDIAN
--# define _BIG_ENDIAN
-+# undef _LITTLE_ENDIAN
-+# undef _PDP_ENDIAN
- # elif BYTE_ORDER == PDP_ENDIAN
--# define _PDP_ENDIAN
-+# undef _LITTLE_ENDIAN
-+# undef _BIG_ENDIAN
- # endif
- #endif
-
diff --git a/misc/openoffice2/patches/patch-ad b/misc/openoffice2/patches/patch-ad
deleted file mode 100644
index 64465cadcbf..00000000000
--- a/misc/openoffice2/patches/patch-ad
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/10/06 20:02:22 hira Exp $
-
---- sal/osl/unx/system.c.orig 2007-07-05 18:05:56.000000000 +0900
-+++ sal/osl/unx/system.c 2007-09-26 17:14:54.000000000 +0900
-@@ -71,8 +71,11 @@
- struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
- #endif /* BUILD_OS_APPLEOSX */
- #else /* MACOSX */
-+#if (__NetBSD_Version__ < 299001000)
- struct passwd *getpwnam_r(const char* name, struct passwd* s, char* buffer, int size )
-+#endif
- #endif /* MACOSX */
-+#if (__NetBSD_Version__ < 299001000)
- {
- struct passwd* res;
-
-@@ -138,8 +141,9 @@
- return(res);
- #endif /* MACOSX */
- }
-+#endif
-
--#if defined(NETBSD) || defined(MACOSX)
-+#if (defined(NETBSD) && (__NetBSD_Version__ < 299001000)) || defined(MACOSX)
- int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
- size_t buflen, struct passwd **result)
- {
-@@ -432,7 +436,7 @@
- }
- #endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
-
--#if defined(MACOSX)
-+#if defined(MACOSX) || defined(NETBSD)
- /*
- * This section works around calls that are missing or broken
- * in MacOS X 10.1.x and earlier.
-@@ -476,6 +480,10 @@
- return nRet;
- }
-
-+#endif
-+
-+#if defined(MACOSX)
-+
- /* No reentrant asctime() either... */
-
- /*******************************************************************************/
diff --git a/misc/openoffice2/patches/patch-ag b/misc/openoffice2/patches/patch-ag
deleted file mode 100644
index 156f1e34a4d..00000000000
--- a/misc/openoffice2/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2007/03/04 13:11:18 hira Exp $
-
---- solenv/bin/checkdll.sh.orig 2007-02-17 17:27:21.000000000 +0900
-+++ solenv/bin/checkdll.sh 2007-02-17 17:27:43.000000000 +0900
-@@ -37,7 +37,7 @@
- # checkdll.sh - execute checkdll with all -L arguments to this script
- # prepended to LD_LIBRARY_PATH
-
--set -- `getopt "L:" "$@"` || {
-+set -- `getopt "L:R:" "$@"` || {
- echo "Usage: `basename $0` [-L library_path] <shared_library>" 1>&2
- exit 1
- }
-@@ -49,6 +49,7 @@
- do
- case $1 in
- -L) shift; option=$1;;
-+ -R) shift;;
- --) break;;
- esac
- case "${libpath+X}" in
diff --git a/misc/openoffice2/patches/patch-ah b/misc/openoffice2/patches/patch-ah
deleted file mode 100644
index 7058817e1fc..00000000000
--- a/misc/openoffice2/patches/patch-ah
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2007/10/06 20:02:22 hira Exp $
-
---- solenv/inc/_tg_app.mk.orig 2007-06-27 23:01:57.000000000 +0900
-+++ solenv/inc/_tg_app.mk 2007-09-26 19:50:23.000000000 +0900
-@@ -94,7 +94,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_1.cmd
-- @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
-+ @cat $(mktmp /dev/null $(APP1LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_1.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_1.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_1.cmd
-@@ -292,7 +292,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_2.cmd
-- @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
-+ @cat $(mktmp /dev/null $(APP2LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_2.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_2.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_2.cmd
-@@ -490,7 +490,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_3.cmd
-- @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
-+ @cat $(mktmp /dev/null $(APP3LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_3.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_3.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_3.cmd
-@@ -688,7 +688,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_4.cmd
-- @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
-+ @cat $(mktmp /dev/null $(APP4LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_4.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_4.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_4.cmd
-@@ -886,7 +886,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_5.cmd
-- @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
-+ @cat $(mktmp /dev/null $(APP5LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_5.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_5.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_5.cmd
-@@ -1084,7 +1084,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_6.cmd
-- @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
-+ @cat $(mktmp /dev/null $(APP6LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_6.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_6.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_6.cmd
-@@ -1282,7 +1282,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_7.cmd
-- @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
-+ @cat $(mktmp /dev/null $(APP7LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_7.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_7.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_7.cmd
-@@ -1480,7 +1480,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_8.cmd
-- @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
-+ @cat $(mktmp /dev/null $(APP8LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_8.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_8.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_8.cmd
-@@ -1678,7 +1678,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_9.cmd
-- @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
-+ @cat $(mktmp /dev/null $(APP9LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_9.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_9.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_9.cmd
-@@ -1876,7 +1876,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_10.cmd
- @echo $(APP10LINKER) $(APP10LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_10.cmd
-- @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
-+ @cat $(mktmp /dev/null $(APP10LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_10.cmd
- cat $(MISC)$/$(TARGET).$(@:b)_10.cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_10.cmd
diff --git a/misc/openoffice2/patches/patch-ai b/misc/openoffice2/patches/patch-ai
deleted file mode 100644
index e97275a976d..00000000000
--- a/misc/openoffice2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2007/10/06 20:02:22 hira Exp $
-
---- solenv/inc/tg_app.mk.orig 2007-07-02 18:23:33.000000000 +0900
-+++ solenv/inc/tg_app.mk 2007-09-26 17:53:57.000000000 +0900
-@@ -131,7 +131,7 @@
- @-$(RM) $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- @echo $(APP$(TNR)LINKER) $(APP$(TNR)LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \
- $(APP$(TNR)OBJS:s/.obj/.o/) '\' > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-- @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
-+ @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | sed -E 's#[[:space:]]+# #g' | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
- @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd
diff --git a/misc/openoffice2/patches/patch-ak b/misc/openoffice2/patches/patch-ak
deleted file mode 100644
index f1e0fcb8ec9..00000000000
--- a/misc/openoffice2/patches/patch-ak
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-ak,v 1.8 2008/04/13 20:32:43 hira Exp $
-
---- config_office/set_soenv.in.orig 2008-01-23 17:07:28.000000000 +0000
-+++ config_office/set_soenv.in 2008-04-14 04:39:32.000000000 +0000
-@@ -40,7 +40,7 @@
- #
- my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment,
- $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
-- $wps, $wps2, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
-+ $wps, $wps2, $cur_dir, $par_dir, $I, $L, $R, $D, $buildenv, $answer, $tmp, $MINGW,
- $USE_MINGW, $platform, $NOWRAPCMD,
- $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
- $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
-@@ -90,7 +90,7 @@
- $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
- $PROEXT,
-- $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
-+ $PYTHON, $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA, $EPM_FLAGS);
- #
- #-------------------------------------------
- # IId. Declaring the aliases.
-@@ -132,6 +132,7 @@
- $par_dir = ".."; # parrent directory
- $I = " -I"; # include search path
- $L = " -L"; # library search path
-+$R = " -R"; # library search path
- $D = " -D"; # define search path
- $empty = ""; # used as argument
- $no_stl = "NO_STLPORT4"; # possible argument
-@@ -284,6 +285,16 @@
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
- }
-+ elsif ($platform =~ m/^x86_64/)
-+ { print "Setting NetBSD x86-64 specific values... ";
-+ $outfile = "NetBSDX86-64Env.Set";
-+ $CPU = "X";
-+ $CPUNAME = "X86_64";
-+ $OUTPATH = "unxbsdx";
-+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+ }
- elsif ($platform =~ m/^sparc/)
- { print "Setting NetBSD Sparc specific values... ";
- $outfile = "NetBSDSparcEnv.Set";
-@@ -310,7 +321,14 @@
- }
- #Conditional setting depending on gcc3:
- $CVER = "C300";
-- $OUTPATH = $OUTPATH."2";
-+ if (@GCCVER@ >= 30401) {
-+ $CVER = "C341";
-+ $OUTPATH = $OUTPATH."3";
-+ }
-+ else {
-+ $CVER = "C300";
-+ $OUTPATH = $OUTPATH."2";
-+ }
- # General NetBSD settings:
- $BIG_SVX = "TRUE";
- $COM = "GCC";
-@@ -1387,7 +1405,8 @@
- $L.$JRETOOLKITDIR.
- $L.$JRETHREADDIR.
- $L_STLPORT_LIB.
-- $L.$XLIB;
-+ $L.$XLIB.
-+ $R.$XLIB;
- }
- elsif ($platform =~ m/linux-gnu|netbasd|osf1|irix|aix|freebsd/)
- { $SOLARLIB = $L.$par_dir.$LIB.
-@@ -1548,6 +1567,7 @@
- }
-
- if ($SYSTEM_PYTHON eq "NO") {
-+ $PYTHON = python
- $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
- $PYTHONHOME = $SOLARVER.$ds.$INPATH;
- if ($GUIBASE eq "WIN") {
-@@ -1693,6 +1713,7 @@
- ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
- }
- ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-+ToFile( "X11_LDFLAGS", "@X_LIBS@", "e" );
- ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
- ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
- ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
-@@ -1942,6 +1963,7 @@
- ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );
- ToFile( "MOZ_NSPR_CFLAGS", "@MOZ_NSPR_CFLAGS@", "e" );
- ToFile( "MOZ_NSS_CFLAGS", "@MOZ_NSS_CFLAGS@", "e" );
-+ToFile( "MOZ_NSS_LIBS", "@MOZ_NSS_LIBS@", "e" );
- ToFile( "MOZ_LDAP_CFLAGS", "@MOZ_LDAP_CFLAGS@", "e" );
- ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
- ToFile( "WITH_FONTS", "@WITH_FONTS@", "e" );
-@@ -1967,6 +1989,7 @@
- ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
- ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
- ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" );
-+ToFile( "PYTHON", "@PYTHON@", "e" );
- ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" );
- ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );
- if ($SYSTEM_PYTHON eq "NO") {
diff --git a/misc/openoffice2/patches/patch-am b/misc/openoffice2/patches/patch-am
deleted file mode 100644
index 34fbc66599e..00000000000
--- a/misc/openoffice2/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- soltools/checkdll/makefile.mk.orig 2007-02-17 17:42:05.000000000 +0900
-+++ soltools/checkdll/makefile.mk 2007-02-17 17:42:44.000000000 +0900
-@@ -57,7 +57,7 @@
- STDLIB += -ldl
- .ENDIF
- .IF "$(OS)"=="NETBSD"
--APP1STDLIBS += -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
-+APP1STDLIBS += -u _Unwind_Resume -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
- .ENDIF
- .ENDIF # "$(GUI)"=="UNX"
-
diff --git a/misc/openoffice2/patches/patch-an b/misc/openoffice2/patches/patch-an
deleted file mode 100644
index 7db1f9f5745..00000000000
--- a/misc/openoffice2/patches/patch-an
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- psprint/source/printergfx/printerjob.cxx.orig 2007-02-17 17:43:14.000000000 +0900
-+++ psprint/source/printergfx/printerjob.cxx 2007-02-17 17:43:55.000000000 +0900
-@@ -82,6 +82,17 @@
-
- #include "glyphset.hxx"
-
-+#if defined(NETBSD)
-+#if defined(__cplusplus)
-+extern "C" {
-+#endif
-+int getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer,
-+ size_t buflen, struct passwd **result);
-+#if defined(__cplusplus)
-+}
-+#endif
-+#endif
-+
- using namespace psp;
- using namespace rtl;
-
diff --git a/misc/openoffice2/patches/patch-ao b/misc/openoffice2/patches/patch-ao
deleted file mode 100644
index 82b48258d2c..00000000000
--- a/misc/openoffice2/patches/patch-ao
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- i18npool/source/breakiterator/gendict.cxx.orig 2007-02-17 23:18:38.000000000 +0900
-+++ i18npool/source/breakiterator/gendict.cxx 2007-02-17 23:20:08.000000000 +0900
-@@ -74,8 +74,12 @@
- fprintf(cfp, "extern \"C\" {\n");
-
- sal_Int32 count, i, j;
-- sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, charArray[0x10000];
-- sal_Bool exist[0x10000];
-+ sal_Int32 lenArrayCurr = 0, lenArrayCount = 0, lenArrayLen = 0, *lenArray = NULL, *charArray;
-+ sal_Bool *exist;
-+ charArray = (sal_Int32*) malloc(0x10000*sizeof(*charArray));
-+ if (charArray == NULL) exit(1);
-+ exist = (sal_Bool*) malloc(0x10000*sizeof(*exist));
-+ if (exist == NULL) exit(1);
- for (i = 0; i < 0x10000; i++) {
- exist[i] = sal_False;
- charArray[i] = 0;
diff --git a/misc/openoffice2/patches/patch-ap b/misc/openoffice2/patches/patch-ap
deleted file mode 100644
index 7c92fd6f386..00000000000
--- a/misc/openoffice2/patches/patch-ap
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2007/10/06 20:02:22 hira Exp $
-
---- stlport/STLport-4.5.patch.orig 2007-09-27 00:35:49.000000000 +0900
-+++ stlport/STLport-4.5.patch 2007-09-27 01:38:51.000000000 +0900
-@@ -1068,3 +1068,77 @@
- #ifndef _STLP_CMATH
- #include <cmath>
- #endif
-+*** misc/STLport-4.5/src/gcc-3.0-netbsd.mak Wed Sep 26 22:26:07 2007
-+--- misc/build/STLport-4.5/src/gcc-3.0-netbsd.mak Wed Sep 26 22:23:39 2007
-+***************
-+*** 1 ****
-+! dummy
-+--- 1,68 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+!
-+! #
-+! # compiler
-+! #
-+! CC+= -D_REENTRANT
-+! CXX+= -D_REENTRANT
-+!
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+!
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXX) $(LDFLAGS) $(PTHREAD_LIBS) -fexceptions -shared -o
-+!
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix
-+!
-+! all: all_dynamic all_static symbolic_links
-+!
-+! include common_macros.mak
-+!
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+!
-+! CXXFLAGS_COMMON = -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} $(CXXFLAGS)
-+! CFLAGS_COMMON = -D_REENTRANT -DGXX_INCLUDE_PATH=${GXX_INCLUDE_PATH} -fexceptions -I${STLPORT_DIR} ${WARNING_FLAGS} ${ARCH_FLAGS}
-+!
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+!
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+!
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+!
-+! CFLAGS_RELEASE_static = $(CFLAGS_COMMON) -O2 -fPIC
-+! CFLAGS_RELEASE_dynamic = $(CFLAGS_COMMON) -O2 -fPIC
-+!
-+! CFLAGS_DEBUG_static = $(CFLAGS_COMMON) -g -fPIC
-+! CFLAGS_DEBUG_dynamic = $(CFLAGS_COMMON) -g -fPIC
-+!
-+! CFLAGS_STLDEBUG_static = $(CFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CFLAGS_STLDEBUG_dynamic = $(CFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+!
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+!
-+!
-+! #install: all
-+! # cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+!
-+! #%.s: %.cpp
-+! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+!
diff --git a/misc/openoffice2/patches/patch-aq b/misc/openoffice2/patches/patch-aq
deleted file mode 100644
index b2d3528d6d7..00000000000
--- a/misc/openoffice2/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2007/10/06 20:02:22 hira Exp $
-
---- stlport/makefile.mk.orig 2007-07-31 22:10:28.000000000 +0900
-+++ stlport/makefile.mk 2007-09-27 00:26:24.000000000 +0900
-@@ -111,7 +111,7 @@
- TAR_EXCLUDES=*/SC5/*
- .ENDIF # "$(USE_SHELL)"=="4nt"
-
--ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
-+ADDITIONAL_FILES=src$/gcc-3.0.mak src$/gcc-3.0-macosx.mak src$/gcc-3.0-freebsd.mak src$/gcc-3.0-netbsd.mak src$/sunpro8.mak src$/sunpro11.mak src$/gcc-3.0-mingw.mak
-
-
- CONFIGURE_ACTION=none
-@@ -133,6 +133,8 @@
- # FreeBSD needs a special makefile
- .IF "$(OS)"=="FREEBSD"
- BUILD_FLAGS=-f gcc-3.0-freebsd.mak
-+ .ELIF "$(OS)"=="NETBSD"
-+ BUILD_FLAGS=-f gcc-3.0-netbsd.mak
- .ELIF "$(OS)"=="MACOSX"
- BUILD_FLAGS=-f gcc-3.0-macosx.mak
- .ELIF "$(GUI)"=="WNT"
diff --git a/misc/openoffice2/patches/patch-ar b/misc/openoffice2/patches/patch-ar
deleted file mode 100644
index 6999e6220de..00000000000
--- a/misc/openoffice2/patches/patch-ar
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- sal/osl/unx/tempfile.c.orig 2007-02-17 23:20:56.000000000 +0900
-+++ sal/osl/unx/tempfile.c 2007-02-17 23:22:45.000000000 +0900
-@@ -38,6 +38,9 @@
- /*****************************************************************/
-
- #include <stdio.h>
-+#if defined(NETBSD)
-+#include <paths.h>
-+#endif
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -91,6 +94,9 @@
- #if defined(SOLARIS) || defined (LINUX) || defined (FREEBSD)
- if ( !pValue )
- pValue = P_tmpdir;
-+#elif defined(NETBSD)
-+ if ( !pValue )
-+ pValue = _PATH_TMP;
- #endif
- }
- #endif /* MACOSX */
diff --git a/misc/openoffice2/patches/patch-as b/misc/openoffice2/patches/patch-as
deleted file mode 100644
index 784e905f1a3..00000000000
--- a/misc/openoffice2/patches/patch-as
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-as,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- sal/osl/unx/file.cxx.orig 2007-02-17 23:02:10.000000000 +0900
-+++ sal/osl/unx/file.cxx 2007-02-17 23:04:04.000000000 +0900
-@@ -1424,7 +1424,7 @@
-
- #ifdef HAVE_STATFS_H
-
--#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if defined(FREEBSD) || defined(MACOSX)
- # define __OSL_STATFS_STRUCT struct statfs
- # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs))
- # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
-@@ -1438,6 +1438,32 @@
- # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
- #endif /* FREEBSD || NETBSD */
-
-+#if defined(NETBSD)
-+
-+#include <sys/param.h>
-+
-+/* statvfs() replaced statfs() in 2.99.9 */
-+# if __NetBSD_Version__ >= 299000900
-+ /* 2.0D or later */
-+# define __OSL_STATFS_STRUCT struct statvfs
-+# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs))
-+# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0)
-+
-+# else
-+ /* version before 2.0D */
-+# define __OSL_STATFS_STRUCT struct statfs
-+# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs))
-+# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0)
-+
-+# endif /* >2.0D */
-+
-+# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
-+# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename)
-+
-+# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
-+# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0)
-+#endif
-+
- #if defined(LINUX)
- # define __OSL_NFS_SUPER_MAGIC 0x6969
- # define __OSL_SMB_SUPER_MAGIC 0x517B
diff --git a/misc/openoffice2/patches/patch-aw b/misc/openoffice2/patches/patch-aw
deleted file mode 100644
index 334752a3c93..00000000000
--- a/misc/openoffice2/patches/patch-aw
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- sal/osl/unx/system.h.orig 2007-02-17 23:26:16.000000000 +0900
-+++ sal/osl/unx/system.h 2007-02-17 22:59:36.000000000 +0900
-@@ -136,7 +136,10 @@
- #endif
-
- #ifdef NETBSD
-+# include <sys/param.h>
-+# ifndef ETIME
- # define ETIME ETIMEDOUT
-+# endif
- # define _POSIX_THREAD_SYSCALL_SOFT 1
- # include <pthread.h>
- # include <netdb.h>
-@@ -530,7 +533,6 @@
-
- #ifdef NO_PTHREAD_RTL
- #if !defined FREEBSD || (__FreeBSD_version < 500112)
--struct passwd *getpwent_r(struct passwd *pwd, char *buffer, int buflen);
- extern struct spwd *getspnam_r(const char *name, struct spwd *result,
- char *buffer, int buflen);
-
diff --git a/misc/openoffice2/patches/patch-ba b/misc/openoffice2/patches/patch-ba
deleted file mode 100644
index 06b3447bf56..00000000000
--- a/misc/openoffice2/patches/patch-ba
+++ /dev/null
@@ -1,188 +0,0 @@
-$NetBSD: patch-ba,v 1.15 2009/09/10 00:27:08 tnn Exp $
-
---- config_office/configure.orig 2008-05-20 18:28:55.000000000 +0200
-+++ config_office/configure
-@@ -3176,11 +3176,11 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
- test_cups=no
- _os=OSF1
- ;;
-- netbsd)
-+ *netbsd*)
- test_gtk=yes
- build_cairo=yes
- test_kde=yes
-- test_cups=no
-+ test_cups=yes
- PTHREAD_CFLAGS="-pthread"
- PTHREAD_LIBS="-pthread -lpthread"
- _os=NetBSD
-@@ -10304,7 +10304,7 @@ echo "$as_me: error: $_javadoc_path not
- fi
-
- if test "$SOLAR_JAVA" != ""; then
-- if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-+ if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
- if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
- cat > findhome.java <<_ACEOF
- import java.io.File;
-@@ -10404,7 +10404,7 @@ echo "$as_me: WARNING: in case JAVA_HOME
- echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
- echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
- echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
-- if test "$JDK" == "gcj"; then
-+ if test "$JDK" = "gcj"; then
- echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
- fi
- fi
-@@ -13098,7 +13098,7 @@ fi
- if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
- test "$with_system_libxslt" != "no"; then
- if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
-- test "$with_system_libxml" == "no"; then
-+ test "$with_system_libxml" = "no"; then
- # somehow AC_MSG_WARN won't work...
- echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
- echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
-@@ -13108,7 +13108,7 @@ fi
- if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
- test "$with_system_libxml" != "no"; then
- if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
-- test "$with_system_libxslt" == "no"; then
-+ test "$with_system_libxslt" = "no"; then
- # somehow AC_MSG_WARN won't work...
- echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
- echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
-@@ -13591,13 +13591,14 @@ echo "${ECHO_T}$am_cv_python_pyexecdir"
-
-
- python_include=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('INCLUDEPY');"`
-+ python_ldflags=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LDFLAGS');"`
- python_version=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('VERSION');"`
- PYTHON_CFLAGS="-I$python_include"
-
- if test "$_os" = "Darwin"; then
- PYTHON_LIBS="-framework Python"
- else
-- PYTHON_LIBS="-lpython$python_version"
-+ PYTHON_LIBS="-lpython$python_version $python_ldflags"
- fi
-
- save_CPPFLAGS="$CPPFLAGS"
-@@ -13868,7 +13869,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
-- DB_INCLUDES=/usr/include
-+ DB_INCLUDES=${BLNK_PREFIX_db4}/include/db4
- else
-
- CFLAGS=-I/usr/include/db4
-@@ -13991,13 +13992,13 @@ echo "${ECHO_T}no. you need at least db
- #AC_CHECK_LIB(db, db_create, [],
- # [AC_MSG_ERROR([db library not installed or functional])], [])
-
--echo "$as_me:$LINENO: checking for main in -ldb" >&5
--echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for main in -ldb4" >&5
-+echo $ECHO_N "checking for main in -ldb4... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb $LIBS"
-+LIBS="-ldb4 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14054,7 +14055,7 @@ if test $ac_cv_lib_db_main = yes; then
- #define HAVE_LIBDB 1
- _ACEOF
-
-- LIBS="-ldb $LIBS"
-+ LIBS="-ldb4 $LIBS"
-
- else
- { { echo "$as_me:$LINENO: error: db not installed or functional" >&5
-@@ -15758,23 +15759,23 @@ fi
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-- echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom " >&5
--echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom ... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for libxul" >&5
-+echo $ECHO_N "checking for libxul ... $ECHO_C" >&6
-
-- if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom " ; then
-+ if $PKG_CONFIG --exists libxul; then
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5
- echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6
-- MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom "`
-+ MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags libxul`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5
- echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5
- echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6
-- MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom "`
-+ MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs libxul`
- echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5
- echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6
- else
-@@ -19718,7 +19719,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_header_audio_audiolib_h" >&5
- echo "${ECHO_T}$ac_cv_header_audio_audiolib_h" >&6
- if test $ac_cv_header_audio_audiolib_h = yes; then
-- NAS_INCLUDES=/usr/include
-+ NAS_INCLUDES=${BLNK_PREFIX_nas}/include
- else
-
- CFLAGS=-I/usr/X11R6/include
-@@ -20526,7 +20527,7 @@ echo "${ECHO_T}internal" >&6
- NEON_CFLAGS=
- BUILD_TYPE="$BUILD_TYPE NEON"
- fi
--if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
-+if test "$USE_BUILTIN_openssl" = "yes" && test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" && test "$with_system_openssl" != "no"; then
- with_system_openssl=yes
- fi
- echo "$as_me:$LINENO: checking which libssl to use" >&5
-@@ -20537,7 +20538,7 @@ if test -n "$with_system_openssl" -o -n
- echo "${ECHO_T}external" >&6
- # Mac OS builds should get out without extra stuff is the Mac porters'
- # wish. And pkg-config is although Xcode ships a .pc for openssl
-- if test "$_os" = "Darwin"; then
-+ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
- OPENSSL_CFLAGS=
- OPENSSL_LIBS="-lssl -lcrypto"
- else
-@@ -23949,7 +23950,7 @@ echo "${ECHO_T}yes" >&6
- ENABLE_REPORTDESIGN=YES
- echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5
- echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6
-- if test "$with_system_jfreereport" == "yes"; then
-+ if test "$with_system_jfreereport" = "yes"; then
- SYSTEM_JFREEREPORT=YES
- echo "$as_me:$LINENO: result: external" >&5
- echo "${ECHO_T}external" >&6
-@@ -24466,7 +24467,7 @@ your KDE installation by exporting KDEDI
- fi
-
- KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
-- KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
-+ KDE_LIBS="-L$kde_libdir -Wl,-R$kde_libdir -L$qt_libdir -Wl,-R$qt_libdir -lkdeui -lkdecore -lqt-mt"
- fi
-
-
-@@ -25019,7 +25020,7 @@ if test "$_os" = "Darwin"; then
- XINERAMA_LINK=dynamic
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-+elif test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
- if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
- # we have both versions, let the user decide but use the dynamic one
- # per default
diff --git a/misc/openoffice2/patches/patch-bb b/misc/openoffice2/patches/patch-bb
deleted file mode 100644
index 37fd0dbd08b..00000000000
--- a/misc/openoffice2/patches/patch-bb
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- sal/osl/unx/backtrace.h.orig 2007-02-17 22:54:13.000000000 +0900
-+++ sal/osl/unx/backtrace.h 2007-02-17 22:57:00.000000000 +0900
-@@ -34,7 +34,7 @@
- ************************************************************************/
-
-
--#if defined (SOLARIS) || (FREEBSD)
-+#if defined (SOLARIS) || (FREEBSD) || (NETBSD)
-
- #ifdef __cplusplus
- extern "C" {
-@@ -47,7 +47,7 @@
- void backtrace_symbols_fd( void **buffer, int size, int fd );
-
- /* no frame.h on FreeBSD */
--#if defined FREEBSD
-+#if defined FREEBSD || NETBSD
- struct frame {
- long arg0[8];
- long arg1[6];
diff --git a/misc/openoffice2/patches/patch-bc b/misc/openoffice2/patches/patch-bc
deleted file mode 100644
index 66cba7377a0..00000000000
--- a/misc/openoffice2/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- portaudio/portaudio_v18_1.patch.orig 2007-02-19 01:22:02.000000000 +0900
-+++ portaudio/portaudio_v18_1.patch 2007-02-19 01:22:28.000000000 +0900
-@@ -98,7 +98,7 @@
-
- #ifdef __linux__
- #include <linux/soundcard.h>
--+ #elif defined (__FreeBSD__)
-++ #elif defined (__FreeBSD__) || defined (__NetBSD__)
- + #include <sys/soundcard.h>
- #else
- #include <machine/soundcard.h> /* JH20010905 */
diff --git a/misc/openoffice2/patches/patch-bd b/misc/openoffice2/patches/patch-bd
deleted file mode 100644
index e1ba4d2c971..00000000000
--- a/misc/openoffice2/patches/patch-bd
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- sal/rtl/source/makefile.mk.orig 2007-02-22 20:55:50.000000000 +0900
-+++ sal/rtl/source/makefile.mk 2007-02-22 20:56:44.000000000 +0900
-@@ -135,6 +135,10 @@
-
- .ENDIF # .IF "$(OS)"=="LINUX"
-
-+.IF "$(OS)" == "NETBSD"
-+CDEFS+= -DFORCE_SYSALLOC
-+.ENDIF
-+
- #.ENDIF
-
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bf b/misc/openoffice2/patches/patch-bf
deleted file mode 100644
index 72ff4d7a2f4..00000000000
--- a/misc/openoffice2/patches/patch-bf
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- soltools/cpp/cpp.h.orig 2007-02-23 12:14:25.000000000 +0900
-+++ soltools/cpp/cpp.h 2007-02-23 12:14:59.000000000 +0900
-@@ -2,7 +2,7 @@
-
- #define INS 32768 /* input buffer */
- #define OBS 8092 /* outbut buffer */
--#define NARG 32 /* Max number arguments to a macro */
-+#define NARG 64 /* Max number arguments to a macro */
- #define NINCLUDE 32 /* Max number of include directories (-I) */
- #define NIF 64 /* depth of nesting of #if */
- #define NINC 32 /* depth of nesting of #include */
diff --git a/misc/openoffice2/patches/patch-bg b/misc/openoffice2/patches/patch-bg
deleted file mode 100644
index 81f1d162829..00000000000
--- a/misc/openoffice2/patches/patch-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.4 2008/04/07 16:24:51 hira Exp $
-
---- vcl/util/makefile.mk.orig 2008-01-24 02:19:40.000000000 +0900
-+++ vcl/util/makefile.mk 2008-04-07 18:15:43.000000000 +0900
-@@ -323,8 +323,8 @@
-
- .IF "$(GUIBASE)"=="unx"
-
--SHL2STDLIBS += -lXext -lSM -lICE -lX11
--.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD"
-+SHL2STDLIBS += $(X11_LDFLAGS) -lXext -lSM -lICE -lX11
-+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- # needed by salprnpsp.cxx
- SHL2STDLIBS+= -ldl
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bh b/misc/openoffice2/patches/patch-bh
deleted file mode 100644
index 81c10cf1418..00000000000
--- a/misc/openoffice2/patches/patch-bh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2007/10/06 20:02:23 hira Exp $
-
---- psprint/util/makefile.mk.orig 2007-06-27 22:51:57.000000000 +0900
-+++ psprint/util/makefile.mk 2007-09-26 17:42:01.000000000 +0900
-@@ -75,6 +75,7 @@
- $(COMPHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
-+ $(X11_LDFLAGS) \
- -lX11
- .IF "$(SOLAR_JAVA)"!=""
- SHL1STDLIBS+=$(JVMFWKLIB)
diff --git a/misc/openoffice2/patches/patch-bi b/misc/openoffice2/patches/patch-bi
deleted file mode 100644
index cc9f915ebbf..00000000000
--- a/misc/openoffice2/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- shell/source/unix/misc/makefile.mk.orig 2007-02-23 18:59:47.000000000 +0900
-+++ shell/source/unix/misc/makefile.mk 2007-02-23 19:00:19.000000000 +0900
-@@ -59,7 +59,7 @@
- APP1OBJS = \
- $(OBJ)$/gnome-open-url.obj
- APP1LIBS =
--.IF "$(OS)"!="FREEBSD"
-+.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
- APP1STDLIBS=-ldl
- .ENDIF
-
diff --git a/misc/openoffice2/patches/patch-bj b/misc/openoffice2/patches/patch-bj
deleted file mode 100644
index b799015cbbd..00000000000
--- a/misc/openoffice2/patches/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- toolkit/util/makefile.mk.orig 2007-02-23 19:08:23.000000000 +0900
-+++ toolkit/util/makefile.mk 2007-02-23 19:09:14.000000000 +0900
-@@ -84,13 +84,13 @@
-
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-- -lX11 -lXt -lXmu
-+ $(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
-
- .ELSE
- .IF "$(GUI)"=="UNX"
- SHL1STDLIBS +=\
-- -lX11
-+ $(X11_LDFLAGS) -lX11
- .ENDIF
- .ENDIF
-
diff --git a/misc/openoffice2/patches/patch-bk b/misc/openoffice2/patches/patch-bk
deleted file mode 100644
index 60a87776709..00000000000
--- a/misc/openoffice2/patches/patch-bk
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bk,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- forms/util/makefile.mk.orig 2007-02-23 19:13:29.000000000 +0900
-+++ forms/util/makefile.mk 2007-02-23 19:13:44.000000000 +0900
-@@ -111,11 +111,11 @@
- .IF "$(OS)"=="MACOSX"
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-- -lX11 -lXt -lXmu
-+ $(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
- .ELSE
- SHL1STDLIBS +=\
-- -lX11
-+ $(X11_LDFLAGS) -lX11
- .ENDIF # OS == MACOSX
-
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bl b/misc/openoffice2/patches/patch-bl
deleted file mode 100644
index 2bf215cde4f..00000000000
--- a/misc/openoffice2/patches/patch-bl
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bl,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- padmin/source/makefile.mk.orig 2007-02-23 19:14:40.000000000 +0900
-+++ padmin/source/makefile.mk 2007-02-23 19:14:51.000000000 +0900
-@@ -103,6 +103,7 @@
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
-+ $(X11_LDFLAGS) \
- -lXext -lX11
-
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bm b/misc/openoffice2/patches/patch-bm
deleted file mode 100644
index f8c68a0d9ae..00000000000
--- a/misc/openoffice2/patches/patch-bm
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bm,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- binfilter/bf_forms/util/makefile.mk.orig 2007-02-24 00:55:39.000000000 +0900
-+++ binfilter/bf_forms/util/makefile.mk 2007-02-24 00:56:10.000000000 +0900
-@@ -109,11 +109,11 @@
- .IF "$(OS)"=="MACOSX"
- .IF "$(GUIBASE)"=="unx"
- SHL1STDLIBS +=\
-- -lX11 -lXt -lXmu
-+ $(X11_LDFLAGS) -lX11 -lXt -lXmu
- .ENDIF
- .ELSE
- SHL1STDLIBS +=\
-- -lX11
-+ $(X11_LDFLAGS) -lX11
- .ENDIF # OS == MACOSX
-
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bn b/misc/openoffice2/patches/patch-bn
deleted file mode 100644
index 901626523d2..00000000000
--- a/misc/openoffice2/patches/patch-bn
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bn,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- crashrep/source/unx/makefile.mk.orig 2007-02-24 00:59:23.000000000 +0900
-+++ crashrep/source/unx/makefile.mk 2007-02-24 00:59:55.000000000 +0900
-@@ -70,8 +70,8 @@
- APP1TARGET=$(TARGET)
- APP1OBJS=$(OBJFILES)
-
--APP1STDLIBS=$(DYNAMIC) -lXext -lX11
--.IF "$(OS)" != "FREEBSD"
-+APP1STDLIBS=$(DYNAMIC) $(X11_LDFLAGS) -lXext -lX11
-+.IF "$(OS)" != "FREEBSD" && "$(OS)" != "NETBSD"
- APP1STDLIBS+=-ldl -lnsl
- .ENDIF
- .IF "$(OS)" == "SOLARIS"
diff --git a/misc/openoffice2/patches/patch-bo b/misc/openoffice2/patches/patch-bo
deleted file mode 100644
index 84497cb3252..00000000000
--- a/misc/openoffice2/patches/patch-bo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bo,v 1.3 2007/04/05 23:24:01 hira Exp $
-
---- extensions/source/plugin/unx/makefile.mk.orig 2006-12-01 23:19:00.000000000 +0900
-+++ extensions/source/plugin/unx/makefile.mk 2007-04-01 22:05:33.000000000 +0900
-@@ -81,7 +81,7 @@
- APP1STDLIBS+=-lXaw
- .ENDIF
- .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
--APP1STDLIBS+= -lXt -lXext -lX11
-+APP1STDLIBS+=$(X11_LDFLAGS) -lXt -lXext -lX11
- .ELSE
- APP1STDLIBS+= -lXt -lXext -lX11 -ldl
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bp b/misc/openoffice2/patches/patch-bp
deleted file mode 100644
index 73055012f6e..00000000000
--- a/misc/openoffice2/patches/patch-bp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bp,v 1.2 2007/03/04 13:11:19 hira Exp $
-
---- extensions/source/nsplugin/source/makefile.mk.orig 2007-02-24 02:05:26.000000000 +0900
-+++ extensions/source/nsplugin/source/makefile.mk 2007-02-24 02:13:01.000000000 +0900
-@@ -115,7 +115,7 @@
- $(TOOLSLIB)
-
- .IF "$(GUI)"=="UNX"
--.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
- .ELSE
- APP1STDLIBS+= -ldl -lnsl -lnls -lsocket
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-bq b/misc/openoffice2/patches/patch-bq
deleted file mode 100644
index 18d5f39d05d..00000000000
--- a/misc/openoffice2/patches/patch-bq
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-bq,v 1.5 2008/10/31 11:02:55 hira Exp $
-
---- instsetoo_native/util/makefile.mk.orig 2008-10-31 19:34:16.000000000 +0900
-+++ instsetoo_native/util/makefile.mk 2008-10-31 19:36:17.000000000 +0900
-@@ -61,6 +61,9 @@
- ENABLE_DOWNLOADSETS=TRUE
- .ENDIF # "$(FORCE_DOWNLOADSETS)"!=""
-
-+# Don't create download set with pkgsrc.
-+ENABLE_DOWNLOADSETS=
-+
- .EXPORT: ENABLE_DOWNLOADSETS
- .EXPORT: LAST_MINOR
- .EXPORT: PRJ
-@@ -131,7 +134,8 @@
-
- .IF "$(alllangiso)"!=""
-
--openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-+openoffice:
-+ @echo -n ""
-
- openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-
-@@ -236,7 +240,7 @@
- .ELSE # "$(PKGFORMAT)"!=""
- openoffice_% :
- .ENDIF # "$(PKGFORMAT)"!=""
-- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- .IF "$(PKGFORMAT)"!=""
-@@ -265,7 +269,7 @@
- .ELSE # "$(PKGFORMAT)"!=""
- ooolanguagepack_% :
- .ENDIF # "$(PKGFORMAT)"!=""
-- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -i . -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH))
-
- .IF "$(PKGFORMAT)"!=""
- $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-@@ -403,11 +407,11 @@
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
- -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
- -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-- $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-- $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-- $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-- $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+ $(GNUCOPY) -Rp $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d)
-+ $(GNUCOPY) -Rp $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d)
-+ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
-+ $(GNUCOPY) -Rp $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d)
-+ $(GNUCOPY) -Rp $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d)
- $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
diff --git a/misc/openoffice2/patches/patch-bs b/misc/openoffice2/patches/patch-bs
deleted file mode 100644
index 669630ee74e..00000000000
--- a/misc/openoffice2/patches/patch-bs
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bs,v 1.3 2008/04/13 20:32:43 hira Exp $
-
---- xmlsecurity/util/makefile.mk.orig 2008-04-14 05:03:09.000000000 +0000
-+++ xmlsecurity/util/makefile.mk 2008-04-14 05:10:23.000000000 +0000
-@@ -101,6 +101,7 @@
- $(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
-+ $(LIBXML_LIBS) \
- $(XMLOFFLIB)
-
- .IF "$(SYSTEM_MOZILLA)" == "YES"
-@@ -110,6 +111,9 @@
- .IF "$(NSS_LIB)" != ""
- SHL2STDLIBS += $(NSS_LIB)
- .ENDIF
-+.IF "$(MOZ_NSS_LIBS)" != ""
-+SHL2STDLIBS += $(MOZ_NSS_LIBS)
-+.ENDIF
- .ENDIF
-
- .IF "$(CRYPTO_ENGINE)" == "mscrypto"
-@@ -159,11 +163,12 @@
- $(SOTLIB) \
- $(SVLLIB) \
- $(SFXLIB) \
-+ $(LIBXML_LIBS) \
- $(XMLOFFLIB) \
- $(SVXLIB)
-
- #MT: Remove libxml2 and xs_comm (above) by cerating service for base encodings
--SHL4STDLIBS+= $(LIBXML2LIB) $(XMLSECLIB)
-+SHL4STDLIBS+= $(LIBXML_LIBS) $(LIBXML2LIB) $(XMLSECLIB)
-
- SHL4VERSIONMAP = xmlsecurity.map
- SHL4DEPN=
diff --git a/misc/openoffice2/patches/patch-bt b/misc/openoffice2/patches/patch-bt
deleted file mode 100644
index ca7fc80396e..00000000000
--- a/misc/openoffice2/patches/patch-bt
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-bt,v 1.3 2007/03/04 13:11:20 hira Exp $
-
---- epm/epm-3.7.patch.orig 2007-02-28 11:29:52.000000000 +0900
-+++ epm/epm-3.7.patch 2007-02-28 20:00:38.000000000 +0900
-@@ -697,3 +697,22 @@
- }
-
- --- 457,462 ----
-+*** misc/epm-3.7/configure Wed Feb 28 11:36:52 2007
-+--- misc/build/epm-3.7/configure Wed Feb 28 11:35:57 2007
-+***************
-+*** 4944,4950 ****
-+ fi
-+
-+
-+! if test "x$FLTKCONFIG" = x; then
-+ GUIS=""
-+ GUILIBS=""
-+ INSTALL_GUIS=""
-+--- 4944,4950 ----
-+ fi
-+
-+
-+! if test "x$FLTKCONFIG" = x -o x"$enable_fltk" = x"no"; then
-+ GUIS=""
-+ GUILIBS=""
-+ INSTALL_GUIS=""
diff --git a/misc/openoffice2/patches/patch-bv b/misc/openoffice2/patches/patch-bv
deleted file mode 100644
index d513856be80..00000000000
--- a/misc/openoffice2/patches/patch-bv
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2007/03/04 13:11:20 hira Exp $
-
---- setup_native/scripts/linuxpatchscript.sh.orig 2007-03-04 21:42:59.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh 2007-03-04 21:43:36.000000000 +0900
-@@ -25,7 +25,7 @@
- echo
- read -p "Patching the installation in ${PRODUCTINSTALLLOCATION}. Continue (y/n) ? " -n 1 reply leftover
- echo
--[ "$reply" == "y" ] || exit 1
-+[ "$reply" = "y" ] || exit 1
-
- echo
- echo "About to update the following packages ..."
-@@ -53,13 +53,13 @@
- # Check, that $RPMLIST does not contain online update rpm (then it is already installed)
- ONLINEPDATEINSTALLED=`grep onlineupdate ${RPMLIST}`
-
-- if [ "x$ONLINEPDATEINSTALLED" == "x" ]; then
-+ if [ "x$ONLINEPDATEINSTALLED" = "x" ]; then
- # Ask user, if online update shall be installed
- echo
- read -p "Do you want to install the new online update feature (y/n) ? " -n 1 reply leftover
- echo
-
-- if [ "$reply" == "y" ]; then
-+ if [ "$reply" = "y" ]; then
- # Install the online update rpm
- rpm --install -v --hash --prefix $PRODUCTINSTALLLOCATION --notriggers $ONLINEUPDATERPM
- fi
diff --git a/misc/openoffice2/patches/patch-bw b/misc/openoffice2/patches/patch-bw
deleted file mode 100644
index 4a67c314e12..00000000000
--- a/misc/openoffice2/patches/patch-bw
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bw,v 1.2 2007/04/05 23:24:01 hira Exp $
-
---- canvas/source/cairo/makefile.mk.orig 2007-02-02 03:59:18.000000000 +0900
-+++ canvas/source/cairo/makefile.mk 2007-04-01 22:07:07.000000000 +0900
-@@ -83,9 +83,9 @@
- SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(TOOLSLIB)
-
- .IF "$(SYSTEM_CAIRO)" == "YES"
--SHL1STDLIBS+= $(CAIRO_LIBS) -lX11 -lXrender
-+SHL1STDLIBS+= $(CAIRO_LIBS) $(X11_LDFLAGS) -lX11 -lXrender
- .ELSE
--SHL1STDLIBS+= -lcairo -lX11 -lXrender
-+SHL1STDLIBS+= -lcairo $(X11_LDFLAGS) -lX11 -lXrender
- .ENDIF
-
- SHL1IMPLIB=i$(TARGET)
diff --git a/misc/openoffice2/patches/patch-bx b/misc/openoffice2/patches/patch-bx
deleted file mode 100644
index 91af6cb3206..00000000000
--- a/misc/openoffice2/patches/patch-bx
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bx,v 1.2 2007/10/06 20:02:23 hira Exp $
-
---- filter/source/config/fragments/makefile.mk.orig 2007-05-10 22:13:05.000000000 +0900
-+++ filter/source/config/fragments/makefile.mk 2007-10-06 13:06:37.000000000 +0900
-@@ -153,7 +153,8 @@
-
- .IF "$(SOLAR_JAVA)"==""
- #cmc, hack to workaround the java build requirement
--MERGE:=python ../tools/merge/pyAltFCFGMerge
-+MERGE:=$(PYTHON) ../tools/merge/pyAltFCFGMerge
-+PACKLANG:=$(PERL) langfilter.pl
- .ELSE
- MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-by b/misc/openoffice2/patches/patch-by
deleted file mode 100644
index 4da708b7675..00000000000
--- a/misc/openoffice2/patches/patch-by
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-by,v 1.2 2007/04/05 23:24:02 hira Exp $
-
---- filter/source/config/fragments/langfilter.pl.orig 2007-03-19 22:40:51.000000000 +0900
-+++ filter/source/config/fragments/langfilter.pl 2007-03-19 22:41:34.000000000 +0900
-@@ -0,0 +1,18 @@
-+#!/usr/pkg/bin/perl
-+
-+use strict;
-+
-+# XXX
-+my $infile = $ARGV[1];
-+my $lang = $ARGV[4];
-+
-+open(IN, $infile) || die "cannot open: $!";
-+
-+while (<IN>) {
-+ if (/^\s*<value xml:lang="\s*(.*)\s*".*$/) {
-+ next if ($1 ne $lang);
-+ }
-+ print $_;
-+}
-+
-+close(IN);
diff --git a/misc/openoffice2/patches/patch-ch b/misc/openoffice2/patches/patch-ch
deleted file mode 100644
index 9839e2273d3..00000000000
--- a/misc/openoffice2/patches/patch-ch
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD: patch-ch,v 1.5 2008/10/31 11:02:55 hira Exp $
-
---- solenv/inc/unxbsdi3.mk.orig 2007-10-05 10:11:25.000000000 +0900
-+++ solenv/inc/unxbsdi3.mk 2007-10-05 10:14:03.000000000 +0900
-@@ -0,0 +1,178 @@
-+#
-+# mk file for NetBSD/i386 with gcc 3.4.x and higher.
-+#
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA=
-+JAVAFLAGSDEBUG=-g
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+= -DX86 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# architecture dependent flags for the C and C++ compiler that can be changed by
-+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ARCH_FLAGS*=
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+# flags for C and C++ Compiler
-+CFLAGS+=-fmessage-length=0 -c
-+
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-+.ELSE # "$(PRODUCT)"!=""
-+CFLAGSOPT= # no optimizing for non products
-+.ENDIF # "$(PRODUCT)"!=""
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+# CFLAGSOPT=-O2
-+# reduce to -O1 to avoid optimization problems
-+CFLAGSOPT=-O1
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+CFLAGSWARNCC=
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-+CFLAGSWERRCC=-Werror
-+
-+# switches for dynamic and static linking
-+STATIC = -Wl,-Bstatic
-+DYNAMIC = -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lgcc_s -lstdc++
-+
-+# default objectfilenames to link
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+STDOBJVCL=$(L)$/salmain.o
-+
-+# libraries for linking applications
-+STDLIBGUIMT=-lX11 -lpthread -lm -lc -lgcc_s -lstdc++
-+STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
-+STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPOSTFIX=bi
-+DLLPRE=lib
-+DLLPOST=.so
diff --git a/misc/openoffice2/patches/patch-ci b/misc/openoffice2/patches/patch-ci
deleted file mode 100644
index 62932cf8251..00000000000
--- a/misc/openoffice2/patches/patch-ci
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ci,v 1.2 2007/10/12 15:41:43 hira Exp $
-
---- solenv/inc/unx.mk.orig 2006-07-19 18:26:37.000000000 +0900
-+++ solenv/inc/unx.mk 2007-04-05 10:30:18.000000000 +0900
-@@ -151,6 +151,14 @@
- .INCLUDE : unxbsdi2.mk
- .ENDIF
-
-+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDI"
-+.INCLUDE : unxbsdi3.mk
-+.ENDIF
-+
-+.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC341NETBSDX"
-+.INCLUDE : unxbsdx3.mk
-+.ENDIF
-+
- .IF "$(COM)$(OS)$(CPU)" == "GCCNETBSDS"
- .INCLUDE : unxbsds.mk
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-cj b/misc/openoffice2/patches/patch-cj
deleted file mode 100644
index 1162f13ab01..00000000000
--- a/misc/openoffice2/patches/patch-cj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2007/10/06 20:02:23 hira Exp $
-
---- tools/inc/tools/inetdef.hxx.orig 2007-09-26 17:35:00.000000000 +0900
-+++ tools/inc/tools/inetdef.hxx 2007-09-26 17:36:01.000000000 +0900
-@@ -51,11 +51,11 @@
- #elif defined SCO
- #define TOOLS_INETDEF_OS "SCO"
- #elif defined NETBSD && defined X86
--#define TOOLS_INETDEF_OS "NETBSD x86"
-+#define TOOLS_INETDEF_OS "NetBSD/i386"
- #elif defined NETBSD && defined ARM32
--#define TOOLS_INETDEF_OS "NETBSD ARM32"
-+#define TOOLS_INETDEF_OS "NetBSD/arm32"
- #elif defined NETBSD && defined SPARC
--#define TOOLS_INETDEF_OS "NETBSD Sparc"
-+#define TOOLS_INETDEF_OS "NetBSD/sparc"
- #elif defined LINUX && defined X86
- #define TOOLS_INETDEF_OS "Linux"
- #elif defined FREEBSD && defined X86
diff --git a/misc/openoffice2/patches/patch-cn b/misc/openoffice2/patches/patch-cn
deleted file mode 100644
index d7d3052251c..00000000000
--- a/misc/openoffice2/patches/patch-cn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2007/06/10 04:55:06 hira Exp $
-
---- desktop/scripts/soffice.sh.orig 2007-06-10 11:44:31.000000000 +0900
-+++ desktop/scripts/soffice.sh 2007-06-10 11:45:05.000000000 +0900
-@@ -55,6 +55,12 @@
- export JITC_PROCESSOR_TYPE
- fi
-
-+# XXX: Ignore "unlocking unlocked mutex" error.
-+if [ $sd_platform = "NetBSD" ]; then
-+ PTHREAD_DIAGASSERT=AEL
-+ export PTHREAD_DIAGASSERT
-+fi
-+
- # set -x
-
- # resolve installation directory
diff --git a/misc/openoffice2/patches/patch-cp b/misc/openoffice2/patches/patch-cp
deleted file mode 100644
index d3b566059ab..00000000000
--- a/misc/openoffice2/patches/patch-cp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cp,v 1.2 2008/04/07 16:24:51 hira Exp $
-
---- pyuno/source/module/makefile.mk.orig 2008-01-03 02:29:28.000000000 +0900
-+++ pyuno/source/module/makefile.mk 2008-04-07 18:22:21.000000000 +0900
-@@ -96,6 +96,7 @@
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
-+ $(PYTHON_LIBS) \
- $(PYTHONLIB) \
- $(EXTRA_FRAMEWORK_FLAG)
-
diff --git a/misc/openoffice2/patches/patch-cq b/misc/openoffice2/patches/patch-cq
deleted file mode 100644
index 4847fd93371..00000000000
--- a/misc/openoffice2/patches/patch-cq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2007/10/06 20:02:24 hira Exp $
-
---- bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk.orig 2007-10-06 03:53:00.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_netbsd_intel/makefile.mk 2007-10-06 03:53:08.000000000 +0900
-@@ -46,7 +46,7 @@
-
- # --- Files --------------------------------------------------------
-
--.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3"
-
- .IF "$(cppu_no_leak)" == ""
- CFLAGS += -DLEAK_STATIC_DATA
diff --git a/misc/openoffice2/patches/patch-cr b/misc/openoffice2/patches/patch-cr
deleted file mode 100644
index bf14c9b3509..00000000000
--- a/misc/openoffice2/patches/patch-cr
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-cr,v 1.2 2008/04/07 16:24:51 hira Exp $
-
---- setup_native/scripts/linuxpatchscript.sh.orig 2008-04-07 17:55:52.000000000 +0900
-+++ setup_native/scripts/linuxpatchscript.sh 2008-04-07 18:23:25.000000000 +0900
-@@ -49,7 +49,7 @@
- # Check, that $RPMLIST does not contain search toolbar rpm (then it is already installed)
- SEARCHTOOLBARINSTALLED=`grep searchtoolbar ${RPMLIST}`
-
-- if [ "x$SEARCHTOOLBARINSTALLED" == "x" ]; then
-+ if [ "x$SEARCHTOOLBARINSTALLED" = "x" ]; then
- # Install the search toolbar rpm
- RPMLIST="$RPMLIST $SEARCHTOOLBARRPM"
- fi
-@@ -62,7 +62,7 @@
- # Check, that $RPMLIST does not contain kde integration rpm (then it is already installed)
- KDERPMINSTALLED=`grep kde-integration ${RPMLIST}`
-
-- if [ "x$KDERPMINSTALLED" == "x" ]; then
-+ if [ "x$KDERPMINSTALLED" = "x" ]; then
- # Install the kde integration rpm
- RPMLIST="$RPMLIST $KDERPM"
- fi
diff --git a/misc/openoffice2/patches/patch-cs b/misc/openoffice2/patches/patch-cs
deleted file mode 100644
index e45e8a73b8f..00000000000
--- a/misc/openoffice2/patches/patch-cs
+++ /dev/null
@@ -1,183 +0,0 @@
-$NetBSD: patch-cs,v 1.4 2008/10/31 11:02:55 hira Exp $
-
---- solenv/inc/unxbsdx3.mk.orig 2007-10-13 00:24:19.000000000 +0900
-+++ solenv/inc/unxbsdx3.mk 2007-10-13 00:28:56.000000000 +0900
-@@ -0,0 +1,178 @@
-+#
-+# mk file for NetBSD/amd64 with gcc 3.4.x and higher.
-+#
-+
-+ASM=
-+AFLAGS=
-+
-+SOLAR_JAVA=
-+JAVAFLAGSDEBUG=-g
-+
-+# filter for supressing verbose messages from linker
-+#not needed at the moment
-+#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
-+
-+# _PTHREADS is needed for the stl
-+CDEFS+= -DX86_64 $(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-+
-+# enable visibility define in "sal/types.h"
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# this is a platform with JAVA support
-+.IF "$(SOLAR_JAVA)"!=""
-+JAVADEF=-DSOLAR_JAVA
-+.IF "$(debug)"==""
-+JAVA_RUNTIME=-ljava
-+.ELSE
-+JAVA_RUNTIME=-ljava_g
-+.ENDIF
-+.ENDIF
-+
-+# architecture dependent flags for the C and C++ compiler that can be changed by
-+# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-+ARCH_FLAGS*=
-+
-+# name of C++ Compiler
-+CXX*=g++
-+# name of C Compiler
-+CC*=gcc
-+# flags for C and C++ Compiler
-+CFLAGS+=-fmessage-length=0 -c
-+
-+# Compiler flags for enabling optimizations
-+.IF "$(PRODUCT)"!=""
-+CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products
-+.ELSE # "$(PRODUCT)"!=""
-+CFLAGSOPT= # no optimizing for non products
-+.ENDIF # "$(PRODUCT)"!=""
-+
-+# flags to enable build with symbols; required for crashdump feature
-+.IF "$(ENABLE_SYMBOLS)"=="SMALL"
-+CFLAGSENABLESYMBOLS=-g1
-+.ELSE
-+CFLAGSENABLESYMBOLS=-g
-+.ENDIF
-+
-+# flags for the C++ Compiler
-+CFLAGSCC= -pipe $(ARCH_FLAGS)
-+# Flags for enabling exception handling
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-+
-+CFLAGSCXX= -pipe $(ARCH_FLAGS)
-+PICSWITCH:=-fpic
-+.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+CFLAGSCXX += -fvisibility-inlines-hidden
-+.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-+
-+# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-+CFLAGSOBJGUIMT=
-+# Compiler flags for compiling static object in multi threaded environment with character user interface
-+CFLAGSOBJCUIMT=
-+# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-+CFLAGSSLOGUIMT=$(PICSWITCH)
-+# Compiler flags for compiling shared object in multi threaded environment with character user interface
-+CFLAGSSLOCUIMT=$(PICSWITCH)
-+# Compiler flags for profiling
-+CFLAGSPROF=
-+# Compiler flags for debugging
-+CFLAGSDEBUG=-g
-+CFLAGSDBGUTIL=
-+# Compiler flags for enabling optimizations
-+# CFLAGSOPT=-O2
-+# reduce to -O1 to avoid optimization problems
-+CFLAGSOPT=-O1
-+# Compiler flags for disabling optimizations
-+CFLAGSNOOPT=-O0
-+# Compiler flags for describing the output path
-+CFLAGSOUTOBJ=-o
-+
-+CFLAGSWARNCC=
-+CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy
-+# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
-+CFLAGSWALLCC=-Wall -Wextra -Wendif-labels
-+CFLAGSWALLCXX=$(CFLAGSWALLCC) -Wshadow -Wno-ctor-dtor-privacy
-+CFLAGSWERRCC=-Werror
-+
-+# switches for dynamic and static linking
-+STATIC = -Wl,-Bstatic
-+DYNAMIC = -Wl,-Bdynamic
-+
-+# name of linker
-+LINK*=$(CXX)
-+LINKC*=$(CC)
-+
-+# default linker flags
-+LINKFLAGSDEFS*=-Wl,-z,defs
-+LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
-+
-+# linker flags for linking applications
-+LINKFLAGSAPPGUI= -Wl,-export-dynamic
-+LINKFLAGSAPPCUI= -Wl,-export-dynamic
-+
-+# linker flags for linking shared libraries
-+LINKFLAGSSHLGUI= -shared
-+LINKFLAGSSHLCUI= -shared
-+
-+LINKFLAGSTACK=
-+LINKFLAGSPROF=
-+LINKFLAGSDEBUG=-g
-+LINKFLAGSOPT=-L$(SOLARVERSION)$/$(INPATH)$/lib
-+
-+# linker flags for optimization (symbol hashtable)
-+# for now, applied to symbol scoped libraries, only
-+LINKFLAGSOPTIMIZE*=-Wl,-O1
-+LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
-+
-+SONAME_SWITCH=-Wl,-h
-+
-+# Sequence of libs does matter !
-+
-+STDLIBCPP=-lgcc_s -lstdc++
-+
-+# default objectfilenames to link
-+STDOBJGUI=
-+STDSLOGUI=
-+STDOBJCUI=
-+STDSLOCUI=
-+STDOBJVCL=$(L)$/salmain.o
-+
-+# libraries for linking applications
-+STDLIBGUIMT=-lX11 -lpthread -lm -lc -lgcc_s -lstdc++
-+STDLIBCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+# libraries for linking shared libraries
-+STDSHLGUIMT=-lX11 -lXext -lpthread -lm -lc -lgcc_s -lstdc++
-+STDSHLCUIMT=-lpthread -lm -lc -lgcc_s -lstdc++
-+
-+LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
-+
-+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lgcc_s -lstdc++
-+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
-+
-+#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
-+
-+# name of library manager
-+LIBMGR=ar
-+LIBFLAGS=-r
-+
-+# tool for generating import libraries
-+IMPLIB=
-+IMPLIBFLAGS=
-+
-+MAPSYM=
-+MAPSYMFLAGS=
-+
-+RC=irc
-+RCFLAGS=-fo$@ $(RCFILES)
-+RCLINK=
-+RCLINKFLAGS=
-+RCSETVERSION=
-+
-+# platform specific identifier for shared libs
-+DLLPOSTFIX=bx
-+DLLPRE=lib
-+DLLPOST=.so
diff --git a/misc/openoffice2/patches/patch-ct b/misc/openoffice2/patches/patch-ct
deleted file mode 100644
index 331152ec109..00000000000
--- a/misc/openoffice2/patches/patch-ct
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ct,v 1.2 2008/04/07 16:24:51 hira Exp $
-
---- tools/inc/tools/solar.h.orig 2007-11-02 22:00:07.000000000 +0900
-+++ tools/inc/tools/solar.h 2008-04-07 18:24:54.000000000 +0900
-@@ -343,6 +343,7 @@
- #define SYSTEM_UNXSOGI 32
- #define SYSTEM_UNXMACXI 33
- #define SYSTEM_OS2GCCI 34
-+#define SYSTEM_UNXBSDX 35
- #define SYSTEM_WNTGCCI 99
-
- #if defined WNT
-@@ -398,6 +399,8 @@
- #define __DLLEXTENSION "mxp.dylib"
- #elif defined MACOSX && defined X86
- #define __DLLEXTENSION "mxi.dylib"
-+#elif defined NETBSD && defined X86_64
-+ #define __DLLEXTENSION "bx.so"
- #else
- #define __DLLEXTENSION ".so"
- #endif
diff --git a/misc/openoffice2/patches/patch-cu b/misc/openoffice2/patches/patch-cu
deleted file mode 100644
index d1c00ed3801..00000000000
--- a/misc/openoffice2/patches/patch-cu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cu,v 1.1 2007/10/12 15:41:44 hira Exp $
-
---- bridges/source/cpp_uno/gcc3_netbsd_x86-64/makefile.mk.orig 2007-10-10 11:52:30.000000000 +0900
-+++ bridges/source/cpp_uno/gcc3_netbsd_x86-64/makefile.mk 2007-10-10 11:52:51.000000000 +0900
-@@ -46,7 +46,7 @@
-
- # --- Files --------------------------------------------------------
-
--.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3"
-+.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3"
-
- .IF "$(cppu_no_leak)" == ""
- CFLAGS += -DLEAK_STATIC_DATA
diff --git a/misc/openoffice2/patches/patch-cv b/misc/openoffice2/patches/patch-cv
deleted file mode 100644
index 63ba3431218..00000000000
--- a/misc/openoffice2/patches/patch-cv
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cv,v 1.1 2007/10/12 15:41:44 hira Exp $
-
---- bridges/prj/build.lst.orig 2007-10-12 02:40:55.000000000 +0000
-+++ bridges/prj/build.lst 2007-10-12 02:42:54.000000000 +0000
-@@ -22,6 +22,7 @@
- br bridges\source\cpp_uno\gcc3_solaris_sparc nmake - u br_gcc3sogs br_cppuno_shared br_unotypes br_inc NULL
- br bridges\source\cpp_uno\gcc3_solaris_intel nmake - u br_gcc3sogi br_cppuno_shared br_unotypes br_inc NULL
- br bridges\source\cpp_uno\gcc3_netbsd_intel nmake - u br_gccni br_unotypes br_inc NULL
-+br bridges\source\cpp_uno\gcc3_netbsd_x86-64 nmake - u br_gcc3nx br_cppuno_shared br_unotypes br_inc NULL
- br bridges\source\cpp_uno\shared nmake - all br_cppuno_shared br_unotypes br_inc NULL
- br bridges\source\jni_uno nmake - all br_jni_uno br_unotypes br_inc NULL
- br bridges\source\jni_uno\java\com\sun\star\bridges\jni_uno nmake - all br_jni_uno_java br_unotypes br_inc NULL
diff --git a/misc/openoffice2/patches/patch-cw b/misc/openoffice2/patches/patch-cw
deleted file mode 100644
index 660c5797870..00000000000
--- a/misc/openoffice2/patches/patch-cw
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-cw,v 1.2 2008/04/07 16:24:51 hira Exp $
-
---- i18npool/source/collator/makefile.mk.orig 2007-11-07 00:50:57.000000000 +0900
-+++ i18npool/source/collator/makefile.mk 2008-04-07 18:28:18.000000000 +0900
-@@ -46,7 +46,24 @@
-
- # --- Files --------------------------------------------------------
-
--tempvar:=$(shell @cd data && ls *.txt)
-+tempvar= \
-+ dz_charset.txt \
-+ hu_charset.txt \
-+ ja_charset.txt \
-+ ja_phonetic_alphanumeric_first.txt \
-+ ja_phonetic_alphanumeric_last.txt \
-+ ko_charset.txt \
-+ ku_alphanumeric.txt \
-+ ln_charset.txt \
-+ ne_charset.txt \
-+ zh_TW_charset.txt \
-+ zh_TW_radical.txt \
-+ zh_TW_stroke.txt \
-+ zh_charset.txt \
-+ zh_pinyin.txt \
-+ zh_radical.txt \
-+ zh_stroke.txt \
-+ zh_zhuyin.txt
- LOCAL_RULE_LANGS:=$(uniq $(foreach,i,$(tempvar) $(i:s/-/_/:s/_/ /:1)))
- rules_dependencies:=$(foreach,i,$(tempvar) data$/$i)
-
diff --git a/misc/openoffice2/patches/patch-cx b/misc/openoffice2/patches/patch-cx
deleted file mode 100644
index cab6afef96f..00000000000
--- a/misc/openoffice2/patches/patch-cx
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cx,v 1.4 2008/10/31 11:02:55 hira Exp $
-
---- solenv/inc/libs.mk.orig 2008-10-31 19:38:26.000000000 +0900
-+++ solenv/inc/libs.mk 2008-10-31 19:39:20.000000000 +0900
-@@ -238,7 +238,11 @@
- BERKELEYLIB=-ldb-4.2
- BERKELEYCPPLIB=-ldb_cxx-4.2
- .ENDIF
-+.IF "$(SYSTEM_CURL)" == "YES"
-+CURLLIB=$(CURL_LIBS)
-+.ELSE
- CURLLIB=-lcurl
-+.ENDIF
- .ENDIF # "$(GUI)$(COM)"=="WNTGCC"
- SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
- SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX)
diff --git a/misc/openoffice2/patches/patch-cy b/misc/openoffice2/patches/patch-cy
deleted file mode 100644
index eaa5fd11dea..00000000000
--- a/misc/openoffice2/patches/patch-cy
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cy,v 1.2 2008/02/06 16:41:07 hira Exp $
-
---- store/util/makefile.mk.orig 2007-07-05 08:57:12.000000000 +0000
-+++ store/util/makefile.mk 2008-02-06 22:10:01.000000000 +0000
-@@ -79,14 +79,16 @@
- .IF "$(GUI)"=="WNT"
- SHL1STDLIBS+= -lsupc++
- .ELSE
--.IF "$(OS)"=="NETBSD"
--SHL1STDLIBS+= -lsupc++
--.ELIF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="MACOSX" || "$(OS)"=="NETBSD"
- .IF "$(CCNUMVER)"<="000399999999"
- SHL1STDLIBS+= -lsupc++
- .ENDIF # CCNUMVER
- .ELIF "$(CCNUMVER)"<="000400000999"
-+.IF "$(OS)"=="FREEBSD"
-+SHL1STDLIBS+= -lsupc++ -lgcc
-+.ELSE
- SHL1STDLIBS+= -lsupc++ -lgcc_s
-+.ENDIF # FREEBSD
- .ENDIF
- .ENDIF
- .ENDIF
diff --git a/misc/openoffice2/patches/patch-dc b/misc/openoffice2/patches/patch-dc
deleted file mode 100644
index dafe884e8c3..00000000000
--- a/misc/openoffice2/patches/patch-dc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-dc,v 1.3 2008/09/29 23:17:00 hira Exp $
-
---- icc/SampleICC-1.3.2.patch.orig 2008-01-31 17:07:33.000000000 +0900
-+++ icc/SampleICC-1.3.2.patch 2008-09-30 01:29:06.000000000 +0900
-@@ -489,7 +489,7 @@
- ! }
- ! }
- ! }
----- 1,329 ----
-+--- 1,332 ----
- ! /*
- ! File: Vetters.cpp
- !
-@@ -575,7 +575,7 @@
- ! using namespace std;
- !
- ! #ifndef WIN32
--! #ifdef sun
-+! #if 1
- ! #include <errno.h>
- ! #else
- ! #include <sys/errno.h>
-@@ -584,8 +584,11 @@
- ! #include <string.h>
- ! #define stat _stat
- ! #endif
-+! #ifdef NETBSD
-+! #include <sys/param.h>
-+! #endif
- !
--! #if defined WIN32 || defined sun
-+! #if defined WIN32 || defined sun || (defined(NETBSD) && (__NetBSD_Version__ < 400000000))
- ! int strerror_r(int errnum, char *str, int strsize)
- ! {
- ! const char *errstr = strerror(errnum);
diff --git a/misc/openoffice2/patches/patch-dd b/misc/openoffice2/patches/patch-dd
deleted file mode 100644
index cd48f1d2569..00000000000
--- a/misc/openoffice2/patches/patch-dd
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-dd,v 1.2 2008/09/29 23:17:00 hira Exp $
-
---- icc/SampleICC-1.3.2-bendian.patch.orig 2008-01-31 17:07:26.000000000 +0900
-+++ icc/SampleICC-1.3.2-bendian.patch 2008-09-30 02:57:56.000000000 +0900
-@@ -489,7 +489,7 @@
- ! }
- ! }
- ! }
----- 1,329 ----
-+--- 1,332 ----
- ! /*
- ! File: Vetters.cpp
- !
-@@ -575,7 +575,7 @@
- ! using namespace std;
- !
- ! #ifndef WIN32
--! #ifdef sun
-+! #if 1
- ! #include <errno.h>
- ! #else
- ! #include <sys/errno.h>
-@@ -584,8 +584,11 @@
- ! #include <string.h>
- ! #define stat _stat
- ! #endif
-+! #ifdef NETBSD
-+! #include <sys/param.h>
-+! #endif
- !
--! #if defined WIN32 || defined sun
-+! #if defined WIN32 || defined sun || (defined(NETBSD) && (__NetBSD_Version__ < 400000000))
- ! int strerror_r(int errnum, char *str, int strsize)
- ! {
- ! const char *errstr = strerror(errnum);
diff --git a/misc/openoffice2/patches/patch-de b/misc/openoffice2/patches/patch-de
deleted file mode 100644
index 21fc650ceb3..00000000000
--- a/misc/openoffice2/patches/patch-de
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-de,v 1.1 2008/08/29 08:08:11 hira Exp $
-
-Fix CVE-2008-3282.
-
---- sal/rtl/source/alloc_global.c.orig 2008-05-21 21:53:26.000000000 +0900
-+++ sal/rtl/source/alloc_global.c 2008-08-29 08:18:14.000000000 +0900
-@@ -214,9 +214,7 @@
- char * addr;
- sal_Size size = RTL_MEMORY_ALIGN(n + RTL_MEMALIGN, RTL_MEMALIGN);
-
-- int index = (size - 1) >> RTL_MEMALIGN_SHIFT;
- OSL_ASSERT(RTL_MEMALIGN >= sizeof(sal_Size));
--
- if (n >= SAL_MAX_SIZE - (RTL_MEMALIGN + RTL_MEMALIGN - 1))
- {
- /* requested size too large for roundup alignment */
-@@ -224,8 +222,8 @@
- }
-
- try_alloc:
-- if (index < RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SHIFT)
-- addr = (char*)rtl_cache_alloc (g_alloc_table[index]);
-+ if (size <= RTL_MEMORY_CACHED_LIMIT)
-+ addr = (char*)rtl_cache_alloc(g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT]);
- else
- addr = (char*)rtl_arena_alloc (gp_alloc_arena, &size);
-
-@@ -255,9 +253,8 @@
- char * addr = (char*)(p) - RTL_MEMALIGN;
- sal_Size size = ((sal_Size*)(addr))[0];
-
-- int index = (size - 1) >> RTL_MEMALIGN_SHIFT;
-- if (index < RTL_MEMORY_CACHED_LIMIT >> RTL_MEMALIGN_SHIFT)
-- rtl_cache_free (g_alloc_table[index], addr);
-+ if (size <= RTL_MEMORY_CACHED_LIMIT)
-+ rtl_cache_free(g_alloc_table[(size - 1) >> RTL_MEMALIGN_SHIFT], addr);
- else
- rtl_arena_free (gp_alloc_arena, addr, size);
- }
diff --git a/misc/openoffice2/patches/patch-dt b/misc/openoffice2/patches/patch-dt
deleted file mode 100644
index ca3fb86ec9d..00000000000
--- a/misc/openoffice2/patches/patch-dt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dt,v 1.1 2008/10/31 11:02:55 hira Exp $
-
---- solenv/inc/settings.mk.orig 2008-10-31 19:44:01.000000000 +0900
-+++ solenv/inc/settings.mk 2008-10-31 19:46:27.000000000 +0900
-@@ -977,6 +977,8 @@
- .INCLUDE : unx.mk
- .ENDIF
-
-+.INCLUDE : pkgsrc.mk
-+
- # for multiprocess building in external modules
- # allow seperate handling
- EXTMAXPROCESS*=$(MAXPROCESS)
diff --git a/misc/openoffice2/patches/patch-du b/misc/openoffice2/patches/patch-du
deleted file mode 100644
index d1e231ad28f..00000000000
--- a/misc/openoffice2/patches/patch-du
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-du,v 1.1 2008/10/31 11:02:55 hira Exp $
-
---- solenv/inc/pkgsrc.mk.orig 2008-10-31 19:30:22.000000000 +0900
-+++ solenv/inc/pkgsrc.mk 2008-10-31 19:33:23.000000000 +0900
-@@ -0,0 +1,30 @@
-+#
-+# Settings for pkgsrc.
-+#
-+
-+BERKELEYLIB="@LIB_db4@ -ldb4"
-+BERKELEYCPPLIB="@LIB_db4@ -ldb4_cxx"
-+
-+EXPAT3RDLIB="@LIB_expat@ -lexpat"
-+EXPATASCII3RDLIB="@LIB_expat@ -lexpat"
-+
-+ICUINLIB="@LIB_icu@ -licui18n"
-+ICULELIB="@LIB_icu@ -licule"
-+ICUUCLIB="@LIB_icu@ -licuuc"
-+ICUDATALIB="@LIB_icu@ -licudata"
-+
-+JPEG3RDLIB="@LIB_jpeg@ -ljpeg"
-+
-+ZLIB3RDLIB="@LIB_zlib@ -lz"
-+
-+STDLIBGUIMT+=${X11_LDFLAGS}
-+STDSHLGUIMT+=${X11_LDFLAGS}
-+
-+LIB_base=@COMPILER_RPATH_FLAG@@OO_LIBDIR@
-+
-+# Add runtime search path ($ORIGIN cannot be used in pkgsrc).
-+LINKFLAGS+= ${LIB_base}
-+EXTRA_LINKFLAGS+= ${LIB_base}
-+
-+# XXX: libxmlsec doesn't use LINKFLAGS.
-+xmlsec_LDFLAGS+= ${LIB_base}
diff --git a/misc/openoffice2/patches/patch-dy b/misc/openoffice2/patches/patch-dy
deleted file mode 100644
index efd684e9000..00000000000
--- a/misc/openoffice2/patches/patch-dy
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-dy,v 1.2 2008/10/31 11:02:55 hira Exp $
-
---- libxmlsec/xmlsec1-1.2.6.patch.orig 2008-03-18 23:06:34.000000000 +0900
-+++ libxmlsec/xmlsec1-1.2.6.patch 2008-10-20 03:29:32.000000000 +0900
-@@ -175,6 +175,23 @@
- case $version_type in
- freebsd-elf*)
- ***************
-+*** 7969,7975 ****
-+ ;;
-+
-+ netbsd*)
-+! version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+--- 7970,7976 ----
-+ ;;
-+
-+ netbsd*)
-+! version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+***************
- *** 9046,9052 ****
- ;;
- esac
-@@ -249,6 +266,23 @@
- case $version_type in
- freebsd-elf*)
- ***************
-+*** 11688,11694 ****
-+ ;;
-+
-+ netbsd*)
-+! version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+--- 11689,11695 ----
-+ ;;
-+
-+ netbsd*)
-+! version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+***************
- *** 13259,13269 ****
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-@@ -308,6 +342,23 @@
- case $version_type in
- freebsd-elf*)
- ***************
-+*** 14858,14864 ****
-+ ;;
-+
-+ netbsd*)
-+! version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+--- 14859,14865 ----
-+ ;;
-+
-+ netbsd*)
-+! version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+***************
- *** 15607,15617 ****
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-@@ -384,6 +435,23 @@
- case $version_type in
- freebsd-elf*)
- ***************
-+*** 17226,17232 ****
-+ ;;
-+
-+ netbsd*)
-+! version_type=sunos
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+--- 17227,17233 ----
-+ ;;
-+
-+ netbsd*)
-+! version_type=freebsd-elf
-+ need_lib_prefix=no
-+ need_version=no
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+***************
- *** 24598,24604 ****
- fi
-
-@@ -418,7 +486,7 @@
-
- XMLSEC_NO_NSS="1"
- MOZILLA_MIN_VERSION="1.4"
--+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
-++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then
- + MOZILLA_MIN_VERSION="1.0"
- + fi
- NSS_MIN_VERSION="3.2"
-@@ -2705,7 +2773,7 @@
-
- XMLSEC_NO_NSS="1"
- MOZILLA_MIN_VERSION="1.4"
--+ if test "z$MOZ_FLAVOUR" = "zfirefox" ; then
-++ if test "z$MOZ_FLAVOUR" = "zfirefox" -o "z$MOZ_FLAVOUR" = "zseamonkey"; then
- + MOZILLA_MIN_VERSION="1.0"
- + fi
- NSS_MIN_VERSION="3.2"
diff --git a/misc/openoffice2/patches/patch-ed b/misc/openoffice2/patches/patch-ed
deleted file mode 100644
index 2f552e3687d..00000000000
--- a/misc/openoffice2/patches/patch-ed
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ed,v 1.1 2008/10/31 11:02:55 hira Exp $
-
---- extensions/source/nsplugin/source/so_main.cxx.orig 2008-10-31 10:48:20.000000000 +0900
-+++ extensions/source/nsplugin/source/so_main.cxx 2008-10-31 10:48:52.000000000 +0900
-@@ -312,6 +312,10 @@
- }
-
- NSP_Sleep(5);
-+#ifdef NETBSD
-+ NSP_CloseSocket(my_sock);
-+ my_sock=socket(PF_INET, SOCK_STREAM, 0);
-+#endif
- // try to connect to background SO, thus judge if it is ready
- while(0 > connect(my_sock, (struct sockaddr *)&dst_addr, sizeof(dst_addr)))
- {
-@@ -323,6 +327,10 @@
- return sal_False;
- }
- debug_fprintf(NSP_LOG_APPEND, "print by nsplugin, Current count: %d\n", count);
-+#ifdef NETBSD
-+ NSP_CloseSocket(my_sock);
-+ my_sock=socket(PF_INET, SOCK_STREAM, 0);
-+#endif
- }
- NSP_CloseSocket(my_sock);
- NSP_Sleep(5);
diff --git a/misc/openoffice2/patches/patch-ef b/misc/openoffice2/patches/patch-ef
deleted file mode 100644
index 4210b41ebcc..00000000000
--- a/misc/openoffice2/patches/patch-ef
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-ef,v 1.2 2008/11/26 15:48:16 hira Exp $
-
---- sysui/desktop/share/create_tree.sh.orig 2007-05-11 00:00:24.000000000 +0900
-+++ sysui/desktop/share/create_tree.sh 2008-11-27 00:40:42.000000000 +0900
-@@ -1,46 +1,41 @@
- umask 022
-
--if [ "${KDEMAINDIR}" ]
-+ICON_THEMES="hicolor/??x??"
-+
-+if [ "${KDE}" ]
- then
-+ for i in `cat mimelnklist`; do
-+ ${BSD_INSTALL_DATA} $i ${DESTDIR}${_PREFIX}/share/kde/mimelnk/application/${PREFIX}-$i
-+ done
-+ ICON_THEMES="${ICON_THEMES} locolor"
-+fi
-+
- echo Copying icons ..
-- for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
-+ for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES} -name "*.png"`
- do
-- targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
-- mkdir -p $targetdir
-+ targetdir=${DESTDIR}${_PREFIX}/share/icons/`dirname $i`
-+ ${BSD_INSTALL_DATA_DIR} $targetdir
- destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i`
-- cp ${ICON_SOURCE_DIR}/$i $destfile
-- chmod 0644 $destfile
-- done
--
-- mkdir -p ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application
-- for i in `cat mimelnklist`; do
-- cp $i ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/${PREFIX}-$i
-+ ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/$i $destfile
- done
-- chmod 0644 ${DESTDIR}/${KDEMAINDIR}/share/mimelnk/application/*
--fi
-
--if [ "${GNOMEDIR}" ]
-+if [ "${GNOME}" ]
- then
- echo Copying GNOME icons ..
- for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"`
- do
-- targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i`
-- mkdir -p $targetdir
-+ targetdir=${DESTDIR}${_PREFIX}/share/icons/gnome/`dirname $i`
- destfile=$targetdir/${ICON_PREFIX:-}${ICON_PREFIX:+-}`basename $i`
-- cp ${ICON_SOURCE_DIR}/hicolor/$i $destfile
-- chmod 0644 $destfile
-+ ${BSD_INSTALL_DATA} ${ICON_SOURCE_DIR}/hicolor/$i $destfile
- done
-+fi
-
-- mkdir -p ${DESTDIR}/${GNOMEDIR}/share/mime-info
-- cp openoffice.mime ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.mime
-- cp openoffice.keys ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.keys
-- chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/mime-info/${PREFIX}.*
--
-- mkdir -p ${DESTDIR}/${GNOMEDIR}/share/application-registry
-- cp openoffice.applications ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.applications
-- chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
-+ ${BSD_INSTALL_DATA} openoffice.mime ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.mime
-+ ${BSD_INSTALL_DATA} openoffice.keys ${DESTDIR}${_PREFIX}/share/mime-info/${PREFIX}.keys
-+
-+ ${BSD_INSTALL_DATA} openoffice.applications ${DESTDIR}${_PREFIX}/share/application-registry/${PREFIX}.applications
-
-- if [ "${GNOME_MIME_THEME}" ]
-+ if [ ]
- then
- echo "Creating legacy mimetype symlinks for GNOME .."
- # add symlinks so that nautilus can identify the mime-icons
-@@ -88,29 +83,22 @@
- ln -sf $link_target_dir${ICON_PREFIX:-}${ICON_PREFIX:+-}extension.png ${link_dir}/gnome-mime-application-vnd.openofficeorg.extension.png
- done
- fi
--fi
--
--mkdir -p ${DESTDIR}/usr/bin
-
- # reference symbolic link in /etc for relocatable packages
--office_root=/etc/${PREFIX}
-+office_root=${DESTDIR}${OO_PREFIX}
- if [ ! -e "${DESTDIR}/$office_root" -a ! -h "${DESTDIR}/$office_root" ]; then
- office_root=/opt/${PREFIX}
- fi
-
--ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
--ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg
-+#ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
-+#ln -sf ${office_root}/program/unopkg ${DESTDIR}/usr/bin/unopkg
-+
-+${BSD_INSTALL_SCRIPT} openoffice.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}
-+${BSD_INSTALL_SCRIPT} printeradmin.sh ${DESTDIR}${_PREFIX}/bin/${PREFIX}-printeradmin
-
--cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
--cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
--chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
--
--mkdir -p ${DESTDIR}/usr/share/mime/packages
--cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
--chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
-+${BSD_INSTALL_DATA} openoffice.org.xml ${DESTDIR}${_PREFIX}/share/mime/packages/
-
--mkdir -p ${DESTDIR}/usr/share/applications
- for i in `cat launcherlist`; do
-- ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i
-+ ln -sf ${office_root}/share/xdg/$i ${DESTDIR}${_PREFIX}/share/applications/${PREFIX}-$i
- done
-
diff --git a/misc/openoffice2/patches/patch-eg b/misc/openoffice2/patches/patch-eg
deleted file mode 100644
index 7c5a0e368af..00000000000
--- a/misc/openoffice2/patches/patch-eg
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-eg,v 1.2 2009/02/08 15:27:35 hira Exp $
-
---- sysui/desktop/share/openoffice.sh.orig 2008-11-24 16:06:47.000000000 +0900
-+++ sysui/desktop/share/openoffice.sh 2008-11-24 16:07:17.000000000 +0900
-@@ -1,2 +1,2 @@
- #!/bin/sh
--exec /etc/%PREFIX/program/soffice "$@"
-+exec @OO_PREFIX@/program/soffice "$@"
diff --git a/misc/openoffice2/patches/patch-eh b/misc/openoffice2/patches/patch-eh
deleted file mode 100644
index c89ac05e745..00000000000
--- a/misc/openoffice2/patches/patch-eh
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-eh,v 1.2 2009/02/08 15:27:35 hira Exp $
-
---- sysui/desktop/share/printeradmin.sh.orig 2008-11-24 16:06:52.000000000 +0900
-+++ sysui/desktop/share/printeradmin.sh 2008-11-24 16:07:29.000000000 +0900
-@@ -1,3 +1,3 @@
- #!/bin/sh
-
--exec /etc/%PREFIX/program/spadmin
-+exec @OO_PREFIX@/program/spadmin
diff --git a/misc/openoffice2/patches/patch-ei b/misc/openoffice2/patches/patch-ei
deleted file mode 100644
index 71a21935287..00000000000
--- a/misc/openoffice2/patches/patch-ei
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ei,v 1.1 2009/01/26 15:39:05 hira Exp $
-
---- sal/osl/unx/nlsupport.c.orig 2007-07-03 21:48:57.000000000 +0900
-+++ sal/osl/unx/nlsupport.c 2009-01-20 19:46:23.000000000 +0900
-@@ -323,7 +323,7 @@
- { "sjis", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
- };
-
--#elif defined(LINUX) || defined(NETBSD)
-+#elif defined(LINUX)
-
- const _pair _nl_language_list[] = {
- { "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
-@@ -534,16 +534,22 @@
- const _pair _nl_language_list[] = {
- { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
- { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
-+ { "Big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
-+ { "Big5-HKSCS", RTL_TEXTENCODING_BIG5_HKSCS }, /* locale: zh_CN.BIG5HK */
-+ { "Big5HKSCS", RTL_TEXTENCODING_BIG5_HKSCS }, /* depricated */
- { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
- { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
- { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
-- { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
-- { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
-- { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
-- { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
-+ { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
-+ { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
-+ { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
-+ { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
-+ { "GB18030", RTL_TEXTENCODING_GB_18030 }, /* locale: zh_CN.gb18030 */
-+ { "GB2312", RTL_TEXTENCODING_GB_2312 }, /* locale: zh_CN */
- { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */
- { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */
- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
-+ { "ISO8859-13", RTL_TEXTENCODING_ISO_8859_13 }, /* ISO-IR-179 LATIN7 */
- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
- { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
-@@ -552,6 +558,7 @@
- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
- { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */
- { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */
-+ { "PT154", RTL_TEXTENCODING_PT154 }, /* */
- { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
- { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
- { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
diff --git a/misc/openoffice2/patches/patch-ej b/misc/openoffice2/patches/patch-ej
deleted file mode 100644
index 89b77b24003..00000000000
--- a/misc/openoffice2/patches/patch-ej
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ej,v 1.1 2009/01/26 15:39:05 hira Exp $
-
---- rsc/source/rscpp/cpp3.c.orig 2007-09-21 01:34:31.000000000 +0900
-+++ rsc/source/rscpp/cpp3.c 2009-01-20 18:47:08.000000000 +0900
-@@ -474,7 +474,11 @@
- register char *tp;
- register DEFBUF *dp;
- int i;
-+#ifdef NETBSD
-+ time_t tvec;
-+#else
- long tvec;
-+#endif
-
- #if !defined( ZTC ) && !defined( WNT ) && !defined(BLC) && !defined(G3)
- extern char *ctime();
diff --git a/misc/openoffice2/patches/patch-ga b/misc/openoffice2/patches/patch-ga
deleted file mode 100644
index b78b926b9be..00000000000
--- a/misc/openoffice2/patches/patch-ga
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ga,v 1.1 2009/09/13 03:54:13 hira Exp $
-
-Fix build with getline() in libc.
-From http://bugs.gentoo.org/show_bug.cgi?id=270263
-
---- soltools/mkdepend/def.h.orig 2007-07-19 00:01:07.000000000 +0900
-+++ soltools/mkdepend/def.h 2009-09-12 20:56:00.000000000 +0900
-@@ -151,7 +151,7 @@
-
- char *copy();
- char *base_name();
--char *getline();
-+char *ooo_getline();
- struct symtab *slookup();
- struct symtab *isdefined();
- struct symtab *fdefined();
diff --git a/misc/openoffice2/patches/patch-gb b/misc/openoffice2/patches/patch-gb
deleted file mode 100644
index b9cdfe2a056..00000000000
--- a/misc/openoffice2/patches/patch-gb
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gb,v 1.1 2009/09/13 03:54:14 hira Exp $
-
-Fix build with getline() in libc.
-From http://bugs.gentoo.org/show_bug.cgi?id=270263
-
---- soltools/mkdepend/main.c.orig 2007-10-15 23:29:29.000000000 +0900
-+++ soltools/mkdepend/main.c 2009-09-12 20:53:46.000000000 +0900
-@@ -543,7 +543,7 @@
- * Get the next line. We only return lines beginning with '#' since that
- * is all this program is ever interested in.
- */
--char *getline(filep)
-+char *ooo_getline(filep)
- register struct filepointer *filep;
- {
- register char *p, /* walking pointer */
diff --git a/misc/openoffice2/patches/patch-gc b/misc/openoffice2/patches/patch-gc
deleted file mode 100644
index 45a7bb35c57..00000000000
--- a/misc/openoffice2/patches/patch-gc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-gc,v 1.1 2009/09/13 03:54:14 hira Exp $
-
-Fix build with getline() in libc.
-From http://bugs.gentoo.org/show_bug.cgi?id=270263
-
---- soltools/mkdepend/parse.c.orig 2006-09-22 17:57:33.000000000 +0900
-+++ soltools/mkdepend/parse.c 2009-09-12 20:56:36.000000000 +0900
-@@ -45,7 +45,7 @@
- register int type;
- boolean recfailOK;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, TRUE)) {
- case IF:
- doif:
-@@ -167,7 +167,7 @@
- register char *line;
- register int type;
-
-- while ((line = getline(filep))) {
-+ while ((line = ooo_getline(filep))) {
- switch(type = deftype(line, filep, file_red, file, FALSE)) {
- case IF:
- case IFFALSE:
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 5c79ccaa18c..cf832161030 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.183 2011/07/13 23:43:02 jmcneill Exp $
+# $NetBSD: Makefile,v 1.184 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Multimedia utilities
-SUBDIR+= RealPlayerGold
SUBDIR+= acidrip
SUBDIR+= adobe-flash-plugin
SUBDIR+= adobe-flash-plugin10.1
diff --git a/multimedia/RealPlayerGold/DESCR b/multimedia/RealPlayerGold/DESCR
deleted file mode 100644
index ea7135ca765..00000000000
--- a/multimedia/RealPlayerGold/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-RealPlayer for Unix allows you to play streaming audio and video over
-the Internet in real-time. RealPlayerGold supports RealAudio, RealVideo
-10, MP3, Ogg Vorbis and Theora, H263, AAC, and more. Other features
-include a Mozilla compatible plugin, a themeable GTK2 user interface,
-accelerated video, and full screen playback.
diff --git a/multimedia/RealPlayerGold/Makefile b/multimedia/RealPlayerGold/Makefile
deleted file mode 100644
index e0366c723d9..00000000000
--- a/multimedia/RealPlayerGold/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2011/03/08 12:00:15 obache Exp $
-#
-
-DISTNAME= RealPlayer10GOLD
-# Exact version obtained from the output of
-# file RealPlayer10GOLD.rpm
-PKGNAME= RealPlayerGold-10.0.9.809.20070726
-CATEGORIES= multimedia
-MASTER_SITES= http://forms.real.com/real/player/download.html?f=unix/
-EXTRACT_SUFX= .rpm
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.real.com/linux/
-COMMENT= Real Audio and Video Player
-
-RESTRICTED= Redistribution not permitted
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-PKGVER= ${PKGNAME_NOREV:S/^RealPlayerGold-//}
-DIST_SUBDIR= ${PKGNAME_NOREV}
-
-WRKSRC= ${WRKDIR}
-BUILD_DIRS= # empty
-
-EMUL_PLATFORMS= linux-i386
-EMUL_MODULES.linux= base fontconfig freetype2 gtk2 x11
-
-EMUL_PKG_FMT= rpm
-RPM2PKG_STRIP= 3
-RPM2PKG_PREFIX= ${DESTDIR}${PREFIX}
-RPM2PKG_SUBPREFIX= lib
-RPM2PKG_STAGE= do-install
-RUN_LDCONFIG= no
-
-REALPLAYER_HOME= ${PREFIX}/lib/RealPlayer
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= post-install
-SUBST_FILES.paths= ${DESTDIR}${REALPLAYER_HOME}/realplay
-SUBST_SED.paths= -e 's,/bin/true,${TRUE},g'
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-
-INSTALLATION_DIRS+= bin
-
-# Verify that the version of the distfile (which changes often without
-# the name changing) is still correct. This helps sort out download
-# errors vs. out-of-date-pkgsrc errors.
-#
-post-fetch:
- ${RUN} ver=`file ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${SED} -e 's;.*Player-;;g' -e 's;-;.;g'` ; \
- if [ "$$ver" != "${PKGVER}" ] ; then \
- ${ECHO} "It appears that real.com has made a new version ($$ver) available so this" ; \
- ${ECHO} "package will need updating to work correctly. That likely the reason for" ; \
- ${ECHO} "the checksum failure." ; \
- fi
-
-do-build:
- ${SED} -e 's|@REALPLAYER_HOME@|${REALPLAYER_HOME}|g' \
- ${FILESDIR}/realplay.sh > ${WRKSRC}/realplay
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/realplay ${DESTDIR}${PREFIX}/bin
- ${ECHO} bin/realplay >> ${PLIST_SRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/RealPlayerGold/distinfo b/multimedia/RealPlayerGold/distinfo
deleted file mode 100644
index c3fac211256..00000000000
--- a/multimedia/RealPlayerGold/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2008/02/15 12:25:59 obache Exp $
-
-SHA1 (RealPlayerGold-10.0.9.809.20070726/RealPlayer10GOLD.rpm) = 5231a724a1d3987400c79d066ff6b5c0ba3f5251
-RMD160 (RealPlayerGold-10.0.9.809.20070726/RealPlayer10GOLD.rpm) = 2a88652b0b9ab825d7fa3b63103e980005a58259
-Size (RealPlayerGold-10.0.9.809.20070726/RealPlayer10GOLD.rpm) = 6645239 bytes
diff --git a/multimedia/RealPlayerGold/files/realplay.sh b/multimedia/RealPlayerGold/files/realplay.sh
deleted file mode 100644
index 2adf6ffe9c0..00000000000
--- a/multimedia/RealPlayerGold/files/realplay.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: realplay.sh,v 1.1.1.1 2004/11/20 12:45:40 rh Exp $
-#
-HELIX_LIBS=@REALPLAYER_HOME@ ; export HELIX_LIBS
-LD_LIBRARY_PATH=${HELIX_LIBS}/lib:${HELIX_LIBS}/plugins:${HELIX_LIBS}:${LD_LIBRARY_PATH} ; export LD_LIBRARY_PATH
-exec ${HELIX_LIBS}/realplay "$@"
diff --git a/net/Makefile b/net/Makefile
index b94bd09b9a0..7862faaf38f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.883 2011/09/16 11:59:00 obache Exp $
+# $NetBSD: Makefile,v 1.884 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Networking tools
@@ -70,7 +70,6 @@ SUBDIR+= connect
SUBDIR+= corkscrew
SUBDIR+= couriertcpd
SUBDIR+= csup
-SUBDIR+= ctorrent
SUBDIR+= dante
SUBDIR+= darkstat
SUBDIR+= dc_gui2
@@ -314,7 +313,6 @@ SUBDIR+= nsd
SUBDIR+= nslint
SUBDIR+= nstx
SUBDIR+= ntop
-SUBDIR+= ntop1
SUBDIR+= ntp4
SUBDIR+= ocamlnet
SUBDIR+= ocsinventory-agent
diff --git a/net/ctorrent/DESCR b/net/ctorrent/DESCR
deleted file mode 100644
index 5c69243e408..00000000000
--- a/net/ctorrent/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-CTorrent is a BitTorrent client written in the C programming language.
-It currently runs on most Linux variants, MacOS and FreeBSD, but
-hopefully on Windows as well! CTorrent is built as a console program,
-which means that it doesn't require any graphical components (such as an
-X server) on the machine you are running it on, you can even run it
-remotely through a terminal if you wish.
diff --git a/net/ctorrent/Makefile b/net/ctorrent/Makefile
deleted file mode 100644
index 8f959b8a1b0..00000000000
--- a/net/ctorrent/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:31 wiz Exp $
-
-DISTNAME= ctorrent-1.3.4
-PKGREVISION= 3
-CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ctorrent/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://ctorrent.sourceforge.net/
-COMMENT= Bittorrent client for the console
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-USE_LANGUAGES= c c++
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ctorrent/PLIST b/net/ctorrent/PLIST
deleted file mode 100644
index da21be2382d..00000000000
--- a/net/ctorrent/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/06/25 17:20:47 wiz Exp $
-bin/ctorrent
diff --git a/net/ctorrent/distinfo b/net/ctorrent/distinfo
deleted file mode 100644
index e3ed584d0cc..00000000000
--- a/net/ctorrent/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.7 2005/11/07 21:32:27 tv Exp $
-
-SHA1 (ctorrent-1.3.4.tar.bz2) = bf1ea430513dc6de48de5ac429cdac57ceab738d
-RMD160 (ctorrent-1.3.4.tar.bz2) = 0cf6a89e8e29a1c3fad087e1c666941c6ecd73b9
-Size (ctorrent-1.3.4.tar.bz2) = 87333 bytes
-SHA1 (patch-aa) = e20e81beba3a3a98ce27c36e4542edb0a9ea1d04
-SHA1 (patch-ab) = cfa80ca0d3f030837334ac9cc27c437dfd9adbf6
-SHA1 (patch-ac) = 40396b3d538cb37219ddd1bfe207f294e70b5ed1
-SHA1 (patch-ad) = 8e270120390e8bd64a5ac0ee6b9ea6da69aab5dd
diff --git a/net/ctorrent/patches/patch-aa b/net/ctorrent/patches/patch-aa
deleted file mode 100644
index c7f50dc14ed..00000000000
--- a/net/ctorrent/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/01/04 11:10:10 wiz Exp $
-
---- configure.orig 2004-09-09 01:10:51.000000000 +0200
-+++ configure
-@@ -3159,7 +3159,7 @@ if test "${ac_cv_lib_ssl_SHA1_Init+set}"
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lssl $LIBS"
-+LIBS="-lssl -lcrypto $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -3212,7 +3212,7 @@ if test $ac_cv_lib_ssl_SHA1_Init = yes;
- #define HAVE_LIBSSL 1
- _ACEOF
-
-- LIBS="-lssl $LIBS"
-+ LIBS="-lssl -lcrypto $LIBS"
-
- else
-
diff --git a/net/ctorrent/patches/patch-ab b/net/ctorrent/patches/patch-ab
deleted file mode 100644
index b378d66a081..00000000000
--- a/net/ctorrent/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/11/22 15:45:18 adam Exp $
-
---- peerlist.cpp.orig 2004-09-08 23:10:51.000000000 +0000
-+++ peerlist.cpp
-@@ -360,6 +360,7 @@ int PeerList::Initial_ListenPort()
- struct sockaddr_in lis_addr;
- memset(&lis_addr,0, sizeof(sockaddr_in));
- lis_addr.sin_addr.s_addr = INADDR_ANY;
-+ lis_addr.sin_family = AF_INET;
-
- m_listen_sock = socket(AF_INET,SOCK_STREAM,0);
-
diff --git a/net/ctorrent/patches/patch-ac b/net/ctorrent/patches/patch-ac
deleted file mode 100644
index 9ec4c20a2f8..00000000000
--- a/net/ctorrent/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/11/07 21:32:27 tv Exp $
-
---- peerlist.h.orig 2004-09-08 19:10:51.000000000 -0400
-+++ peerlist.h
-@@ -2,6 +2,7 @@
- #define PEERLIST_H
-
- #include <sys/types.h>
-+#include <sys/time.h>
- #include "./def.h"
- #include "./peer.h"
- #include "./rate.h"
diff --git a/net/ctorrent/patches/patch-ad b/net/ctorrent/patches/patch-ad
deleted file mode 100644
index 552e87e18c5..00000000000
--- a/net/ctorrent/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/11/07 21:32:27 tv Exp $
-
---- tracker.h.orig 2004-09-08 19:10:51.000000000 -0400
-+++ tracker.h
-@@ -2,7 +2,7 @@
- #define TRACKER_H
-
- #include <sys/types.h>
--
-+#include <sys/time.h>
- #include "./def.h"
- #include "./bufio.h"
-
diff --git a/net/ntop1/DESCR b/net/ntop1/DESCR
deleted file mode 100644
index 0cf209b3d48..00000000000
--- a/net/ntop1/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-ntop is a tool that shows the network usage, similar to what the
-popular top Unix command does. ntop has been written in a portable
-way in order to virtually run on every Unix platform.
-
-ntop can be used in both interactive or web mode. In the first case,
-ntop displays the network status on the user's terminal whereas in
-web mode a web browser (e.g. netscape) can attach to ntop (that acts
-as a web server) and get a dump of the network status. In the latter
-case, ntop can be seen as a simple RMON-like agent with an embedded
-web interface.
diff --git a/net/ntop1/Makefile b/net/ntop1/Makefile
deleted file mode 100644
index 9addac8fd09..00000000000
--- a/net/ntop1/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/12/22 11:48:09 obache Exp $
-
-DISTNAME= ntop-1.1
-PKGREVISION= 4
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.unipi.it/pub/local/ntop/source/
-EXTRACT_SUFX= -src.tar.gz
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.ntop.org/
-COMMENT= Shows network usage (similar to "top" for processes)
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-threads=no
-
-INSTALL_TARGET= install install-man
-INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop1/PLIST b/net/ntop1/PLIST
deleted file mode 100644
index 36933a90a78..00000000000
--- a/net/ntop1/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/01/06 11:44:16 adam Exp $
-sbin/ntop
-man/man8/ntop.8
diff --git a/net/ntop1/distinfo b/net/ntop1/distinfo
deleted file mode 100644
index 4f2ed4331a6..00000000000
--- a/net/ntop1/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 12:13:57 agc Exp $
-
-SHA1 (ntop-1.1-src.tar.gz) = b244f025709cfcdae14d59e78778e2daf2e7bc55
-RMD160 (ntop-1.1-src.tar.gz) = 7a755c1bd6546d660f69d6345785acfe49105e7f
-Size (ntop-1.1-src.tar.gz) = 220950 bytes
-SHA1 (patch-aa) = 1d9002e962061ddc174cb0f904f868ca91070465
-SHA1 (patch-ab) = f0d6be0bde866803f25da5ace473e244514e3d14
-SHA1 (patch-ac) = 1f32b536470e77bf6e029d0933bb375c1b08aee0
-SHA1 (patch-ad) = b2ef6583696880a55888a549ad5d4a7d3c8d49c0
diff --git a/net/ntop1/patches/patch-aa b/net/ntop1/patches/patch-aa
deleted file mode 100644
index 9866b41ff45..00000000000
--- a/net/ntop1/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/01/06 11:44:16 adam Exp $
-
---- Makefile.in.orig Mon May 3 09:03:10 1999
-+++ Makefile.in
-@@ -54,7 +54,7 @@
- DEFS = @DEFS@
-
- # Standard CFLAGS
--CFLAGS = $(CCOPT) $(DEFS) @G_THREAD_CFLAGS@ @LSOF_DEFS@ @OS_DEFS@ $(INCLS)
-+CFLAGS = $(CCOPT) $(DEFS) @G_THREAD_CFLAGS@ @LSOF_DEFS@ @OS_DEFS@ $(INCLS) $(CPPFLAGS)
-
- # Standard LDFLAGS
- LDFLAGS = @LDFLAGS@
-@@ -105,7 +105,7 @@
- report.c: ntop.h
-
- install:
-- $(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
-+ $(INSTALL) -m 555 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
-
- install-man:
- $(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8
diff --git a/net/ntop1/patches/patch-ab b/net/ntop1/patches/patch-ab
deleted file mode 100644
index 9766ba24a50..00000000000
--- a/net/ntop1/patches/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/01/06 11:44:16 adam Exp $
-
---- ntop.c.orig Wed Apr 28 19:49:00 1999
-+++ ntop.c
-@@ -254,7 +254,7 @@
- initIPServices();
-
- #ifndef WIN32
-- while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nw:m:")) != EOF)
-+ while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nm:")) != EOF)
- switch (op) {
-
- #ifndef WIN32
-@@ -324,6 +324,7 @@
- numericFlag++;
- break;
-
-+#if 0
- case 'w':
- if(!isdigit(optarg[0])) {
- printf("FATAL ERROR: flag -w expects a numeric argument.\n");
-@@ -332,6 +333,7 @@
- webMode++;
- webPort = atoi(optarg);
- break;
-+#endif
-
- default:
- usage(0);
-@@ -348,11 +350,6 @@
- #endif
-
- #ifndef WIN32
-- if((rFileName == NULL) && (getuid () && geteuid ()) || setuid (0)) {
-- printf("Sorry, you must be superuser in order to run ntop.\n");
-- return(-1);
-- }
--
- if(daemonMode && (!webMode)) {
- printf("WARNING: -d is incompatible with interactive mode.\n");
- } else if(daemonMode)
-@@ -392,13 +389,30 @@
- #ifndef WIN32
- /* Determine the device name if not specified */
- if (device == NULL && (device = pcap_lookupdev(ebuf)) == NULL) {
-- printf(ebuf);
-+ printf("%s\n", ebuf);
- return(-1);
- }
-
- getLocalHostAddress(&localHostAddress, device);
-
- if(rFileName == NULL) {
-+ /* Fire up libpcap */
-+ pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf);
-+ } else {
-+ pcapPtr = pcap_open_offline(rFileName, ebuf);
-+ }
-+
-+ if (pcapPtr == NULL) {
-+ printf("%s\n", ebuf);
-+ return(-1);
-+ }
-+
-+ if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-+ printf("%s\n", ebuf);
-+ return(-1);
-+ }
-+
-+ if(rFileName == NULL) {
- if(webMode) {
- (void)fprintf(stderr, "ntop v.%s %s [%s]"
- #ifndef WIN32
-@@ -418,21 +432,6 @@
- init_curses();
- }
- #endif
--
-- /* Fire up libpcap */
-- pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf);
-- } else {
-- pcapPtr = pcap_open_offline(rFileName, ebuf);
-- }
--
-- if (pcapPtr == NULL) {
-- printf(ebuf);
-- return(-1);
-- }
--
-- if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-- printf(ebuf);
-- return(-1);
- }
- #else /* WIN32 */
- printf("ntop v.%s %s [%s]"
-@@ -458,12 +457,6 @@
- free(localAddresses);
- localAddresses = NULL;
- }
--
--#ifndef WIN32
-- /* Now that the socket is open, throw away potential setuid/setgid */
-- (void)setgid(getgid());
-- (void)setuid(getuid());
--#endif
-
- #ifndef WIN32
- /* get datalink type */
diff --git a/net/ntop1/patches/patch-ac b/net/ntop1/patches/patch-ac
deleted file mode 100644
index 046203fad03..00000000000
--- a/net/ntop1/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/01/06 11:44:16 adam Exp $
-
---- pbuf.c.orig Mon May 3 17:43:09 1999
-+++ pbuf.c
-@@ -843,20 +843,18 @@
-
- int checkKeyPressed() {
- int theChar = getch();
-- unsigned char in_char;
- int rc = 1, numScreens;
-
-- if((theChar != EOF)
-- && ((in_char = (unsigned char)theChar)) != 255) {
-+ if((theChar != EOF) && (theChar != ERR)) {
-
- /*
- char buf[32];
-
-- sprintf(buf, ">%c-%d<", in_char, in_char);
-+ sprintf(buf, ">%c-%d<", theChar, theChar);
- mvprintw(0, 40, buf); refresh();
- sleep(2);
- */
-- switch(in_char) {
-+ switch(theChar) {
- case 'q':
- case 'Q':
- cleanup(-1);
diff --git a/net/ntop1/patches/patch-ad b/net/ntop1/patches/patch-ad
deleted file mode 100644
index ee44970141a..00000000000
--- a/net/ntop1/patches/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/01/06 11:44:17 adam Exp $
-
---- ntop.8.orig 1999-04-13 10:20:11.000000000 +0200
-+++ ntop.8
-@@ -19,8 +19,6 @@ ntop \- display top network users
- .IR "IP protocols to monitor" ]
- .RB [ -i
- .IR interface ]
--.RB [ -w
--.IR port ]
- .RB [ -d ]
- .RB [ -m
- .IR "local subnet" ]
-@@ -34,12 +32,7 @@ ntop \- display top network users
- shows the current network usage. It displays a list of hosts that are
- currently using the network and reports information concerning the (IP and non-IP)
- traffic generated by each host.
--.B ntop
--can be started either in a terminal window (interactive mode) or in
--web mode. In the latter case, a web browser is needed to use the
--program. The traffic is sorted according to the host and the protocol. Whenever
--.B ntop
--is started in web mode (-w flag), multiple remote users can access the traffic information. See below for more information.
-+The traffic is sorted according to the host and the protocol.
- .PP
- .SH "COMMAND\-LINE OPTIONS"
- .It -r
-@@ -77,28 +70,10 @@ Specifies the network interface used by
- .
-
- .It -w
--Starts
--.B ntop
--in web mode. Users can attach their web browsers to the specified port and browse
--traffic information remotely. Supposing to start
--.B ntop
--at the port 3000 (ntop -w 3000), the URL to access is
--http://hostname:3000/. The file ~/.ntop specifies the HTTP
--user/password of those people who are allowed to access ntop. If the
--~/.ntop file is missing no security will be used hence everyone can
--access traffic information. A simple .ntop file is the following:
--.
--#
--# .ntop File format
--#
--# user<tab>/<space>pw
--#
--#
--luca linux
--.
--Please note that an HTTP server is NOT
--needed in order to use the program in interactive mode.
--.
-+Is disabled in this version of ntop for security reasons.
-+See
-+.B http://www.securityfocus.com/advisories/2520
-+for details.
-
- .It -d
- This flag (it has to be used with -w) causes ntop to become a daemon, i.e. it is started in background and detached from the terminal.
-@@ -185,12 +160,6 @@ three
- columns are toggled. Please note that these columns represent either
- the traffic sent or received, according to the the way the list is sorted (see previous
- command).
--
--.SH "WEB VIEWS (Web mode)"
--While
--.B ntop
--is running in web mode (-w flag), multiple users can access the traffic information using conventional web browsers. The main HTML page, is divided is two frames. The left frame allows users to select the traffic view that will be displayed in the right frame. Available sections are: sort traffic by data sent, sort traffic by data received, traffic statistics, active hosts list, remote to local (i.e. inside the subnet defined for the network board from which the program is currently sniffing) IP traffic, local to remote IP traffic, local to local IP traffic, list of active TCP sessions, IP protocol distribution statistics, IP protocol usage, IP traffic matrix.
--
- .
- .SH "FIELD DESCRIPTIONS (Interactive mode)"
- .B ntop
-@@ -247,4 +216,4 @@ at ftp://ftp.ee.lbl.gov/libpcap.tar.Z.
- .
- .
- .SH AUTHOR
--Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.
-\ No newline at end of file
-+Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.
diff --git a/print/Makefile b/print/Makefile
index 4e39567a0fe..8bd07c7428c 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.498 2011/09/18 03:32:28 minskim Exp $
+# $NetBSD: Makefile,v 1.499 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Desktop publishing
@@ -9,8 +9,6 @@ SUBDIR+= LPRng-doc
SUBDIR+= a2ps
SUBDIR+= abc2ps
SUBDIR+= abcm2ps
-SUBDIR+= acroread
-SUBDIR+= acroread5
SUBDIR+= acroread7
SUBDIR+= acroread8
SUBDIR+= acroread9
@@ -75,7 +73,6 @@ SUBDIR+= libspectre
SUBDIR+= lilypond
SUBDIR+= luatex
SUBDIR+= magicfilter
-SUBDIR+= mgv
SUBDIR+= mp
SUBDIR+= mpage
SUBDIR+= mupdf
diff --git a/print/acroread/ALTERNATIVES b/print/acroread/ALTERNATIVES
deleted file mode 100644
index 3b6497d8d8d..00000000000
--- a/print/acroread/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/acroread @PREFIX@/bin/acroread4
diff --git a/print/acroread/DESCR b/print/acroread/DESCR
deleted file mode 100644
index 194ebebee76..00000000000
--- a/print/acroread/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Acrobat Reader is part of the Adobe Acrobat family of software, which lets
-you view, distribute, and print documents in Portable Document Format
-(PDF)--regardless of the computer, operating system, fonts, or application
-used to create the original file. PDF files retain all the formatting,
-fonts, and graphics of the original document, and virtually any
-PostScript(TM) document can be converted into a PDF file.
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
deleted file mode 100644
index e9f3ae5efb5..00000000000
--- a/print/acroread/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# $NetBSD: Makefile,v 1.58 2011/09/08 19:29:35 cheusov Exp $
-
-DISTNAME= acroread # overridden below
-PKGNAME= acroread-4.05
-PKGREVISION= 6
-CATEGORIES= print
-MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/ \
- http://download.adobe.com/pub/adobe/acrobatreader/unix/4.x/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
-COMMENT= View, distribute and print PDF documents
-LICENSE= adobe-acrobat-license
-
-RESTRICTED= Original installer required to redistribute.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-BUILD_DIRS= # empty
-
-EMUL_PLATFORMS= linux-i386
-EMUL_PLATFORMS+= osf1-alpha
-EMUL_PLATFORMS+= solaris-i386 solaris-sparc
-EMUL_MODULES.linux= x11
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME= linux-ar-405
-PLATFORM= intellinux
-WRKSRC= ${WRKDIR}/ILINXR.install
-.elif ${EMUL_PLATFORM} == "osf1-alpha"
-DISTNAME= fdec-rs-405
-PLATFORM= alphaosf
-WRKSRC= ${WRKDIR}/AOSFRS.install
-.elif ${EMUL_PLATFORM} == "solaris-i386"
-DISTNAME= sunx86-ar-405
-WRKSRC= ${WRKDIR}/SS86RS.install
-PLATFORM= intelsolaris
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME= sunsparc-rs-405
-WRKSRC= ${WRKDIR}/SSOLRS.install
-PLATFORM= sparcsolaris
-PREPEND_PATH+= /bin # for "ed"
-
-post-patch:
- ${CHMOD} -R o+rwx ${WRKSRC}
-.else
-PLATFORM= unknown
-.endif
-
-PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
-
-NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
-
-BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
-
-INSTALLATION_DIRS= bin ${PREFIX}/Acrobat4 ${NS_PLUGINS_DIR}
-
-do-install:
- @( ${ECHO} accept ) | PAGER=${CAT} ReadInstallDir=${DESTDIR}${PREFIX}/Acrobat4 ${WRKSRC}/INSTALL
- @cd ${DESTDIR}${PREFIX}/Acrobat4/bin && \
- ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
- ${INSTALL_SCRIPT} ${DESTDIR}${PREFIX}/Acrobat4/bin/acroread \
- ${DESTDIR}${PREFIX}/bin/acroread4 && ${RM} -f acroread.orig
- ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread4
- ${INSTALL_DATA} ${DESTDIR}${PREFIX}/Acrobat4/Browsers/${PLATFORM}/nppdf.so \
- ${DESTDIR}${NS_PLUGINS_DIR}
- @${ECHO_MSG} "Be sure to read the license agreement in"
- @${ECHO_MSG} "${PREFIX}/Acrobat4/Reader/License.pdf"
-.if ((${PLATFORM} == "sparcsolaris") || (${PLATFORM} == "intelsolaris"))
- @cd ${DESTDIR}${PREFIX}/Acrobat4/Reader/${PLATFORM}/lib && \
- for LIB in AGM.so.3 CoolType.so.1 ICC.so.1 readcore.so.4; do \
- ${RM} -f lib$${LIB} && \
- ${LN} -s lib$${LIB}.* lib$${LIB}; \
- done
-.endif
-
-.if !empty(DESTDIR)
-SUBST_CLASSES+= rmdestdir
-SUBST_STAGE.rmdestdir= post-install
-SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/bin/acroread4
-SUBST_FILES.rmdestdir+= ${DESTDIR}${PREFIX}/Acrobat4/bin/acroread
-SUBST_SED.rmdestdir= -e 's,${DESTDIR},,g'
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread/PLIST.common b/print/acroread/PLIST.common
deleted file mode 100644
index 5ccffe374be..00000000000
--- a/print/acroread/PLIST.common
+++ /dev/null
@@ -1,44 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.3 2006/03/13 19:29:45 joerg Exp $
-Acrobat4/Browsers/netscape
-Acrobat4/Browsers/${PLATFORM}/nppdf.so
-Acrobat4/ReadMe
-Acrobat4/Reader/AcroVersion
-Acrobat4/Reader/Acrobat.pdf
-Acrobat4/Reader/License.pdf
-Acrobat4/Reader/MapTypes.pdf
-Acrobat4/Reader/help/reader.pdf
-Acrobat4/Reader/res/splashScreen11R.xbm
-Acrobat4/Reader/res/splashScreen18R.xpm
-Acrobat4/Reader/res/splashScreen21.xbm
-Acrobat4/Reader/res/splashScreen28.xpm
-Acrobat4/Reader/${PLATFORM}/app-defaults/AcroRead
-Acrobat4/Reader/${PLATFORM}/bin/acroread
-Acrobat4/Reader/${PLATFORM}/fonts
-Acrobat4/Reader/${PLATFORM}/plug_ins/AcroForm.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/Highlight.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AFStrENU.js
-Acrobat4/Reader/${PLATFORM}/plug_ins/JavaScripts/AForm.js
-Acrobat4/Reader/${PLATFORM}/plug_ins/ewh.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/wwwlink.api
-Acrobat4/Reader/${PLATFORM}/res
-Acrobat4/Resource/Font/AdobeSansMM
-Acrobat4/Resource/Font/AdobeSansMM.MMM
-Acrobat4/Resource/Font/AdobeSerifMM
-Acrobat4/Resource/Font/AdobeSerifMM.MMM
-Acrobat4/Resource/Font/Arial
-Acrobat4/Resource/Font/Arial-Bold
-Acrobat4/Resource/Font/Arial-BoldItalic
-Acrobat4/Resource/Font/Arial-Italic
-Acrobat4/Resource/Font/Courier
-Acrobat4/Resource/Font/Courier-Bold
-Acrobat4/Resource/Font/Courier-BoldOblique
-Acrobat4/Resource/Font/Courier-Oblique
-Acrobat4/Resource/Font/Fonts14.upr
-Acrobat4/Resource/Font/Symbol
-Acrobat4/Resource/Font/TimesNewRoman
-Acrobat4/Resource/Font/TimesNewRoman-Bold
-Acrobat4/Resource/Font/TimesNewRoman-BoldItalic
-Acrobat4/Resource/Font/TimesNewRoman-Italic
-Acrobat4/Resource/Font/ZapfDingbats
-Acrobat4/bin/acroread
-bin/acroread4
diff --git a/print/acroread/PLIST.common_end b/print/acroread/PLIST.common_end
deleted file mode 100644
index 0894cc7169c..00000000000
--- a/print/acroread/PLIST.common_end
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2009/06/14 21:16:21 joerg Exp $
-@pkgdir lib/netscape/plugins
diff --git a/print/acroread/PLIST.linux-i386 b/print/acroread/PLIST.linux-i386
deleted file mode 100644
index bcb03c80c89..00000000000
--- a/print/acroread/PLIST.linux-i386
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:49 jlam Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
diff --git a/print/acroread/PLIST.osf1-alpha b/print/acroread/PLIST.osf1-alpha
deleted file mode 100644
index 1b1f08c300b..00000000000
--- a/print/acroread/PLIST.osf1-alpha
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST.osf1-alpha,v 1.2 2009/06/14 18:11:53 joerg Exp $
-Acrobat4/Reader/help/search.pdf
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-Acrobat4/Reader/${PLATFORM}/plug_ins/autoIndx.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/acrosrch.uid
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.cmp
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.lic
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.std
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.syx
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/acro20.lng
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rsd
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rst
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.stc
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.stp
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.syd
diff --git a/print/acroread/PLIST.solaris-i386 b/print/acroread/PLIST.solaris-i386
deleted file mode 100644
index c90b43291cc..00000000000
--- a/print/acroread/PLIST.solaris-i386
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST.solaris-i386,v 1.2 2009/06/14 18:11:53 joerg Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/desktop/olwm/acroread.cetable
-Acrobat4/Reader/desktop/olwm/acroread.deskinstall
-Acrobat4/Reader/desktop/olwm/acroread.prog.icon
-Acrobat4/Reader/desktop/olwm/pdf.icon
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
diff --git a/print/acroread/PLIST.solaris-sparc b/print/acroread/PLIST.solaris-sparc
deleted file mode 100644
index 83fdd645d2b..00000000000
--- a/print/acroread/PLIST.solaris-sparc
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST.solaris-sparc,v 1.2 2009/06/14 18:11:53 joerg Exp $
-lib/netscape/plugins/nppdf.so
-Acrobat4/Reader/desktop/olwm/acroread.cetable
-Acrobat4/Reader/desktop/olwm/acroread.deskinstall
-Acrobat4/Reader/desktop/olwm/acroread.prog.icon
-Acrobat4/Reader/desktop/olwm/pdf.icon
-Acrobat4/Reader/help/search.pdf
-Acrobat4/Reader/${PLATFORM}/lib/XKeysymDB
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3
-Acrobat4/Reader/${PLATFORM}/lib/libAGM.so.3.0
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libCoolType.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1
-Acrobat4/Reader/${PLATFORM}/lib/libICC.so.1.0
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4
-Acrobat4/Reader/${PLATFORM}/lib/libreadcore.so.4.0
-Acrobat4/Reader/${PLATFORM}/plug_ins/autoIndx.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/search.api
-Acrobat4/Reader/${PLATFORM}/plug_ins/acrosrch.uid
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.cmp
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.lic
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.std
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.syx
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.lng
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rsd
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rst
-Acrobat4/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.syd
diff --git a/print/acroread/distinfo b/print/acroread/distinfo
deleted file mode 100644
index 0d15a660cbe..00000000000
--- a/print/acroread/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.8 2008/08/19 13:15:02 joerg Exp $
-
-SHA1 (fdec-rs-405.tar.gz) = cf38c862af69b0bd1c76e5b182f6026bfe552250
-RMD160 (fdec-rs-405.tar.gz) = 75dd87c6798d98cee412de5e35e89f4d82ebadc5
-Size (fdec-rs-405.tar.gz) = 8437452 bytes
-SHA1 (linux-ar-405.tar.gz) = b504f9101de8a65d7bec968f41f6532c2c392b85
-RMD160 (linux-ar-405.tar.gz) = 80d0bb4d5360ed25ee5d6a98be924b8ea43058bd
-Size (linux-ar-405.tar.gz) = 6144813 bytes
-SHA1 (sunsparc-rs-405.tar.gz) = 764d1257ec3e91bb1b169aae722e9665ae2805f9
-RMD160 (sunsparc-rs-405.tar.gz) = 5ea0b9e3eead4a1cad19f5acc7b0301d0573a41c
-Size (sunsparc-rs-405.tar.gz) = 6557221 bytes
-SHA1 (sunx86-ar-405.tar.gz) = 87392070fb6fb9f64a90beecdd072362c6b8232c
-RMD160 (sunx86-ar-405.tar.gz) = 3c47abd00aae9bcf56adb846b9128585dcffbb77
-Size (sunx86-ar-405.tar.gz) = 5661973 bytes
-SHA1 (patch-aa) = 68c5f6a97eadc0c50094b168e718e55aec90c729
diff --git a/print/acroread/files/acroread.diff b/print/acroread/files/acroread.diff
deleted file mode 100644
index 44cdc52604f..00000000000
--- a/print/acroread/files/acroread.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: acroread.diff,v 1.7 2008/08/19 13:15:02 joerg Exp $
-
---- acroread.orig Mon Apr 17 16:30:05 2000
-+++ acroread Mon Apr 17 16:33:30 2000
-@@ -210,4 +210,21 @@
- export ACRO_CONFIG
- ;;
-+ NetBSD|DragonFly)
-+ machine_type=`uname -p`
-+ case "$machine_type" in
-+ alpha)
-+ ACRO_CONFIG=alphaosf
-+ export ACRO_CONFIG
-+ ;;
-+ i386|x86_64)
-+ ACRO_CONFIG=intellinux
-+ export ACRO_CONFIG
-+ ;;
-+ sparc)
-+ ACRO_CONFIG=sparcsolaris
-+ export ACRO_CONFIG
-+ ;;
-+ esac
-+ ;;
- esac
-
-@@ -310,4 +327,6 @@
- LD_LIBRARY_PATH="`prepend "$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib:$ACRO_INSTALL_DIR/$ACRO_CONFIG/lib" "$LD_LIBRARY_PATH"`"
- export LD_LIBRARY_PATH
-+ LC_CTYPE="C"
-+ export LC_CTYPE
- ;;
- intelbsdi)
diff --git a/print/acroread/patches/patch-aa b/print/acroread/patches/patch-aa
deleted file mode 100644
index 917824cefc2..00000000000
--- a/print/acroread/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/08/19 13:15:02 joerg Exp $
-
---- INSTALL.orig Wed Jan 26 19:40:25 2000
-+++ INSTALL Mon Apr 17 16:20:38 2000
-@@ -116,4 +116,6 @@
- if [ `uname -s` = "Linux" ] ; then
- size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
-+ elif [ `uname -s|sed -e 's|.*\(...\)|\\1|'` = "BSD" -o `uname -s` = "DragonFly" ] ; then
-+ size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
- else
- size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
-@@ -564,5 +566,5 @@
- esac
-
--if [ "`type uname`" != "uname not found" ] ; then
-+if [ "`uname`" != "uname not found" ] ; then
- OSname=`uname -s`
- if [ "$OSname" = "AIX" ] ; then
-@@ -1048,4 +1050,30 @@
- DistDefaultNum="$DistIntelBSDINum"
- DefaultName="Intel/BSDI"
-+ ;;
-+ NetBSD | DragonFly)
-+ MachArch=`uname -p`
-+ case "$MachArch" in
-+ alpha)
-+ AcroDefaultNum="$AcroAlphaOSFNum"
-+ ExchDefaultNum="$ExchAlphaOSFNum"
-+ ReadDefaultNum="$ReadAlphaOSFNum"
-+ DistDefaultNum="$DistAlphaOSFNum"
-+ DefaultName="DEC Alpha/OSF1"
-+ ;;
-+ i386|x86_64)
-+ AcroDefaultNum="$AcroIntelLinuxNum"
-+ ExchDefaultNum="$ExchIntelLinuxNum"
-+ ReadDefaultNum="$ReadIntelLinuxNum"
-+ DistDefaultNum="$DistIntelLinuxNum"
-+ DefaultName="Intel/Linux"
-+ ;;
-+ sparc)
-+ AcroDefaultNum="$AcroSparcSolarisNum"
-+ ExchDefaultNum="$ExchSparcSolarisNum"
-+ ReadDefaultNum="$ReadSparcSolarisNum"
-+ DistDefaultNum="$DistSparcSolarisNum"
-+ DefaultName="SPARC/Solaris 2.x"
-+ ;;
-+ esac
- ;;
- Linux)
diff --git a/print/acroread5/ALTERNATIVES b/print/acroread5/ALTERNATIVES
deleted file mode 100644
index 566c983ef12..00000000000
--- a/print/acroread5/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/acroread @PREFIX@/bin/acroread5
diff --git a/print/acroread5/DESCR b/print/acroread5/DESCR
deleted file mode 100644
index 194ebebee76..00000000000
--- a/print/acroread5/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Acrobat Reader is part of the Adobe Acrobat family of software, which lets
-you view, distribute, and print documents in Portable Document Format
-(PDF)--regardless of the computer, operating system, fonts, or application
-used to create the original file. PDF files retain all the formatting,
-fonts, and graphics of the original document, and virtually any
-PostScript(TM) document can be converted into a PDF file.
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
deleted file mode 100644
index d0b8c57ac4c..00000000000
--- a/print/acroread5/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile,v 1.43 2011/09/08 19:29:35 cheusov Exp $
-
-DISTNAME= acroread5 # overridden below
-PKGNAME= acroread5-5.10
-PKGREVISION= 5
-CATEGORIES= print
-MASTER_SITES= http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.adobe.com/products/acrobat/readstep2.html
-COMMENT= View, distribute and print PDF documents
-LICENSE= adobe-acrobat-license
-
-RESTRICTED= Original installer required to redistribute.
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-WRKSRC= ${WRKDIR}/installers
-BUILD_DIRS= # empty
-
-EMUL_PLATFORMS= linux-i386
-EMUL_PLATFORMS+= solaris-sparc
-EMUL_MODULES.linux= x11
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${EMUL_PLATFORM} == "linux-i386"
-DISTNAME= linux-5010
-PLATFORM= intellinux
-.elif ${EMUL_PLATFORM} == "solaris-sparc"
-DISTNAME= solaris-5010
-PLATFORM= sparcsolaris
-.else
-PLATFORM= unknown
-.endif
-
-PLIST_SUBST+= PLATFORM=${PLATFORM:Q}
-
-BIN_PATCH= ${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
-
-INSTALLATION_DIRS= bin ${PREFIX}/Acrobat5
-
-do-install:
- @( ${ECHO} accept ) | PAGER=${CAT} ReadInstallDir=${DESTDIR}${PREFIX}/Acrobat5 ${WRKSRC}/INSTALL
- @cd ${DESTDIR}${PREFIX}/Acrobat5/bin && \
- ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
- ${INSTALL_SCRIPT} ${DESTDIR}${PREFIX}/Acrobat5/bin/acroread \
- ${DESTDIR}${PREFIX}/bin/acroread5 && ${RM} -f acroread.orig
- ${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread5
- @${ECHO_MSG} "Be sure to read the license agreement in"
- @${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt"
-
-.if !empty(DESTDIR)
-SUBST_CLASSES+= rmdestdir
-SUBST_STAGE.rmdestdir= post-install
-SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/bin/acroread5
-SUBST_FILES.rmdestdir= ${DESTDIR}${PREFIX}/Acrobat5/bin/acroread
-SUBST_SED.rmdestdir= -e 's,${DESTDIR},,g'
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread5/PLIST.common b/print/acroread5/PLIST.common
deleted file mode 100644
index 16378c76eca..00000000000
--- a/print/acroread5/PLIST.common
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.3 2011/09/06 21:08:09 cheusov Exp $
-Acrobat5/Browsers/netscape
-Acrobat5/Browsers/${PLATFORM}/nppdf.so
-Acrobat5/Reader/AcroVersion
-Acrobat5/Reader/MapTypes.pdf
-Acrobat5/Reader/help/acrobat.pdf
-Acrobat5/Reader/help/reader.pdf
-Acrobat5/Reader/license.txt
-Acrobat5/Reader/res/ENUtxt.pdf
-Acrobat5/Reader/res/splashScreen11R.xbm
-Acrobat5/Reader/res/splashScreen18R.xpm
-Acrobat5/Reader/${PLATFORM}/app-defaults/AcroRead
-Acrobat5/Reader/${PLATFORM}/bin/acroread
-Acrobat5/Reader/${PLATFORM}/fonts
-Acrobat5/Reader/${PLATFORM}/lib/XKeysymDB
-Acrobat5/Reader/${PLATFORM}/lib/libACE.so
-Acrobat5/Reader/${PLATFORM}/lib/libACE.so.2.02
-Acrobat5/Reader/${PLATFORM}/lib/libBIB.so
-Acrobat5/Reader/${PLATFORM}/lib/libBIB.so.1.1
-Acrobat5/Reader/${PLATFORM}/lib/libAGM.so
-Acrobat5/Reader/${PLATFORM}/lib/libAGM.so.4.08
-Acrobat5/Reader/${PLATFORM}/lib/libCoolType.so
-Acrobat5/Reader/${PLATFORM}/lib/libCoolType.so.4.10
-Acrobat5/Reader/${PLATFORM}/lib/libOPP.so
-Acrobat5/Reader/${PLATFORM}/lib/libOPP.so.1.02
-Acrobat5/Reader/${PLATFORM}/plug_ins/AcroForm.api
-Acrobat5/Reader/${PLATFORM}/plug_ins/EScript.api
-Acrobat5/Reader/${PLATFORM}/plug_ins/Highlight.api
-Acrobat5/Reader/${PLATFORM}/plug_ins/JavaScripts/AFStrENU.js
-Acrobat5/Reader/${PLATFORM}/plug_ins/JavaScripts/AForm.js
-Acrobat5/Reader/${PLATFORM}/plug_ins/ewh.api
-Acrobat5/Reader/${PLATFORM}/plug_ins/wwwlink.api
-Acrobat5/Reader/${PLATFORM}/res
-Acrobat5/Resource/Font/AdobeSansMM
-Acrobat5/Resource/Font/AdobeSansMM.MMM
-Acrobat5/Resource/Font/AdobeSerifMM
-Acrobat5/Resource/Font/AdobeSerifMM.MMM
-Acrobat5/Resource/Font/Arial
-Acrobat5/Resource/Font/Arial-Bold
-Acrobat5/Resource/Font/Arial-BoldItalic
-Acrobat5/Resource/Font/Arial-Italic
-Acrobat5/Resource/Font/Courier
-Acrobat5/Resource/Font/Courier-Bold
-Acrobat5/Resource/Font/Courier-BoldOblique
-Acrobat5/Resource/Font/Courier-Oblique
-Acrobat5/Resource/Font/Fonts14.upr
-Acrobat5/Resource/Font/Symbol
-Acrobat5/Resource/Font/TimesNewRoman
-Acrobat5/Resource/Font/TimesNewRoman-Bold
-Acrobat5/Resource/Font/TimesNewRoman-BoldItalic
-Acrobat5/Resource/Font/TimesNewRoman-Italic
-Acrobat5/Resource/Font/ZapfDingbats
-Acrobat5/Resource/LICFONT.TXT
-Acrobat5/bin/acroread
-bin/acroread5
diff --git a/print/acroread5/PLIST.solaris-sparc b/print/acroread5/PLIST.solaris-sparc
deleted file mode 100644
index 1e0d7c610ae..00000000000
--- a/print/acroread5/PLIST.solaris-sparc
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST.solaris-sparc,v 1.2 2009/06/14 18:11:53 joerg Exp $
-Acrobat5/Reader/help/search.pdf
-Acrobat5/Reader/${PLATFORM}/plug_ins/search.api
-Acrobat5/Reader/${PLATFORM}/plug_ins/acrosrch.uid
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.cmp
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.lic
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.std
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/vdk10.syx
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.lng
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rsd
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.rst
-Acrobat5/Reader/${PLATFORM}/plug_ins/vdkHome/language/vdk10.syd
-Acrobat5/desktop/olwm/acroread.cetable
-Acrobat5/desktop/olwm/acroread.deskinstall
-Acrobat5/desktop/olwm/acroread.prog.icon
-Acrobat5/desktop/olwm/pdf.icon
diff --git a/print/acroread5/distinfo b/print/acroread5/distinfo
deleted file mode 100644
index 027001b504a..00000000000
--- a/print/acroread5/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.11 2008/08/19 13:13:28 joerg Exp $
-
-SHA1 (linux-5010.tar.gz) = 68df0a31c08d97f96d082ddbb66f2f615e501106
-RMD160 (linux-5010.tar.gz) = be3eb598a023f49212b7c17926c5774130f7aef8
-Size (linux-5010.tar.gz) = 9286383 bytes
-SHA1 (solaris-5010.tar.gz) = 25537c27a83618bf754c6a3a9ecbf0059c51b72b
-RMD160 (solaris-5010.tar.gz) = ea6ab3c00a09fb488c26181289018fa90eafe9bb
-Size (solaris-5010.tar.gz) = 9941925 bytes
-SHA1 (patch-aa) = 76fcc60995fcd31f393a9432090e2747797dd65f
diff --git a/print/acroread5/files/acroread.diff b/print/acroread5/files/acroread.diff
deleted file mode 100644
index 0e52507cbe4..00000000000
--- a/print/acroread5/files/acroread.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: acroread.diff,v 1.5 2008/08/19 13:13:28 joerg Exp $
-
---- acroread.orig Tue Jul 2 08:08:00 2002
-+++ acroread Thu Aug 1 21:50:23 2002
-@@ -191,6 +191,19 @@
- ACRO_CONFIG=intellinux
- export ACRO_CONFIG
- ;;
-+ NetBSD | DragonFly)
-+ machine_type=`uname -p`
-+ case "$machine_type" in
-+ i386|x86_64)
-+ ACRO_CONFIG=intellinux
-+ export ACRO_CONFIG
-+ ;;
-+ sparc*)
-+ ACRO_CONFIG=sparcsolaris
-+ export ACRO_CONFIG
-+ ;;
-+ esac
-+ ;;
- esac
-
- if [ -z "$ACRO_CONFIG" ] ; then
diff --git a/print/acroread5/patches/patch-aa b/print/acroread5/patches/patch-aa
deleted file mode 100644
index 4d6d7413918..00000000000
--- a/print/acroread5/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/08/19 13:13:28 joerg Exp $
-
---- INSTALL.orig Tue Jul 2 08:09:57 2002
-+++ INSTALL
-@@ -82,7 +82,7 @@ OutputLicense ()
- fi
-
- TypeCheck $PAGER
-- if [ $? -ne 0 ] || [ -z "$PAGER" ] ; then
-+ if [ $? -eq 0 ] || [ -z "$PAGER" ] ; then
- command=cat
- TypeCheck pg
- if [ $? -eq 0 ] ; then
-@@ -135,6 +135,8 @@ PrintRequiredFree()
- if [ "$i" -a -f "$i" ] ; then
- if [ `uname -s` = "Linux" ] ; then
- size=`ls -lLn "$i" | ( read perm links owner group size date ; echo $size )`
-+ elif [ `uname -s|sed -e 's|.*\(...\)|\\1|'` = "BSD" -o `uname -s` = "DragonFly" ] ; then
-+ size=`ls -lL "$i" | ( read perm links owner group size date ; echo $size )`
- else
- size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )`
- fi
-@@ -276,6 +278,8 @@ GetInstallDirectory ()
- AIX)
- defdir="/usr/lpp/Acrobat5"
- ;;
-+ NetBSD | DragonFly)
-+ ;;
- esac
-
- while [ -z "$InstallDir" ] ; do
-@@ -528,6 +532,20 @@ case "$OSname" in
- ReadDefaultNum="$ReadIntelLinuxNum"
- DefaultName="Intel/Linux"
- ;;
-+ NetBSD | DragonFly)
-+ MachArch=`uname -p`
-+ case "$MachArch" in
-+ i386|x86_64)
-+ ReadDefaultNum="$ReadIntelLinuxNum"
-+ DefaultName="Intel/Linux"
-+ ;;
-+ sparc*)
-+ ReadDefaultNum="$ReadSparcSolarisNum"
-+ DefaultName="SPARC/Solaris 2.x"
-+ ;;
-+ esac
-+ ;;
-+
- esac
-
- if [ -z "$ReadDefaultNum" ] ; then
diff --git a/print/mgv/DESCR b/print/mgv/DESCR
deleted file mode 100644
index bad07e60294..00000000000
--- a/print/mgv/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-mgv is a Motif/LessTif based viewer for PostScript files which uses
-Ghostscript as the underlying PostScript rendering engine. Limited
-PDF support is also supplied.
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
deleted file mode 100644
index 38e735581b7..00000000000
--- a/print/mgv/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2010/01/27 17:29:01 joerg Exp $
-
-DISTNAME= mgv-3.1.5
-PKGREVISION= 4
-CATEGORIES= print
-MASTER_SITES= #
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://web.archive.org/web/20020201231345/http://www.trends.net/~mu/mgv.html
-COMMENT= Motif/LessTif user interface for Ghostscript
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-MAKE_JOBS_SAFE= no
-
-GNU_CONFIGURE= yes
-USE_X11BASE= yes
-USE_TOOLS+= gs:run
-
-CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include
-CONFIGURE_ARGS+= --with-motif-libs=${MOTIFBASE}/lib
-
-INSTALLATION_DIRS+= share/doc/html
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help
- ${LN} -fs ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help ${DESTDIR}${PREFIX}/share/doc/html/mgv
-
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/motif.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/mgv/PLIST b/print/mgv/PLIST
deleted file mode 100644
index 41d32dd5de1..00000000000
--- a/print/mgv/PLIST
+++ /dev/null
@@ -1,101 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:11:57 joerg Exp $
-bin/mgv
-man/man1/mgv.1
-share/doc/html/mgv
-share/mgv/3.1.5/MGv
-share/mgv/3.1.5/help/file-info.gif
-share/mgv/3.1.5/help/file-open.gif
-share/mgv/3.1.5/help/file-print.gif
-share/mgv/3.1.5/help/file-save.gif
-share/mgv/3.1.5/help/gs-log.gif
-share/mgv/3.1.5/help/help-about.gif
-share/mgv/3.1.5/help/help-bldopts.gif
-share/mgv/3.1.5/help/main-zoom.gif
-share/mgv/3.1.5/help/mainwindow.gif
-share/mgv/3.1.5/help/mgv-1.html
-share/mgv/3.1.5/help/mgv-10.html
-share/mgv/3.1.5/help/mgv-11.html
-share/mgv/3.1.5/help/mgv-12.html
-share/mgv/3.1.5/help/mgv-13.html
-share/mgv/3.1.5/help/mgv-14.html
-share/mgv/3.1.5/help/mgv-15.html
-share/mgv/3.1.5/help/mgv-16.html
-share/mgv/3.1.5/help/mgv-17.html
-share/mgv/3.1.5/help/mgv-18.html
-share/mgv/3.1.5/help/mgv-19.html
-share/mgv/3.1.5/help/mgv-2.html
-share/mgv/3.1.5/help/mgv-20.html
-share/mgv/3.1.5/help/mgv-21.html
-share/mgv/3.1.5/help/mgv-22.html
-share/mgv/3.1.5/help/mgv-23.html
-share/mgv/3.1.5/help/mgv-24.html
-share/mgv/3.1.5/help/mgv-25.html
-share/mgv/3.1.5/help/mgv-26.html
-share/mgv/3.1.5/help/mgv-27.html
-share/mgv/3.1.5/help/mgv-28.html
-share/mgv/3.1.5/help/mgv-29.html
-share/mgv/3.1.5/help/mgv-3.html
-share/mgv/3.1.5/help/mgv-30.html
-share/mgv/3.1.5/help/mgv-4.html
-share/mgv/3.1.5/help/mgv-5.html
-share/mgv/3.1.5/help/mgv-6.html
-share/mgv/3.1.5/help/mgv-7.html
-share/mgv/3.1.5/help/mgv-8.html
-share/mgv/3.1.5/help/mgv-9.html
-share/mgv/3.1.5/help/mgv.html
-share/mgv/3.1.5/help/next.gif
-share/mgv/3.1.5/help/prev.gif
-share/mgv/3.1.5/help/toc.gif
-share/mgv/3.1.5/icon.xbm
-share/mgv/3.1.5/icon.xpm
-share/mgv/3.1.5/mask.xbm
-share/mgv/3.1.5/splash.xbm
-share/mgv/3.1.5/splash.xpm
-share/mgv/3.1.5/toolbar/fileOpen-i.xbm
-share/mgv/3.1.5/toolbar/fileOpen-i.xpm
-share/mgv/3.1.5/toolbar/fileOpen.xbm
-share/mgv/3.1.5/toolbar/fileOpen.xpm
-share/mgv/3.1.5/toolbar/filePrint-i.xbm
-share/mgv/3.1.5/toolbar/filePrint-i.xpm
-share/mgv/3.1.5/toolbar/filePrint.xbm
-share/mgv/3.1.5/toolbar/filePrint.xpm
-share/mgv/3.1.5/toolbar/helpContext-i.xbm
-share/mgv/3.1.5/toolbar/helpContext-i.xpm
-share/mgv/3.1.5/toolbar/helpContext.xbm
-share/mgv/3.1.5/toolbar/helpContext.xpm
-share/mgv/3.1.5/toolbar/magstepDecr-i.xbm
-share/mgv/3.1.5/toolbar/magstepDecr-i.xpm
-share/mgv/3.1.5/toolbar/magstepDecr.xbm
-share/mgv/3.1.5/toolbar/magstepDecr.xpm
-share/mgv/3.1.5/toolbar/magstepIncr-i.xbm
-share/mgv/3.1.5/toolbar/magstepIncr-i.xpm
-share/mgv/3.1.5/toolbar/magstepIncr.xbm
-share/mgv/3.1.5/toolbar/magstepIncr.xpm
-share/mgv/3.1.5/toolbar/mark-i.xbm
-share/mgv/3.1.5/toolbar/mark-i.xpm
-share/mgv/3.1.5/toolbar/mark.xbm
-share/mgv/3.1.5/toolbar/mark.xpm
-share/mgv/3.1.5/toolbar/markAll-i.xbm
-share/mgv/3.1.5/toolbar/markAll-i.xpm
-share/mgv/3.1.5/toolbar/markAll.xbm
-share/mgv/3.1.5/toolbar/markAll.xpm
-share/mgv/3.1.5/toolbar/markEven-i.xbm
-share/mgv/3.1.5/toolbar/markEven-i.xpm
-share/mgv/3.1.5/toolbar/markEven.xbm
-share/mgv/3.1.5/toolbar/markEven.xpm
-share/mgv/3.1.5/toolbar/markNone-i.xbm
-share/mgv/3.1.5/toolbar/markNone-i.xpm
-share/mgv/3.1.5/toolbar/markNone.xbm
-share/mgv/3.1.5/toolbar/markNone.xpm
-share/mgv/3.1.5/toolbar/markOdd-i.xbm
-share/mgv/3.1.5/toolbar/markOdd-i.xpm
-share/mgv/3.1.5/toolbar/markOdd.xbm
-share/mgv/3.1.5/toolbar/markOdd.xpm
-share/mgv/3.1.5/toolbar/pageNext-i.xbm
-share/mgv/3.1.5/toolbar/pageNext-i.xpm
-share/mgv/3.1.5/toolbar/pageNext.xbm
-share/mgv/3.1.5/toolbar/pageNext.xpm
-share/mgv/3.1.5/toolbar/pagePrev-i.xbm
-share/mgv/3.1.5/toolbar/pagePrev-i.xpm
-share/mgv/3.1.5/toolbar/pagePrev.xbm
-share/mgv/3.1.5/toolbar/pagePrev.xpm
diff --git a/print/mgv/distinfo b/print/mgv/distinfo
deleted file mode 100644
index 35d0af16283..00000000000
--- a/print/mgv/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 12:51:44 agc Exp $
-
-SHA1 (mgv-3.1.5.tar.gz) = 5500221347dabed04effea78b4ca5bf7c8ecc35a
-RMD160 (mgv-3.1.5.tar.gz) = 70e93581467119fdd93c5e9dedb20a110e832a6d
-Size (mgv-3.1.5.tar.gz) = 740150 bytes
-SHA1 (patch-aa) = ecbc6b70f8ae07013a23b4db2decfe9e23204539
-SHA1 (patch-ab) = 430fcefb48fbb1f432af4c32f4703787a27a48df
-SHA1 (patch-ad) = e067c1be2c4b0885f29a5230643e84fd08998e38
diff --git a/print/mgv/patches/patch-aa b/print/mgv/patches/patch-aa
deleted file mode 100644
index 3143b1d6378..00000000000
--- a/print/mgv/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/14 00:51:17 jtb Exp $
-
---- wlib/about.c.orig Tue Sep 1 20:49:44 1998
-+++ wlib/about.c
-@@ -21,6 +21,7 @@
- * Authors: Matthew D. Francey
- * Eric A. Howe (mu@trends.net)
- */
-+#include <stdio.h>
- #include <wlib/rcs.h>
- MU_ID("$Mu: wlib/about.c 1.33 1998/09/01 20:49:44 $")
-
diff --git a/print/mgv/patches/patch-ab b/print/mgv/patches/patch-ab
deleted file mode 100644
index b73c39776ea..00000000000
--- a/print/mgv/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/14 00:51:17 jtb Exp $
-
---- Makefile.in.orig Mon Sep 28 09:54:02 1998
-+++ Makefile.in
-@@ -502,7 +502,7 @@
- _bld.c: $(mgv_OBJECTS) wlib/libwlib.a
- tools/mkver '$(VERSION)' '$(COMPILE)' '$(LDFLAGS)' '-lwlib @LIBHELP_LIBS@ @XM_LIBS@ @XT_LIBS@ @XPM_LIBS@ @EDITRES_LIBS@ @X11_LIBS@' '$(bindir)' '$(datadir)' > _bld.c || (rm -f _bld.c; exit 1)
-
--all: .been-warned
-+all:
- .been-warned:
- @echo
- @echo "**********************************************************"
diff --git a/print/mgv/patches/patch-ad b/print/mgv/patches/patch-ad
deleted file mode 100644
index 12584bc3151..00000000000
--- a/print/mgv/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/14 00:51:17 jtb Exp $
-
---- doc/Makefile.in.orig Mon Sep 28 09:54:02 1998
-+++ doc/Makefile.in
-@@ -89,7 +89,7 @@
- mgv-26.html mgv-27.html mgv-28.html mgv-29.html mgv-30.html
-
- helpdir = $(pkgdatadir)/$(VERSION)/help
--help_DATA = mgv.html $(mu_htmlchunks) *.gif
-+help_DATA = mgv.html $(mu_htmlchunks)
-
- SUFFIXES = .gif .sgml-in .sgml .ps .eps
- mkinstalldirs = $(SHELL) $(top_srcdir)/tools/mkinstalldirs
diff --git a/www/Makefile b/www/Makefile
index ccafa518ce6..e2ec8c8b866 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.818 2011/09/15 09:15:34 wiz Exp $
+# $NetBSD: Makefile,v 1.819 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Packages related to the World Wide Web
@@ -129,13 +129,6 @@ SUBDIR+= fcgi
SUBDIR+= fengoffice
SUBDIR+= ffproxy
SUBDIR+= firefox
-SUBDIR+= firefox-bin
-SUBDIR+= firefox-bin-acroread
-SUBDIR+= firefox-bin-acroread5
-SUBDIR+= firefox-bin-acroread7
-SUBDIR+= firefox-bin-flash
-SUBDIR+= firefox-bin-java
-SUBDIR+= firefox-bin-realplayer
SUBDIR+= firefox-l10n
SUBDIR+= firefox36
SUBDIR+= firefox36-l10n
@@ -161,10 +154,7 @@ SUBDIR+= icedtea-web
SUBDIR+= ies4linux
SUBDIR+= ijb
SUBDIR+= ikiwiki
-SUBDIR+= instiki
SUBDIR+= ja-trac
-SUBDIR+= jakarta-tomcat4
-SUBDIR+= jakarta-tomcat5
SUBDIR+= jalbum
SUBDIR+= kahua
SUBDIR+= kannel
@@ -611,12 +601,8 @@ SUBDIR+= ruby-staticmatic
SUBDIR+= ruby-tag
SUBDIR+= ruby-webrobots
SUBDIR+= ruby-webunit
-SUBDIR+= sarg
SUBDIR+= screws
SUBDIR+= seamonkey
-SUBDIR+= seamonkey-bin
-SUBDIR+= seamonkey-bin-flash
-SUBDIR+= seamonkey-bin-java
SUBDIR+= seamonkey-l10n
SUBDIR+= serf
SUBDIR+= shibboleth-sp
diff --git a/www/firefox-bin-acroread/DEINSTALL b/www/firefox-bin-acroread/DEINSTALL
deleted file mode 100644
index 8b5101dc1a5..00000000000
--- a/www/firefox-bin-acroread/DEINSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2007/07/30 16:15:10 jlam Exp $
-
-case "${STAGE}" in
-DEINSTALL)
- dest="${PKG_PREFIX}/lib/firefox-linux/plugins/nppdf.so"
- ${RM} -f "$dest"
- ;;
-esac
diff --git a/www/firefox-bin-acroread/DESCR b/www/firefox-bin-acroread/DESCR
deleted file mode 100644
index b8d01204bf2..00000000000
--- a/www/firefox-bin-acroread/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides Adobe Acrobat Reader 4 plugin for the Linux
-version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread/INSTALL b/www/firefox-bin-acroread/INSTALL
deleted file mode 100644
index 7951d33a294..00000000000
--- a/www/firefox-bin-acroread/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2007/07/30 16:15:11 jlam Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
- src="${PKG_PREFIX}/@ACROREAD@/@ACRO_SUBDIR@/@ACRO_PLATFORM@/nppdf.so"
- dest="${PKG_PREFIX}/lib/firefox-linux/plugins/nppdf.so"
- ${TEST} -f "$dest" || ${LN} -s "$src" "$dest"
- ;;
-esac
diff --git a/www/firefox-bin-acroread/Makefile b/www/firefox-bin-acroread/Makefile
deleted file mode 100644
index 334e8de35d6..00000000000
--- a/www/firefox-bin-acroread/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2009/09/02 08:34:15 wiz Exp $
-
-DISTNAME= MozillaFirebird-bin-acroread-1.0
-PKGREVISION= 2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Acrobat Reader 4 plugin for firefox-bin
-
-DEPENDS+= acroread-4.[0-9]*:../../print/acroread
-CONFLICTS+= firefox-bin-acroread3-[0-9]*
-CONFLICTS+= firefox-bin-acroread5-[0-9]*
-
-ACROREAD= Acrobat4
-ACRO_SUBDIR= Browsers
-
-.include "../../www/firefox-bin-acroread/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-acroread/Makefile.common b/www/firefox-bin-acroread/Makefile.common
deleted file mode 100644
index 8fa047bb719..00000000000
--- a/www/firefox-bin-acroread/Makefile.common
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile.common,v 1.7 2011/03/17 13:41:22 obache Exp $
-
-PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|}
-CATEGORIES= www print
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin
-
-EMUL_PLATFORMS= linux-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-ACRO_PLATFORM= intellinux
-
-WRKSRC= ${WRKDIR}
-NO_CONFIGURE= YES
-BUILD_DIRS= # empty
-PLIST_SRC= # empty
-
-FILES_SUBST+= ACROREAD=${ACROREAD:Q}
-FILES_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q}
-FILES_SUBST+= ACRO_PLATFORM=${ACRO_PLATFORM:Q}
-
-DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/www/firefox-bin-acroread/DEINSTALL
-INSTALL_TEMPLATES+= ${PKGSRCDIR}/www/firefox-bin-acroread/INSTALL
-
-REQD_DIRS+= ${PREFIX}/lib/firefox-linux/plugins
-
-do-install: # nothing
diff --git a/www/firefox-bin-acroread5/DESCR b/www/firefox-bin-acroread5/DESCR
deleted file mode 100644
index 14345b19845..00000000000
--- a/www/firefox-bin-acroread5/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides Adobe Acrobat Reader 5 plugin for the Linux
-version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread5/Makefile b/www/firefox-bin-acroread5/Makefile
deleted file mode 100644
index f93e9cf6d1f..00000000000
--- a/www/firefox-bin-acroread5/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2009/09/02 08:34:15 wiz Exp $
-
-DISTNAME= MozillaFirebird-bin-acroread5-1.0
-PKGREVISION= 2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Acrobat Reader 5 plugin for firefox-bin
-
-DEPENDS+= acroread5-5.[0-9]*:../../print/acroread5
-CONFLICTS+= firefox-bin-acroread3-[0-9]*
-CONFLICTS+= firefox-bin-acroread-[0-9]*
-
-ACROREAD= Acrobat5
-ACRO_SUBDIR= Browsers
-
-.include "../../www/firefox-bin-acroread/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-acroread7/DESCR b/www/firefox-bin-acroread7/DESCR
deleted file mode 100644
index 8db5228d3a8..00000000000
--- a/www/firefox-bin-acroread7/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides Adobe Acrobat Reader 7 plugin for the Linux
-version of the firefox-bin package.
diff --git a/www/firefox-bin-acroread7/Makefile b/www/firefox-bin-acroread7/Makefile
deleted file mode 100644
index 746b29073ec..00000000000
--- a/www/firefox-bin-acroread7/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2009/09/02 08:34:15 wiz Exp $
-
-DISTNAME= MozillaFirebird-bin-acroread7-1.0
-PKGREVISION= 1
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= Acrobat Reader 7 plugin for firefox-bin
-
-DEPENDS+= acroread7>=7.0:../../print/acroread7
-CONFLICTS+= firefox-bin-acroread5-[0-9]*
-CONFLICTS+= firefox-bin-acroread3-[0-9]*
-CONFLICTS+= firefox-bin-acroread-[0-9]*
-
-ACROREAD= Acrobat7
-ACRO_SUBDIR= Browser
-
-.include "../../www/firefox-bin-acroread/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-flash/DESCR b/www/firefox-bin-flash/DESCR
deleted file mode 100644
index 224e9d49dc3..00000000000
--- a/www/firefox-bin-flash/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides the Macromedia Flash player plugin for the
-firefox-bin package.
diff --git a/www/firefox-bin-flash/Makefile b/www/firefox-bin-flash/Makefile
deleted file mode 100644
index 80b0a6c6af9..00000000000
--- a/www/firefox-bin-flash/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/07/29 05:19:52 jlam Exp $
-
-.include "Makefile.common"
-
-COMMENT= Flash Player plugin for firefox-bin
-
-DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
deleted file mode 100644
index f4a3c4b4628..00000000000
--- a/www/firefox-bin-flash/Makefile.common
+++ /dev/null
@@ -1,46 +0,0 @@
-# $NetBSD: Makefile.common,v 1.24 2011/03/17 11:47:45 obache Exp $
-
-DISTNAME= install_flash_player_9_${DISTUNAME}
-PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
-CATEGORIES= www graphics
-MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/
-
-MAINTAINER?= pkgsrc-users@NetBSD.org
-HOMEPAGE?= http://www.flash.com/
-LICENSE= flash-license
-
-RESTRICTED= Redistribution not permitted
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-DIST_SUBDIR= flash/${FLASH_VERS}
-
-EMUL_PLATFORMS= linux-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-SUB= english/${DISTUNAME}/${FLASH_VERS}
-
-FLASH_VERS= 9.0r124
-DISTUNAME= linux
-WRKNAME= install_flash_player_9_${DISTUNAME}
-
-DISTINFO_FILE= ${.CURDIR}/../../www/firefox-bin-flash/distinfo
-
-BUILD_DIRS= # empty
-CRYPTO= yes
-
-MOZ_NAME?= firefox-linux
-MOZ_BIN?= ${MOZ_NAME:S/linux/bin/}
-WRKSRC= ${WRKDIR}/${WRKNAME}
-NS_PLUGINS_DIR= ${PREFIX}/lib/${MOZ_NAME}/plugins
-
-PLIST_SUBST+= MOZ_NAME=${MOZ_NAME:Q}
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
- ${INSTALL_DATA} ${WRKSRC}/libflashplayer.so ${DESTDIR}${NS_PLUGINS_DIR}
diff --git a/www/firefox-bin-flash/PLIST b/www/firefox-bin-flash/PLIST
deleted file mode 100644
index a68f9896c7a..00000000000
--- a/www/firefox-bin-flash/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/23 22:27:15 tnn Exp $
-lib/${MOZ_NAME}/plugins/libflashplayer.so
diff --git a/www/firefox-bin-flash/distinfo b/www/firefox-bin-flash/distinfo
deleted file mode 100644
index db08c8d7e9e..00000000000
--- a/www/firefox-bin-flash/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.11 2008/04/09 08:39:24 tron Exp $
-
-SHA1 (flash/9.0r124/install_flash_player_9_linux.tar.gz) = c838e8216c2e6a0027991d567d9d951ffc26d797
-RMD160 (flash/9.0r124/install_flash_player_9_linux.tar.gz) = 21daef4b5438a13be16a4021bb1a9bba8f5c16d3
-Size (flash/9.0r124/install_flash_player_9_linux.tar.gz) = 3044538 bytes
diff --git a/www/firefox-bin-java/DESCR b/www/firefox-bin-java/DESCR
deleted file mode 100644
index 0d81e6eaff8..00000000000
--- a/www/firefox-bin-java/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package package provides Sun Java Run Time Environment (JRE)
-plugin for the firefox-bin package.
diff --git a/www/firefox-bin-java/Makefile b/www/firefox-bin-java/Makefile
deleted file mode 100644
index 42909c22f53..00000000000
--- a/www/firefox-bin-java/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2006/05/29 14:04:04 tron Exp $
-
-.include "Makefile.common"
-
-DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-java/Makefile.common b/www/firefox-bin-java/Makefile.common
deleted file mode 100644
index da2e8823e8e..00000000000
--- a/www/firefox-bin-java/Makefile.common
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2011/03/08 21:58:42 bad Exp $
-
-DISTNAME= ${MOZ_BIN}-java-1.2
-CATEGORIES= www lang
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT?= Java Run Time Environment (JRE) 1.5 plugin for firefox-bin
-
-USE_JAVA= run
-USE_JAVA2= yes
-PKG_JVMS_ACCEPTED= jdk15 sun-jdk6
-
-EMUL_PLATFORMS= linux-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-# XXX
-# XXX There is a bug where we depend on sun-jre15 and get the x86_64
-# XXX version of sun-jre15, but we need the i386 version instead.
-# XXX
-NOT_FOR_PLATFORM= *-*-x86_64
-
-WRKSRC= ${WRKDIR}
-BUILD_DIRS= # empty
-
-MOZ_NAME?= firefox-linux
-MOZ_BIN?= ${MOZ_NAME:S/linux/bin/}
-
-PLIST_SUBST+= MOZ_NAME=${MOZ_NAME:Q}
-PLIST_SRC= ${.CURDIR}/../firefox-bin-java/PLIST
-
-NS_PLUGINS_DIR= ${PREFIX}/lib/${MOZ_NAME}/plugins
-PLUGIN= ${PKG_JAVA_HOME}/plugin/i386/ns7/libjavaplugin_oji.so
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
- ${LN} -s ${PLUGIN} ${DESTDIR}${NS_PLUGINS_DIR}/libjavaplugin_oji.so
-
-.include "../../mk/java-vm.mk"
diff --git a/www/firefox-bin-java/PLIST b/www/firefox-bin-java/PLIST
deleted file mode 100644
index 108254003d6..00000000000
--- a/www/firefox-bin-java/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/03 23:46:58 tron Exp $
-lib/${MOZ_NAME}/plugins/libjavaplugin_oji.so
diff --git a/www/firefox-bin-realplayer/DESCR b/www/firefox-bin-realplayer/DESCR
deleted file mode 100644
index e86815d4a19..00000000000
--- a/www/firefox-bin-realplayer/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides RealNetworks RealAudio and RealVideo player
-plugin for the firefox-bin package.
diff --git a/www/firefox-bin-realplayer/Makefile b/www/firefox-bin-realplayer/Makefile
deleted file mode 100644
index e8cec9e642a..00000000000
--- a/www/firefox-bin-realplayer/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2011/03/17 11:38:42 obache Exp $
-
-DISTNAME= firefox-bin-realplayer-1.0
-PKGREVISION= 4
-CATEGORIES= www audio graphics
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-COMMENT= RealAudio and RealVideo player plugin for firefox-bin
-
-DEPENDS+= firefox-bin>=0.8:../../www/firefox-bin
-DEPENDS+= RealPlayerGold-[0-9]*:../../multimedia/RealPlayerGold
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-EMUL_PLATFORMS= linux-i386
-
-WRKSRC= ${WRKDIR}
-BUILD_DIRS= # empty
-
-NS_PLUGINS_DIR= ${PREFIX}/lib/firefox-linux/plugins
-PLUGIN_SOURCE= ${PREFIX}/lib/RealPlayer/mozilla/nphelix.so
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
- ${LN} -s ${PLUGIN_SOURCE} ${DESTDIR}${NS_PLUGINS_DIR}/nphelix.so
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/firefox-bin-realplayer/PLIST b/www/firefox-bin-realplayer/PLIST
deleted file mode 100644
index 06b7f075ff3..00000000000
--- a/www/firefox-bin-realplayer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/01/31 17:05:31 sketch Exp $
-lib/firefox-linux/plugins/nphelix.so
diff --git a/www/firefox-bin/DESCR b/www/firefox-bin/DESCR
deleted file mode 100644
index 2f9713be943..00000000000
--- a/www/firefox-bin/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Mozilla Firefox is a free, open-source and cross-platform web browser
-for Windows, Linux, MacOS X and many other operating systems. It is
-small, fast and easy to use, and offers many advantages over other web
-browsers, such as tabbed browsing and the ability to block pop-up
-windows.
-
-Firefox also offers excellent bookmark and history management, and it
-can be extended by developers using industry standards such as XML,
-CSS, JavaScript, C++, etc. Many extensions are available.
diff --git a/www/firefox-bin/Makefile b/www/firefox-bin/Makefile
deleted file mode 100644
index 35114d6816f..00000000000
--- a/www/firefox-bin/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2010/03/21 16:29:44 wiz Exp $
-
-MOZILLA= firefox
-MOZ_VER= 2.0.0.20
-MOZ_DISTVER= ${MOZ_VER}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.mozilla.com/en-US/firefox/
-COMMENT= Lightweight gecko-based web browser (binary package)
-
-DIST_SUBDIR= ${MOZILLA}/releases/${MOZ_DIR}
-
-EMUL_PLATFORMS= linux-i386
-EMUL_PLATFORMS+= solaris-i386 solaris-sparc
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/firefox-bin/Makefile.linux-i386 b/www/firefox-bin/Makefile.linux-i386
deleted file mode 100644
index c12675b7ebd..00000000000
--- a/www/firefox-bin/Makefile.linux-i386
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:19:55 jlam Exp $
-
-DISTNAME= firefox-${MOZ_DISTVER}
-MOZ_DIR= ${MOZ_DISTVER}/linux-i686/en-US
-
-MOZ_GTK2= yes
-MOZ_PLATFORM= linux
diff --git a/www/firefox-bin/Makefile.solaris-i386 b/www/firefox-bin/Makefile.solaris-i386
deleted file mode 100644
index 85fdc492d1c..00000000000
--- a/www/firefox-bin/Makefile.solaris-i386
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.solaris-i386,v 1.2 2007/08/23 18:20:34 jlam Exp $
-
-# Use the Solaris 8 binaries if we're not running at least Solaris 10.
-.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
-DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-i386
-EMUL_REQD= solaris>=10
-MOZ_GTK2= yes
-.else
-DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-i386-gtk1
-EMUL_REQD= solaris>=8
-.endif
-
-EXTRACT_SUFX= .tar.bz2
-MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball
-
-MOZ_PLATFORM= solaris
diff --git a/www/firefox-bin/Makefile.solaris-sparc b/www/firefox-bin/Makefile.solaris-sparc
deleted file mode 100644
index c3bb0f706e7..00000000000
--- a/www/firefox-bin/Makefile.solaris-sparc
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.solaris-sparc,v 1.4 2007/10/09 19:19:16 martti Exp $
-
-# Use the Solaris 8 binaries if we're not running at least Solaris 10.
-.if (${OPSYS} == "SunOS") && !empty(OS_VERSION:M5.1[0-9]*)
-DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris10-sparc
-EMUL_REQD= solaris>=10
-MOZ_GTK2= yes
-.else
-DISTNAME= firefox-${MOZ_DISTVER}.en-US.solaris8-sparc-gtk1
-EMUL_REQD= solaris>=8
-.endif
-
-EXTRACT_SUFX= .tar.bz2
-MOZ_DIR= ${MOZ_DISTVER}/contrib/solaris_tarball
-
-MOZ_PLATFORM= solaris
diff --git a/www/firefox-bin/distinfo b/www/firefox-bin/distinfo
deleted file mode 100644
index 22e0876d550..00000000000
--- a/www/firefox-bin/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.49 2009/09/30 09:35:56 sketch Exp $
-
-SHA1 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris10-i386.tar.bz2) = ba79d72d732f913ea90f05c080bd063d83361537
-RMD160 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris10-i386.tar.bz2) = ad6f00c6cc458b5dcc6ee7f5e306810390376cd7
-Size (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris10-i386.tar.bz2) = 11941565 bytes
-SHA1 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-i386-gtk1.tar.bz2) = f8853b8a2d48b282f95fbde88155da5a07ea3ec4
-RMD160 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-i386-gtk1.tar.bz2) = 56fead689cd02a36d2b6bfd01545d23a27ddfd8d
-Size (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-i386-gtk1.tar.bz2) = 11274918 bytes
-SHA1 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-sparc-gtk1.tar.bz2) = 8bb14c7dde7ffa58945aff04a42132333b6548f0
-RMD160 (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-sparc-gtk1.tar.bz2) = 131ba8f2433da860960d27131c37ade1d19e5781
-Size (firefox/releases/2.0.0.20/contrib/solaris_tarball/firefox-2.0.0.20.en-US.solaris8-sparc-gtk1.tar.bz2) = 12950650 bytes
-SHA1 (firefox/releases/2.0.0.20/linux-i686/en-US/firefox-2.0.0.20.tar.gz) = 4a4da438535207d88f44cf6614ea0afd5040026c
-RMD160 (firefox/releases/2.0.0.20/linux-i686/en-US/firefox-2.0.0.20.tar.gz) = 71150f277d8fb9e360d799efa5a66b06538b7326
-Size (firefox/releases/2.0.0.20/linux-i686/en-US/firefox-2.0.0.20.tar.gz) = 9710348 bytes
diff --git a/www/instiki/DESCR b/www/instiki/DESCR
deleted file mode 100644
index 04b3d6f009d..00000000000
--- a/www/instiki/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Instiki is a wiki clone with a strong focus on simplicity of
-installation and running. Instiki lowers the barriers of interest for
-when you might consider using a wiki. It is so simple to get running
-that you'll find yourself using it for anything -- taking notes,
-brainstorming, organizing a gathering, etc.
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
deleted file mode 100644
index 4850c3342cc..00000000000
--- a/www/instiki/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2011/09/16 02:26:45 obache Exp $
-
-DISTNAME= instiki-0.9.2
-PKGREVISION= 5
-CATEGORIES= www
-MASTER_SITES= http://rubyforge.org/frs/download.php/2515/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= minskim@NetBSD.org
-HOMEPAGE= http://instiki.org/show/HomePage
-COMMENT= Wiki clone that focuses on simple installation and running
-LICENSE= gnu-gpl-v2 OR ruby-license
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-NO_BUILD= yes
-
-RCD_SCRIPTS= instiki
-FILES_SUBST+= RUBY=${RUBY:Q}
-
-REPLACE_RUBY= instiki
-
-INSTIKI_DIR= share/${PKGBASE}
-
-SUBST_CLASSES+= paths
-SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= app/controllers/wiki.rb
-SUBST_SED.paths= \
- -e 's,File.dirname(__FILE__) + "/../../storage,"${VARBASE}/instiki,g'
-
-INSTALLATION_DIRS= share/doc/${PKGBASE} ${INSTIKI_DIR}
-
-post-patch:
- ${MV} ${WRKSRC}/instiki ${WRKSRC}/instiki.tmp
- ${TR} -d '\015' < ${WRKSRC}/instiki.tmp > ${WRKSRC}/instiki
-
-do-install:
-.for d in app libraries
- cd ${WRKSRC} && ${CP} -R ${d} ${DESTDIR}${PREFIX}/${INSTIKI_DIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${INSTIKI_DIR}/${d}
-.endfor
- ${FIND} ${DESTDIR}${PREFIX}/${INSTIKI_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
- ${FIND} ${DESTDIR}${PREFIX}/${INSTIKI_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
- ${INSTALL_SCRIPT} ${WRKSRC}/instiki ${DESTDIR}${PREFIX}/${INSTIKI_DIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-
-.include "../../lang/ruby/replace.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/instiki/PLIST b/www/instiki/PLIST
deleted file mode 100644
index 976edee8583..00000000000
--- a/www/instiki/PLIST
+++ /dev/null
@@ -1,86 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:23 joerg Exp $
-share/doc/instiki/README
-share/examples/rc.d/instiki
-share/instiki/app/controllers/wiki.rb
-share/instiki/app/models/author.rb
-share/instiki/app/models/chunks/category.rb
-share/instiki/app/models/chunks/category_test.rb
-share/instiki/app/models/chunks/chunk.rb
-share/instiki/app/models/chunks/engines.rb
-share/instiki/app/models/chunks/include.rb
-share/instiki/app/models/chunks/literal.rb
-share/instiki/app/models/chunks/match.rb
-share/instiki/app/models/chunks/nowiki.rb
-share/instiki/app/models/chunks/nowiki_test.rb
-share/instiki/app/models/chunks/test.rb
-share/instiki/app/models/chunks/uri.rb
-share/instiki/app/models/chunks/uri_test.rb
-share/instiki/app/models/chunks/wiki.rb
-share/instiki/app/models/chunks/wiki_test.rb
-share/instiki/app/models/page.rb
-share/instiki/app/models/page_lock.rb
-share/instiki/app/models/page_set.rb
-share/instiki/app/models/page_test.rb
-share/instiki/app/models/revision.rb
-share/instiki/app/models/revision_test.rb
-share/instiki/app/models/web.rb
-share/instiki/app/models/web_test.rb
-share/instiki/app/models/wiki_content.rb
-share/instiki/app/models/wiki_service.rb
-share/instiki/app/models/wiki_service_test.rb
-share/instiki/app/models/wiki_words.rb
-share/instiki/app/models/wiki_words_test.rb
-share/instiki/app/views/bottom.rhtml
-share/instiki/app/views/markdown_help.rhtml
-share/instiki/app/views/navigation.rhtml
-share/instiki/app/views/rdoc_help.rhtml
-share/instiki/app/views/static_style_sheet.rhtml
-share/instiki/app/views/textile_help.rhtml
-share/instiki/app/views/top.rhtml
-share/instiki/app/views/wiki/authors.rhtml
-share/instiki/app/views/wiki/edit.rhtml
-share/instiki/app/views/wiki/edit_web.rhtml
-share/instiki/app/views/wiki/export.rhtml
-share/instiki/app/views/wiki/feeds.rhtml
-share/instiki/app/views/wiki/list.rhtml
-share/instiki/app/views/wiki/locked.rhtml
-share/instiki/app/views/wiki/login.rhtml
-share/instiki/app/views/wiki/new.rhtml
-share/instiki/app/views/wiki/new_system.rhtml
-share/instiki/app/views/wiki/new_web.rhtml
-share/instiki/app/views/wiki/page.rhtml
-share/instiki/app/views/wiki/print.rhtml
-share/instiki/app/views/wiki/published.rhtml
-share/instiki/app/views/wiki/recently_revised.rhtml
-share/instiki/app/views/wiki/revision.rhtml
-share/instiki/app/views/wiki/rollback.rhtml
-share/instiki/app/views/wiki/rss_feed.rhtml
-share/instiki/app/views/wiki/search.rhtml
-share/instiki/app/views/wiki/tex.rhtml
-share/instiki/app/views/wiki/tex_web.rhtml
-share/instiki/app/views/wiki/web_list.rhtml
-share/instiki/app/views/wiki_words_help.rhtml
-share/instiki/instiki
-share/instiki/libraries/action_controller_servlet.rb
-share/instiki/libraries/bluecloth.rb
-share/instiki/libraries/diff/diff.rb
-share/instiki/libraries/diff/diff_test.rb
-share/instiki/libraries/erb.rb
-share/instiki/libraries/madeleine.rb
-share/instiki/libraries/madeleine/automatic.rb
-share/instiki/libraries/madeleine/clock.rb
-share/instiki/libraries/madeleine/files.rb
-share/instiki/libraries/madeleine/zmarshal.rb
-share/instiki/libraries/madeleine_service.rb
-share/instiki/libraries/rdocsupport.rb
-share/instiki/libraries/redcloth.rb
-share/instiki/libraries/redcloth_for_tex.rb
-share/instiki/libraries/redcloth_for_tex_test.rb
-share/instiki/libraries/view_helper.rb
-share/instiki/libraries/web_controller_server.rb
-share/instiki/libraries/zip/ioextras.rb
-share/instiki/libraries/zip/stdrubyext.rb
-share/instiki/libraries/zip/tempfile_bugfixed.rb
-share/instiki/libraries/zip/zip.rb
-share/instiki/libraries/zip/zipfilesystem.rb
-share/instiki/libraries/zip/ziprequire.rb
diff --git a/www/instiki/distinfo b/www/instiki/distinfo
deleted file mode 100644
index 22cf7cf901b..00000000000
--- a/www/instiki/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2005/10/16 15:13:49 taca Exp $
-
-SHA1 (instiki-0.9.2.tgz) = 9b90d83ec911cbaffce483cc6d15904b69eb8ff9
-RMD160 (instiki-0.9.2.tgz) = 4c42cc7a548e10cecbaf7952535029c49a71b046
-Size (instiki-0.9.2.tgz) = 91651 bytes
diff --git a/www/instiki/files/instiki.sh b/www/instiki/files/instiki.sh
deleted file mode 100644
index 3f263a4f924..00000000000
--- a/www/instiki/files/instiki.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: instiki.sh,v 1.1.1.1 2005/01/15 16:18:39 minskim Exp $
-#
-
-# PROVIDE: instiki
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="instiki"
-rcvar=${name}
-command="@PREFIX@/share/instiki/${name}"
-command_args="-t @VARBASE@/instiki"
-command_interpreter="@RUBY@"
-
-if [ -f /etc/rc.subr ]; then
- load_rc_config ${name}
- run_rc_command "$1"
-else
- @ECHO_N@ " ${name}"
- ${command} ${instiki_flags} ${command_args}
-fi
diff --git a/www/jakarta-tomcat4/DESCR b/www/jakarta-tomcat4/DESCR
deleted file mode 100644
index ce6c4b29846..00000000000
--- a/www/jakarta-tomcat4/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Tomcat is the Java Servlet / Java Server Page environment produced
-by the Apache Foundation's Jakarta Project. Tomcat can be run as a
-standalone web server with Servlet and JSP support, or using Apache
-Server as its web server via the mod_jk Apache module (www/ap-jk).
diff --git a/www/jakarta-tomcat4/MESSAGE b/www/jakarta-tomcat4/MESSAGE
deleted file mode 100644
index 6ae73cdbe87..00000000000
--- a/www/jakarta-tomcat4/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/04/29 15:08:06 erh Exp $
-
-For detailed instructions on how to run Tomcat, either as a
-standalone server or in conjunction with Apache (using the
-www/ap-jk package), see:
-
- http://localhost:8080/tomcat-docs/index.html
-
-For more information on application development with Tomcat, see
-
- http://localhost:8080/tomcat-docs/appdev/index.html
-
-Note that tomcat may be started with the following command:
-
- ${PREFIX}/etc/rc.d/tomcat4 start
-
-===========================================================================
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
deleted file mode 100644
index 5594a6f42ac..00000000000
--- a/www/jakarta-tomcat4/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2011/03/27 09:16:58 obache Exp $
-
-PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
-DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${DISTNAME}
-CATEGORIES= www java
-MASTER_SITES= http://archive.apache.org/dist/tomcat/tomcat-4/v${TOMCAT_VERSION}/bin/
-
-MAINTAINER= erh@NetBSD.org
-HOMEPAGE= http://tomcat.apache.org/
-COMMENT= The Apache Project's Java Servlet 2.3 and JSP 1.2 server
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-TOMCAT_VERSION= 4.1.30
-
-# This needs java 1.4 or higher.
-USE_JAVA=run
-USE_JAVA2=yes
-
-USE_TOOLS+= pax
-
-TOMCAT_LIB= ${PREFIX}/tomcat4
-
-SAMPLECONFDIR= ${TOMCAT_LIB}/conf
-PKG_SYSCONFDIR.jakarta-tomcat4= ${SAMPLECONFDIR}
-
-CFILES= server.xml web.xml tomcat-users.xml
-CFILES+= catalina.policy jk2.properties
-
-CONF_FILES= # empty
-.for FILE in ${CFILES}
-CONF_FILES+= ${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE}
-.endfor
-RCD_SCRIPTS= tomcat4
-
-FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
-
-.include "../../mk/java-vm.mk"
-
-do-build:
-.for FILE in ${CFILES}
- ${MV} -f ${WRKSRC}/conf/${FILE} ${WRKSRC}/conf/${FILE}.default
-.endfor
-
-INSTALLATION_DIRS= ${TOMCAT_LIB}
-
-do-install:
- cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}
- @${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print \
- | ${XARGS} ${CHMOD} a+r
- @${FIND} ${DESTDIR}${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
- | ${XARGS} ${CHMOD} a+rx
- @${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print \
- | ${XARGS} ${CHMOD} a+rx
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/jakarta-tomcat4/PLIST b/www/jakarta-tomcat4/PLIST
deleted file mode 100644
index 041c65818ad..00000000000
--- a/www/jakarta-tomcat4/PLIST
+++ /dev/null
@@ -1,1473 +0,0 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 22:00:24 joerg Exp $
-share/examples/rc.d/tomcat4
-tomcat4/LICENSE
-tomcat4/README.txt
-tomcat4/RELEASE-NOTES-4.1.txt
-tomcat4/RELEASE-PLAN-4.1.txt
-tomcat4/RUNNING.txt
-tomcat4/bin/bootstrap.jar
-tomcat4/bin/catalina.bat
-tomcat4/bin/catalina.sh
-tomcat4/bin/commons-daemon.jar
-tomcat4/bin/cpappend.bat
-tomcat4/bin/digest.bat
-tomcat4/bin/digest.sh
-tomcat4/bin/jasper.bat
-tomcat4/bin/jasper.sh
-tomcat4/bin/jspc.bat
-tomcat4/bin/jspc.sh
-tomcat4/bin/setclasspath.bat
-tomcat4/bin/setclasspath.sh
-tomcat4/bin/shutdown.bat
-tomcat4/bin/shutdown.sh
-tomcat4/bin/startup.bat
-tomcat4/bin/startup.sh
-tomcat4/bin/tomcat-jni.jar
-tomcat4/bin/tomcat.exe
-tomcat4/bin/tool-wrapper.bat
-tomcat4/bin/tool-wrapper.sh
-tomcat4/common/endorsed/xercesImpl.jar
-tomcat4/common/endorsed/xmlParserAPIs.jar
-tomcat4/common/lib/activation.jar
-tomcat4/common/lib/ant.jar
-tomcat4/common/lib/commons-collections.jar
-tomcat4/common/lib/commons-dbcp-1.1.jar
-tomcat4/common/lib/commons-logging-api.jar
-tomcat4/common/lib/commons-pool-1.1.jar
-tomcat4/common/lib/jasper-compiler.jar
-tomcat4/common/lib/jasper-runtime.jar
-tomcat4/common/lib/jdbc2_0-stdext.jar
-tomcat4/common/lib/jndi.jar
-tomcat4/common/lib/jta.jar
-tomcat4/common/lib/mail.jar
-tomcat4/common/lib/naming-common.jar
-tomcat4/common/lib/naming-factory.jar
-tomcat4/common/lib/naming-resources.jar
-tomcat4/common/lib/servlet.jar
-tomcat4/conf/catalina.policy.default
-tomcat4/conf/jk2.properties.default
-tomcat4/conf/server-noexamples.xml.config
-tomcat4/conf/server.xml.default
-tomcat4/conf/tomcat-users.xml.default
-tomcat4/conf/web.xml.default
-tomcat4/server/lib/catalina-ant.jar
-tomcat4/server/lib/catalina.jar
-tomcat4/server/lib/commons-beanutils.jar
-tomcat4/server/lib/commons-digester.jar
-tomcat4/server/lib/commons-fileupload-1.0.jar
-tomcat4/server/lib/commons-logging.jar
-tomcat4/server/lib/commons-modeler.jar
-tomcat4/server/lib/jaas.jar
-tomcat4/server/lib/jakarta-regexp-1.3.jar
-tomcat4/server/lib/mx4j-jmx.jar
-tomcat4/server/lib/mx4j.license
-tomcat4/server/lib/servlets-cgi.renametojar
-tomcat4/server/lib/servlets-common.jar
-tomcat4/server/lib/servlets-default.jar
-tomcat4/server/lib/servlets-invoker.jar
-tomcat4/server/lib/servlets-manager.jar
-tomcat4/server/lib/servlets-ssi.renametojar
-tomcat4/server/lib/servlets-webdav.jar
-tomcat4/server/lib/tomcat-coyote.jar
-tomcat4/server/lib/tomcat-http11.jar
-tomcat4/server/lib/tomcat-jk.jar
-tomcat4/server/lib/tomcat-jk2.jar
-tomcat4/server/lib/tomcat-util.jar
-tomcat4/server/lib/tomcat-warp.jar
-tomcat4/server/webapps/admin/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ActionsTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationLocales.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources.properties
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_ja.properties
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationServlet.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/CommitChangesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DataTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpRegistryAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/DumpServerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LabelValueBean.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/Lists.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/LogOutAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/RowTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetLocaleForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpTreeAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TableTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeBuilder.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControl.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlNode.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTestAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/AddConnectorAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/ConnectorsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/DeleteConnectorsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/SaveConnectorAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/AddContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/ContextsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/DeleteContextsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/EditContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/context/SaveContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/AddDefaultContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DefaultContextForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DefaultContextsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/DeleteDefaultContextsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/EditDefaultContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/defaultcontext/SaveDefaultContextAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddAliasAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AddHostAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/AliasesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteAliasesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/DeleteHostsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/EditHostAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/HostsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveAliasAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/host/SaveHostAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/AddLoggerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggerForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/DeleteLoggersAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/EditLoggerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggerForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/LoggersForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/BaseForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourcesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteDataSourcesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteEnvEntriesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteMailSessionsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteResourceLinksAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DeleteUserDatabasesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntriesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListDataSourcesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListEnvEntriesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListMailSessionsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListResourceLinksAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ListUserDatabasesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinksForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceUtils.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourcesTreeBuilder.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveEnvEntryAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveMailSessionAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveResourceLinkAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveUserDatabaseAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpDataSourceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpEnvEntryAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpMailSessionAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpResourceLinkAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SetUpUserDatabaseAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabasesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/EditServerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/SaveServerAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/server/ServerForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/AddServiceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServiceForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/DeleteServicesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/EditServiceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/SaveServiceAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServiceForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/service/ServicesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveUserAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserUtils.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersTreeBuilder.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AccessLogValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/AddValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/DeleteValvesAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/EditValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteAddrValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RemoteHostValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/RequestDumperValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveAccessLogValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteAddrValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRemoteHostValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveRequestDumperValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SaveSingleSignOnValveAction.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/SingleSignOnValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveForm.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValveUtil.class
-tomcat4/server/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/valve/ValvesForm.class
-tomcat4/server/webapps/admin/WEB-INF/controls.tld
-tomcat4/server/webapps/admin/WEB-INF/lib/struts.jar
-tomcat4/server/webapps/admin/WEB-INF/struts-bean.tld
-tomcat4/server/webapps/admin/WEB-INF/struts-config.xml
-tomcat4/server/webapps/admin/WEB-INF/struts-html.tld
-tomcat4/server/webapps/admin/WEB-INF/struts-logic.tld
-tomcat4/server/webapps/admin/WEB-INF/web.xml
-tomcat4/server/webapps/admin/admin.css
-tomcat4/server/webapps/admin/banner.jsp
-tomcat4/server/webapps/admin/blank.jsp
-tomcat4/server/webapps/admin/buttons.jsp
-tomcat4/server/webapps/admin/connector/connector.jsp
-tomcat4/server/webapps/admin/connector/connectors.jsp
-tomcat4/server/webapps/admin/context/context.jsp
-tomcat4/server/webapps/admin/context/contexts.jsp
-tomcat4/server/webapps/admin/defaultcontext/defaultcontext.jsp
-tomcat4/server/webapps/admin/dumpRegistry.jsp
-tomcat4/server/webapps/admin/dumpServer.jsp
-tomcat4/server/webapps/admin/error.jsp
-tomcat4/server/webapps/admin/footer.jsp
-tomcat4/server/webapps/admin/header.jsp
-tomcat4/server/webapps/admin/host/alias.jsp
-tomcat4/server/webapps/admin/host/aliases.jsp
-tomcat4/server/webapps/admin/host/host.jsp
-tomcat4/server/webapps/admin/host/hosts.jsp
-tomcat4/server/webapps/admin/images/BlueTile.gif
-tomcat4/server/webapps/admin/images/Connector.gif
-tomcat4/server/webapps/admin/images/Context.gif
-tomcat4/server/webapps/admin/images/Datasource.gif
-tomcat4/server/webapps/admin/images/DefaultContext.gif
-tomcat4/server/webapps/admin/images/EnvironmentEntries.gif
-tomcat4/server/webapps/admin/images/Groups.gif
-tomcat4/server/webapps/admin/images/Host.gif
-tomcat4/server/webapps/admin/images/Logger.gif
-tomcat4/server/webapps/admin/images/Login.jpg
-tomcat4/server/webapps/admin/images/LoginBackgroundTile.gif
-tomcat4/server/webapps/admin/images/Mailsession.gif
-tomcat4/server/webapps/admin/images/PaperTexture.gif
-tomcat4/server/webapps/admin/images/Realm.gif
-tomcat4/server/webapps/admin/images/ResourceLink.gif
-tomcat4/server/webapps/admin/images/Roles.gif
-tomcat4/server/webapps/admin/images/Server.gif
-tomcat4/server/webapps/admin/images/Service.gif
-tomcat4/server/webapps/admin/images/TomcatBanner.jpg
-tomcat4/server/webapps/admin/images/Users.gif
-tomcat4/server/webapps/admin/images/Valve.gif
-tomcat4/server/webapps/admin/images/folder_16_pad.gif
-tomcat4/server/webapps/admin/images/handledownlast.gif
-tomcat4/server/webapps/admin/images/handledownmiddle.gif
-tomcat4/server/webapps/admin/images/handlerightlast.gif
-tomcat4/server/webapps/admin/images/handlerightmiddle.gif
-tomcat4/server/webapps/admin/images/linelastnode.gif
-tomcat4/server/webapps/admin/images/linemiddlenode.gif
-tomcat4/server/webapps/admin/images/linevertical.gif
-tomcat4/server/webapps/admin/index.jsp
-tomcat4/server/webapps/admin/logger/logger.jsp
-tomcat4/server/webapps/admin/logger/loggers.jsp
-tomcat4/server/webapps/admin/login.jsp
-tomcat4/server/webapps/admin/realm/jdbcRealm.jsp
-tomcat4/server/webapps/admin/realm/jndiRealm.jsp
-tomcat4/server/webapps/admin/realm/memoryRealm.jsp
-tomcat4/server/webapps/admin/realm/realms.jsp
-tomcat4/server/webapps/admin/realm/userDatabaseRealm.jsp
-tomcat4/server/webapps/admin/resources/dataSource.jsp
-tomcat4/server/webapps/admin/resources/dataSources.jspf
-tomcat4/server/webapps/admin/resources/deleteDataSources.jsp
-tomcat4/server/webapps/admin/resources/deleteEnvEntries.jsp
-tomcat4/server/webapps/admin/resources/deleteMailSessions.jsp
-tomcat4/server/webapps/admin/resources/deleteResourceLinks.jsp
-tomcat4/server/webapps/admin/resources/deleteUserDatabases.jsp
-tomcat4/server/webapps/admin/resources/envEntries.jspf
-tomcat4/server/webapps/admin/resources/envEntry.jsp
-tomcat4/server/webapps/admin/resources/listDataSources.jsp
-tomcat4/server/webapps/admin/resources/listDataSources.jspf
-tomcat4/server/webapps/admin/resources/listEnvEntries.jsp
-tomcat4/server/webapps/admin/resources/listEnvEntries.jspf
-tomcat4/server/webapps/admin/resources/listMailSessions.jsp
-tomcat4/server/webapps/admin/resources/listMailSessions.jspf
-tomcat4/server/webapps/admin/resources/listResourceLinks.jsp
-tomcat4/server/webapps/admin/resources/listResourceLinks.jspf
-tomcat4/server/webapps/admin/resources/listUserDatabases.jsp
-tomcat4/server/webapps/admin/resources/listUserDatabases.jspf
-tomcat4/server/webapps/admin/resources/mailSession.jsp
-tomcat4/server/webapps/admin/resources/mailSessions.jspf
-tomcat4/server/webapps/admin/resources/resourceLink.jsp
-tomcat4/server/webapps/admin/resources/resourceLinks.jspf
-tomcat4/server/webapps/admin/resources/userDatabase.jsp
-tomcat4/server/webapps/admin/resources/userDatabases.jspf
-tomcat4/server/webapps/admin/saved.jsp
-tomcat4/server/webapps/admin/server/server.jsp
-tomcat4/server/webapps/admin/service/service.jsp
-tomcat4/server/webapps/admin/service/services.jsp
-tomcat4/server/webapps/admin/tree-control-test.css
-tomcat4/server/webapps/admin/tree-control-test.jsp
-tomcat4/server/webapps/admin/users/deleteGroups.jsp
-tomcat4/server/webapps/admin/users/deleteRoles.jsp
-tomcat4/server/webapps/admin/users/deleteUsers.jsp
-tomcat4/server/webapps/admin/users/footer.jsp
-tomcat4/server/webapps/admin/users/group.jsp
-tomcat4/server/webapps/admin/users/groups.jspf
-tomcat4/server/webapps/admin/users/header.jsp
-tomcat4/server/webapps/admin/users/listGroups.jsp
-tomcat4/server/webapps/admin/users/listGroups.jspf
-tomcat4/server/webapps/admin/users/listRoles.jsp
-tomcat4/server/webapps/admin/users/listRoles.jspf
-tomcat4/server/webapps/admin/users/listUsers.jsp
-tomcat4/server/webapps/admin/users/listUsers.jspf
-tomcat4/server/webapps/admin/users/role.jsp
-tomcat4/server/webapps/admin/users/roles.jspf
-tomcat4/server/webapps/admin/users/user.jsp
-tomcat4/server/webapps/admin/users/users.jspf
-tomcat4/server/webapps/admin/valve/accessLogValve.jsp
-tomcat4/server/webapps/admin/valve/remoteAddrValve.jsp
-tomcat4/server/webapps/admin/valve/remoteHostValve.jsp
-tomcat4/server/webapps/admin/valve/requestDumperValve.jsp
-tomcat4/server/webapps/admin/valve/singleSignOnValve.jsp
-tomcat4/server/webapps/admin/valve/valves.jsp
-tomcat4/server/webapps/manager/WEB-INF/web.xml
-tomcat4/server/webapps/manager/html-manager-howto.html
-tomcat4/server/webapps/manager/images/jakarta-logo.gif
-tomcat4/server/webapps/manager/images/tomcat.gif
-tomcat4/server/webapps/manager/images/void.gif
-tomcat4/server/webapps/manager/manager-howto.html
-tomcat4/temp/README.txt
-tomcat4/webapps/ROOT/WEB-INF/web.xml
-tomcat4/webapps/ROOT/index.jsp
-tomcat4/webapps/ROOT/jakarta-banner.gif
-tomcat4/webapps/ROOT/tomcat-power.gif
-tomcat4/webapps/ROOT/tomcat.gif
-tomcat4/webapps/admin.xml
-tomcat4/webapps/examples/WEB-INF/classes/CookieExample.class
-tomcat4/webapps/examples/WEB-INF/classes/CookieExample.java
-tomcat4/webapps/examples/WEB-INF/classes/HelloWorldExample.class
-tomcat4/webapps/examples/WEB-INF/classes/HelloWorldExample.java
-tomcat4/webapps/examples/WEB-INF/classes/JndiServlet.class
-tomcat4/webapps/examples/WEB-INF/classes/JndiServlet.java
-tomcat4/webapps/examples/WEB-INF/classes/LocalStrings.properties
-tomcat4/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
-tomcat4/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
-tomcat4/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
-tomcat4/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
-tomcat4/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
-tomcat4/webapps/examples/WEB-INF/classes/RequestInfoExample.class
-tomcat4/webapps/examples/WEB-INF/classes/RequestInfoExample.java
-tomcat4/webapps/examples/WEB-INF/classes/RequestParamExample.class
-tomcat4/webapps/examples/WEB-INF/classes/RequestParamExample.java
-tomcat4/webapps/examples/WEB-INF/classes/SendMailServlet.class
-tomcat4/webapps/examples/WEB-INF/classes/SendMailServlet.java
-tomcat4/webapps/examples/WEB-INF/classes/SessionExample.class
-tomcat4/webapps/examples/WEB-INF/classes/SessionExample.java
-tomcat4/webapps/examples/WEB-INF/classes/cal/Entries.class
-tomcat4/webapps/examples/WEB-INF/classes/cal/Entries.java
-tomcat4/webapps/examples/WEB-INF/classes/cal/Entry.class
-tomcat4/webapps/examples/WEB-INF/classes/cal/Entry.java
-tomcat4/webapps/examples/WEB-INF/classes/cal/JspCalendar.class
-tomcat4/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
-tomcat4/webapps/examples/WEB-INF/classes/cal/TableBean.class
-tomcat4/webapps/examples/WEB-INF/classes/cal/TableBean.java
-tomcat4/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
-tomcat4/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
-tomcat4/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
-tomcat4/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-tomcat4/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
-tomcat4/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
-tomcat4/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
-tomcat4/webapps/examples/WEB-INF/classes/error/Smart.class
-tomcat4/webapps/examples/WEB-INF/classes/error/Smart.java
-tomcat4/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
-tomcat4/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
-tomcat4/webapps/examples/WEB-INF/classes/examples/FooTag.class
-tomcat4/webapps/examples/WEB-INF/classes/examples/FooTag.java
-tomcat4/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
-tomcat4/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
-tomcat4/webapps/examples/WEB-INF/classes/examples/LogTag.class
-tomcat4/webapps/examples/WEB-INF/classes/examples/LogTag.java
-tomcat4/webapps/examples/WEB-INF/classes/examples/ShowSource.class
-tomcat4/webapps/examples/WEB-INF/classes/examples/ShowSource.java
-tomcat4/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
-tomcat4/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
-tomcat4/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
-tomcat4/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
-tomcat4/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-tomcat4/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-tomcat4/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
-tomcat4/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
-tomcat4/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
-tomcat4/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
-tomcat4/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
-tomcat4/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
-tomcat4/webapps/examples/WEB-INF/classes/servletToJsp.class
-tomcat4/webapps/examples/WEB-INF/classes/servletToJsp.java
-tomcat4/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
-tomcat4/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
-tomcat4/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
-tomcat4/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
-tomcat4/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
-tomcat4/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
-tomcat4/webapps/examples/WEB-INF/jsp/applet/Clock2.java
-tomcat4/webapps/examples/WEB-INF/jsp/debug-taglib.tld
-tomcat4/webapps/examples/WEB-INF/jsp/example-taglib.tld
-tomcat4/webapps/examples/WEB-INF/web.xml
-tomcat4/webapps/examples/images/code.gif
-tomcat4/webapps/examples/images/execute.gif
-tomcat4/webapps/examples/images/return.gif
-tomcat4/webapps/examples/jsp/cal/Entries.txt
-tomcat4/webapps/examples/jsp/cal/Entry.txt
-tomcat4/webapps/examples/jsp/cal/JspCalendar.txt
-tomcat4/webapps/examples/jsp/cal/TableBean.txt
-tomcat4/webapps/examples/jsp/cal/cal1.jsp
-tomcat4/webapps/examples/jsp/cal/cal1.txt
-tomcat4/webapps/examples/jsp/cal/cal2.jsp
-tomcat4/webapps/examples/jsp/cal/cal2.txt
-tomcat4/webapps/examples/jsp/cal/calendar.html
-tomcat4/webapps/examples/jsp/cal/login.html
-tomcat4/webapps/examples/jsp/checkbox/CheckTest.html
-tomcat4/webapps/examples/jsp/checkbox/check.html
-tomcat4/webapps/examples/jsp/checkbox/checkresult.jsp
-tomcat4/webapps/examples/jsp/checkbox/checkresult.txt
-tomcat4/webapps/examples/jsp/checkbox/cresult.html
-tomcat4/webapps/examples/jsp/colors/ColorGameBean.html
-tomcat4/webapps/examples/jsp/colors/clr.html
-tomcat4/webapps/examples/jsp/colors/colors.html
-tomcat4/webapps/examples/jsp/colors/colors.txt
-tomcat4/webapps/examples/jsp/colors/colrs.jsp
-tomcat4/webapps/examples/jsp/dates/date.html
-tomcat4/webapps/examples/jsp/dates/date.jsp
-tomcat4/webapps/examples/jsp/dates/date.txt
-tomcat4/webapps/examples/jsp/error/er.html
-tomcat4/webapps/examples/jsp/error/err.jsp
-tomcat4/webapps/examples/jsp/error/err.txt
-tomcat4/webapps/examples/jsp/error/error.html
-tomcat4/webapps/examples/jsp/error/errorpge.jsp
-tomcat4/webapps/examples/jsp/forward/forward.jsp
-tomcat4/webapps/examples/jsp/forward/forward.txt
-tomcat4/webapps/examples/jsp/forward/fwd.html
-tomcat4/webapps/examples/jsp/forward/one.jsp
-tomcat4/webapps/examples/jsp/forward/two.html
-tomcat4/webapps/examples/jsp/include/foo.html
-tomcat4/webapps/examples/jsp/include/foo.jsp
-tomcat4/webapps/examples/jsp/include/inc.html
-tomcat4/webapps/examples/jsp/include/include.jsp
-tomcat4/webapps/examples/jsp/include/include.txt
-tomcat4/webapps/examples/jsp/index.html
-tomcat4/webapps/examples/jsp/jsptoserv/hello.jsp
-tomcat4/webapps/examples/jsp/jsptoserv/jsptoservlet.jsp
-tomcat4/webapps/examples/jsp/jsptoserv/jts.html
-tomcat4/webapps/examples/jsp/jsptoserv/jts.txt
-tomcat4/webapps/examples/jsp/jsptoserv/stj.txt
-tomcat4/webapps/examples/jsp/mail/sendmail.html
-tomcat4/webapps/examples/jsp/mail/sendmail.jsp
-tomcat4/webapps/examples/jsp/mail/sendmail.txt
-tomcat4/webapps/examples/jsp/num/numguess.html
-tomcat4/webapps/examples/jsp/num/numguess.jsp
-tomcat4/webapps/examples/jsp/num/numguess.txt
-tomcat4/webapps/examples/jsp/plugin/applet/Clock2.class
-tomcat4/webapps/examples/jsp/plugin/applet/Clock2.java
-tomcat4/webapps/examples/jsp/plugin/plugin.html
-tomcat4/webapps/examples/jsp/plugin/plugin.jsp
-tomcat4/webapps/examples/jsp/plugin/plugin.txt
-tomcat4/webapps/examples/jsp/security/protected/error.jsp
-tomcat4/webapps/examples/jsp/security/protected/index.jsp
-tomcat4/webapps/examples/jsp/security/protected/login.jsp
-tomcat4/webapps/examples/jsp/sessions/DummyCart.html
-tomcat4/webapps/examples/jsp/sessions/carts.html
-tomcat4/webapps/examples/jsp/sessions/carts.jsp
-tomcat4/webapps/examples/jsp/sessions/carts.txt
-tomcat4/webapps/examples/jsp/sessions/crt.html
-tomcat4/webapps/examples/jsp/simpletag/foo.html
-tomcat4/webapps/examples/jsp/simpletag/foo.jsp
-tomcat4/webapps/examples/jsp/simpletag/foo.txt
-tomcat4/webapps/examples/jsp/snp/snoop.html
-tomcat4/webapps/examples/jsp/snp/snoop.jsp
-tomcat4/webapps/examples/jsp/snp/snoop.txt
-tomcat4/webapps/examples/jsp/source.jsp
-tomcat4/webapps/examples/jsp/xml/xml.html
-tomcat4/webapps/examples/jsp/xml/xml.jsp
-tomcat4/webapps/examples/jsp/xml/xml.txt
-tomcat4/webapps/examples/servlets/cookies.html
-tomcat4/webapps/examples/servlets/helloworld.html
-tomcat4/webapps/examples/servlets/index.html
-tomcat4/webapps/examples/servlets/jndi.html
-tomcat4/webapps/examples/servlets/reqheaders.html
-tomcat4/webapps/examples/servlets/reqinfo.html
-tomcat4/webapps/examples/servlets/reqparams.html
-tomcat4/webapps/examples/servlets/sessions.html
-tomcat4/webapps/manager.xml
-tomcat4/webapps/tomcat-docs/BUILDING.txt
-tomcat4/webapps/tomcat-docs/README.txt
-tomcat4/webapps/tomcat-docs/RUNNING.txt
-tomcat4/webapps/tomcat-docs/WEB-INF/web.xml
-tomcat4/webapps/tomcat-docs/appdev/build.xml.txt
-tomcat4/webapps/tomcat-docs/appdev/deployment.html
-tomcat4/webapps/tomcat-docs/appdev/index.html
-tomcat4/webapps/tomcat-docs/appdev/installation.html
-tomcat4/webapps/tomcat-docs/appdev/introduction.html
-tomcat4/webapps/tomcat-docs/appdev/printer/build.xml.txt
-tomcat4/webapps/tomcat-docs/appdev/printer/deployment.html
-tomcat4/webapps/tomcat-docs/appdev/printer/index.html
-tomcat4/webapps/tomcat-docs/appdev/printer/installation.html
-tomcat4/webapps/tomcat-docs/appdev/printer/introduction.html
-tomcat4/webapps/tomcat-docs/appdev/printer/processes.html
-tomcat4/webapps/tomcat-docs/appdev/printer/source.html
-tomcat4/webapps/tomcat-docs/appdev/printer/web.xml.txt
-tomcat4/webapps/tomcat-docs/appdev/processes.html
-tomcat4/webapps/tomcat-docs/appdev/sample/build.xml
-tomcat4/webapps/tomcat-docs/appdev/sample/docs/README.txt
-tomcat4/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java
-tomcat4/webapps/tomcat-docs/appdev/sample/web/WEB-INF/web.xml
-tomcat4/webapps/tomcat-docs/appdev/sample/web/hello.jsp
-tomcat4/webapps/tomcat-docs/appdev/sample/web/images/tomcat.gif
-tomcat4/webapps/tomcat-docs/appdev/sample/web/index.html
-tomcat4/webapps/tomcat-docs/appdev/source.html
-tomcat4/webapps/tomcat-docs/appdev/web.xml.txt
-tomcat4/webapps/tomcat-docs/catalina/docs/api/allclasses-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/allclasses-noframe.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/constant-values.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/deprecated-list.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/help-doc.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/index-all.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/index.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Authenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Cluster.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Connector.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Contained.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Container.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerEvent.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Context.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/DefaultContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Deployer.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Engine.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Globals.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Group.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Host.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/HttpRequest.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/HttpResponse.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/InstanceEvent.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/InstanceListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Lifecycle.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleEvent.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleException.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Loader.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Logger.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Manager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Mapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Pipeline.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Realm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Request.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Response.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Role.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Server.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ServerFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Service.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Session.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/SessionEvent.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/SessionListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Store.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/User.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/UserDatabase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Valve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ValveContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Wrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/AbstractCatalinaTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/DeployTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/InstallTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ListTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ReloadTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RemoveTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ResourcesTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RolesTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StartTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StopTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/UndeployTask.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/AuthenticatorBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/BasicAuthenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/DigestAuthenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/FormAuthenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/NonLoginAuthenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/ClusterMemberInfo.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/ClusterReceiver.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/ClusterSender.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/ClusterSessionBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/MulticastReceiver.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/MulticastSender.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/ReplicationWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/StandardCluster.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/cluster/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ClientAbortException.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpRequestBase.PrivilegedGetSession.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpRequestBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpRequestFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpRequestWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpResponseBase.PrivilegedFlushBuffer.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpResponseBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpResponseFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpResponseWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/RequestBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/RequestFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/RequestStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/RequestWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseWriter.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/HttpConnector.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/HttpRequestStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/HttpResponseStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/SocketInputStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10/HttpConnector.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/http10/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpCertificates.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConfigurationHandler.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConnection.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpConnector.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpEngine.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpHost.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpLogger.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpPacket.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequest.Stream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequest.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpRequestHandler.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpResponse.Stream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpResponse.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/WarpSSLData.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/warp/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetRequestDispatcher.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetResource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedGetResourcePaths.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedLogException.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedLogMessage.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.PrivilegedLogThrowable.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContextFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ContainerBase.PrivilegedAddChild.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ContainerBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/FastEngineMapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/MappingRequest.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/NamingContextListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardContextMapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardDefaultContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardEngine.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardEngineMapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardHost.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardHostDeployer.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardHostMapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardPipeline.StandardPipelineValveContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardPipeline.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardServer.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardService.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardWrapperFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ApplicationParameter.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextEjb.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextEnvironment.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextLocalEjb.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextResource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextResourceLink.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ErrorPage.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/FilterDef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/FilterMap.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/LoginConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/NamingResources.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ResourceParams.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/SecurityCollection.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/SecurityConstraint.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/Test.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Extension.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.WebappContextNotifier.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/FileLogger.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/LoggerBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/SystemErrLogger.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/SystemOutLogger.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ClassNameMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ConnectorMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextEnvironmentMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextResourceLinkMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextResourceMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/DefaultContextMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/GroupMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MBeanFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MBeanUtils.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/NamingResourcesMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/RoleMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ServerLifecycleListener.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardContextMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardEngineMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardHostMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardServerMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardServiceMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/UserMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/DefaultServerSocketFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/SSLServerSocketFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/ServerSocketFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/DataSourceRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/GenericPrincipal.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASCallbackHandler.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASMemoryLoginModule.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JDBCRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JNDIRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/MemoryRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/MemoryRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/RealmBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/UserDatabaseRealm.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIEnvironment.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIRunner.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/HTMLManagerServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/InvokerServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/ManagerServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/WebdavServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/DistributedManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/FileStore.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/JDBCStore.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/ManagerBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/PersistentManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/PersistentManagerBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StandardManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StandardSessionFacade.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StoreBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExternalResolver.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIFlastmod.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIFsize.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIInclude.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIMediator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIPrintenv.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIProcessor.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServlet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletExternalResolver.ServletContextAndPath.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletExternalResolver.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Bootstrap.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/BootstrapService.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/BootstrapServiceContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Catalina.CatalinaShutdownHook.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Catalina.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaManagerMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaService.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ClassLoaderFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CopyParentClassLoaderRule.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Embedded.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EmbeddedManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EmbeddedManagerMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ExpandWar.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HomesUserDatabase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HostConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HostRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/LifecycleListenerRule.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/NamingRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/PasswdUserDatabase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SecurityClassLoad.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Tool.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/UserConfig.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/UserDatabase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/WebRuleSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractGroup.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractRole.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractUser.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryGroup.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryRole.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUser.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUserDatabase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUserDatabaseFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Base64.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CGIProcessEnvironment.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CharsetMapper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CookieTools.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CustomObjectInputStream.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/DOMWriter.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/DateTool.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Enumerator.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/FastDateFormat.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/FastHttpDateFormat.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/HexUtils.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/IOTools.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/InstanceSupport.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/LifecycleSupport.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/MD5Encoder.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/MIME2Java.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ParameterMap.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ProcessEnvironment.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ProcessHelper.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Queue.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/RequestUtil.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ResourceSet.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ServerInfo.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Strftime.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/StringManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/StringParser.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/URL.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/URLEncoder.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/XMLWriter.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/AccessLogValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/CertificatesValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/Constants.AccessLog.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ErrorDispatcherValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ErrorReportValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/JDBCAccessLogValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RemoteAddrValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RemoteHostValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RequestDumperValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RequestFilterValve.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ValveBase.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ContextAccessController.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ContextBindings.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/EjbRef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/JndiPermission.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NameParserImpl.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContextBindingsEnumeration.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContextEnumeration.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingEntry.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingService.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingServiceMBean.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceEnvRef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceLinkRef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceRef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/SelectorContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/StringManager.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/TransactionRef.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/BeanFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/EjbFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/MailSessionFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceEnvFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceLinkFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/SendMailFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/TransactionFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/TyrexFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/TyrexResourceFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/TyrexTransactionFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/javaURLContextFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/BaseDirContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/Constants.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLConnection.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLStreamHandler.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLStreamHandlerFactory.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.FileResource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.FileResourceAttributes.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ImmutableNameNotFoundException.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ProxyDirContext.CacheEntry.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ProxyDirContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/RecyclableNamingEnumeration.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/Resource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ResourceAttributes.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.Entry.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.WARResource.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/Handler.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/overview-frame.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/overview-summary.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/overview-tree.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/package-list
-tomcat4/webapps/tomcat-docs/catalina/docs/api/packages.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/resources/inherit.gif
-tomcat4/webapps/tomcat-docs/catalina/docs/api/serialized-form.html
-tomcat4/webapps/tomcat-docs/catalina/docs/api/stylesheet.css
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-admin-apps.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-admin-objects.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-admin-opers.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-default.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-invoker.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-jdbc-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-jndi-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/fs-memory-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/index.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/mbean-names.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-apps.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-objects.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-opers.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-default.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-invoker.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jdbc-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jndi-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/fs-memory-realm.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/index.html
-tomcat4/webapps/tomcat-docs/catalina/funcspecs/printer/mbean-names.html
-tomcat4/webapps/tomcat-docs/cgi-howto.html
-tomcat4/webapps/tomcat-docs/class-loader-howto.html
-tomcat4/webapps/tomcat-docs/config/connectors.html
-tomcat4/webapps/tomcat-docs/config/context.html
-tomcat4/webapps/tomcat-docs/config/coyote.html
-tomcat4/webapps/tomcat-docs/config/defaultcontext.html
-tomcat4/webapps/tomcat-docs/config/engine.html
-tomcat4/webapps/tomcat-docs/config/globalresources.html
-tomcat4/webapps/tomcat-docs/config/host.html
-tomcat4/webapps/tomcat-docs/config/http11.html
-tomcat4/webapps/tomcat-docs/config/index.html
-tomcat4/webapps/tomcat-docs/config/jk.html
-tomcat4/webapps/tomcat-docs/config/jk2.html
-tomcat4/webapps/tomcat-docs/config/loader.html
-tomcat4/webapps/tomcat-docs/config/logger.html
-tomcat4/webapps/tomcat-docs/config/manager.html
-tomcat4/webapps/tomcat-docs/config/printer/connectors.html
-tomcat4/webapps/tomcat-docs/config/printer/context.html
-tomcat4/webapps/tomcat-docs/config/printer/coyote.html
-tomcat4/webapps/tomcat-docs/config/printer/defaultcontext.html
-tomcat4/webapps/tomcat-docs/config/printer/engine.html
-tomcat4/webapps/tomcat-docs/config/printer/globalresources.html
-tomcat4/webapps/tomcat-docs/config/printer/host.html
-tomcat4/webapps/tomcat-docs/config/printer/http11.html
-tomcat4/webapps/tomcat-docs/config/printer/index.html
-tomcat4/webapps/tomcat-docs/config/printer/jk.html
-tomcat4/webapps/tomcat-docs/config/printer/jk2.html
-tomcat4/webapps/tomcat-docs/config/printer/loader.html
-tomcat4/webapps/tomcat-docs/config/printer/logger.html
-tomcat4/webapps/tomcat-docs/config/printer/manager.html
-tomcat4/webapps/tomcat-docs/config/printer/realm.html
-tomcat4/webapps/tomcat-docs/config/printer/resources.html
-tomcat4/webapps/tomcat-docs/config/printer/server.html
-tomcat4/webapps/tomcat-docs/config/printer/service.html
-tomcat4/webapps/tomcat-docs/config/printer/valve.html
-tomcat4/webapps/tomcat-docs/config/printer/webapp.html
-tomcat4/webapps/tomcat-docs/config/realm.html
-tomcat4/webapps/tomcat-docs/config/resources.html
-tomcat4/webapps/tomcat-docs/config/server.html
-tomcat4/webapps/tomcat-docs/config/service.html
-tomcat4/webapps/tomcat-docs/config/valve.html
-tomcat4/webapps/tomcat-docs/config/webapp.html
-tomcat4/webapps/tomcat-docs/html-manager-howto.html
-tomcat4/webapps/tomcat-docs/images/jakarta-logo.gif
-tomcat4/webapps/tomcat-docs/images/printer.gif
-tomcat4/webapps/tomcat-docs/images/tomcat.gif
-tomcat4/webapps/tomcat-docs/images/void.gif
-tomcat4/webapps/tomcat-docs/index.html
-tomcat4/webapps/tomcat-docs/introduction.html
-tomcat4/webapps/tomcat-docs/jasper-howto.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/allclasses-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/allclasses-noframe.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/constant-values.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/deprecated-list.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/help-doc.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/index-all.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/index.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/Constants.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/EmbededServletOptions.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JasperException.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JspC.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JspCompilationContext.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/Options.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/BeanRepository.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Collector.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Compiler.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Dumper.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ErrorDispatcher.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ErrorHandler.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Generator.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JavacErrorDetail.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspDocumentParser.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspReader.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspRuntimeContext.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.ValidAttribute.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Mark.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Comment.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.CustomTag.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Declaration.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Expression.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.FallBackAction.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ForwardAction.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.GetProperty.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.IncludeAction.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.IncludeDirective.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspAttribute.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspRoot.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspText.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Nodes.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.PageDirective.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ParamAction.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ParamsAction.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.PlugIn.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Root.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ScriptingElement.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Scriptlet.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.SetProperty.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.TaglibDirective.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.TemplateText.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.UninterpretedTag.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.UseBean.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Visitor.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/PageDataImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Parser.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ParserController.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ScriptingVariabler.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ServletWriter.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagConstants.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagLibraryInfoImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TldLocationsCache.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Validator.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/DefaultLogger.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/JasperLogger.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/LogAware.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/Logger.Helper.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/Logger.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/logging/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/BodyContentImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/HttpJspBase.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspFactoryImpl.PrivilegedGetPageContext.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspFactoryImpl.PrivilegedReleasePageContext.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspFactoryImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspRuntimeLibrary.PrivilegedIntrospectHelper.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspRuntimeLibrary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspWriterImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/PageContextImpl.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/ServletResponseWrapperInclude.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/TagHandlerPool.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JasperLoader.PrivilegedLoadClass.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JasperLoader.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspCServletContext.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspServlet.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspServletWrapper.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/ServletEngine.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/TomcatServletEngine.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/FastDateFormat.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/Queue.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/SimplePool.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/StringManager.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/SystemLogHandler.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/ParserUtils.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/TreeNode.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/overview-frame.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/overview-summary.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/overview-tree.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/package-list
-tomcat4/webapps/tomcat-docs/jasper/docs/api/packages.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/resources/inherit.gif
-tomcat4/webapps/tomcat-docs/jasper/docs/api/serialized-form.html
-tomcat4/webapps/tomcat-docs/jasper/docs/api/stylesheet.css
-tomcat4/webapps/tomcat-docs/jk2/common/AJPv13-extensions-proposal.html
-tomcat4/webapps/tomcat-docs/jk2/common/AJPv13.html
-tomcat4/webapps/tomcat-docs/jk2/common/doccontrib.html
-tomcat4/webapps/tomcat-docs/jk2/common/tools.html
-tomcat4/webapps/tomcat-docs/jk2/faq.html
-tomcat4/webapps/tomcat-docs/jk2/images/corner.gif
-tomcat4/webapps/tomcat-docs/jk2/images/jakarta.gif
-tomcat4/webapps/tomcat-docs/jk2/images/jk2.gif
-tomcat4/webapps/tomcat-docs/jk2/images/jk2.png
-tomcat4/webapps/tomcat-docs/jk2/images/mod_jk.jpg
-tomcat4/webapps/tomcat-docs/jk2/images/pixel.gif
-tomcat4/webapps/tomcat-docs/jk2/images/tomcat.ico
-tomcat4/webapps/tomcat-docs/jk2/index.html
-tomcat4/webapps/tomcat-docs/jk2/jk/aphowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk/domhowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk/iishowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk/neshowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk/quickhowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk/workershowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/confighowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configtc.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configtccom.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configtcex.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configweb.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configwebcom.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/configwebex.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/installhowto.html
-tomcat4/webapps/tomcat-docs/jk2/jk2/vhosthowto.html
-tomcat4/webapps/tomcat-docs/jk2/style.css
-tomcat4/webapps/tomcat-docs/jndi-datasource-examples-howto.html
-tomcat4/webapps/tomcat-docs/jndi-resources-howto.html
-tomcat4/webapps/tomcat-docs/manager-howto.html
-tomcat4/webapps/tomcat-docs/mbeans-descriptor-howto.html
-tomcat4/webapps/tomcat-docs/printer/BUILDING.txt
-tomcat4/webapps/tomcat-docs/printer/README.txt
-tomcat4/webapps/tomcat-docs/printer/RUNNING.txt
-tomcat4/webapps/tomcat-docs/printer/cgi-howto.html
-tomcat4/webapps/tomcat-docs/printer/class-loader-howto.html
-tomcat4/webapps/tomcat-docs/printer/html-manager-howto.html
-tomcat4/webapps/tomcat-docs/printer/index.html
-tomcat4/webapps/tomcat-docs/printer/introduction.html
-tomcat4/webapps/tomcat-docs/printer/jasper-howto.html
-tomcat4/webapps/tomcat-docs/printer/jndi-datasource-examples-howto.html
-tomcat4/webapps/tomcat-docs/printer/jndi-resources-howto.html
-tomcat4/webapps/tomcat-docs/printer/manager-howto.html
-tomcat4/webapps/tomcat-docs/printer/mbeans-descriptor-howto.html
-tomcat4/webapps/tomcat-docs/printer/proxy-howto.html
-tomcat4/webapps/tomcat-docs/printer/realm-howto.html
-tomcat4/webapps/tomcat-docs/printer/security-manager-howto.html
-tomcat4/webapps/tomcat-docs/printer/ssi-howto.html
-tomcat4/webapps/tomcat-docs/printer/ssl-howto.html
-tomcat4/webapps/tomcat-docs/proxy-howto.html
-tomcat4/webapps/tomcat-docs/realm-howto.html
-tomcat4/webapps/tomcat-docs/security-manager-howto.html
-tomcat4/webapps/tomcat-docs/servletapi/allclasses-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/allclasses-noframe.html
-tomcat4/webapps/tomcat-docs/servletapi/constant-values.html
-tomcat4/webapps/tomcat-docs/servletapi/deprecated-list.html
-tomcat4/webapps/tomcat-docs/servletapi/help-doc.html
-tomcat4/webapps/tomcat-docs/servletapi/index-all.html
-tomcat4/webapps/tomcat-docs/servletapi/index.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/Filter.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/FilterChain.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/FilterConfig.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/GenericServlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/RequestDispatcher.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/Servlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletConfig.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletInputStream.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletOutputStream.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequest.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponse.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponseWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/SingleThreadModel.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/UnavailableException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Filter.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterChain.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterConfig.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/GenericServlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/RequestDispatcher.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Servlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletConfig.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletInputStream.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletOutputStream.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequest.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponse.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponseWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/SingleThreadModel.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/class-use/UnavailableException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/Cookie.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequest.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequestWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponse.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponseWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSession.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionActivationListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionAttributeListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpUtils.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/Cookie.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServlet.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequest.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequestWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponse.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponseWrapper.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSession.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionActivationListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionAttributeListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionEvent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionListener.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpUtils.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/package-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/package-summary.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/package-tree.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/http/package-use.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/HttpJspPage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspEngineInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspFactory.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspPage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspTagException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/JspWriter.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/PageContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/HttpJspPage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspEngineInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspFactory.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspPage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspTagException.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/JspWriter.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/class-use/PageContext.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/package-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/package-summary.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/package-tree.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/package-use.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/BodyContent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/BodyTag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/BodyTagSupport.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/IterationTag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/PageData.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/Tag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagAttributeInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagData.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagExtraInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagLibraryInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagLibraryValidator.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagSupport.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TagVariableInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/TryCatchFinally.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/ValidationMessage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/VariableInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/BodyContent.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/BodyTag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/BodyTagSupport.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/IterationTag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/PageData.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/Tag.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagAttributeInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagData.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagExtraInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagLibraryInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagLibraryValidator.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagSupport.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TagVariableInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/TryCatchFinally.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/ValidationMessage.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/class-use/VariableInfo.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/doc-files/VariableInfo-1.gif
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/package-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/package-summary.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/package-tree.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/jsp/tagext/package-use.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/package-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/package-summary.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/package-tree.html
-tomcat4/webapps/tomcat-docs/servletapi/javax/servlet/package-use.html
-tomcat4/webapps/tomcat-docs/servletapi/overview-frame.html
-tomcat4/webapps/tomcat-docs/servletapi/overview-summary.html
-tomcat4/webapps/tomcat-docs/servletapi/overview-tree.html
-tomcat4/webapps/tomcat-docs/servletapi/package-list
-tomcat4/webapps/tomcat-docs/servletapi/packages.html
-tomcat4/webapps/tomcat-docs/servletapi/resources/inherit.gif
-tomcat4/webapps/tomcat-docs/servletapi/serialized-form.html
-tomcat4/webapps/tomcat-docs/servletapi/stylesheet.css
-tomcat4/webapps/tomcat-docs/ssi-howto.html
-tomcat4/webapps/tomcat-docs/ssl-howto.html
-tomcat4/webapps/webdav/WEB-INF/web.xml
-tomcat4/webapps/webdav/index.html
-tomcat4/webapps/webdav/tomcat-power.gif
-tomcat4/webapps/webdav/tomcat.gif
-@comment must explicitly remove webapp working files, but not any user files in webapps
-@unexec ${RM} -rf %D/tomcat4/webapps/ROOT
-@unexec ${RM} -rf %D/tomcat4/webapps/admin
-@unexec ${RM} -rf %D/tomcat4/webapps/examples
-@unexec ${RM} -rf %D/tomcat4/webapps/test
-@unexec ${RM} -rf %D/tomcat4/webapps/tomcat-docs
-@unexec ${RM} -rf %D/tomcat4/webapps/webdav
-@unexec ${RM} -rf %D/tomcat4/server/webapps
-@comment must explicitly remove tomcat working stash
-@unexec ${RM} -rf %D/tomcat4/work
-@comment also remove auto-generated conf fragments, if present
-@unexec ${RM} -f %D/tomcat4/conf/iis_redirect.reg-auto
-@unexec ${RM} -f %D/tomcat4/conf/mod_jk.conf-auto
-@unexec ${RM} -f %D/tomcat4/conf/obj.conf-auto
-@unexec ${RM} -f %D/tomcat4/conf/uriworkermap.properties-auto
-@comment Directory removal handled by PKG_SYSCONFDIR setting:
-@comment tomcat4/conf
-@comment Directory removal handled by PKG_SYSCONFDIR setting:
-@comment tomcat4
diff --git a/www/jakarta-tomcat4/distinfo b/www/jakarta-tomcat4/distinfo
deleted file mode 100644
index 4debbdb828e..00000000000
--- a/www/jakarta-tomcat4/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 14:08:32 wiz Exp $
-
-SHA1 (jakarta-tomcat-4.1.30.tar.gz) = 26250f0639fea602f20b7f51992b6bf14483582a
-RMD160 (jakarta-tomcat-4.1.30.tar.gz) = a5fe2d812f4e019cfd4e8bf8c30bcfe9c8c78ed5
-Size (jakarta-tomcat-4.1.30.tar.gz) = 7894019 bytes
diff --git a/www/jakarta-tomcat4/files/tomcat4.sh b/www/jakarta-tomcat4/files/tomcat4.sh
deleted file mode 100644
index 87fe87f861a..00000000000
--- a/www/jakarta-tomcat4/files/tomcat4.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! @RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: tomcat4.sh,v 1.1.1.1 2004/04/29 15:08:11 erh Exp $
-#
-# PROVIDE: tomcat
-# REQUIRE: DAEMON
-#
-# To start tomcat4 at startup, copy this script to /etc/rc.d and set
-# tomcat4=YES in /etc/rc.conf.
-
-PREFIX=@PREFIX@
-TOMCAT_LIB=@TOMCAT_LIB@
-
-if [ -z "${JAVA_HOME}" ]
-then
- JAVA_HOME="@JAVA_HOME@"
- export JAVA_HOME
-fi
-
-name="tomcat4"
-rcvar=$name
-command="${TOMCAT_LIB}/bin/catalina.sh"
-
-# set defaults
-if [ -r /etc/rc.conf ]
-then
- . /etc/rc.conf
-else
- eval ${rcvar}=YES
-fi
-
-# $flags from environment overrides ${rcvar}_flags
-if [ -n "${flags}" ]
-then
- eval ${rcvar}_flags="${flags}"
-fi
-
-CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar
-if [ -n "${tomcat_classpath}" ]
-then
- CLASSPATH=${CLASSPATH}:${tomcat_classpath}
-fi
-export CLASSPATH
-
-cmd=${1:-start}
-
-checkyesno()
-{
- eval _value=\$${1}
- case $_value in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0 ;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1 ;;
- *)
- echo "\$${1} is not set properly."
- return 1
- ;;
- esac
-}
-
-if checkyesno ${rcvar}
-then
- if [ -x ${command} ]
- then
- case ${cmd} in
- run|start)
- echo "Starting ${name}."
- (cd ${TOMCAT_LIB} && ${command} ${cmd})
- ;;
-
- stop)
- echo "Stopping ${name}."
- (cd ${TOMCAT_LIB} && ${command} ${cmd})
- ;;
-
- restart)
- ( $0 stop )
- sleep 5
- $0 start
- ;;
-
- flush)
- cd ${TOMCAT_LIB}/work && rm -rf */*
- ;;
-
- *)
- echo 1>&2 "Usage: $0 [restart|start|stop|flush]"
- exit 1
- ;;
- esac
- fi
-fi
-exit 0
diff --git a/www/jakarta-tomcat5/DESCR b/www/jakarta-tomcat5/DESCR
deleted file mode 100644
index faef208e1c4..00000000000
--- a/www/jakarta-tomcat5/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Tomcat is the Java Servlet / Java Server Page environment produced
-by the Apache Foundation's Jakarta Project. Tomcat can be run as a
-standalone web server with Servlet and JSP support, or using Apache
-Server as its web server via the mod_jk Apache module (www/ap-jk).
-This is the Tomcat 5 package, which is a Java Serlet 2.4 and JSP
-2.0 server.
-Tomcat 5.5 supports the same Servlet and JSP Specification versions
-as Tomcat 5.0.x, with improved performance, stability, and total
-cost of ownership.
diff --git a/www/jakarta-tomcat5/MESSAGE b/www/jakarta-tomcat5/MESSAGE
deleted file mode 100644
index e3bb7857044..00000000000
--- a/www/jakarta-tomcat5/MESSAGE
+++ /dev/null
@@ -1,18 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/04/01 13:44:58 abs Exp $
-
-For detailed instructions on how to run Tomcat, either as a
-standalone server or in conjunction with Apache (using the
-www/ap-jk package), see:
-
- http://localhost:8080/tomcat-docs/index.html
-
-For more information on application development with Tomcat, see
-
- http://localhost:8080/tomcat-docs/appdev/index.html
-
-Note that tomcat may be started with the following command:
-
- ${RCD_SCRIPTS_DIR}/tomcat start
-
-===========================================================================
diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile
deleted file mode 100644
index 46f7f5fee75..00000000000
--- a/www/jakarta-tomcat5/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2011/03/27 09:57:12 obache Exp $
-
-PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION}
-DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
-PKGREVISION= 4
-CATEGORIES= www java
-MASTER_SITES= http://archive.apache.org/dist/tomcat/tomcat-5/v${TOMCAT_VERSION}/bin/
-
-MAINTAINER= erh@NetBSD.org
-HOMEPAGE= http://tomcat.apache.org/
-COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-TOMCAT_VERSION= 5.0.30
-
-USE_JAVA= run
-# This needs java 1.4 or higher.
-USE_JAVA2= yes
-
-USE_TOOLS+= pax
-
-TOMCAT_LIB= ${PREFIX}/tomcat5
-CATALINA_DIR= Catalina/localhost
-
-EGDIR= ${TOMCAT_LIB}/share/examples/jakarta-tomcat
-EGDIR2= ${EGDIR}/${CATALINA_DIR}
-
-REPLACE_SH+= bin/contrib/GNU-Linux/catalina.sh
-
-.include "../../mk/bsd.prefs.mk"
-
-# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
-.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
-EXTRACT_USING= bsdtar
-.endif
-
-PKG_SYSCONFDIR.jakarta-tomcat5= ${TOMCAT_LIB}/conf
-MAKE_DIRS= ${PKG_SYSCONFDIR.jakarta-tomcat5}/${CATALINA_DIR}
-
-RCD_SCRIPTS= tomcat5
-CFILES= server.xml web.xml tomcat-users.xml
-CFILES+= catalina.policy catalina.properties jk2.properties
-CF2FILES= admin.xml balancer.xml manager.xml
-
-CONF_FILES= # empty
-.for f in ${CFILES}
-CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-.for f in ${CF2FILES}
-CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
-.endfor
-
-FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
-
-do-build:
- @${MV} ${WRKSRC}/conf ${WRKDIR}
-
-INSTALLATION_DIRS= ${EGDIR} ${EGDIR2} ${TOMCAT_LIB}
-
-do-install:
-.for f in ${CFILES}
- ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR}
-.endfor
-.for f in ${CF2FILES}
- ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2}
-.endfor
- @(cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}; \
- ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \
- ${FIND} ${DESTDIR}${TOMCAT_LIB} \( -type f -o -perm -u+x \) -print \
- | ${XARGS} ${CHMOD} a+rx; \
- ${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} a+rx; \
- ${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.bat -print | \
- ${XARGS} ${RM} -f)
-
-.include "../../mk/java-vm.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/jakarta-tomcat5/PLIST b/www/jakarta-tomcat5/PLIST
deleted file mode 100644
index de18d6979ab..00000000000
--- a/www/jakarta-tomcat5/PLIST
+++ /dev/null
@@ -1,1752 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:24 joerg Exp $
-share/examples/rc.d/tomcat5
-tomcat5/LICENSE
-tomcat5/NOTICE
-tomcat5/RELEASE-NOTES
-tomcat5/RUNNING.txt
-tomcat5/bin/LauncherBootstrap.class
-tomcat5/bin/bootstrap.jar
-tomcat5/bin/catalina.50.sh
-tomcat5/bin/catalina.sh
-tomcat5/bin/catalina.xml
-tomcat5/bin/commons-daemon.jar
-tomcat5/bin/commons-launcher.jar
-tomcat5/bin/commons-logging-api.jar
-tomcat5/bin/contrib/GNU-Linux/catalina.sh
-tomcat5/bin/contrib/README.txt
-tomcat5/bin/contrib/openVMS-alpha/TOMCAT_Setup_Java.com
-tomcat5/bin/digest.sh
-tomcat5/bin/jmx.jar
-tomcat5/bin/jsvc.tar.gz
-tomcat5/bin/launcher.properties
-tomcat5/bin/setclasspath.sh
-tomcat5/bin/shutdown-using-launcher.sh
-tomcat5/bin/shutdown.sh
-tomcat5/bin/startup-using-launcher.sh
-tomcat5/bin/startup.sh
-tomcat5/bin/tomcat5.exe
-tomcat5/bin/tomcat5w.exe
-tomcat5/bin/tool-wrapper-using-launcher.sh
-tomcat5/bin/tool-wrapper.sh
-tomcat5/bin/version.sh
-tomcat5/common/endorsed/xercesImpl.jar
-tomcat5/common/endorsed/xml-apis.jar
-tomcat5/common/lib/ant-launcher.jar
-tomcat5/common/lib/ant.jar
-tomcat5/common/lib/commons-collections-3.1.jar
-tomcat5/common/lib/commons-dbcp-1.2.1.jar
-tomcat5/common/lib/commons-el.jar
-tomcat5/common/lib/commons-pool-1.2.jar
-tomcat5/common/lib/jasper-compiler.jar
-tomcat5/common/lib/jasper-runtime.jar
-tomcat5/common/lib/jsp-api.jar
-tomcat5/common/lib/naming-common.jar
-tomcat5/common/lib/naming-factory.jar
-tomcat5/common/lib/naming-java.jar
-tomcat5/common/lib/naming-resources.jar
-tomcat5/common/lib/servlet-api.jar
-tomcat5/server/lib/catalina-ant.jar
-tomcat5/server/lib/catalina-cluster.jar
-tomcat5/server/lib/catalina-i18n-es.jar
-tomcat5/server/lib/catalina-i18n-fr.jar
-tomcat5/server/lib/catalina-i18n-ja.jar
-tomcat5/server/lib/catalina-optional.jar
-tomcat5/server/lib/catalina.jar
-tomcat5/server/lib/commons-beanutils.jar
-tomcat5/server/lib/commons-digester.jar
-tomcat5/server/lib/commons-fileupload-1.0.jar
-tomcat5/server/lib/commons-modeler.jar
-tomcat5/server/lib/jakarta-regexp-1.3.jar
-tomcat5/server/lib/jkconfig.jar
-tomcat5/server/lib/jkshm.jar
-tomcat5/server/lib/servlets-cgi.renametojar
-tomcat5/server/lib/servlets-common.jar
-tomcat5/server/lib/servlets-default.jar
-tomcat5/server/lib/servlets-invoker.jar
-tomcat5/server/lib/servlets-ssi.renametojar
-tomcat5/server/lib/servlets-webdav.jar
-tomcat5/server/lib/tomcat-coyote.jar
-tomcat5/server/lib/tomcat-http11.jar
-tomcat5/server/lib/tomcat-jk.jar
-tomcat5/server/lib/tomcat-jk2.jar
-tomcat5/server/lib/tomcat-jni.jar
-tomcat5/server/lib/tomcat-util.jar
-tomcat5/server/webapps/admin/WEB-INF/controls.tld
-tomcat5/server/webapps/admin/WEB-INF/lib/catalina-admin.jar
-tomcat5/server/webapps/admin/WEB-INF/lib/struts.jar
-tomcat5/server/webapps/admin/WEB-INF/struts-bean.tld
-tomcat5/server/webapps/admin/WEB-INF/struts-config.xml
-tomcat5/server/webapps/admin/WEB-INF/struts-html.tld
-tomcat5/server/webapps/admin/WEB-INF/struts-logic.tld
-tomcat5/server/webapps/admin/WEB-INF/web.xml
-tomcat5/server/webapps/admin/admin.css
-tomcat5/server/webapps/admin/admin.xml
-tomcat5/server/webapps/admin/images/BlueTile.gif
-tomcat5/server/webapps/admin/images/Connector.gif
-tomcat5/server/webapps/admin/images/Context.gif
-tomcat5/server/webapps/admin/images/Datasource.gif
-tomcat5/server/webapps/admin/images/DefaultContext.gif
-tomcat5/server/webapps/admin/images/EnvironmentEntries.gif
-tomcat5/server/webapps/admin/images/Groups.gif
-tomcat5/server/webapps/admin/images/Host.gif
-tomcat5/server/webapps/admin/images/Logger.gif
-tomcat5/server/webapps/admin/images/Login.jpg
-tomcat5/server/webapps/admin/images/LoginBackgroundTile.gif
-tomcat5/server/webapps/admin/images/Mailsession.gif
-tomcat5/server/webapps/admin/images/PaperTexture.gif
-tomcat5/server/webapps/admin/images/Realm.gif
-tomcat5/server/webapps/admin/images/ResourceLink.gif
-tomcat5/server/webapps/admin/images/Roles.gif
-tomcat5/server/webapps/admin/images/Server.gif
-tomcat5/server/webapps/admin/images/Service.gif
-tomcat5/server/webapps/admin/images/Thumbs.db
-tomcat5/server/webapps/admin/images/TomcatBanner.jpg
-tomcat5/server/webapps/admin/images/Users.gif
-tomcat5/server/webapps/admin/images/Valve.gif
-tomcat5/server/webapps/admin/images/folder_16_pad.gif
-tomcat5/server/webapps/admin/images/handledownlast.gif
-tomcat5/server/webapps/admin/images/handledownmiddle.gif
-tomcat5/server/webapps/admin/images/handlerightlast.gif
-tomcat5/server/webapps/admin/images/handlerightmiddle.gif
-tomcat5/server/webapps/admin/images/linelastnode.gif
-tomcat5/server/webapps/admin/images/linemiddlenode.gif
-tomcat5/server/webapps/admin/images/linevertical.gif
-tomcat5/server/webapps/admin/resources/dataSources.jspf
-tomcat5/server/webapps/admin/resources/envEntries.jspf
-tomcat5/server/webapps/admin/resources/listDataSources.jspf
-tomcat5/server/webapps/admin/resources/listEnvEntries.jspf
-tomcat5/server/webapps/admin/resources/listMailSessions.jspf
-tomcat5/server/webapps/admin/resources/listResourceLinks.jspf
-tomcat5/server/webapps/admin/resources/listUserDatabases.jspf
-tomcat5/server/webapps/admin/resources/mailSessions.jspf
-tomcat5/server/webapps/admin/resources/resourceLinks.jspf
-tomcat5/server/webapps/admin/resources/userDatabases.jspf
-tomcat5/server/webapps/admin/tree-control-test.css
-tomcat5/server/webapps/admin/users/groups.jspf
-tomcat5/server/webapps/admin/users/listGroups.jspf
-tomcat5/server/webapps/admin/users/listRoles.jspf
-tomcat5/server/webapps/admin/users/listUsers.jspf
-tomcat5/server/webapps/admin/users/roles.jspf
-tomcat5/server/webapps/admin/users/users.jspf
-tomcat5/server/webapps/manager/WEB-INF/lib/catalina-manager.jar
-tomcat5/server/webapps/manager/WEB-INF/web.xml
-tomcat5/server/webapps/manager/html-manager-howto.html
-tomcat5/server/webapps/manager/images/add.gif
-tomcat5/server/webapps/manager/images/code.gif
-tomcat5/server/webapps/manager/images/design.gif
-tomcat5/server/webapps/manager/images/docs.gif
-tomcat5/server/webapps/manager/images/fix.gif
-tomcat5/server/webapps/manager/images/jakarta-logo.gif
-tomcat5/server/webapps/manager/images/tomcat.gif
-tomcat5/server/webapps/manager/images/update.gif
-tomcat5/server/webapps/manager/images/void.gif
-tomcat5/server/webapps/manager/manager-howto.html
-tomcat5/server/webapps/manager/manager.xml
-tomcat5/server/webapps/manager/status.xsd
-tomcat5/server/webapps/manager/xform.xsl
-tomcat5/share/examples/jakarta-tomcat/Catalina/localhost/admin.xml
-tomcat5/share/examples/jakarta-tomcat/Catalina/localhost/balancer.xml
-tomcat5/share/examples/jakarta-tomcat/Catalina/localhost/manager.xml
-tomcat5/share/examples/jakarta-tomcat/catalina.policy
-tomcat5/share/examples/jakarta-tomcat/catalina.properties
-tomcat5/share/examples/jakarta-tomcat/jk2.properties
-tomcat5/share/examples/jakarta-tomcat/server.xml
-tomcat5/share/examples/jakarta-tomcat/tomcat-users.xml
-tomcat5/share/examples/jakarta-tomcat/web.xml
-tomcat5/webapps/ROOT/RELEASE-NOTES.txt
-tomcat5/webapps/ROOT/WEB-INF/classes/org/apache/jsp/index_jsp.class
-tomcat5/webapps/ROOT/WEB-INF/lib/catalina-root.jar
-tomcat5/webapps/ROOT/WEB-INF/web.xml
-tomcat5/webapps/ROOT/index.jsp
-tomcat5/webapps/ROOT/jakarta-banner.gif
-tomcat5/webapps/ROOT/tomcat-power.gif
-tomcat5/webapps/ROOT/tomcat.gif
-tomcat5/webapps/balancer/WEB-INF/config/rules.xml
-tomcat5/webapps/balancer/WEB-INF/lib/catalina-balancer.jar
-tomcat5/webapps/balancer/WEB-INF/web.xml
-tomcat5/webapps/balancer/balancer.xml
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entries.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entries.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entry.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/Entry.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/JspCalendar.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/cal/TableBean.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/checkbox/CheckTest.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/colors/ColorGameBean.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/dates/JspCalendar.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/error/Smart.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/error/Smart.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ExampleTagBase.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/FooTagExtraInfo.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/LogTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/examples/ShowSource.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/ExampleFilter.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/RequestDumperFilter.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/BookBean.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/FooBean.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/el/Functions.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/ContextListener.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/listeners/SessionListener.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/num/NumberGuessBean.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal1_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/cal/cal2_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/checkbox/checkresult_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/colors/colrs_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/dates/date_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/err_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/error/errorpge_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/forward_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/forward/one_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/foo_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/include/include_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002darithmetic_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/basic_002dcomparisons_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/functions_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/el/implicit_002dobjects_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/jspattribute_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp$shuffle_jspHelper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspattribute/shuffle_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx$basic_jspxHelper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/basic_jspx.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/jspx/textRotate_jspx.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/config_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/misc/dynamicattrs_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/book_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/hello_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp$repeat_jspHelper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/simpletag/repeat_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/hello_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp$panel_jspHelper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/panel_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp$products_jspHelper.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsp2/tagfiles/products_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/hello_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/jsptoserv/jsptoservlet_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/num/numguess_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/plugin/plugin_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/error_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/index_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/security/protected_/login_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/sessions/carts_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/simpletag/foo_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/snp/snoop_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/source_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/displayProducts_tag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/helloWorld_tag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/panel_tag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tag/web/xhtmlbasic_tag.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/choose_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$1.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$10.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$2.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$3.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$4.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$5.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$6.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$7.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$8.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp$9.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/foreach_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/tagplugin/if_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/org/apache/jsp/xml/xml_jsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/servletToJsp.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/servletToJsp.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/sessions/DummyCart.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/util/HTMLFilter.java
-tomcat5/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.class
-tomcat5/webapps/jsp-examples/WEB-INF/classes/validators/DebugValidator.java
-tomcat5/webapps/jsp-examples/WEB-INF/jsp/applet/Clock2.java
-tomcat5/webapps/jsp-examples/WEB-INF/jsp/debug-taglib.tld
-tomcat5/webapps/jsp-examples/WEB-INF/jsp/example-taglib.tld
-tomcat5/webapps/jsp-examples/WEB-INF/jsp2/jsp2-example-taglib.tld
-tomcat5/webapps/jsp-examples/WEB-INF/lib/jstl.jar
-tomcat5/webapps/jsp-examples/WEB-INF/lib/standard.jar
-tomcat5/webapps/jsp-examples/WEB-INF/tagPlugins.xml
-tomcat5/webapps/jsp-examples/WEB-INF/tags/displayProducts.tag
-tomcat5/webapps/jsp-examples/WEB-INF/tags/helloWorld.tag
-tomcat5/webapps/jsp-examples/WEB-INF/tags/panel.tag
-tomcat5/webapps/jsp-examples/WEB-INF/tags/xhtmlbasic.tag
-tomcat5/webapps/jsp-examples/WEB-INF/web.xml
-tomcat5/webapps/jsp-examples/cal/Entries.java.html
-tomcat5/webapps/jsp-examples/cal/Entry.java.html
-tomcat5/webapps/jsp-examples/cal/JspCalendar.java.html
-tomcat5/webapps/jsp-examples/cal/TableBean.java.html
-tomcat5/webapps/jsp-examples/cal/cal1.jsp
-tomcat5/webapps/jsp-examples/cal/cal1.jsp.html
-tomcat5/webapps/jsp-examples/cal/cal2.jsp
-tomcat5/webapps/jsp-examples/cal/cal2.jsp.html
-tomcat5/webapps/jsp-examples/cal/calendar.html
-tomcat5/webapps/jsp-examples/cal/login.html
-tomcat5/webapps/jsp-examples/checkbox/CheckTest.html
-tomcat5/webapps/jsp-examples/checkbox/check.html
-tomcat5/webapps/jsp-examples/checkbox/checkresult.jsp
-tomcat5/webapps/jsp-examples/checkbox/checkresult.jsp.html
-tomcat5/webapps/jsp-examples/checkbox/cresult.html
-tomcat5/webapps/jsp-examples/colors/ColorGameBean.html
-tomcat5/webapps/jsp-examples/colors/clr.html
-tomcat5/webapps/jsp-examples/colors/colors.html
-tomcat5/webapps/jsp-examples/colors/colrs.jsp
-tomcat5/webapps/jsp-examples/colors/colrs.jsp.html
-tomcat5/webapps/jsp-examples/dates/date.html
-tomcat5/webapps/jsp-examples/dates/date.jsp
-tomcat5/webapps/jsp-examples/dates/date.jsp.html
-tomcat5/webapps/jsp-examples/error/er.html
-tomcat5/webapps/jsp-examples/error/err.jsp
-tomcat5/webapps/jsp-examples/error/err.jsp.html
-tomcat5/webapps/jsp-examples/error/error.html
-tomcat5/webapps/jsp-examples/error/errorpge.jsp
-tomcat5/webapps/jsp-examples/forward/forward.jsp
-tomcat5/webapps/jsp-examples/forward/forward.jsp.html
-tomcat5/webapps/jsp-examples/forward/fwd.html
-tomcat5/webapps/jsp-examples/forward/one.jsp
-tomcat5/webapps/jsp-examples/forward/two.html
-tomcat5/webapps/jsp-examples/images/code.gif
-tomcat5/webapps/jsp-examples/images/execute.gif
-tomcat5/webapps/jsp-examples/images/read.gif
-tomcat5/webapps/jsp-examples/images/return.gif
-tomcat5/webapps/jsp-examples/include/foo.html
-tomcat5/webapps/jsp-examples/include/foo.jsp
-tomcat5/webapps/jsp-examples/include/inc.html
-tomcat5/webapps/jsp-examples/include/include.jsp
-tomcat5/webapps/jsp-examples/include/include.jsp.html
-tomcat5/webapps/jsp-examples/index.html
-tomcat5/webapps/jsp-examples/jsp2/el/Functions.java.html
-tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.html
-tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp
-tomcat5/webapps/jsp-examples/jsp2/el/basic-arithmetic.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.html
-tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp
-tomcat5/webapps/jsp-examples/jsp2/el/basic-comparisons.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/el/functions.html
-tomcat5/webapps/jsp-examples/jsp2/el/functions.jsp
-tomcat5/webapps/jsp-examples/jsp2/el/functions.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.html
-tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.jsp
-tomcat5/webapps/jsp-examples/jsp2/el/implicit-objects.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/FooBean.java.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/HelloWorldSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/ShuffleSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/TileSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/jspattribute.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.html
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp
-tomcat5/webapps/jsp-examples/jsp2/jspattribute/shuffle.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/jspx/basic.html
-tomcat5/webapps/jsp-examples/jsp2/jspx/basic.jspx
-tomcat5/webapps/jsp-examples/jsp2/jspx/basic.jspx.html
-tomcat5/webapps/jsp-examples/jsp2/jspx/svgexample.html
-tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.html
-tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jpg
-tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jspx
-tomcat5/webapps/jsp-examples/jsp2/jspx/textRotate.jspx.html
-tomcat5/webapps/jsp-examples/jsp2/misc/EchoAttributesTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/misc/coda.jspf
-tomcat5/webapps/jsp-examples/jsp2/misc/coda.jspf.html
-tomcat5/webapps/jsp-examples/jsp2/misc/config.html
-tomcat5/webapps/jsp-examples/jsp2/misc/config.jsp
-tomcat5/webapps/jsp-examples/jsp2/misc/config.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.html
-tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp
-tomcat5/webapps/jsp-examples/jsp2/misc/dynamicattrs.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/misc/prelude.jspf
-tomcat5/webapps/jsp-examples/jsp2/misc/prelude.jspf.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/BookBean.java.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/FindBookSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/Functions.java.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/HelloWorldSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/RepeatSimpleTag.java.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/book.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/book.jsp
-tomcat5/webapps/jsp-examples/jsp2/simpletag/book.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.jsp
-tomcat5/webapps/jsp-examples/jsp2/simpletag/hello.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.html
-tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.jsp
-tomcat5/webapps/jsp-examples/jsp2/simpletag/repeat.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/displayProducts.tag.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.jsp
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/hello.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/helloWorld.tag.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.jsp
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/panel.tag.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.jsp
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/products.jsp.html
-tomcat5/webapps/jsp-examples/jsp2/tagfiles/xhtmlbasic.tag.html
-tomcat5/webapps/jsp-examples/jsptoserv/hello.jsp
-tomcat5/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp
-tomcat5/webapps/jsp-examples/jsptoserv/jsptoservlet.jsp.html
-tomcat5/webapps/jsp-examples/jsptoserv/jts.html
-tomcat5/webapps/jsp-examples/jsptoserv/servletToJsp.java.html
-tomcat5/webapps/jsp-examples/num/numguess.html
-tomcat5/webapps/jsp-examples/num/numguess.jsp
-tomcat5/webapps/jsp-examples/num/numguess.jsp.html
-tomcat5/webapps/jsp-examples/plugin/applet/Clock2.class
-tomcat5/webapps/jsp-examples/plugin/applet/Clock2.java
-tomcat5/webapps/jsp-examples/plugin/plugin.html
-tomcat5/webapps/jsp-examples/plugin/plugin.jsp
-tomcat5/webapps/jsp-examples/plugin/plugin.jsp.html
-tomcat5/webapps/jsp-examples/security/protected/error.jsp
-tomcat5/webapps/jsp-examples/security/protected/index.jsp
-tomcat5/webapps/jsp-examples/security/protected/login.jsp
-tomcat5/webapps/jsp-examples/sessions/DummyCart.html
-tomcat5/webapps/jsp-examples/sessions/carts.html
-tomcat5/webapps/jsp-examples/sessions/carts.jsp
-tomcat5/webapps/jsp-examples/sessions/carts.jsp.html
-tomcat5/webapps/jsp-examples/sessions/crt.html
-tomcat5/webapps/jsp-examples/simpletag/foo.html
-tomcat5/webapps/jsp-examples/simpletag/foo.jsp
-tomcat5/webapps/jsp-examples/simpletag/foo.jsp.html
-tomcat5/webapps/jsp-examples/snp/snoop.html
-tomcat5/webapps/jsp-examples/snp/snoop.jsp
-tomcat5/webapps/jsp-examples/snp/snoop.jsp.html
-tomcat5/webapps/jsp-examples/source.jsp
-tomcat5/webapps/jsp-examples/tagplugin/choose.html
-tomcat5/webapps/jsp-examples/tagplugin/choose.jsp
-tomcat5/webapps/jsp-examples/tagplugin/choose.jsp.html
-tomcat5/webapps/jsp-examples/tagplugin/foreach.html
-tomcat5/webapps/jsp-examples/tagplugin/foreach.jsp
-tomcat5/webapps/jsp-examples/tagplugin/foreach.jsp.html
-tomcat5/webapps/jsp-examples/tagplugin/howto.html
-tomcat5/webapps/jsp-examples/tagplugin/if.html
-tomcat5/webapps/jsp-examples/tagplugin/if.jsp
-tomcat5/webapps/jsp-examples/tagplugin/if.jsp.html
-tomcat5/webapps/jsp-examples/tagplugin/notes.html
-tomcat5/webapps/jsp-examples/xml/xml.html
-tomcat5/webapps/jsp-examples/xml/xml.jsp
-tomcat5/webapps/jsp-examples/xml/xml.jsp.html
-tomcat5/webapps/servlets-examples/WEB-INF/classes/CookieExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/CookieExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/HelloWorldExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings.properties
-tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_en.properties
-tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_es.properties
-tomcat5/webapps/servlets-examples/WEB-INF/classes/LocalStrings_fr.properties
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestHeaderExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestInfoExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/RequestParamExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/SessionExample.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/SessionExample.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/ExampleFilter.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/RequestDumperFilter.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/ContextListener.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/listeners/SessionListener.java
-tomcat5/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.class
-tomcat5/webapps/servlets-examples/WEB-INF/classes/util/HTMLFilter.java
-tomcat5/webapps/servlets-examples/WEB-INF/web.xml
-tomcat5/webapps/servlets-examples/cookies.html
-tomcat5/webapps/servlets-examples/helloworld.html
-tomcat5/webapps/servlets-examples/images/code.gif
-tomcat5/webapps/servlets-examples/images/execute.gif
-tomcat5/webapps/servlets-examples/images/return.gif
-tomcat5/webapps/servlets-examples/index.html
-tomcat5/webapps/servlets-examples/reqheaders.html
-tomcat5/webapps/servlets-examples/reqinfo.html
-tomcat5/webapps/servlets-examples/reqparams.html
-tomcat5/webapps/servlets-examples/sessions.html
-tomcat5/webapps/tomcat-docs/RELEASE-NOTES.txt
-tomcat5/webapps/tomcat-docs/WEB-INF/web.xml
-tomcat5/webapps/tomcat-docs/appdev/build.xml.txt
-tomcat5/webapps/tomcat-docs/appdev/deployment.html
-tomcat5/webapps/tomcat-docs/appdev/index.html
-tomcat5/webapps/tomcat-docs/appdev/installation.html
-tomcat5/webapps/tomcat-docs/appdev/introduction.html
-tomcat5/webapps/tomcat-docs/appdev/printer/build.xml.txt
-tomcat5/webapps/tomcat-docs/appdev/printer/deployment.html
-tomcat5/webapps/tomcat-docs/appdev/printer/index.html
-tomcat5/webapps/tomcat-docs/appdev/printer/installation.html
-tomcat5/webapps/tomcat-docs/appdev/printer/introduction.html
-tomcat5/webapps/tomcat-docs/appdev/printer/processes.html
-tomcat5/webapps/tomcat-docs/appdev/printer/source.html
-tomcat5/webapps/tomcat-docs/appdev/printer/web.xml.txt
-tomcat5/webapps/tomcat-docs/appdev/processes.html
-tomcat5/webapps/tomcat-docs/appdev/sample/build.xml
-tomcat5/webapps/tomcat-docs/appdev/sample/docs/README.txt
-tomcat5/webapps/tomcat-docs/appdev/sample/src/mypackage/Hello.java
-tomcat5/webapps/tomcat-docs/appdev/sample/web/WEB-INF/web.xml
-tomcat5/webapps/tomcat-docs/appdev/sample/web/hello.jsp
-tomcat5/webapps/tomcat-docs/appdev/sample/web/images/tomcat.gif
-tomcat5/webapps/tomcat-docs/appdev/sample/web/index.html
-tomcat5/webapps/tomcat-docs/appdev/source.html
-tomcat5/webapps/tomcat-docs/appdev/web.xml.txt
-tomcat5/webapps/tomcat-docs/architecture/index.html
-tomcat5/webapps/tomcat-docs/architecture/overview.html
-tomcat5/webapps/tomcat-docs/architecture/printer/index.html
-tomcat5/webapps/tomcat-docs/architecture/printer/overview.html
-tomcat5/webapps/tomcat-docs/architecture/printer/requestProcess.html
-tomcat5/webapps/tomcat-docs/architecture/printer/startup.html
-tomcat5/webapps/tomcat-docs/architecture/requestProcess.html
-tomcat5/webapps/tomcat-docs/architecture/requestProcess/requestProcess.pdf
-tomcat5/webapps/tomcat-docs/architecture/requestProcess/roseModel.mdl
-tomcat5/webapps/tomcat-docs/architecture/startup.html
-tomcat5/webapps/tomcat-docs/architecture/startup/serverStartup.pdf
-tomcat5/webapps/tomcat-docs/architecture/startup/serverStartup.txt
-tomcat5/webapps/tomcat-docs/balancer-howto.html
-tomcat5/webapps/tomcat-docs/build.xml
-tomcat5/webapps/tomcat-docs/building.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/allclasses-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/allclasses-noframe.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/constant-values.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/deprecated-list.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/help-doc.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/index-all.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/index.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/Ajp13.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/Ajp13Packet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/AjpHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/Logger.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/NegociationHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/RequestHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat33/Ajp14Interceptor.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat33/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat33/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat33/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Ajp13Connector.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Ajp13InputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Ajp13OutputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Ajp13Request.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Ajp13Response.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/JkServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/ApacheConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/BaseJkConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/IISConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/NSConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/config/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/ajp/tomcat4/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Authenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Cluster.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Connector.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Contained.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Container.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerEvent.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ContainerServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Context.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/DefaultContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Deployer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Engine.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Globals.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Group.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Host.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/HttpRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/HttpResponse.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/InstanceEvent.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/InstanceListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Lifecycle.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleEvent.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleException.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/LifecycleListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Loader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Logger.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Manager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Pipeline.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Realm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Request.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Response.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Role.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Server.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ServerFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Service.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Session.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/SessionEvent.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/SessionListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Store.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/User.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/UserDatabase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Valve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ValveContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/Wrapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/AbstractCatalinaTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/DeployTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/InstallTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/JMXQueryTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/JMXSetTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ListTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ReloadTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RemoveTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ResourcesTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/RolesTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ServerinfoTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/SessionsTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StartTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/StopTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/UndeployTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/ValidatorTask.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ant/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/AuthenticatorBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/BasicAuthenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/DigestAuthenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/FormAuthenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/NonLoginAuthenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SSLAuthenticator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SavedRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOn.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/SingleSignOnEntry.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/authenticator/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ClientAbortException.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpRequestFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/HttpResponseFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/RequestFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/ResponseFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/connector/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationContextFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ApplicationFilterFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ContainerBase.ContainerBackgroundProcessor.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ContainerBase.PrivilegedAddChild.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/ContainerBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/DummyRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/DummyResponse.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/NamingContextListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardDefaultContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardEngine.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardHost.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardHostDeployer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardPipeline.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardServer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardService.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardValveContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardWrapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/StandardWrapperFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/core/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ApplicationParameter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextEjb.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextEnvironment.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextLocalEjb.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextResource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ContextResourceLink.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ErrorPage.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/FilterDef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/FilterMap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/LoginConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/MessageDestination.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/MessageDestinationRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/NamingResources.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/ResourceParams.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/SecurityCollection.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/SecurityConstraint.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/Test.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/deploy/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/launcher/CatalinaLaunchFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/launcher/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/launcher/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/launcher/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/Reloader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/FileLogger.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/LoggerBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/SystemErrLogger.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/SystemOutLogger.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/logger/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ClassNameMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ConnectorMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextEnvironmentMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextResourceLinkMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ContextResourceMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/DefaultContextMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/GroupMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MBeanFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MBeanUtils.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/NamingResourcesMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/RoleMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/ServerLifecycleListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardContextMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardEngineMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardHostMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardServerMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/StandardServiceMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/UserMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/mbeans/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/DefaultServerSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/ServerSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/net/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/DataSourceRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/GenericPrincipal.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASCallbackHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASMemoryLoginModule.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JAASRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JDBCRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/JNDIRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/MemoryRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/MemoryRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/RealmBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/UserDatabaseRealm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/realm/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/SecurityClassLoad.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/SecurityConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/SecurityUtil.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/security/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIEnvironment.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.CGIRunner.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.HTTPHeaderInputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.NameValuePair.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/CGIServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.ResourceInfo.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/DefaultServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/InvokerServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/WebdavServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/servlets/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/FileStore.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/JDBCStore.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/ManagerBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/PersistentManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/PersistentManagerBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StandardManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StandardSession.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StandardSessionFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/StoreBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/session/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ByteArrayServletOutputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionParseTree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ExpressionTokenizer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/ResponseIncludeWrapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSICommand.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConditional.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIEcho.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExec.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIExternalResolver.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIFlastmod.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIFsize.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIInclude.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIMediator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIPrintenv.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIProcessor.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServlet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletExternalResolver.ServletContextAndPath.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletExternalResolver.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIServletRequestUtil.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSISet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/SSIStopProcessingException.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/ssi/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Bootstrap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Catalina.CatalinaShutdownHook.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Catalina.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CatalinaProperties.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ClassLoaderFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ClusterRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ContextRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/CopyParentClassLoaderRule.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/DigesterFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Embedded.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/EngineRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/ExpandWar.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HomesUserDatabase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HostConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/HostRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/LifecycleListenerRule.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/NamingRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/PasswdUserDatabase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetAllPropertiesRule.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/SetDocBaseRule.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/TldRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/Tool.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/UserConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/UserDatabase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/WebRuleSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/startup/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractGroup.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractRole.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/AbstractUser.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryGroup.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryRole.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUser.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUserDatabase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/MemoryUserDatabaseFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/users/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Base64.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CGIProcessEnvironment.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CatalinaDigester.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CharsetMapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CookieTools.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/CustomObjectInputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/DOMWriter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/DateTool.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Enumerator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Extension.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ExtensionValidator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/FastDateFormat.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/HexUtils.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/IOTools.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/InstanceSupport.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/LifecycleSupport.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/MD5Encoder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/MIME2Java.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ManifestResource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ParameterMap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ProcessEnvironment.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ProcessHelper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Queue.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/RequestUtil.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ResourceSet.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/SchemaResolver.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/ServerInfo.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/Strftime.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/StringManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/StringParser.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/TomcatCSS.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/URL.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/URLEncoder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/XMLWriter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/util/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/AccessLogValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/Constants.AccessLog.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ErrorReportValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ExtendedAccessLogValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/JDBCAccessLogValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/PersistentValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RemoteAddrValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RemoteHostValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RequestDumperValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/RequestFilterValve.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/ValveBase.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/valves/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/ActionCode.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/ActionHook.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/Adapter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/InputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/OutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/Processor.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/ProtocolHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/Request.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/RequestGroupInfo.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/RequestInfo.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/Response.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/Http11Processor.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/Http11Protocol.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalInputBuffer.InputStreamInputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalInputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalOutputBuffer.OutputStreamOutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/InternalOutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/OutputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/BufferedInputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/ChunkedInputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/ChunkedOutputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/GzipOutputFilter.FakeOutputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/GzipOutputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/IdentityInputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/IdentityOutputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/VoidInputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/VoidOutputFilter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/filters/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/http11/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/MemoryProtocolHandler.ByteChunkInputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/MemoryProtocolHandler.ByteChunkOutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/MemoryProtocolHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/memory/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/CoyoteInterceptor2.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/Tomcat3Adapter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/Tomcat3Request.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat3/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteConnector.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteInputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyotePrincipal.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteRequest.PrivilegedGetSession.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteRequestFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteResponse.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteResponseFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/OutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat4/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteAdapter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteConnector.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteInputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteOutputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyotePrincipal.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteReader.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteRequestFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponse.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteResponseFacade.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteServerSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/CoyoteWriter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/InputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/MapperListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/OutputBuffer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/coyote/tomcat5/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/apr/AprImpl.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/apr/TomcatStarter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/apr/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/apr/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/apr/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/ChannelJni.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/ChannelShm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/ChannelSocket.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/ChannelUn.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/HandlerDispatch.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/HandlerRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/JkInputStream.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/JkMX.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/JniHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/ModJkMX.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/MsgAjp.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/Shm.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/Shm14.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/WorkerDummy.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/common/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/ApacheConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/BaseJkConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorApache2.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk1.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/GeneratorJk2.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/IISConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/NSConfig.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.MappingGenerator.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.NullResolver.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/WebXml2Jk.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/config/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/JkChannel.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/JkHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/Msg.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/MsgContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/WorkerEnv.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/core/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/server/JkCoyoteHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/server/JkMain.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/server/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/server/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/jk/server/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ContextAccessController.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ContextBindings.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/EjbRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/JndiPermission.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NameParserImpl.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContextBindingsEnumeration.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingContextEnumeration.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingEntry.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingService.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/NamingServiceMBean.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceEnvRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceLinkRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/ResourceRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/SelectorContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/StringManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/TransactionRef.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/BeanFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/EjbFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/MailSessionFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/OpenEjbFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceEnvFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/ResourceLinkFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/SendMailFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/TransactionFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/factory/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/javaURLContextFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/java/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/BaseDirContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/CacheEntry.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/Constants.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLConnection.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLStreamHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/DirContextURLStreamHandlerFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.FileResource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.FileResourceAttributes.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/FileDirContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ImmutableNameNotFoundException.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ProxyDirContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/RecyclableNamingEnumeration.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/Resource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ResourceAttributes.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/ResourceCache.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.Entry.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.WARResource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/WARDirContext.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/Handler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/jndi/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/naming/resources/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.AttributeHolder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.PropertySource.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/IntrospectionUtils.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/Ascii.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/B2CConverter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/Base64.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/ByteChunk.ByteInputChannel.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/ByteChunk.ByteOutputChannel.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/ByteChunk.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/C2BConverter.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/CharChunk.CharInputChannel.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/CharChunk.CharOutputChannel.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/CharChunk.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/DateTool.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/HexUtils.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/MessageBytes.MessageBytesFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/MessageBytes.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/TimeStamp.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/UDecoder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/UEncoder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/UTF8Decoder.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/buf/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/EmptyEnumeration.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/LRUCache.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/MultiMap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/MultiMapNamesEnumeration.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/Queue.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/SimpleHashtable.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/SimplePool.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/collections/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/compat/Jdk14Compat.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/compat/JdkCompat.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/compat/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/compat/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/compat/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/AcceptLanguage.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/BaseRequest.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/ContentType.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/Cookies.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/FastHttpDateFormat.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/HttpMessages.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/LocaleToCharsetMap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/MimeHeaders.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/MimeMap.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/Parameters.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/ServerCookie.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.Context.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.ContextList.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.Host.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.MapElement.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.Wrapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/Mapper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/MappingData.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/mapper/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/http/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/log/SystemLogHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/log/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/log/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/log/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/PoolTcpEndpoint.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/SSLImplementation.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/SSLSupport.CipherData.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/SSLSupport.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/ServerSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/TcpConnection.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/TcpConnectionHandler.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/URL.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE13SocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEImplementation.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSEKeyManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/JSSESocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/jsse/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/PureTLSImplementation.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/PureTLSSocket.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/PureTLSSocketFactory.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/net/puretls/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/res/StringManager.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/res/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/res/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/res/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/Expirer.ExpireCallback.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/Expirer.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/Reaper.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadPool.ControlRunnable.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadPool.MonitorRunnable.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadPool.ThreadPoolListener.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadPool.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadPoolRunnable.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/ThreadWithAttributes.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/package-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/package-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/org/apache/tomcat/util/threads/package-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/overview-frame.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/overview-summary.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/overview-tree.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/package-list
-tomcat5/webapps/tomcat-docs/catalina/docs/api/packages.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/resources/inherit.gif
-tomcat5/webapps/tomcat-docs/catalina/docs/api/serialized-form.html
-tomcat5/webapps/tomcat-docs/catalina/docs/api/stylesheet.css
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-apps.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-objects.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-admin-opers.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-default.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-invoker.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-jdbc-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-jndi-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/fs-memory-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/index.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/mbean-names.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-apps.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-objects.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-admin-opers.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-default.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-invoker.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jdbc-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-jndi-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/fs-memory-realm.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/index.html
-tomcat5/webapps/tomcat-docs/catalina/funcspecs/printer/mbean-names.html
-tomcat5/webapps/tomcat-docs/cgi-howto.html
-tomcat5/webapps/tomcat-docs/changelog.html
-tomcat5/webapps/tomcat-docs/class-loader-howto.html
-tomcat5/webapps/tomcat-docs/cluster-howto.html
-tomcat5/webapps/tomcat-docs/config/ajp.html
-tomcat5/webapps/tomcat-docs/config/context.html
-tomcat5/webapps/tomcat-docs/config/defaultcontext.html
-tomcat5/webapps/tomcat-docs/config/engine.html
-tomcat5/webapps/tomcat-docs/config/globalresources.html
-tomcat5/webapps/tomcat-docs/config/host.html
-tomcat5/webapps/tomcat-docs/config/http.html
-tomcat5/webapps/tomcat-docs/config/index.html
-tomcat5/webapps/tomcat-docs/config/loader.html
-tomcat5/webapps/tomcat-docs/config/logger.html
-tomcat5/webapps/tomcat-docs/config/manager.html
-tomcat5/webapps/tomcat-docs/config/printer/ajp.html
-tomcat5/webapps/tomcat-docs/config/printer/context.html
-tomcat5/webapps/tomcat-docs/config/printer/defaultcontext.html
-tomcat5/webapps/tomcat-docs/config/printer/engine.html
-tomcat5/webapps/tomcat-docs/config/printer/globalresources.html
-tomcat5/webapps/tomcat-docs/config/printer/host.html
-tomcat5/webapps/tomcat-docs/config/printer/http.html
-tomcat5/webapps/tomcat-docs/config/printer/index.html
-tomcat5/webapps/tomcat-docs/config/printer/loader.html
-tomcat5/webapps/tomcat-docs/config/printer/logger.html
-tomcat5/webapps/tomcat-docs/config/printer/manager.html
-tomcat5/webapps/tomcat-docs/config/printer/realm.html
-tomcat5/webapps/tomcat-docs/config/printer/resources.html
-tomcat5/webapps/tomcat-docs/config/printer/server.html
-tomcat5/webapps/tomcat-docs/config/printer/service.html
-tomcat5/webapps/tomcat-docs/config/printer/valve.html
-tomcat5/webapps/tomcat-docs/config/realm.html
-tomcat5/webapps/tomcat-docs/config/resources.html
-tomcat5/webapps/tomcat-docs/config/server.html
-tomcat5/webapps/tomcat-docs/config/service.html
-tomcat5/webapps/tomcat-docs/config/valve.html
-tomcat5/webapps/tomcat-docs/default-servlet.html
-tomcat5/webapps/tomcat-docs/deployer-howto.html
-tomcat5/webapps/tomcat-docs/developers.html
-tomcat5/webapps/tomcat-docs/html-manager-howto.html
-tomcat5/webapps/tomcat-docs/images/add.gif
-tomcat5/webapps/tomcat-docs/images/code.gif
-tomcat5/webapps/tomcat-docs/images/design.gif
-tomcat5/webapps/tomcat-docs/images/docs.gif
-tomcat5/webapps/tomcat-docs/images/fix.gif
-tomcat5/webapps/tomcat-docs/images/jakarta-logo.gif
-tomcat5/webapps/tomcat-docs/images/printer.gif
-tomcat5/webapps/tomcat-docs/images/tomcat.gif
-tomcat5/webapps/tomcat-docs/images/update.gif
-tomcat5/webapps/tomcat-docs/images/void.gif
-tomcat5/webapps/tomcat-docs/index.html
-tomcat5/webapps/tomcat-docs/introduction.html
-tomcat5/webapps/tomcat-docs/jasper-howto.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/allclasses-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/allclasses-noframe.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/constant-values.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/deprecated-list.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/help-doc.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/index-all.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/index.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/Constants.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/EmbeddedServletOptions.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JasperException.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JspC.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/JspCompilationContext.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/Options.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Compiler.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELFunctionMapper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.ELText.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.Function.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.Nodes.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.Root.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.Text.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELNode.Visitor.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ELParser.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ErrorDispatcher.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ErrorHandler.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JavacErrorDetail.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspConfig.JspProperty.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspConfig.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspRuntimeContext.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.ValidAttribute.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/JspUtil.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Localizer.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.AttributeDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.AttributeGenerator.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ChildInfo.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Comment.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.CustomTag.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Declaration.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.DoBodyAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ELExpression.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Expression.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.FallBackAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ForwardAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.GetProperty.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.IncludeAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.IncludeDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.InvokeAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspAttribute.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspBody.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspElement.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspOutput.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspRoot.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.JspText.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.NamedAttribute.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Nodes.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.PageDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ParamAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ParamsAction.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.PlugIn.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Root.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.ScriptingElement.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Scriptlet.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.SetProperty.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.TagDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.TaglibDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.TemplateText.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.UninterpretedTag.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.UseBean.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.VariableDirective.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/Node.Visitor.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/ServletWriter.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapGenerator.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapStratum.LineInfo.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapStratum.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/SmapUtil.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagConstants.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TagPluginManager.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TextOptimizer.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/TldLocationsCache.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/tagplugin/TagPlugin.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/tagplugin/TagPluginContext.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/tagplugin/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/tagplugin/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/compiler/tagplugin/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/BodyContentImpl.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/HttpJspBase.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspContextWrapper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspFactoryImpl.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspFragmentHelper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspRuntimeLibrary.PrivilegedIntrospectHelper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspRuntimeLibrary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspSourceDependent.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/JspWriterImpl.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/PageContextImpl.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/PerThreadTagHandlerPool.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/ProtectedFunctionMapper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/ServletResponseWrapperInclude.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/TagHandlerPool.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/runtime/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityClassLoad.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/SecurityUtil.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/security/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JasperLoader.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspCServletContext.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspServlet.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/JspServletWrapper.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/servlet/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/Choose.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/ForEach.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/If.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/Otherwise.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/When.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/tagplugins/jstl/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/FastDateFormat.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/Queue.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/SimplePool.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/SystemLogHandler.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/util/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/ASCIIReader.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/ParserUtils.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/TreeNode.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/UCSReader.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/UTF8Reader.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/XMLEncodingDetector.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/XercesEncodingDetector.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/org/apache/jasper/xmlparser/package-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/overview-frame.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/overview-summary.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/overview-tree.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/package-list
-tomcat5/webapps/tomcat-docs/jasper/docs/api/packages.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/resources/inherit.gif
-tomcat5/webapps/tomcat-docs/jasper/docs/api/serialized-form.html
-tomcat5/webapps/tomcat-docs/jasper/docs/api/stylesheet.css
-tomcat5/webapps/tomcat-docs/jndi-datasource-examples-howto.html
-tomcat5/webapps/tomcat-docs/jndi-resources-howto.html
-tomcat5/webapps/tomcat-docs/jspapi/allclasses-frame.html
-tomcat5/webapps/tomcat-docs/jspapi/allclasses-noframe.html
-tomcat5/webapps/tomcat-docs/jspapi/constant-values.html
-tomcat5/webapps/tomcat-docs/jspapi/deprecated-list.html
-tomcat5/webapps/tomcat-docs/jspapi/help-doc.html
-tomcat5/webapps/tomcat-docs/jspapi/index-all.html
-tomcat5/webapps/tomcat-docs/jspapi/index.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/ErrorData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/HttpJspPage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspContext.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspEngineInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspFactory.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspPage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspTagException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/JspWriter.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/PageContext.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/SkipPageException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/ErrorData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/HttpJspPage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspContext.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspEngineInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspFactory.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspPage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspTagException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/JspWriter.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/PageContext.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/class-use/SkipPageException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ELParseException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/Expression.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/ExpressionEvaluator.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/FunctionMapper.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/VariableResolver.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ELParseException.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/Expression.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/ExpressionEvaluator.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/FunctionMapper.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/class-use/VariableResolver.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-frame.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-summary.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-tree.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/el/package-use.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-frame.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-summary.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-tree.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/package-use.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyContent.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/BodyTagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/DynamicAttributes.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/FunctionInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/IterationTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspFragment.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/JspTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/PageData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/SimpleTagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/Tag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAdapter.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagAttributeInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagExtraInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagFileInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagLibraryValidator.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TagVariableInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/TryCatchFinally.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/ValidationMessage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/VariableInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyContent.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/BodyTagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/DynamicAttributes.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/FunctionInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/IterationTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspFragment.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/JspTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/PageData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/SimpleTagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/Tag.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAdapter.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagAttributeInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagData.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagExtraInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagFileInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagLibraryValidator.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagSupport.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TagVariableInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/TryCatchFinally.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/ValidationMessage.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/class-use/VariableInfo.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/BodyTagProtocol.gif
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/IterationTagProtocol.gif
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/TagProtocol.gif
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/doc-files/VariableInfo-1.gif
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-frame.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-summary.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-tree.html
-tomcat5/webapps/tomcat-docs/jspapi/javax/servlet/jsp/tagext/package-use.html
-tomcat5/webapps/tomcat-docs/jspapi/overview-frame.html
-tomcat5/webapps/tomcat-docs/jspapi/overview-summary.html
-tomcat5/webapps/tomcat-docs/jspapi/overview-tree.html
-tomcat5/webapps/tomcat-docs/jspapi/package-list
-tomcat5/webapps/tomcat-docs/jspapi/packages.html
-tomcat5/webapps/tomcat-docs/jspapi/resources/inherit.gif
-tomcat5/webapps/tomcat-docs/jspapi/serialized-form.html
-tomcat5/webapps/tomcat-docs/jspapi/stylesheet.css
-tomcat5/webapps/tomcat-docs/manager-howto.html
-tomcat5/webapps/tomcat-docs/mbeans-descriptor-howto.html
-tomcat5/webapps/tomcat-docs/printer/balancer-howto.html
-tomcat5/webapps/tomcat-docs/printer/building.html
-tomcat5/webapps/tomcat-docs/printer/cgi-howto.html
-tomcat5/webapps/tomcat-docs/printer/changelog.html
-tomcat5/webapps/tomcat-docs/printer/class-loader-howto.html
-tomcat5/webapps/tomcat-docs/printer/cluster-howto.html
-tomcat5/webapps/tomcat-docs/printer/default-servlet.html
-tomcat5/webapps/tomcat-docs/printer/deployer-howto.html
-tomcat5/webapps/tomcat-docs/printer/developers.html
-tomcat5/webapps/tomcat-docs/printer/html-manager-howto.html
-tomcat5/webapps/tomcat-docs/printer/index.html
-tomcat5/webapps/tomcat-docs/printer/introduction.html
-tomcat5/webapps/tomcat-docs/printer/jasper-howto.html
-tomcat5/webapps/tomcat-docs/printer/jndi-datasource-examples-howto.html
-tomcat5/webapps/tomcat-docs/printer/jndi-resources-howto.html
-tomcat5/webapps/tomcat-docs/printer/manager-howto.html
-tomcat5/webapps/tomcat-docs/printer/mbeans-descriptor-howto.html
-tomcat5/webapps/tomcat-docs/printer/proxy-howto.html
-tomcat5/webapps/tomcat-docs/printer/realm-howto.html
-tomcat5/webapps/tomcat-docs/printer/security-manager-howto.html
-tomcat5/webapps/tomcat-docs/printer/setup.html
-tomcat5/webapps/tomcat-docs/printer/ssi-howto.html
-tomcat5/webapps/tomcat-docs/printer/ssl-howto.html
-tomcat5/webapps/tomcat-docs/printer/status.html
-tomcat5/webapps/tomcat-docs/proxy-howto.html
-tomcat5/webapps/tomcat-docs/realm-howto.html
-tomcat5/webapps/tomcat-docs/security-manager-howto.html
-tomcat5/webapps/tomcat-docs/servletapi/allclasses-frame.html
-tomcat5/webapps/tomcat-docs/servletapi/allclasses-noframe.html
-tomcat5/webapps/tomcat-docs/servletapi/constant-values.html
-tomcat5/webapps/tomcat-docs/servletapi/deprecated-list.html
-tomcat5/webapps/tomcat-docs/servletapi/help-doc.html
-tomcat5/webapps/tomcat-docs/servletapi/index-all.html
-tomcat5/webapps/tomcat-docs/servletapi/index.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/Filter.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/FilterChain.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/FilterConfig.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/GenericServlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/RequestDispatcher.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/Servlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletConfig.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContext.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletContextListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletException.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletInputStream.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletOutputStream.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequest.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletRequestWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponse.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/ServletResponseWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/SingleThreadModel.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/UnavailableException.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Filter.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterChain.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/FilterConfig.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/GenericServlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/RequestDispatcher.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/Servlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletConfig.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContext.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletContextListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletException.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletInputStream.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletOutputStream.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequest.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestAttributeEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletRequestWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponse.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/ServletResponseWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/SingleThreadModel.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/class-use/UnavailableException.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/Cookie.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequest.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletRequestWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponse.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpServletResponseWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSession.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionActivationListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionBindingListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionContext.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpSessionListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/HttpUtils.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/Cookie.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServlet.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequest.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletRequestWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponse.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpServletResponseWrapper.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSession.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionActivationListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionAttributeListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionBindingListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionContext.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionEvent.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpSessionListener.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/class-use/HttpUtils.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/package-frame.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/package-summary.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/package-tree.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/http/package-use.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/package-frame.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/package-summary.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/package-tree.html
-tomcat5/webapps/tomcat-docs/servletapi/javax/servlet/package-use.html
-tomcat5/webapps/tomcat-docs/servletapi/overview-frame.html
-tomcat5/webapps/tomcat-docs/servletapi/overview-summary.html
-tomcat5/webapps/tomcat-docs/servletapi/overview-tree.html
-tomcat5/webapps/tomcat-docs/servletapi/package-list
-tomcat5/webapps/tomcat-docs/servletapi/packages.html
-tomcat5/webapps/tomcat-docs/servletapi/resources/inherit.gif
-tomcat5/webapps/tomcat-docs/servletapi/serialized-form.html
-tomcat5/webapps/tomcat-docs/servletapi/stylesheet.css
-tomcat5/webapps/tomcat-docs/setup.html
-tomcat5/webapps/tomcat-docs/ssi-howto.html
-tomcat5/webapps/tomcat-docs/ssl-howto.html
-tomcat5/webapps/tomcat-docs/status.html
-tomcat5/webapps/webdav/WEB-INF/web.xml
-tomcat5/webapps/webdav/index.html
-tomcat5/webapps/webdav/tomcat-power.gif
-tomcat5/webapps/webdav/tomcat.gif
-@pkgdir tomcat5/work
-@pkgdir tomcat5/webapps/balancer/images
-@pkgdir tomcat5/temp
-@pkgdir tomcat5/shared/lib
-@pkgdir tomcat5/shared/classes
-@pkgdir tomcat5/server/webapps/admin/valve
-@pkgdir tomcat5/server/webapps/admin/service
-@pkgdir tomcat5/server/webapps/admin/server
-@pkgdir tomcat5/server/webapps/admin/realm
-@pkgdir tomcat5/server/webapps/admin/logger
-@pkgdir tomcat5/server/webapps/admin/host
-@pkgdir tomcat5/server/webapps/admin/defaultcontext
-@pkgdir tomcat5/server/webapps/admin/context
-@pkgdir tomcat5/server/webapps/admin/connector
-@pkgdir tomcat5/server/classes
-@pkgdir tomcat5/logs
-@pkgdir tomcat5/common/classes
diff --git a/www/jakarta-tomcat5/distinfo b/www/jakarta-tomcat5/distinfo
deleted file mode 100644
index e91b619091a..00000000000
--- a/www/jakarta-tomcat5/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/01 13:44:58 abs Exp $
-
-SHA1 (jakarta-tomcat-5.0.30.tar.gz) = 7d01bd45991deada475490521985e085310bb916
-RMD160 (jakarta-tomcat-5.0.30.tar.gz) = 369b9e6c0090bc8aa8ceffc059365bcc1cea0b1d
-Size (jakarta-tomcat-5.0.30.tar.gz) = 10842790 bytes
diff --git a/www/jakarta-tomcat5/files/tomcat5.sh b/www/jakarta-tomcat5/files/tomcat5.sh
deleted file mode 100644
index 77ab1475844..00000000000
--- a/www/jakarta-tomcat5/files/tomcat5.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! @RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: tomcat5.sh,v 1.1 2005/04/06 18:33:57 abs Exp $
-#
-# PROVIDE: tomcat
-# REQUIRE: DAEMON
-#
-# To start tomcat at startup, copy this script to /etc/rc.d and set
-# tomcat=YES in /etc/rc.conf.
-
-PREFIX=@PREFIX@
-TOMCAT_LIB=@TOMCAT_LIB@
-
-if [ -z "${JAVA_HOME}" ]
-then
- JAVA_HOME="@JAVA_HOME@"
- export JAVA_HOME
-fi
-
-name="tomcat"
-rcvar=$name
-command="${TOMCAT_LIB}/bin/catalina.sh"
-
-# set defaults
-if [ -r /etc/rc.conf ]
-then
- . /etc/rc.conf
-else
- eval ${rcvar}=YES
-fi
-
-# $flags from environment overrides ${rcvar}_flags
-if [ -n "${flags}" ]
-then
- eval ${rcvar}_flags="${flags}"
-fi
-
-CLASSPATH=${CLASSPATH}:${PREFIX}/lib/java/servlet.jar:${PREFIX}/lib/java/jaxp.jar:${PREFIX}/lib/java/parser.jar:${PREFIX}/lib/java/crimson.jar:${PREFIX}/lib/java/ant.jar
-if [ -n "${tomcat_classpath}" ]
-then
- CLASSPATH=${CLASSPATH}:${tomcat_classpath}
-fi
-export CLASSPATH
-
-cmd=${1:-start}
-
-checkyesno()
-{
- eval _value=\$${1}
- case $_value in
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0 ;;
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1 ;;
- *)
- echo "\$${1} is not set properly."
- return 1
- ;;
- esac
-}
-
-if checkyesno ${rcvar}
-then
- if [ -x ${command} ]
- then
- case ${cmd} in
- run|start)
- echo "Starting ${name}."
- (cd ${TOMCAT_LIB} && ${command} ${cmd})
- ;;
-
- stop)
- echo "Stopping ${name}."
- (cd ${TOMCAT_LIB} && ${command} ${cmd})
- ;;
-
- restart)
- ( $0 stop )
- sleep 5
- $0 start
- ;;
-
- flush)
- cd ${TOMCAT_LIB}/work && rm -rf */*
- ;;
-
- *)
- echo 1>&2 "Usage: $0 [restart|start|stop|flush]"
- exit 1
- ;;
- esac
- fi
-fi
-exit 0
diff --git a/www/sarg/DESCR b/www/sarg/DESCR
deleted file mode 100644
index d522ac146d6..00000000000
--- a/www/sarg/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SARG Squid Analysis Report Generator (formerly sqmgrlog) is a tool
-that allow you to view "where" your users are going to on the
-Internet. SARG generate reports in HTML showing users, IP addresses,
-bytes, sites, and times.
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
deleted file mode 100644
index 1848e69463b..00000000000
--- a/www/sarg/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2011/03/17 08:26:08 obache Exp $
-
-DISTNAME= sarg-2.1
-PKGREVISION= 7
-CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sarg/}
-
-PATCH_SITES= http://sarg.sourceforge.net/
-PATCHFILES= datafile.patch lastlog.patch
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://sarg.sourceforge.net/sarg.php
-COMMENT= Squid-Cache proxy server Analysis Report Generator
-LICENSE= gnu-gpl-v2 # or later
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gcc \
- --enable-bindir=${PREFIX}/bin \
- --enable-mandir=${PREFIX}/${PKGMANDIR}/man1 \
- --enable-sysconfdir=${PKG_SYSCONFDIR:Q}
-
-DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils
-
-DIST_SUBDIR= ${DISTNAME}
-PKG_SYSCONFSUBDIR= sarg
-EGDIR= ${PREFIX}/share/examples/sarg
-EGLNG= ${EGDIR}/languages
-CFLNG= ${PKG_SYSCONFDIR}/languages
-
-.include "../../mk/bsd.prefs.mk"
-
-SQUID_ACCESSLOG?= ${VARBASE}/squid/logs/access.log
-SARG_REPORTSDIR?= ${VARBASE}/sarg
-
-OWN_DIRS+= ${SARG_REPORTSDIR} ${CFLNG}
-
-SUBST_CLASSES+= sargconf
-SUBST_MESSAGE.sargconf= Adjusting values in SARG configuration files.
-SUBST_STAGE.sargconf= post-configure
-SUBST_FILES.sargconf= sarg.conf sarg.1
-SUBST_SED.sargconf= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.sargconf+= -e 's,@SQUID_ACCESSLOG@,${SQUID_ACCESSLOG},g'
-SUBST_SED.sargconf+= -e 's,@SARG_REPORTSDIR@,${SARG_REPORTSDIR},g'
-
-SUBST_CLASSES+= gsort
-SUBST_MESSAGE.gsort= Adjusting sort to use GNU coreutils
-SUBST_STAGE.gsort= post-patch
-SUBST_FILES.gsort= authfail.c dansguardian_log.c email.c grepday.c \
- html.c index.c lastlog.c log.c realtime.c siteuser.c \
- smartfilter.c sort.c squidguard_log.c topsites.c topuser.c \
- totday.c useragent.c
-SUBST_SED.gsort= -e 's,"sort ,"'"${PREFIX}/bin/${GNU_PROGRAM_PREFIX}sort ,"
-
-BUILD_DEFS+= SQUID_ACCESSLOG SARG_REPORTSDIR
-MAKE_ENV+= PKG_FLAGS="-DSQUID_ACCESSLOG='\"${SQUID_ACCESSLOG}\"' \
- -DSARG_REPORTSDIR='\"${SARG_REPORTSDIR}\"'" \
- EGDIR=${EGDIR:Q}
-
-INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin
-INSTALL_MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-INSTALL_MAKE_FLAGS+= EGDIR=${DESTDIR}${EGDIR}
-
-CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \
- ${EGDIR}/exclude_codes ${PKG_SYSCONFDIR}/exclude_codes \
- ${EGLNG}/Bulgarian_windows1251 \
- ${CFLNG}/Bulgarian_windows1251 \
- ${EGLNG}/Catalan ${CFLNG}/Catalan \
- ${EGLNG}/Czech ${CFLNG}/Czech \
- ${EGLNG}/Dutch ${CFLNG}/Dutch \
- ${EGLNG}/English ${CFLNG}/English \
- ${EGLNG}/French ${CFLNG}/French \
- ${EGLNG}/German ${CFLNG}/German \
- ${EGLNG}/Greek ${CFLNG}/Greek \
- ${EGLNG}/Hungarian ${CFLNG}/Hungarian \
- ${EGLNG}/Indonesian ${CFLNG}/Indonesian \
- ${EGLNG}/Italian ${CFLNG}/Italian \
- ${EGLNG}/Japanese ${CFLNG}/Japanese \
- ${EGLNG}/Latvian ${CFLNG}/Latvian \
- ${EGLNG}/Polish ${CFLNG}/Polish \
- ${EGLNG}/Portuguese ${CFLNG}/Portuguese \
- ${EGLNG}/Romanian ${CFLNG}/Romanian \
- ${EGLNG}/Russian_koi8 ${CFLNG}/Russian_koi8 \
- ${EGLNG}/Russian_UTF-8 ${CFLNG}/Russian_UTF-8 \
- ${EGLNG}/Russian_windows1251 \
- ${CFLNG}/Russian_windows1251 \
- ${EGLNG}/Serbian ${CFLNG}/Serbian \
- ${EGLNG}/Slovak ${CFLNG}/Slovak \
- ${EGLNG}/Spanish ${CFLNG}/Spanish \
- ${EGLNG}/Turkish ${CFLNG}/Turkish \
- ${EGLNG}/Ukrainian_windows1251 \
- ${CFLNG}/Ukrainian_windows1251
-
-post-extract:
- ${FIND} ${WRKSRC} -type d -exec ${CHMOD} +x {} \;
- ${RM} ${WRKSRC}/languages/.new
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../graphics/gd/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/sarg/PLIST b/www/sarg/PLIST
deleted file mode 100644
index 7d7f716b4c0..00000000000
--- a/www/sarg/PLIST
+++ /dev/null
@@ -1,55 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:34 joerg Exp $
-bin/sarg
-man/man1/sarg.1
-share/examples/sarg/css.tpl
-share/examples/sarg/exclude_codes
-share/examples/sarg/fonts/FreeSans.ttf
-share/examples/sarg/fonts/README
-share/examples/sarg/fonts/license
-share/examples/sarg/images/datetime.png
-share/examples/sarg/images/graph.png
-share/examples/sarg/images/sarg-squidguard-block.png
-share/examples/sarg/images/sarg.png
-share/examples/sarg/languages/Bulgarian_windows1251
-share/examples/sarg/languages/Catalan
-share/examples/sarg/languages/Czech
-share/examples/sarg/languages/Dutch
-share/examples/sarg/languages/English
-share/examples/sarg/languages/French
-share/examples/sarg/languages/German
-share/examples/sarg/languages/Greek
-share/examples/sarg/languages/Hungarian
-share/examples/sarg/languages/Indonesian
-share/examples/sarg/languages/Italian
-share/examples/sarg/languages/Japanese
-share/examples/sarg/languages/Latvian
-share/examples/sarg/languages/Polish
-share/examples/sarg/languages/Portuguese
-share/examples/sarg/languages/Romanian
-share/examples/sarg/languages/Russian_UTF-8
-share/examples/sarg/languages/Russian_koi8
-share/examples/sarg/languages/Russian_windows1251
-share/examples/sarg/languages/Serbian
-share/examples/sarg/languages/Slovak
-share/examples/sarg/languages/Spanish
-share/examples/sarg/languages/Turkish
-share/examples/sarg/languages/Ukrainian_windows1251
-share/examples/sarg/sarg-php/COPYING
-share/examples/sarg/sarg-php/INSTALL
-share/examples/sarg/sarg-php/LANGUAGES
-share/examples/sarg/sarg-php/language.php
-share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.mo
-share/examples/sarg/sarg-php/locale/en_EN/LC_MESSAGES/messages.po
-share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.mo
-share/examples/sarg/sarg-php/locale/fr/LC_MESSAGES/messages.po
-share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.mo
-share/examples/sarg/sarg-php/locale/pt_BR/LC_MESSAGES/messages.po
-share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.mo
-share/examples/sarg/sarg-php/locale/ru/LC_MESSAGES/messages.po
-share/examples/sarg/sarg-php/sarg-block-it.php
-share/examples/sarg/sarg-php/sarg-realtime.php
-share/examples/sarg/sarg-php/sarg-squidguard-block.php
-share/examples/sarg/sarg-php/sarg-squidguard-block2.php
-share/examples/sarg/sarg-php/style.php
-share/examples/sarg/sarg-php/translate.this
-share/examples/sarg/sarg.conf
diff --git a/www/sarg/distinfo b/www/sarg/distinfo
deleted file mode 100644
index 3ba4c4ff3b3..00000000000
--- a/www/sarg/distinfo
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/05/22 03:44:55 ben Exp $
-
-SHA1 (sarg-2.1/sarg-2.1.tar.gz) = e35239d076f8b4bf9b9c41ea68f7711fa9a6d920
-RMD160 (sarg-2.1/sarg-2.1.tar.gz) = 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05
-Size (sarg-2.1/sarg-2.1.tar.gz) = 352935 bytes
-SHA1 (sarg-2.1/datafile.patch) = 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5
-RMD160 (sarg-2.1/datafile.patch) = a158013cbb19620f1942201cec0d7896d5a6ebfc
-Size (sarg-2.1/datafile.patch) = 1300 bytes
-SHA1 (sarg-2.1/lastlog.patch) = c4af4ff498baa5d2a124b52ca84b984169c9eea8
-RMD160 (sarg-2.1/lastlog.patch) = e72fec0af3ce48df9a3aa43656d8be5cf3c1044b
-Size (sarg-2.1/lastlog.patch) = 406 bytes
-SHA1 (patch-aa) = aadbd10cfa7bedd2c7ba629f5be40f48d3092776
-SHA1 (patch-ab) = a22082096256009cef93095184859815f48ec533
-SHA1 (patch-ac) = 7157d9ee56f1d31273e6d020a0d970bd55278ebd
-SHA1 (patch-ad) = 26f90ff3a3c1099f36c6d4a32f7309c4b70a3365
-SHA1 (patch-ae) = 46e01d4c2f106629e512523e3b4d58118ccfb0bf
-SHA1 (patch-af) = e3dc4c6edd26f7361974f573e38265f613e1da42
-SHA1 (patch-ag) = f895801bf2834fb7c65233f15c20cca7c50f6a44
-SHA1 (patch-ah) = 9f3486723378085a8c3d1fdf4b549543038e40e1
-SHA1 (patch-ai) = fb00daf29e53f56e2b2a1a0997f8f364d82e6acf
diff --git a/www/sarg/patches/patch-aa b/www/sarg/patches/patch-aa
deleted file mode 100644
index 77ba2d7b4fe..00000000000
--- a/www/sarg/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- Makefile.in.orig 2005-11-29 08:39:45.000000000 -0800
-+++ Makefile.in
-@@ -4,12 +4,12 @@ CC = @CC@
- BINDIR = @BINDIR@
- IBINDIR = -DBINDIR=\"@BINDIR@\"
- MANDIR = @MANDIR@
--SYSCONFDIR = @SYSCONFDIR@
-+SYSCONFDIR = ${EGDIR}
- HTMLDIR = @HTMLDIR@
- ISYSCONFDIR = -DSYSCONFDIR=\"@SYSCONFDIR@\"
- IHTMLDIR = -DHTMLDIR=\"@HTMLDIR@\"
--CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@
-+CFLAGS += @CFLAGS@ ${PKG_FLAGS}
-+LDFLAGS += @LDFLAGS@
- DEFS = @DEFS@
- LIBS = @LIBS@
- SRCDIR = .
diff --git a/www/sarg/patches/patch-ab b/www/sarg/patches/patch-ab
deleted file mode 100644
index 26549bdb5da..00000000000
--- a/www/sarg/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- convlog.c.orig 2005-11-29 08:39:45.000000000 -0800
-+++ convlog.c
-@@ -39,7 +39,7 @@ void convlog(char *arq, char *df, int df
- struct tm *t;
-
- if(arq[0] == '\0')
-- strcpy(arq,"/usr/local/squid/logs/access.log");
-+ strcpy(arq,SQUID_ACCESSLOG);
-
- if((fp_in=fopen(arq,"r"))==NULL) {
- fprintf(stderr, "SARG: (convlog) %s: %s\n",text[8],arq);
diff --git a/www/sarg/patches/patch-ac b/www/sarg/patches/patch-ac
deleted file mode 100644
index f836c8d74df..00000000000
--- a/www/sarg/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- log.c.orig 2005-11-29 08:39:45.000000000 -0800
-+++ log.c
-@@ -148,7 +148,7 @@ int main(argc,argv)
- SquidGuardLogFormat[0]='\0';
- SquidGuardLogAlternate[0]='\0';
-
-- strcpy(AccessLog,"/usr/local/squid/var/logs/access.log");
-+ strcpy(AccessLog,SQUID_ACCESSLOG);
- sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR);
- strcpy(GraphDaysBytesBarColor,"orange");
- strcpy(BgColor,"#ffffff");
-@@ -163,7 +163,7 @@ int main(argc,argv)
- strcpy(LogoTextColor,"#006699");
- strcpy(FontSize,"9px");
- strcpy(TempDir,"/tmp");
-- strcpy(OutputDir,"/usr/local/etc/httpd/htdocs/squid-reports");
-+ strcpy(OutputDir,SARG_REPORTSDIR);
- strcpy(Ip2Name,"no");
- strcpy(DateFormat,"u");
- strcpy(OverwriteReport,"no");
diff --git a/www/sarg/patches/patch-ad b/www/sarg/patches/patch-ad
deleted file mode 100644
index 23e794e5a87..00000000000
--- a/www/sarg/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- sarg.1.orig 2005-11-29 08:39:45.000000000 -0800
-+++ sarg.1
-@@ -131,9 +131,9 @@ Convert the logfile's date/time field to
- .B \-split
- Split the log file by date in \fB-d\fP parameter.
- .SH FILES
--.BR /usr/local/sarg/sarg.conf
-+.BR @PKG_SYSCONFDIR@/sarg.conf
- .br
--.B /usr/local/squid/logs/access.log
-+.B @SQUID_ACCESSLOG@
- .br
- .B /usr/local/squidGuard/logs/squidGuard.log
- .SH SEE ALSO
diff --git a/www/sarg/patches/patch-ae b/www/sarg/patches/patch-ae
deleted file mode 100644
index a6f9eaa72de..00000000000
--- a/www/sarg/patches/patch-ae
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- sarg.conf.orig 2005-11-29 08:39:45.000000000 -0800
-+++ sarg.conf
-@@ -32,7 +32,7 @@
- # Where is the access.log file
- # sarg -l file
- #
--#access_log /usr/local/squid/var/logs/access.log
-+#access_log @SQUID_ACCESSLOG@
-
- # TAG: graphs yes|no
- # Use graphics where is possible.
-@@ -139,7 +139,7 @@
- # The reports will be saved in that directory
- # sarg -o dir
- #
--#output_dir /var/www/html/squid-reports
-+#output_dir @SARG_REPORTSDIR@
-
- # TAG: output_email
- # Email address to send the reports. If you use this tag, no html reports will be generated.
-@@ -269,7 +269,7 @@
- # TAG: exclude_codes file
- # Ignore records with these codes. Eg.: NONE/400
- #
--#exclude_codes /usr/local/sarg/exclude_codes
-+#exclude_codes @PKG_SYSCONFDIR@/exclude_codes
-
- # TAG: replace_index string
- # Replace "index.html" in the main index file with this string
diff --git a/www/sarg/patches/patch-af b/www/sarg/patches/patch-af
deleted file mode 100644
index acf400c76f0..00000000000
--- a/www/sarg/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2006/05/22 03:44:55 ben Exp $
-
---- splitlog.c.orig 2005-11-29 08:39:45.000000000 -0800
-+++ splitlog.c
-@@ -39,7 +39,7 @@ void splitlog(char *arq, char *df, int d
- struct tm *t;
-
- if(arq[0] == '\0')
-- strcpy(arq,"/usr/local/squid/logs/access.log");
-+ strcpy(arq,SQUID_ACCESSLOG);
-
- if((fp_in=fopen(arq,"r"))==NULL) {
- fprintf(stderr, "SARG: (splitlog) %s: %s\n",text[8],arq);
diff --git a/www/sarg/patches/patch-ag b/www/sarg/patches/patch-ag
deleted file mode 100644
index 5a63f4622a3..00000000000
--- a/www/sarg/patches/patch-ag
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/05/22 03:44:55 ben Exp $
-
---- configure.in.orig 2005-11-29 08:39:45.000000000 -0800
-+++ configure.in
-@@ -6,33 +6,8 @@ LDFLAGS="-g"
-
- AC_CANONICAL_HOST
-
--AC_ARG_WITH(gcc,
--[ --without-gcc use CC to compile])
--
--test -n "$CC" && cc_specified=yes
--case ${with_gcc} in
-- yes ) CC=gcc ;;
--dnl yes ) CC=g++ ;;
-- no ) CC=cc ;;
-- * ) AC_PROG_CC;;
--dnl * ) AC_PROG_CXX ;;
--esac
--
--if test "${CC}" = "cc" ; then
-- CFLAGS="${CFLAGS} -w -g -O2 -Aa"
--else
-- CFLAGS="${CFLAGS} -w"
--fi
--
--case "$host" in
-- *-solaris*)
-- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-- CFLAGS="-DSOLARIS ${CFLAGS}"
-- ;;
--esac
--
--#dnl Checks for programs.
--#AC_PROG_CC
-+dnl Checks for programs.
-+AC_PROG_CC
-
- dnl Check for headers
- AC_HEADER_DIRENT
-@@ -40,7 +15,7 @@ AC_HEADER_STDC
-
- AC_CHECK_HEADERS(stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
- dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
-- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h)
-+ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h)
-
- AC_CHECK_LIB(gd, gdImagePng,LIBS="-lgd ${LIBS}"; HAVE_GD="yes", HAVE_GD="")
-
diff --git a/www/sarg/patches/patch-ah b/www/sarg/patches/patch-ah
deleted file mode 100644
index 02ea0533259..00000000000
--- a/www/sarg/patches/patch-ah
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/05/22 03:44:55 ben Exp $
-
---- configure.orig 2005-11-29 08:39:45.000000000 -0800
-+++ configure
-@@ -853,11 +853,6 @@ Optional Features:
- --enable-htmldir=htmldir
- Select htmldir
-
--Optional Packages:
-- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
-- --without-gcc use CC to compile
--
- Some influential environment variables:
- CC C compiler command
- CFLAGS C compiler flags
-@@ -1388,18 +1383,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^
-
-
-
--
--# Check whether --with-gcc or --without-gcc was given.
--if test "${with_gcc+set}" = set; then
-- withval="$with_gcc"
--
--fi;
--
--test -n "$CC" && cc_specified=yes
--case ${with_gcc} in
-- yes ) CC=gcc ;;
-- no ) CC=cc ;;
-- * ) ac_ext=c
-+ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -2328,24 +2312,7 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--;;
--esac
--
--if test "${CC}" = "cc" ; then
-- CFLAGS="${CFLAGS} -w -g -O2 -Aa"
--else
-- CFLAGS="${CFLAGS} -w"
--fi
--
--case "$host" in
-- *-solaris*)
-- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-- CFLAGS="-DSOLARIS ${CFLAGS}"
-- ;;
--esac
-
--#dnl Checks for programs.
--#AC_PROG_CC
-
-
-
-@@ -3166,10 +3133,35 @@ fi
-
- done
-
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- for ac_header in stdio.h stdlib.h string.h strings.h sys/time.h time.h unistd.h sys/dirent.h \
- dirent.h sys/socket.h netdb.h arpa/inet.h sys/types.h netinet/in.h sys/stat.h \
-- ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h errno.h \
-- sys/resource.h
-+ ctype.h gd.h gdfontl.h gdfontt.h gdfonts.h gdfontmb.h gdfontg.h iconv.h errno.h sys/resource.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/www/sarg/patches/patch-ai b/www/sarg/patches/patch-ai
deleted file mode 100644
index 24c484fe97d..00000000000
--- a/www/sarg/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/05/22 03:44:55 ben Exp $
-
---- grepday.c.orig 2005-11-29 08:39:45.000000000 -0800
-+++ grepday.c
-@@ -43,7 +43,7 @@ char s[15];
- #include <iconv.h>
- #define SARGgdImageStringFT I18NgdImageStringFT
-
--BGD_DECLARE(char *) I18NgdImageStringFT (gdImage * im, int *brect, int fg, char *fontlist,
-+char *I18NgdImageStringFT(gdImage * im, int *brect, int fg, char *fontlist,
- double ptsize, double angle, int x, int y,
- char *string)
- {
diff --git a/www/seamonkey-bin-flash/DESCR b/www/seamonkey-bin-flash/DESCR
deleted file mode 100644
index 60e7c369b4b..00000000000
--- a/www/seamonkey-bin-flash/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package provides the Macromedia Flash player plugin for the
-seamonkey-bin package.
diff --git a/www/seamonkey-bin-flash/Makefile b/www/seamonkey-bin-flash/Makefile
deleted file mode 100644
index 5b7ec9a1b67..00000000000
--- a/www/seamonkey-bin-flash/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../www/firefox-bin-flash/Makefile.common"
-
-COMMENT= Flash Player plugin for seamonkey-bin
-
-MOZ_NAME= seamonkey-linux
-
-DEPENDS+= seamonkey-bin>=1.0:../../www/seamonkey-bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey-bin-flash/PLIST b/www/seamonkey-bin-flash/PLIST
deleted file mode 100644
index a68f9896c7a..00000000000
--- a/www/seamonkey-bin-flash/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2007/12/23 22:27:15 tnn Exp $
-lib/${MOZ_NAME}/plugins/libflashplayer.so
diff --git a/www/seamonkey-bin-java/DESCR b/www/seamonkey-bin-java/DESCR
deleted file mode 100644
index 5c5d85552be..00000000000
--- a/www/seamonkey-bin-java/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package package provides Sun Java Run Time Environment (JRE)
-plugin for the seamonkey-bin package.
diff --git a/www/seamonkey-bin-java/Makefile b/www/seamonkey-bin-java/Makefile
deleted file mode 100644
index 657e3c4dcc4..00000000000
--- a/www/seamonkey-bin-java/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/01 14:02:57 ghen Exp $
-
-.include "../../www/firefox-bin-java/Makefile.common"
-
-COMMENT= Java Run Time Environment (JRE) 1.5 plugin for seamonkey-bin
-
-MOZ_NAME= seamonkey-linux
-
-DEPENDS+= seamonkey-bin>=1.0:../../www/seamonkey-bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey-bin/DESCR b/www/seamonkey-bin/DESCR
deleted file mode 100644
index a62c37e6773..00000000000
--- a/www/seamonkey-bin/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The SeaMonkey project is a community effort to deliver production-quality
-releases of code derived from the application formerly known as "Mozilla
-Application Suite". Whereas the main focus of the Mozilla Foundation is on
-Mozilla Firefox and Mozilla Thunderbird, our group of dedicated volunteers
-works to ensure that you can have "everything but the kitchen sink" (a web
-browser, mail client, HTML composer, address book, IRC client and calendar),
-and have it stable enough for corporate use.
diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
deleted file mode 100644
index 0fe3fc918a4..00000000000
--- a/www/seamonkey-bin/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2010/03/22 07:16:14 obache Exp $
-
-MOZILLA= seamonkey
-MOZ_VER= 1.1.19
-MOZ_DISTVER= ${MOZ_VER}
-
-HOMEPAGE= http://www.mozilla.org/projects/seamonkey/
-COMMENT= Full-featured gecko-based browser suite (binary package)
-
-DIST_SUBDIR= ${MOZILLA}/${MOZ_DISTDIR}
-
-EMUL_PLATFORMS= linux-i386
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-.include "../../www/seamonkey-bin/Makefile.common"
diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common
deleted file mode 100644
index 717850c14a1..00000000000
--- a/www/seamonkey-bin/Makefile.common
+++ /dev/null
@@ -1,128 +0,0 @@
-# $NetBSD: Makefile.common,v 1.17 2009/06/14 22:58:10 joerg Exp $
-
-DISTNAME= ${MOZILLA}${MOX_EXTRA}-bin # overridden below
-PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
-CATEGORIES= www
-
-MAINTAINER?= pkgsrc-users@NetBSD.org
-HOMEPAGE?= http://www.mozilla.org/
-
-WRKSRC?= ${WRKDIR}/${MOZILLA}
-BUILD_DIRS?= # empty
-USE_LANGUAGES= # empty
-USE_TOOLS+= pax
-
-FILESDIR= ${.CURDIR}/../../www/seamonkey-bin/files
-MOZILLA_SCRIPT?= ${FILESDIR}/mozilla.sh
-
-.include "../../mk/bsd.prefs.mk"
-
-# Include Makefile.${EMUL_PLATFORM} to get definitions for DISTNAME,
-# MOZ_PLATFORM and MOZ_GTK2.
-#
-.sinclude "${.CURDIR}/Makefile.${EMUL_PLATFORM}"
-
-.if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
-EMUL_MODULES.linux= compat gtk2 locale alsa resmgr
-EMUL_REQD= suse>=9.1
-.else
-EMUL_MODULES.linux= compat gtk
-EMUL_REQD= suse>=7.3
-.endif
-
-.if defined(EMUL_IS_NATIVE)
-. if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
-DEPENDS+= gtk2+>=2.2:../../x11/gtk2
-. else
-DEPENDS+= gtk+>=1.2:../../x11/gtk
-. endif
-.endif
-
-MOZILLA_SHORT= ${MOZILLA}
-MOZ_DIR?= ${MOZ_VER}
-MOZ_PLATFORM?= ${LOWER_OPSYS}
-
-MASTER_SITES?= ${MASTER_SITE_MOZILLA:=${MOZILLA_SHORT}/releases/${MOZ_DIR}/}
-
-MOZILLA_LIB= ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
-
-FILES_SUBST+= MOZILLA=${MOZILLA:Q}
-FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA:Q}
-FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM:Q}
-
-INSTALLATION_DIRS= bin
-
-SUBST_CLASSES+= paths
-SUBST_FILES.paths= ${WRKDIR}/${MOZILLA}.sh
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
-SUBST_SED.paths+= -e 's,@SH@,${SH},g'
-SUBST_SED.paths+= -e 's,@MOZILLA@,${MOZILLA},g'
-SUBST_SED.paths+= -e 's,@MOZ_EXTRA@,${MOZ_EXTRA},g'
-SUBST_SED.paths+= -e 's,@MOZ_PLATFORM@,${MOZ_PLATFORM},g'
-SUBST_STAGE.paths= post-patch
-
-# we don't want libnullplugin.
-post-extract:
- @${RM} -f ${WRKSRC}/plugins/libnullplugin.so
- ${CP} ${MOZILLA_SCRIPT} ${WRKDIR}/${MOZILLA}.sh
-
-do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${MOZILLA_LIB}
- cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${MOZILLA_LIB}
- ${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA}.sh \
- ${DESTDIR}${PREFIX}/bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
- @${FIND} ${DESTDIR}${MOZILLA_LIB} -type f -print \
- | ${XARGS} ${CHMOD} a+r
- @${FIND} ${DESTDIR}${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \
- | ${XARGS} ${CHMOD} a+rx
- @${FIND} ${DESTDIR}${MOZILLA_LIB} -type d -print \
- | ${XARGS} ${CHMOD} a+rx
-
-# builds typically want exactly 'libgtk-1.2.so.0', etc. symlink them
-# into the mozilla directory.
-post-install:
-.if defined(EMUL_IS_NATIVE)
-. if defined(MOZ_GTK2) && !empty(MOZ_GTK2:M[Yy][Ee][Ss])
- @cd ${DESTDIR}${MOZILLA_LIB} && \
- ${LN} -s ${PREFIX}/lib/libatk-1.0.*so* .; \
- ${LN} -s ${X11PREFIX}/lib/libgdk-x11-2.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libgdk_pixbuf-2.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libglib-2.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libgmodule-2.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libgobject-2.0.*so* .; \
- ${LN} -s ${X11PREFIX}/lib/libgtk-x11-2.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libpango-1.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libpangox-1.0.*so* .; \
- ${LN} -s ${PREFIX}/lib/libpangoxft-1.0.*so* .; \
- \
- ${LN} -s libatk-1.0.so libatk-1.0.so.0; \
- ${LN} -s libgdk-x11-2.0.so libgdk-x11-2.0.so.0; \
- ${LN} -s libgdk_pixbuf-2.0.so libgdk_pixbuf-2.0.so.0; \
- ${LN} -s libglib-2.0.so libglib-2.0.so.0; \
- ${LN} -s libgmodule-2.0.so libgmodule-2.0.so.0; \
- ${LN} -s libgobject-2.0.so libgobject-2.0.so.0; \
- ${LN} -s libgtk-x11-2.0.so libgtk-x11-2.0.so.0; \
- ${LN} -s libpango-1.0.so libpango-1.0.so.0; \
- ${LN} -s libpangox-1.0.so libpangox-1.0.so.0; \
- ${LN} -s libpangoxft-1.0.so libpangoxft-1.0.so.0
-. else
- @cd ${DESTDIR}${MOZILLA_LIB} && \
- ${LN} -s ${PREFIX}/lib/libglib.*so* .; \
- ${LN} -s ${PREFIX}/lib/libgmodule.*so* .; \
- ${LN} -s ${X11PREFIX}/lib/libgdk.*so* .; \
- ${LN} -s ${X11PREFIX}/lib/libgtk.*so* .; \
- ${LN} -s libgtk.so libgtk-1.2.so.0; \
- ${LN} -s libgdk.so libgdk-1.2.so.0; \
- ${LN} -s libglib.so libglib-1.2.so.0; \
- ${LN} -s libgmodule.so libgmodule-1.2.so.0
-. endif
-.endif
- @${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/mozilla-linux/plugins
-
-GENERATE_PLIST+= \
- ${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}; \
- ${FIND} ${DESTDIR}${MOZILLA_LIB} \( -type f -o -type l \) -print\
- | ${SORT} | ${SED} -e "s,${DESTDIR}${PREFIX}/,,g"; \
- ${ECHO} "@pkgdir lib/mozilla-linux/plugins";
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey-bin/Makefile.linux-i386 b/www/seamonkey-bin/Makefile.linux-i386
deleted file mode 100644
index 0b2174d3ae4..00000000000
--- a/www/seamonkey-bin/Makefile.linux-i386
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: Makefile.linux-i386,v 1.1 2007/07/29 05:20:04 jlam Exp $
-
-DISTNAME= seamonkey-${MOZ_DISTVER}.en-US.linux-i686
-MOZ_DISTDIR= releases/${MOZ_DIR}
-MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/seamonkey/${MOZ_DISTDIR}/
-
-MOZ_GTK2= yes
-MOZ_PLATFORM= linux
diff --git a/www/seamonkey-bin/distinfo b/www/seamonkey-bin/distinfo
deleted file mode 100644
index ba36d45b71f..00000000000
--- a/www/seamonkey-bin/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.28 2010/03/22 07:16:14 obache Exp $
-
-SHA1 (seamonkey/releases/1.1.19/seamonkey-1.1.19.en-US.linux-i686.tar.gz) = 1c0f1c9e8ab1bdfd1249b5a4d17d5f74cf494444
-RMD160 (seamonkey/releases/1.1.19/seamonkey-1.1.19.en-US.linux-i686.tar.gz) = 04f4b035241eaf8f69a3316b2ef26a8751999814
-Size (seamonkey/releases/1.1.19/seamonkey-1.1.19.en-US.linux-i686.tar.gz) = 15090356 bytes
diff --git a/www/seamonkey-bin/files/mozilla.sh b/www/seamonkey-bin/files/mozilla.sh
deleted file mode 100644
index 8b354c78c96..00000000000
--- a/www/seamonkey-bin/files/mozilla.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-# $NetBSD: mozilla.sh,v 1.1 2006/09/24 16:35:39 salo Exp $
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/@MOZILLA@@MOZ_EXTRA@-@MOZ_PLATFORM@"
-export LD_LIBRARY_PATH
-
-exec @PREFIX@/lib/@MOZILLA@@MOZ_EXTRA@-@MOZ_PLATFORM@/@MOZILLA@ "$@"
diff --git a/x11/Makefile b/x11/Makefile
index 3bb75a727ca..f6f1ac6e5ac 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.637 2011/08/13 02:13:25 taca Exp $
+# $NetBSD: Makefile,v 1.638 2011/10/02 14:11:52 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -351,7 +351,6 @@ SUBDIR+= tk
SUBDIR+= tk-BWidget
SUBDIR+= tk-Tix
SUBDIR+= tkinfo
-SUBDIR+= tkman
SUBDIR+= transset-df
SUBDIR+= trapproto
SUBDIR+= tzosdclock
diff --git a/x11/tkman/DESCR b/x11/tkman/DESCR
deleted file mode 100644
index 4f5192f5d2a..00000000000
--- a/x11/tkman/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-A manual page reader, TkMan offers two major advantages over xman:
-hypertext links to other man pages (click on a word in the text which
-corresponds to a man page, and you jump there), and better navigation
-within long man pages with searches (both incremental and regular
-expression) and jumps to section headers. TkMan also offers some
-convenience features, like a user-configurable list of commonly used man
-pages, a one-click printout, and integration of `whatis' and `apropos'.
-Further, one may highlight, as if with a yellow marker, arbitrary passages
-of text in man pages and subsequently jump directly to these passages by
-selecting an identifying excerpt from a pulldown menu. Finally, TkMan
-gives one control over the directory-to-menu volume mapping of man pages
-with a capability similar to but superior to xman's mandesc in that rather
-than forcing all who share a man directory to follow a single organization,
-TkMan gives control to the individual. In fact, one may decide he has no
-use for a large set of man pages--say for instance the programmer routines
-in volumes 2, 3, 4, 8--and eliminate them from his personal database.
diff --git a/x11/tkman/MESSAGE b/x11/tkman/MESSAGE
deleted file mode 100644
index 06fbfd5e79d..00000000000
--- a/x11/tkman/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:54 wiz Exp $
-
-You can have the glimpse and apropos databases, needed by tkman,
-kept up-to-date by adding the following entry to root's crontab
-(edit to taste):
-
-10 2 * * 6 ${PREFIX}/libexec/mkindex
-
-===========================================================================
diff --git a/x11/tkman/Makefile b/x11/tkman/Makefile
deleted file mode 100644
index 844e2c5fe53..00000000000
--- a/x11/tkman/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2009/12/12 18:00:19 asau Exp $
-
-DISTNAME= tkman-2.2
-PKGREVISION= 1
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkman/}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://tkman.sourceforge.net/
-COMMENT= Tcl/Tk based manual browser
-
-DEPENDS+= glimpse>=4.1:../../textproc/glimpse
-DEPENDS+= rman>=3.1:../../textproc/rman
-DEPENDS+= tk>=8.4:../../x11/tk
-
-PKG_DESTDIR_SUPPORT= user-destdir
-
-INSTALLATION_DIRS= bin libexec
-
-post-extract:
-.for f in Makefile manpath.tcl
- ${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.cr
- ${TR} -d '\r' < ${WRKSRC}/${f}.cr > ${WRKSRC}/${f}
-.endfor
-
-post-install:
- ${SED} -e 's|@@LOCALBASE@@|${LOCALBASE}|' \
- -e 's|@@PREFIX@@|${PREFIX}|' \
- -e 's|@@X11BASE@@|${X11BASE}|' \
- ${FILESDIR}/mkindex > ${WRKDIR}/mkindex
- ${INSTALL_SCRIPT} ${WRKDIR}/mkindex ${DESTDIR}${PREFIX}/libexec
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkman/PLIST b/x11/tkman/PLIST
deleted file mode 100644
index 536b8dace2c..00000000000
--- a/x11/tkman/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:44 zuntum Exp $
-bin/tkman
-bin/retkman
-libexec/mkindex
diff --git a/x11/tkman/distinfo b/x11/tkman/distinfo
deleted file mode 100644
index baf89712b6d..00000000000
--- a/x11/tkman/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2009/12/12 18:00:19 asau Exp $
-
-SHA1 (tkman-2.2.tar.gz) = c406b755b32292caa321397e5b76fba29d4f70b7
-RMD160 (tkman-2.2.tar.gz) = a5ab43102c3f4a3d6327c46dd4ca3ed4eed3ce15
-Size (tkman-2.2.tar.gz) = 229273 bytes
-SHA1 (patch-aa) = 4efc8649d6fe59c4284ff8e51956efb7a6d2b589
-SHA1 (patch-ab) = 8e3fd6e2ac4bfa439184003c7b80f89789ac1eba
-SHA1 (patch-ac) = 4178da9370cdfc5da0231b12735da89f4cc6fe41
-SHA1 (patch-ad) = 3a406eba6089305ec218ce0428296cb7f4cb438a
diff --git a/x11/tkman/files/mkindex b/x11/tkman/files/mkindex
deleted file mode 100644
index 6d08d9f19b9..00000000000
--- a/x11/tkman/files/mkindex
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $NetBSD: mkindex,v 1.1 2000/09/11 21:08:50 fredb Exp $
-#
-# This is a script to construct the glimpse databases for tkman,
-# and also the apropos databases shared by tkman, man, and xman.
-# We don't do this as part of the package install because it could
-# be very time-consuming. It is possible to simply run tkman as root,
-# and exercise the menu option to "rebuild databases", but it could
-# take a long time, and who wants to run an X app as root, anyway?
-#
-# You might run this on a weekly basis by adding the following
-# entry to root's crontab (edited to taste):
-#
-# 10 2 * * 6 @@PREFIX@@/libexec/mkindex
-
-# Don't add /usr/local to the list unless there's something there,
-# because an empty glimpse database will cause tkman to squawk.
-for i in /usr/share @@LOCALBASE@@ @@X11BASE@@; do
- echo "Rebuilding glimpse database in $i/man..."
- @@LOCALBASE@@/bin/glimpseindex -o -B -z -H $i/man $i/man/man?
- chmod a+r $i/man/.glimpse_*
- echo
- echo "Rebuilding apropos database in $i/man..."
- /usr/libexec/makewhatis $i/man
- echo
-done
diff --git a/x11/tkman/patches/patch-aa b/x11/tkman/patches/patch-aa
deleted file mode 100644
index 60c639d45ef..00000000000
--- a/x11/tkman/patches/patch-aa
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2009/12/12 18:00:19 asau Exp $
-
---- Makefile.orig 2009-12-12 20:50:01.000000000 +0300
-+++ Makefile 2009-12-12 20:57:13.000000000 +0300
-@@ -25,13 +25,13 @@
-
- ### you need to localize the paths on these lines
-
--WISH = /usr/local/bin/wish8.4
-+WISH = ${LOCALBASE}/bin/wish
- #WISH = /usr/sww/tcl-8.4/bin/wish
- #WISH = /private/share/bin/wish8.4
-
- # the executable `tkman' is placed in BINDIR
- # this should be a directory that's in your bin PATH
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- #BINDIR = /private/share/bin
-
-
-@@ -80,11 +80,25 @@
- # will examine for matches if a search in the usual locations fails while searching
- # for a man pages and displaying its associated binaries (if any).
- # Use this feature carefully as a large number of directories can slow down startup.
--mastermen = "/usr/man /usr/local/man"
-+#mastermen = "/usr/man /usr/local/man"
- #mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man /usr/kerberos/man"
--masterbin = "/usr/bin /usr/local/bin"
-+mastermen = /usr/share/man ${LOCALBASE}/man ${X11BASE}/man
-+.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE})
-+mastermen += ${PREFIX}/man
-+.endif
-+.if (${PREFIX} != "/usr/local")
-+mastermen += /usr/local/man
-+.endif
-+#masterbin = "/usr/bin /usr/local/bin"
- #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin"
--
-+masterbin = /bin /sbin /usr/bin /usr/sbin
-+masterbin += ${LOCALBASE}/bin ${LOCALBASE}/sbin ${X11BASE}/bin
-+.if (${PREFIX} != ${LOCALBASE}) && (${PREFIX} != ${X11BASE})
-+masterbin += ${PREFIX}/bin
-+.endif
-+.if (${PREFIX} != "/usr/local")
-+masterbin += /usr/local/bin /usr/local/sbin
-+.endif
-
- # names of common printers, in addition to default printer (PRINTER or LPDEST)
- # (individual users can edit this list in the Preferences panel)
-@@ -113,7 +127,7 @@
- # Lines are cached in .../man/cat<n>@<line-length>;
- # that is, the line length is appended to the usual cache directory names
- #manformat = {groff -te -Tascii -man /tmp/ll -}
--manformat = {groff -te -Tlatin1 -man /tmp/ll -}
-+#manformat = {groff -te -Tlatin1 -man /tmp/ll -}
- # Ultrix users should uncomment the following line (you don't have eqn)
- #manformat = {tbl | nroff -man }
- # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff
-@@ -121,7 +135,7 @@
- # space between the .de and the macro name, and groff doesn't like this.)
- #manformat = {tbl | neqn | nroff -man }
- # BSD macros (.Sh, .Ss, .PP, ...) need -mandoc
--#manformat = {groff -Tascii -te -mandoc}
-+manformat = {groff -Tascii -te -mandoc}
- # BSDI
- #manformat = {tbl | eqn -Tascii | nroff -man }
- # It's actually legal to leave this empty if all the pages you'll ever
-@@ -349,8 +363,8 @@
- echo 'set manx(mintcl) $(mintcl)' >> tkman
- echo 'set manx(mintk) $(mintk)' >> tkman
- echo 'set manx(newuser) $(newuser)' >> tkman
-- echo 'set manx(mastermen) $(mastermen)' >> tkman
-- echo 'set manx(masterbin) $(masterbin)' >> tkman
-+ echo 'set manx(mastermen) "$(mastermen)"' >> tkman
-+ echo 'set manx(masterbin) "$(masterbin)"' >> tkman
- echo 'set man(zcat) $(zcat)' >> tkman
- echo 'set man(compress) $(compress)' >> tkman
- echo 'set man(apropos) $(apropos)' >> tkman
-@@ -428,6 +442,9 @@
- echo 'image create bitmap texRebus -data {' >> tkman
- cat xbm/tex.xbm >> tkman
- echo '}' >> tkman
-+ echo 'set manx(netbsd-bindings) {' >> tkman
-+ cat contrib/netbsd_bindings.tcl >> tkman
-+ echo '}' >> tkman
- echo 'set manx(solaris-bindings) {' >> tkman
- cat contrib/solaris_bindings.tcl >> tkman
- echo '}' >> tkman
-@@ -456,10 +473,8 @@
- chmod +x retkman
-
- install: tkman retkman
-- $(CP) tkman $(BINDIR)
-- chmod +rx $(BINDIR)/tkman
-- $(CP) retkman $(BINDIR)
-- chmod +rx $(BINDIR)/retkman
-+ $(BSD_INSTALL_SCRIPT) tkman $(DESTDIR)$(BINDIR)
-+ $(BSD_INSTALL_SCRIPT) retkman $(DESTDIR)$(BINDIR)
- @echo 'You also need RosettaMan to run TkMan.'
-
- test: dox tkman
diff --git a/x11/tkman/patches/patch-ab b/x11/tkman/patches/patch-ab
deleted file mode 100644
index c012afda348..00000000000
--- a/x11/tkman/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/03/03 04:03:28 minskim Exp $
-
---- manpath.tcl.orig 2003-04-01 15:31:38.000000000 -0800
-+++ manpath.tcl
-@@ -24,8 +24,13 @@ proc manManpathCheck {} {
- # doesn't that's OK (it's got a good whatis organization)
-
- # BSDI concatenates all whatis information into single file
-- # share fBSDI with manualpage.tcl to find xxx.0 files
-+ # share fBSDI with manualpage.tcl to find xxx.0 files,
-+ # but NetBSD uses multiple whatis.db files.
-+ if {![file executable "/usr/libexec/makewhatis"]} {
- set manx(fBSDI) [file readable [set whatis "/usr/share/man/whatis.db"]]
-+ } else {
-+ set manx(fBSDI) 0
-+ }
- set fDebian [expr {[file readable [set whatis "/usr/share/man/index.bt"]] || [file readable [set whatis "/var/cache/man/index.bt"]] || [file readable [set whatis "/usr/man/index.bt"]] || [file readable [set whatis "/var/catman/index.bt"]]}]
- # HPUX concatenates all whatis information into single file
- set fHPUX 0; if {!$manx(fBSDI) && !$fDebian} { set fHPUX [file readable [set whatis "/usr/lib/whatis"]] }
-@@ -84,10 +89,12 @@ proc manManpathCheck {} {
- lappend manx(pathstat) $man($root)
- set manx($root,latest) [lfirst [manLatestMan $root]]
-
-- # check for apropos index (called windex on Solaris)
-+ # check for apropos index (called windex on Solaris, whatis.db on NetBSD)
- if {!$manx(fBSDI) && !$fDebian && !$fHPUX} {
- if {![file exists [set whatis [file join $root "windex"]]]} {
-+ if ![file exists [set whatis $root/whatis.db]] {
- set whatis $root/whatis
-+ }
- }
- }
-
diff --git a/x11/tkman/patches/patch-ac b/x11/tkman/patches/patch-ac
deleted file mode 100644
index 1dd2689733d..00000000000
--- a/x11/tkman/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/09/01 03:14:16 fredb Exp $
-
---- /dev/null Thu Aug 31 21:20:27 2000
-+++ contrib/netbsd_bindings.tcl Thu Aug 31 21:21:06 2000
-@@ -0,0 +1,10 @@
-+# volume titles for NetBSD
-+#
-+
-+set man(manList) {1 2 3 4 5 6 7 8 9 n}
-+set man(manTitleList) {
-+ "User Commands" "System Calls" "Subroutines"
-+ "Devices" "File Formats" "Games and Demos"
-+ "Miscellaneous" "System Administration"
-+ "Kernel Manual" "Tcl/Tk Built-In Commands"
-+}
diff --git a/x11/tkman/patches/patch-ad b/x11/tkman/patches/patch-ad
deleted file mode 100644
index 7df8748689e..00000000000
--- a/x11/tkman/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/03/03 04:03:28 minskim Exp $
-
---- tkman.tcl.orig 2003-04-01 15:31:38.000000000 -0800
-+++ tkman.tcl
-@@ -2355,7 +2355,7 @@ if {$manx(startup) ne "" && ![file exist
- set os [string tolower $tcl_platform(os)]; set osvers $tcl_platform(osVersion)
- set setup ""; # most OSes work without configuration file
-
-- # three trouble makers
-+ # trouble makers
- if {$os eq "sunos" && $osvers>=5.0} {
- set setup solaris
- if {$osvers>=5.7} {append setup "28"
-@@ -2365,6 +2365,8 @@ if {$manx(startup) ne "" && ![file exist
- set setup irix
- } elseif {$os eq "sco_sv"} {
- set setup $os
-+ } elseif {[string match "netbsd*" $os]} {
-+ set setup netbsd
- }
- #puts stderr "\afound $setup"
-