- Update to 1.5.2.

- Add WITHOUT_NLS support.
- Install doc files into the standard DOCSDIR only.
- Clean up Makefile to make portlint happy.
- Improvements since 1.5: translated .po files,
  $SP_MESSAGE_FORMAT, HTTP redirection, $SP_HTTP_USER_AGENT,
  $SP_HTTP_ACCEPT, and preserve case option in osx(1).

Submitted by:	hrs

15 files changed, 110 insertions, 227 deletions

diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 622c339b0311..6db8f6d3bd33 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	OpenSP
-PORTVERSION=	1.5
-PORTREVISION=	7
+PORTVERSION=	1.5.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	openjade
@@ -16,28 +15,25 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	This package is a collection of SGML/XML tools called OpenSP
 
 USE_GETTEXT=	yes
-USE_GMAKE=	YES
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
-		--datadir=${PREFIX}/share/sgml/openjade
+		--datadir=${PREFIX}/share/sgml/openjade \
+		--disable-doc-build
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-INSTALLS_SHLIB=	yes
-
-MAN1=		onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1
-DOC_FILES=	archform.htm autoconf.htm build.htm catalog.htm charset.htm \
-		features.htm generic.htm ideas.htm index.htm new.htm \
-		nsgmls.htm sgmldecl.htm sgmlnorm.htm sgmlsout.htm spam.htm \
-		spcat.htm spent.htm sx.htm sysdecl.htm sysid.htm xml.htm \
-		xmlwarn.htm
-DOC_FILES2=	NEWS AUTHORS README \
-		releasenotes.html releasenotes.pdf releasenotes.ps
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
+.endif
 
-# Perhaps this better should be somewhere under ${PREFIX}/share/doc ?
-DOCSDIR2=	${PREFIX}/share/sgml/openjade/doc/OpenSP
+#MAN1=		onsgmls.1 osgmlnorm.1 ospam.1 ospent.1 osx.1
 
 .include <bsd.port.pre.mk>
 
@@ -47,24 +43,17 @@ DOCSDIR2=	${PREFIX}/share/sgml/openjade/doc/OpenSP
 # other than -O{0,1,}. Idea taken from palm/prc-tools-gcc.
 CPPFLAGS:=	-O ${CFLAGS:N-O*:N-m*}
 
-pre-install:
-	@${REINPLACE_CMD} -e \
-		's|install-man install-pkgdocDATA|install-man|g' \
-		${WRKSRC}/Makefile
-
 post-install:
