Fix default sgml catalog path, add NetBSD id to patch, correct

PLIST.

4 files changed, 45 insertions, 32 deletions

diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 4c0f59851fd..316fb7be623 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/12/16 20:56:20 mjl Exp $
+# $NetBSD: Makefile,v 1.5 1999/12/16 22:03:12 mjl Exp $
 #
 
 DISTNAME=	sp-1.3.4
@@ -19,10 +19,11 @@ CONFLICTS+=	jade-*
 MAKE_ENV+=	INSTALL="${INSTALL}"
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sp/dtd
+	${MKDIR} ${PREFIX}/share/doc/sp ${PREFIX}/share/sgml/dtd
 	cd ${WRKSRC}/doc; for n in *.htm ; do ${INSTALL_DATA} $$n ${PREFIX}/share/doc/sp/$n ; done
-	cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sp/dtd/$n ; done
-	${ECHO} "CATALOG ${PREFIX}/share/sp/dtd/html.soc" > ${PREFIX}/share/sp/catalog
+	cd ${WRKSRC}/pubtext; for n in * ; do ${INSTALL_DATA} $$n ${PREFIX}/share/sgml/dtd/$n ; done
+	cd ${WRKSRC}/lib; ${INSTALL_DATA} libsp.a ${PREFIX}/lib/libsp.a
+	${ECHO} "CATALOG ${PREFIX}/share/sgml/dtd/html.soc" > ${PREFIX}/share/sgml/catalog
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/textproc/sp/files/patch-sum b/textproc/sp/files/patch-sum
index 2de4e3a78ef..e2386b11f0c 100644
--- a/textproc/sp/files/patch-sum
+++ b/textproc/sp/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/12/16 20:56:21 mjl Exp $
+$NetBSD: patch-sum,v 1.3 1999/12/16 22:03:13 mjl Exp $
 
-MD5 (patch-aa) = 27046dc93bd44e9b2f9c893b9c84f8f3
+MD5 (patch-aa) = a048795909d27f4fba5dff7784f62a9e
diff --git a/textproc/sp/patches/patch-aa b/textproc/sp/patches/patch-aa
index 72a6b0000ea..791a058fc33 100644
--- a/textproc/sp/patches/patch-aa
+++ b/textproc/sp/patches/patch-aa
@@ -1,5 +1,7 @@
---- Makefile.orig	Thu Dec 16 21:29:05 1999
-+++ Makefile	Thu Dec 16 21:33:43 1999
+$NetBSD: patch-aa,v 1.3 1999/12/16 22:03:13 mjl Exp $
+
+--- Makefile.orig	Sat Oct 10 06:15:02 1998
++++ Makefile	Thu Dec 16 22:42:56 1999
 @@ -1,11 +1,11 @@
  # Copyright (c) 1994, 1995 James Clark
  # See the file COPYING for copying permission.
@@ -14,3 +16,12 @@
  # You might want to uncomment this on BSD systems
  #INSTALL=install
  
+@@ -34,7 +34,7 @@
+ #  which doesn't appropriately define sig_atomic_t).
+ # Add -DJADE_MIF to include the Jade MIF backend
+ XDEFINES=
+-DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
++DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES) -DSGML_CATALOG_FILES_DEFAULT=\"${PREFIX}/share/sgml/catalog\" -DSP_HAVE_LOCALE
+ CXXFLAGS=-ansi $(DEBUG) $(WARN)
+ # Flag to pass to CXX to make it output list of dependencies as a Makefile.
+ CXXDEPGENFLAGS=-MM
diff --git a/textproc/sp/pkg/PLIST b/textproc/sp/pkg/PLIST
index eb01a29d091..0c8f804400f 100644
--- a/textproc/sp/pkg/PLIST
+++ b/textproc/sp/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/13 13:57:40 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/12/16 22:03:14 mjl Exp $
 bin/nsgmls
 bin/sx
 bin/spam
 bin/sgmlnorm
 bin/spent
+lib/libsp.a
 share/doc/sp/archform.htm
 share/doc/sp/build.htm
 share/doc/sp/catalog.htm
@@ -23,27 +24,27 @@ share/doc/sp/sx.htm
 share/doc/sp/sysdecl.htm
 share/doc/sp/sysid.htm
 share/doc/sp/xml.htm
-share/sp/dtd/HTML32.dcl
-share/sp/dtd/HTML32.dtd
-share/sp/dtd/HTML32.soc
-share/sp/dtd/HTML4-f.dtd
-share/sp/dtd/HTML4-s.dtd
-share/sp/dtd/HTML4.dcl
-share/sp/dtd/HTML4.dtd
-share/sp/dtd/HTMLlat1.ent
-share/sp/dtd/HTMLspec.ent
-share/sp/dtd/HTMLsym.ent
-share/sp/dtd/ISOlat1.ent
-share/sp/dtd/ISOlat1.sgm
-share/sp/dtd/html-1.dtd
-share/sp/dtd/html-1s.dtd
-share/sp/dtd/html-s.dtd
-share/sp/dtd/html.dcl
-share/sp/dtd/html.dtd
-share/sp/dtd/html.soc
-share/sp/dtd/xml.dcl
-share/sp/dtd/xml.soc
-share/sp/catalog
-@dirrm share/sp/dtd
+share/sgml/dtd/HTML32.dcl
+share/sgml/dtd/HTML32.dtd
+share/sgml/dtd/HTML32.soc
+share/sgml/dtd/HTML4-f.dtd
+share/sgml/dtd/HTML4-s.dtd
+share/sgml/dtd/HTML4.dcl
+share/sgml/dtd/HTML4.dtd
+share/sgml/dtd/HTMLlat1.ent
+share/sgml/dtd/HTMLspec.ent
+share/sgml/dtd/HTMLsym.ent
+share/sgml/dtd/ISOlat1.ent
+share/sgml/dtd/ISOlat1.sgm
+share/sgml/dtd/html-1.dtd
+share/sgml/dtd/html-1s.dtd
+share/sgml/dtd/html-s.dtd
+share/sgml/dtd/html.dcl
+share/sgml/dtd/html.dtd
+share/sgml/dtd/html.soc
+share/sgml/dtd/xml.dcl
+share/sgml/dtd/xml.soc
+share/sgml/catalog
+@dirrm share/sgml/dtd
+@dirrm share/sgml
 @dirrm share/doc/sp
-@dirrm share/sp