. Fix the port to work with both JDK 1.3 and JDK 1.4 by using the

  PORTDOCS macro.  Also trims the pkg-plist considerably.

Hopefully not objected to by:	znerd

2 files changed, 1 insertions, 164 deletions

diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 580f768527b6..9d2ba11d920d 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -27,6 +27,7 @@ ANT?=		${LOCALBASE}/bin/ant
 ANT_TARGET=	jar
 .else
 ANT_TARGET=	jar javadoc
+PORTDOCS=	*
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
diff --git a/java/jakarta-commons-lang/pkg-plist b/java/jakarta-commons-lang/pkg-plist
index 54c0771e2041..117c4ae1f752 100644
--- a/java/jakarta-commons-lang/pkg-plist
+++ b/java/jakarta-commons-lang/pkg-plist
@@ -1,165 +1 @@
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/NestableException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/NestableError.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/ExceptionUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/NestableDelegate.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/Nestable.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/class-use/NestableRuntimeException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/Nestable.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/ExceptionUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/NestableDelegate.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/NestableException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/NestableRuntimeException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/exception/NestableError.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/DoubleRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/NumberUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/NumberRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/LongRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/JVMRandom.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/IntRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/Fraction.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/FloatRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/Range.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/class-use/RandomUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/DoubleRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/FloatRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/Fraction.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/IntRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/JVMRandom.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/LongRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/NumberRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/NumberUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/RandomUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/math/Range.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/class-use/StopWatch.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/class-use/DateUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/class-use/FastDateFormat.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/class-use/DateFormatUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/DateFormatUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/DateUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/FastDateFormat.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/time/StopWatch.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/ReflectionToStringBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/ToStringStyle.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/ToStringBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/StandardToStringStyle.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/HashCodeBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/EqualsBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/class-use/CompareToBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/CompareToBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/EqualsBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/HashCodeBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/ReflectionToStringBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/StandardToStringStyle.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/ToStringBuilder.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/builder/ToStringStyle.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/class-use/ValuedEnum.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/class-use/EnumUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/class-use/Enum.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/Enum.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/EnumUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/enum/ValuedEnum.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/ArrayUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/Validate.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/UnhandledException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/SystemUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/StringUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/StringEscapeUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/SerializationUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/SerializationException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/RandomStringUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/ObjectUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/ObjectUtils.Null.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/NumberUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/NumberRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/NullArgumentException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/NotImplementedException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/ClassUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/IncompleteArgumentException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/IllegalClassException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/CharSetUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/CharSet.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/CharRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/BooleanUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/BitField.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/class-use/WordUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/BitField.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/BooleanUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/CharRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/CharSet.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/CharSetUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/ClassUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/NumberRange.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/NumberUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/ObjectUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/ObjectUtils.Null.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/RandomStringUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/SerializationUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/StringEscapeUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/StringUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/SystemUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/Validate.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/WordUtils.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/IllegalClassException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/IncompleteArgumentException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/NotImplementedException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/NullArgumentException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/SerializationException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/UnhandledException.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/package-use.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/package-frame.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/package-summary.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/package-tree.html
-%%PORTDOCS%%share/doc/commons-lang/org/apache/commons/lang/ArrayUtils.html
-%%PORTDOCS%%share/doc/commons-lang/resources/inherit.gif
-%%PORTDOCS%%share/doc/commons-lang/packages.html
-%%PORTDOCS%%share/doc/commons-lang/package-list
-%%PORTDOCS%%share/doc/commons-lang/overview-tree.html
-%%PORTDOCS%%share/doc/commons-lang/overview-summary.html
-%%PORTDOCS%%share/doc/commons-lang/overview-frame.html
-%%PORTDOCS%%share/doc/commons-lang/index.html
-%%PORTDOCS%%share/doc/commons-lang/index-all.html
-%%PORTDOCS%%share/doc/commons-lang/help-doc.html
-%%PORTDOCS%%share/doc/commons-lang/deprecated-list.html
-%%PORTDOCS%%share/doc/commons-lang/constant-values.html
-%%PORTDOCS%%share/doc/commons-lang/allclasses-noframe.html
-%%PORTDOCS%%share/doc/commons-lang/stylesheet.css
-%%PORTDOCS%%share/doc/commons-lang/allclasses-frame.html
-%%PORTDOCS%%share/doc/commons-lang/serialized-form.html
 share/java/classes/commons-lang.jar
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/exception/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/exception
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/math/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/math
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/time/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/time
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/builder/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/builder
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/enum/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/enum
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang/class-use
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons/lang
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache/commons
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org/apache
-%%PORTDOCS%%@dirrm share/doc/commons-lang/org
-%%PORTDOCS%%@dirrm share/doc/commons-lang/resources
-%%PORTDOCS%%@dirrm share/doc/commons-lang