-
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${doc} ${DOCSDIR}
-.endfor
-
-	@${MKDIR} ${DOCSDIR2}
-.for doc in ${DOC_FILES2}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR2}
-.endfor
-
+	@${CAT} ${PLIST} | \
+		${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \
+		${AWK} '/^@comment INSTALL_DATA:/ \
+			{printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi;  %s %s/%s %s/%s\n", \
+			$$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \
+			"${WRKSRC}", $$3, "${PREFIX}", $$4}' | \
+		${SH} && \
+		${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/opensp/distinfo b/textproc/opensp/distinfo
index 3b32a1635664..1b42263fdea8 100644
--- a/textproc/opensp/distinfo
+++ b/textproc/opensp/distinfo
@@ -1,3 +1,3 @@
-MD5 (OpenSP-1.5.tar.gz) = 87f56e79ae0c20397f4207d61d154303
-SHA256 (OpenSP-1.5.tar.gz) = 987eeb9460185950e066e5db3b5fa531e53e213742b545288405552a5a7bb704
-SIZE (OpenSP-1.5.tar.gz) = 1288057
+MD5 (OpenSP-1.5.2.tar.gz) = 670b223c5d12cee40c9137be86b6c39b
+SHA256 (OpenSP-1.5.2.tar.gz) = 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce
+SIZE (OpenSP-1.5.2.tar.gz) = 1521390
diff --git a/textproc/opensp/files/patch-Attribute.h b/textproc/opensp/files/patch-Attribute.h
deleted file mode 100644
index 013a3ff8bc2b..000000000000
--- a/textproc/opensp/files/patch-Attribute.h
+++ /dev/null
@@ -1,64 +0,0 @@
---- include/Attribute.h.orig	Fri Mar 10 03:30:56 2000
-+++ include/Attribute.h	Tue Aug  5 11:49:19 2003
-@@ -25,12 +25,32 @@
- class Entity;
- class Notation;
- class DeclaredValue;
--class AttributeValue;
- class TokenizedAttributeValue;
- class AttributeSemantics;
- class AttributeContext;
- class Syntax;
- 
-+class SP_API AttributeValue : public Resource {
-+public:
-+  enum Type {
-+    implied,
-+    cdata,
-+    tokenized
-+    };
-+  AttributeValue();
-+  virtual ~AttributeValue();
-+  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
-+					    AttributeContext &,
-+					    const StringC &,
-+					    unsigned &,
-+					    unsigned &) const;
-+  virtual Type info(const Text *&, const StringC *&) const = 0;
-+  virtual const Text *text() const;
-+  virtual Boolean recoverUnquoted(const StringC &, const Location &,
-+				  AttributeContext &, const StringC &);
-+  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
-+};
-+
- class SP_API AttributeDefinitionDesc {
- public:
-   AttributeDefinitionDesc() { }
-@@ -378,27 +398,6 @@
-   AttributeSemantics *copy() const;
- private:
-   ConstPtr<Notation> notation_;
--};
--
--class SP_API AttributeValue : public Resource {
--public:
--  enum Type {
--    implied,
--    cdata,
--    tokenized
--    };
--  AttributeValue();
--  virtual ~AttributeValue();
--  virtual AttributeSemantics *makeSemantics(const DeclaredValue *,
--					    AttributeContext &,
--					    const StringC &,
--					    unsigned &,
--					    unsigned &) const;
--  virtual Type info(const Text *&, const StringC *&) const = 0;
--  virtual const Text *text() const;
--  virtual Boolean recoverUnquoted(const StringC &, const Location &,
--				  AttributeContext &, const StringC &);
--  static Boolean handleAsUnterminated(const Text &, AttributeContext &);
- };
- 
- class SP_API ImpliedAttributeValue : public AttributeValue {
diff --git a/textproc/opensp/files/patch-Makefile.in b/textproc/opensp/files/patch-Makefile.in
index 579888378668..7d5d263acc10 100644
--- a/textproc/opensp/files/patch-Makefile.in
+++ b/textproc/opensp/files/patch-Makefile.in
@@ -1,11 +1,23 @@
---- Makefile.in.orig	Fri Oct 31 10:13:26 2003
-+++ Makefile.in	Fri Oct 31 10:13:32 2003
-@@ -107,7 +107,7 @@
- 
+--- Makefile.in.orig	Fri Dec 23 23:16:01 2005
++++ Makefile.in	Sun Jan  7 23:29:03 2007
+@@ -247,9 +247,9 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = check-news
- 
 -SUBDIRS = pubtext unicode doc \
 +SUBDIRS = pubtext unicode \
  	include generic \
+-	intl po \
++	po \
  	lib nsgmls spent spam sgmlnorm sx spcat \
- 	intl po
+ 	tests @DOCSRC@
+ 
+@@ -709,7 +709,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgdocDATA install-pkgincludeHEADERS
++install-data-am: install-pkgincludeHEADERS
+ 
+ install-exec-am:
+ 
diff --git a/textproc/opensp/files/patch-configure b/textproc/opensp/files/patch-configure
index 3ad7406109a7..b33ef3a2b20c 100644
--- a/textproc/opensp/files/patch-configure
+++ b/textproc/opensp/files/patch-configure
@@ -1,20 +1,17 @@
---- configure.orig	Mon Nov 10 13:18:00 2003
-+++ configure	Mon Nov 10 13:18:54 2003
-@@ -10832,7 +10832,7 @@
- #include "confdefs.h"
+--- configure.orig	Fri Dec 23 23:15:56 2005
++++ configure	Fri Aug 25 03:37:02 2006
+@@ -26441,12 +26441,12 @@
+ /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
 -extern int *_nl_domain_bindings;
 +extern int *libintl_nl_domain_bindings;
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -10843,7 +10843,7 @@
+ int
  main ()
  {
  bindtextdomain ("", "");
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
    ;
    return 0;
  }
diff --git a/textproc/opensp/files/patch-doc-Makefile.in b/textproc/opensp/files/patch-doc-Makefile.in
new file mode 100644
index 000000000000..8c4351c4343c
--- /dev/null
+++ b/textproc/opensp/files/patch-doc-Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Fri Dec 23 23:15:58 2005
++++ doc/Makefile.in	Fri Aug 25 03:38:13 2006
+@@ -214,7 +214,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-docdir = $(datadir)/doc
++docdir = $(prefix)/share/doc
+ pkgdocdir = $(docdir)/@PACKAGE@
+ pkgdochtmldir = $(pkgdocdir)/doc
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/textproc/opensp/files/patch-doc:Makefile.in b/textproc/opensp/files/patch-doc:Makefile.in
deleted file mode 100644
index 592abaeb6e12..000000000000
--- a/textproc/opensp/files/patch-doc:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Mon Nov 25 04:31:16 2002
-+++ doc/Makefile.in	Mon Jan  6 17:31:57 2003
-@@ -105,7 +105,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- pkgdocdir = $(docdir)/@PACKAGE@
- 
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/textproc/opensp/files/patch-nsgmls::Makefile.in b/textproc/opensp/files/patch-nsgmls::Makefile.in
deleted file mode 100644
index 27361cce0be1..000000000000
--- a/textproc/opensp/files/patch-nsgmls::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsgmls/Makefile.in.orig	Sat Oct 25 21:23:36 2003
-+++ nsgmls/Makefile.in	Sat Oct 25 21:23:48 2003
-@@ -142,7 +142,7 @@
- 	nsgmls_inst.$(OBJEXT)
- onsgmls_OBJECTS = $(am_onsgmls_OBJECTS)
- onsgmls_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--onsgmls_LDFLAGS =
-+onsgmls_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/files/patch-po-Makefile.in.in b/textproc/opensp/files/patch-po-Makefile.in.in
new file mode 100644
index 000000000000..9580c6cb5e14
--- /dev/null
+++ b/textproc/opensp/files/patch-po-Makefile.in.in
@@ -0,0 +1,13 @@
+--- po/Makefile.in.in.orig	Sun Jan  7 22:59:24 2007
++++ po/Makefile.in.in	Sun Jan  7 23:00:49 2007
+@@ -25,8 +25,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
+-gettextsrcdir = $(datadir)/gettext/po
++localedir = $(prefix)/share/locale
++gettextsrcdir = $(prefix)/share/gettext/po
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/textproc/opensp/files/patch-sgmlnorm::Makefile b/textproc/opensp/files/patch-sgmlnorm::Makefile
deleted file mode 100644
index c08a9a4c4029..000000000000
--- a/textproc/opensp/files/patch-sgmlnorm::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- sgmlnorm/Makefile.in.orig	Sat Oct 25 21:24:54 2003
-+++ sgmlnorm/Makefile.in	Sat Oct 25 21:25:06 2003
-@@ -136,7 +136,7 @@
- am_osgmlnorm_OBJECTS = sgmlnorm.$(OBJEXT) SGMLGenerator.$(OBJEXT)
- osgmlnorm_OBJECTS = $(am_osgmlnorm_OBJECTS)
- osgmlnorm_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--osgmlnorm_LDFLAGS =
-+osgmlnorm_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/files/patch-spam::Makefile.in b/textproc/opensp/files/patch-spam::Makefile.in
deleted file mode 100644
index 4db774302a09..000000000000
--- a/textproc/opensp/files/patch-spam::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- spam/Makefile.in.orig	Sat Oct 25 21:11:02 2003
-+++ spam/Makefile.in	Sat Oct 25 21:11:13 2003
-@@ -138,7 +138,7 @@
- 	MarkupEventHandler.$(OBJEXT) spam_inst.$(OBJEXT)
- ospam_OBJECTS = $(am_ospam_OBJECTS)
- ospam_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospam_LDFLAGS =
-+ospam_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/files/patch-spcat::Makefile.in b/textproc/opensp/files/patch-spcat::Makefile.in
deleted file mode 100644
index dab83cfded01..000000000000
--- a/textproc/opensp/files/patch-spcat::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- spcat/Makefile.in.orig	Sat Oct 25 22:06:38 2003
-+++ spcat/Makefile.in	Sat Oct 25 22:06:54 2003
-@@ -134,7 +134,7 @@
- am_ospcat_OBJECTS = spcat.$(OBJEXT) spcat_inst.$(OBJEXT)
- ospcat_OBJECTS = $(am_ospcat_OBJECTS)
- ospcat_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospcat_LDFLAGS =
-+ospcat_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/files/patch-spent::Makefile.in b/textproc/opensp/files/patch-spent::Makefile.in
deleted file mode 100644
index 274192aa0981..000000000000
--- a/textproc/opensp/files/patch-spent::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- spent/Makefile.in.orig	Sat Oct 25 21:09:41 2003
-+++ spent/Makefile.in	Sat Oct 25 21:09:57 2003
-@@ -134,7 +134,7 @@
- am_ospent_OBJECTS = spent.$(OBJEXT)
- ospent_OBJECTS = $(am_ospent_OBJECTS)
- ospent_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--ospent_LDFLAGS =
-+ospent_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/files/patch-sx::Makefile.in b/textproc/opensp/files/patch-sx::Makefile.in
deleted file mode 100644
index 121ff176b977..000000000000
--- a/textproc/opensp/files/patch-sx::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sx/Makefile.in.orig	Sat Oct 25 21:26:34 2003
-+++ sx/Makefile.in	Sat Oct 25 21:27:03 2003
-@@ -140,7 +140,7 @@
- 	sx_inst.$(OBJEXT)
- osx_OBJECTS = $(am_osx_OBJECTS)
- osx_DEPENDENCIES = $(top_builddir)/lib/libosp.la
--osx_LDFLAGS =
-+osx_LDFLAGS = -lintl
- 
- DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/textproc/opensp/pkg-plist b/textproc/opensp/pkg-plist
index ef4f7538fc0b..2d50278b77ae 100644
--- a/textproc/opensp/pkg-plist
+++ b/textproc/opensp/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/onsgmls
 bin/osgmlnorm
 bin/ospam
@@ -141,33 +142,46 @@ include/OpenSP/rtti.h
 include/OpenSP/sptchar.h
 include/OpenSP/types.h
 include/OpenSP/xnew.h
-lib/charset.alias
+@dirrm include/OpenSP
 lib/libosp.a
 lib/libosp.la
 lib/libosp.so
-lib/libosp.so.3
-%%PORTDOCS%%%%DOCSDIR%%/archform.htm
-%%PORTDOCS%%%%DOCSDIR%%/autoconf.htm
-%%PORTDOCS%%%%DOCSDIR%%/build.htm
-%%PORTDOCS%%%%DOCSDIR%%/catalog.htm
-%%PORTDOCS%%%%DOCSDIR%%/charset.htm
-%%PORTDOCS%%%%DOCSDIR%%/features.htm
-%%PORTDOCS%%%%DOCSDIR%%/generic.htm
-%%PORTDOCS%%%%DOCSDIR%%/ideas.htm
-%%PORTDOCS%%%%DOCSDIR%%/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/new.htm
-%%PORTDOCS%%%%DOCSDIR%%/nsgmls.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmldecl.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmlnorm.htm
-%%PORTDOCS%%%%DOCSDIR%%/sgmlsout.htm
-%%PORTDOCS%%%%DOCSDIR%%/spam.htm
-%%PORTDOCS%%%%DOCSDIR%%/spcat.htm
-%%PORTDOCS%%%%DOCSDIR%%/spent.htm
-%%PORTDOCS%%%%DOCSDIR%%/sx.htm
-%%PORTDOCS%%%%DOCSDIR%%/sysdecl.htm
-%%PORTDOCS%%%%DOCSDIR%%/sysid.htm
-%%PORTDOCS%%%%DOCSDIR%%/xml.htm
-%%PORTDOCS%%%%DOCSDIR%%/xmlwarn.htm
+lib/libosp.so.5
+%%NLS%%share/locale/de/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/sp5.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/sp5.mo
+@comment the following lines used for installation of doc files
+@comment INSTALL_DATA: doc/archform.htm %%DOCSDIR%%/archform.htm
+@comment INSTALL_DATA: doc/autoconf.htm %%DOCSDIR%%/autoconf.htm
+@comment INSTALL_DATA: doc/build.htm %%DOCSDIR%%/build.htm
+@comment INSTALL_DATA: doc/catalog.htm %%DOCSDIR%%/catalog.htm
+@comment INSTALL_DATA: doc/charset.htm %%DOCSDIR%%/charset.htm
+@comment INSTALL_DATA: doc/features.htm %%DOCSDIR%%/features.htm
+@comment INSTALL_DATA: doc/generic.htm %%DOCSDIR%%/generic.htm
+@comment INSTALL_DATA: doc/ideas.htm %%DOCSDIR%%/ideas.htm
+@comment INSTALL_DATA: doc/index.htm %%DOCSDIR%%/index.htm
+@comment INSTALL_DATA: doc/new.htm %%DOCSDIR%%/new.htm
+@comment INSTALL_DATA: doc/nsgmls.htm %%DOCSDIR%%/nsgmls.htm
+@comment INSTALL_DATA: doc/sgmldecl.htm %%DOCSDIR%%/sgmldecl.htm
+@comment INSTALL_DATA: doc/sgmlnorm.htm %%DOCSDIR%%/sgmlnorm.htm
+@comment INSTALL_DATA: doc/sgmlsout.htm %%DOCSDIR%%/sgmlsout.htm
+@comment INSTALL_DATA: doc/spam.htm %%DOCSDIR%%/spam.htm
+@comment INSTALL_DATA: doc/spcat.htm %%DOCSDIR%%/spcat.htm
+@comment INSTALL_DATA: doc/spent.htm %%DOCSDIR%%/spent.htm
+@comment INSTALL_DATA: doc/sx.htm %%DOCSDIR%%/sx.htm
+@comment INSTALL_DATA: doc/sysdecl.htm %%DOCSDIR%%/sysdecl.htm
+@comment INSTALL_DATA: doc/sysid.htm %%DOCSDIR%%/sysid.htm
+@comment INSTALL_DATA: doc/xml.htm %%DOCSDIR%%/xml.htm
+@comment INSTALL_DATA: doc/xmlwarn.htm %%DOCSDIR%%/xmlwarn.htm
+@comment INSTALL_DATA: NEWS %%DOCSDIR%%/NEWS
+@comment INSTALL_DATA: AUTHORS %%DOCSDIR%%/AUTHORS
+@comment INSTALL_DATA: README %%DOCSDIR%%/README
+@comment INSTALL_DATA: ABOUT-NLS %%DOCSDIR%%/ABOUT-NLS
+@comment INSTALL_DATA: BUGS %%DOCSDIR%%/BUGS
+@comment INSTALL_DATA: COPYING %%DOCSDIR%%/COPYING
+@comment INSTALL_DATA: ChangeLog %%DOCSDIR%%/ChangeLog
 share/sgml/openjade/OpenSP/HTML32.dcl
 share/sgml/openjade/OpenSP/HTML32.dtd
 share/sgml/openjade/OpenSP/HTML32.soc
@@ -196,17 +210,5 @@ share/sgml/openjade/OpenSP/unicode.sd
 share/sgml/openjade/OpenSP/unicode.syn
 share/sgml/openjade/OpenSP/xml.dcl
 share/sgml/openjade/OpenSP/xml.soc
-share/sgml/openjade/locale/locale.alias
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/AUTHORS
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/NEWS
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/README
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.html
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.pdf
-%%PORTDOCS%%share/sgml/openjade/doc/OpenSP/releasenotes.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/OpenSP
-@dirrm share/sgml/openjade/locale
 @dirrm share/sgml/openjade/OpenSP
-%%PORTDOCS%%@dirrm share/sgml/openjade/doc/OpenSP
-%%PORTDOCS%%@dirrm share/sgml/openjade/doc
 @dirrm share/sgml/openjade