Update sp port to 1.3. Changing the format a bit, too. John Fieber,

the old maintainer, agrees with it.

8 files changed, 207 insertions, 16 deletions

diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index c6d33343e35d..59f987b0b2c4 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -3,21 +3,25 @@
 # Date created:		April 26, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.7 1998/10/14 23:30:12 jseger Exp $
+# $Id: Makefile,v 1.8 1998/10/16 02:55:50 jseger Exp $
 #
 
-DISTNAME=	sp-1.2.1
+DISTNAME=	sp-1.3
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.jclark.com/pub/sp/
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
-# The shared libsp only works on post 2.1.x systems.
-# shared C++ libraries appear to be broken on post 2.2.1 system too...
-#.if exists(/usr/lib/libstdc++.a)
-#PLIST=		${PKGDIR}/PLIST-shared
-#post-install:
-#	${LDCONFIG} -m ${PREFIX}/lib
-#.endif
+post-patch:
+	$(CP) $(WRKSRC)/Makefile $(WRKSRC)/Makefile.sed
+	$(CP) $(WRKSRC)/Makefile.lib $(WRKSRC)/Makefile.lib.sed
+	$(SED) -e "s%/opt/local%$(PREFIX)%" <$(WRKSRC)/Makefile.sed >$(WRKSRC)/Makefile
+	$(SED) -e "s%/opt/local%$(PREFIX)%" <$(WRKSRC)/Makefile.lib.sed >$(WRKSRC)/Makefile.lib
+
+post-install:
+	$(MKDIR) $(PREFIX)/include/sp
+	$(MKDIR) $(PREFIX)/share/doc/sp
+	for file in $(WRKSRC)/include/*;do $(INSTALL_DATA) $$file $(PREFIX)/include/sp;done
+	for file in $(WRKSRC)/doc/*;do $(INSTALL_DATA) $$file $(PREFIX)/share/doc/sp;done
 
 .include <bsd.port.mk>
diff --git a/textproc/sp/distinfo b/textproc/sp/distinfo
index d56ab0343d92..4677b178ca8b 100644
--- a/textproc/sp/distinfo
+++ b/textproc/sp/distinfo
@@ -1 +1 @@
-MD5 (sp-1.2.1.tar.gz) = 060da115320cb5397167c8cd1d725afe
+MD5 (sp-1.3.tar.gz) = 011bff022a23b2d23b797571fef827cf
diff --git a/textproc/sp/files/patch-ab b/textproc/sp/files/patch-ab
new file mode 100644
index 000000000000..557ad87a4c7f
--- /dev/null
+++ b/textproc/sp/files/patch-ab
@@ -0,0 +1,41 @@
+--- Makefile.orig	Sun Dec 28 06:24:20 1997
++++ Makefile	Wed Jun  2 15:44:11 1999
+@@ -1,13 +1,14 @@
+ # Copyright (c) 1994, 1995 James Clark
+ # See the file COPYING for copying permission.
+ 
+-prefix=/opt/local
++prefix=/usr/local
+ exec_prefix=$(prefix)
+ # Where to install the binaries
+ bindir=$(exec_prefix)/bin
+-INSTALL=cp
++libdir=$(exec_prefix)/lib
++#INSTALL=cp
+ # You might want to change this to uncomment this on BSD systems
+-#INSTALL=install
++INSTALL=install -c
+ 
+ # If you use gcc, then you must have at least version 2.6.1 and
+ # you must use -fno-implicit-templates
+@@ -46,17 +47,17 @@
+ # If you defined SP_HAVE_SOCKET, add any libraries that are needed for sockets
+ # -lsocket -lnsl needed on Solaris 2.x
+ # -lnsl on SunOS 4.1.3
+-XLIBS=#-lsocket -lnsl
++XLIBS=-lgcc
+ # -L/usr/local/lib may be needed on the RS/6000
+ LIBS=$(XLIBS)
+ # If you're building in another directory, copy or link this Makefile
+ # to the build directory, and set srcdir to point to the source directory.
+ srcdir=.
+ AR=ar
+-RANLIB=:
++#RANLIB=:
+ # Uncomment this for SunOS 4.1.3 or FreeBSD
+ # (and probably other BSD flavor systems as well)
+-#RANLIB=ranlib
++RANLIB=ranlib
+ M4=m4
+ # perl is needed if you change or add messages
+ PERL=perl
diff --git a/textproc/sp/files/patch-ad b/textproc/sp/files/patch-ad
new file mode 100644
index 000000000000..a2de3818c2b6
--- /dev/null
+++ b/textproc/sp/files/patch-ad
@@ -0,0 +1,35 @@
+--- Makefile.lib.orig	Sun Dec 21 05:07:22 1997
++++ Makefile.lib	Wed Jun  2 16:00:57 1999
+@@ -1,16 +1,30 @@
+-CLEANFILES=lib$(LIB).a $(OBJS) $(COBJS) core
++prefix=/usr/local
++exec_prefix=$(prefix)
++# Where to install the binaries
++bindir=$(exec_prefix)/bin
++libdir=$(exec_prefix)/lib
++#INSTALL=cp
++# You might want to change this to uncomment this on BSD systems
++INSTALL=install -c
++VERSION=1
++CLEANFILES=lib$(LIB).a lib$(LIB).so.$(VERSION) $(OBJS) $(COBJS) core
+ ALL_CXXFLAGS=$(CXXFLAGS) -I$(srcdir) -I$(srcdir)/../include $(INCLUDE) \
+   $(DEFINES) $(PIC_FLAG)
+ ALL_CFLAGS=$(CFLAGS) $(DEBUG) $(OPTIMIZE) $(INCLUDE) $(DEFINES) $(PIC_FLAG)
+ 
+-all: lib$(LIB).a
++all: lib$(LIB).a lib$(LIB).so.$(VERSION)
+ pure: all
+ 
+ lib$(LIB).a: $(OBJS) $(COBJS)
+ 	$(AR) r $@ $?
+ 	$(RANLIB) $@
+ 
++lib$(LIB).so.$(VERSION): $(SOBJS) $(SCOBJS)
++	$(CC) -shared -o lib$(LIB).so.$(VERSION) $(SOBJS) $(SCOBJS)
++
+ install:
++	$(INSTALL) lib$(LIB).a $(libdir)
++	$(INSTALL) lib$(LIB).so.$(VERSION) $(libdir)
+ install-man:
+ depend: depend_src
+ depend.temp: $(GENSRCS)
diff --git a/textproc/sp/files/patch-ae b/textproc/sp/files/patch-ae
new file mode 100644
index 000000000000..24319f3df964
--- /dev/null
+++ b/textproc/sp/files/patch-ae
@@ -0,0 +1,74 @@
+--- lib/Makefile.sub.orig	Wed Jun  2 14:01:44 1999
++++ lib/Makefile.sub	Wed Jun  2 14:01:53 1999
+@@ -1,10 +1,17 @@
+ LIB=sp
+ INCLUDE=-I$(srcdir)/../generic
+ MSGGENFLAGS=-l
++
+ COMMON_OBJS=Allocator.o Link.o IListBase.o TypeId.o assert.o
++COMMON_SOBJS=Allocator.so Link.so IListBase.so TypeId.so assert.so
++
+ ENTMGR_OBJS=CharsetInfo.o EntityCatalog.o EntityDecl.o EntityManager.o \
+  Hash.o InputSource.o Location.o Message.o MessageArg.o \
+  UnivCharsetDesc.o entmgr_inst.o
++ENTMGR_SOBJS=CharsetInfo.so EntityCatalog.so EntityDecl.so EntityManager.so \
++ Hash.so InputSource.so Location.so Message.so MessageArg.so \
++ UnivCharsetDesc.so entmgr_inst.so
++
+ XENTMGR_OBJS=LiteralStorage.o URLStorage.o RewindStorageObject.o \
+   ErrnoMessageArg.o OffsetOrderedList.o DescriptorManager.o \
+   ExtendEntityManager.o PosixStorage.o StdioStorage.o NotationStorage.o \
+@@ -14,6 +21,16 @@
+   Big5CodingSystem.o XMLCodingSystem.o CodingSystemKit.o \
+   SearchResultMessageArg.o SOEntityCatalog.o OutputByteStream.o \
+   xentmgr_inst.o
++XENTMGR_SOBJS=LiteralStorage.so URLStorage.so RewindStorageObject.so \
++  ErrnoMessageArg.so OffsetOrderedList.so DescriptorManager.so \
++  ExtendEntityManager.so PosixStorage.so StdioStorage.so NotationStorage.so \
++  StorageManager.so CodingSystem.so IdentityCodingSystem.so \
++  UTF8CodingSystem.so Fixed2CodingSystem.so UnicodeCodingSystem.so \
++  EUCJPCodingSystem.so SJISCodingSystem.so TranslateCodingSystem.so \
++  Big5CodingSystem.so XMLCodingSystem.so CodingSystemKit.so \
++  SearchResultMessageArg.so SOEntityCatalog.so OutputByteStream.so \
++  xentmgr_inst.so
++
+ PARSER_OBJS=ContentState.o ParserState.o parser_inst.o parseSd.o Parser.o \
+   parseInstance.o parseMode.o parseAttribute.o \
+   LinkProcess.o Lpd.o parseDecl.o ShortReferenceMap.o \
+@@ -25,15 +42,36 @@
+   Markup.o Text.o ContentToken.o ElementType.o Event.o \
+   InternalInputSource.o OutputState.o ParserMessages.o \
+   SdText.o NumericCharRefOrigin.o Id.o StringVectorMessageArg.o
++PARSER_SOBJS=ContentState.so ParserState.so parser_inst.so parseSd.so Parser.so \
++  parseInstance.so parseMode.so parseAttribute.so \
++  LinkProcess.so Lpd.so parseDecl.so ShortReferenceMap.so \
++  parseParam.so parseCommon.so SgmlParser.so \
++  Entity.so Attribute.so OpenElement.so Notation.so ParserOptions.so Dtd.so \
++  Undo.so Param.so TokenMessageArg.so Group.so \
++  CharsetDecl.so CharsetRegistry.so ExternalId.so \
++  TrieBuilder.so Sd.so Syntax.so Partition.so ModeInfo.so Recognizer.so \
++  Markup.so Text.so ContentToken.so ElementType.so Event.so \
++  InternalInputSource.so OutputState.so ParserMessages.so \
++  SdText.so NumericCharRefOrigin.so Id.so StringVectorMessageArg.so
++
+ APP_OBJS=ErrorCountEventHandler.o MessageEventHandler.o MessageFormatter.o \
+   MessageReporter.o MessageTable.o OutputCharStream.o ConsoleOutput.o \
+   CmdLineApp.o EntityApp.o ParserApp.o app_inst.o \
+   ArcEngine.o arc_inst.o
++APP_SOBJS=ErrorCountEventHandler.so MessageEventHandler.so MessageFormatter.so \
++  MessageReporter.so MessageTable.so OutputCharStream.so ConsoleOutput.so \
++  CmdLineApp.so EntityApp.so ParserApp.so app_inst.so \
++  ArcEngine.so arc_inst.so
++
+ GENERIC_OBJS=ParserEventGeneratorKit.o SGMLApplication.o EventGenerator.o \
+  GenericEventHandler.o
++GENERIC_SOBJS=ParserEventGeneratorKit.so SGMLApplication.so EventGenerator.so \
++ GenericEventHandler.so
+ 
+ OBJS=$(COMMON_OBJS) $(ENTMGR_OBJS) $(XENTMGR_OBJS) $(PARSER_OBJS) $(APP_OBJS) \
+  $(GENERIC_OBJS) $(LIBOBJS)
++SOBJS=$(COMMON_SOBJS) $(ENTMGR_SOBJS) $(XENTMGR_SOBJS) $(PARSER_SOBJS) $(APP_SOBJS) \
++ $(GENERIC_SOBJS) $(LIBSOBJS)
+ 
+ GENSRCS=version.h entmgr_inst.cxx \
+   xentmgr_inst.cxx EntityManagerMessages.h CatalogMessages.h \
diff --git a/textproc/sp/files/patch-af b/textproc/sp/files/patch-af
new file mode 100644
index 000000000000..91722c916b02
--- /dev/null
+++ b/textproc/sp/files/patch-af
@@ -0,0 +1,33 @@
+--- Makefile.comm.orig	Sun Dec 28 06:24:24 1997
++++ Makefile.comm	Wed Jun  2 14:55:44 1999
+@@ -3,6 +3,7 @@
+  $(DEFINES)
+ ALL_CFLAGS=$(CFLAGS) $(DEBUG) $(OPTIMIZE) $(INCLUDE) $(DEFINES)
+ MSGGENFLAGS=
++SHFLAGS=-fpic
+ CXXDEPGENFLAGS=-MM
+ AR=ar
+ RANLIB=:
+@@ -13,13 +14,19 @@
+ PROG=
+ PERL=perl
+ 
+-.SUFFIXES: .cxx .c .o .m4 .msg
++.SUFFIXES: .cxx .c .o .so .m4 .msg
+ 
+ .cxx.o:
+-	$(CXX) $(ALL_CXXFLAGS) -c $<
++	$(CXX) $(ALL_CXXFLAGS) -c -o $@ $<
++
++.cxx.so:
++	$(CXX) $(ALL_CXXFLAGS) $(SHFLAGS) -c -o $@ $<
+ 
+ .c.o:
+-	$(CC) $(ALL_CFLAGS) -c $<
++	$(CC) $(ALL_CFLAGS) -c -o $@ $<
++
++.c.so:
++	$(CC) $(ALL_CFLAGS) $(SHFLAGS) -c -o $@ $<
+ 
+ .m4.cxx:
+ 	rm -f $@
diff --git a/textproc/sp/pkg-comment b/textproc/sp/pkg-comment
index fa99e8c940a9..045d1f2d04f0 100644
--- a/textproc/sp/pkg-comment
+++ b/textproc/sp/pkg-comment
@@ -1 +1 @@
-A free, object-oriented toolkit for SGML parsing and entity management 
+An object-oriented toolkit for SGML parsing and entity management 
diff --git a/textproc/sp/pkg-plist b/textproc/sp/pkg-plist
index 048a186aca98..6e47b16241ea 100644
--- a/textproc/sp/pkg-plist
+++ b/textproc/sp/pkg-plist
@@ -33,7 +33,6 @@ include/sp/EntityManager.h
 include/sp/ErrnoMessageArg.h
 include/sp/ErrorCountEventHandler.h
 include/sp/Event.h
-include/sp/EventGenerator.h
 include/sp/EventsWanted.h
 include/sp/ExtendEntityManager.h
 include/sp/ExternalId.h
@@ -67,11 +66,11 @@ include/sp/Lpd.h
 include/sp/Markup.h
 include/sp/Message.h
 include/sp/MessageArg.h
+include/sp/MessageTable.h
 include/sp/MessageBuilder.h
 include/sp/MessageEventHandler.h
 include/sp/MessageFormatter.h
 include/sp/MessageReporter.h
-include/sp/MessageTable.h
 include/sp/Mode.h
 include/sp/NCVector.h
 include/sp/NCVector.sed
@@ -91,7 +90,6 @@ include/sp/Owner.h
 include/sp/OwnerTable.cxx
 include/sp/OwnerTable.h
 include/sp/ParserApp.h
-include/sp/ParserEventGeneratorKit.h
 include/sp/ParserOptions.h
 include/sp/PointerTable.cxx
 include/sp/PointerTable.h
@@ -102,7 +100,6 @@ include/sp/RangeMap.cxx
 include/sp/RangeMap.h
 include/sp/Resource.h
 include/sp/RewindStorageObject.h
-include/sp/SGMLApplication.h
 include/sp/SJISCodingSystem.h
 include/sp/SOEntityCatalog.h
 include/sp/Sd.h
@@ -129,11 +126,13 @@ include/sp/UnivCharsetDesc.h
 include/sp/Vector.cxx
 include/sp/Vector.h
 include/sp/Win32CodingSystem.h
-include/sp/WinInetStorage.h
 include/sp/WinApp.h
+include/sp/WinInetStorage.h
+include/sp/XMLCodingSystem.h
 include/sp/XcharMap.cxx
 include/sp/XcharMap.h
 include/sp/config.h
+include/sp/config.h.orig
 include/sp/constant.h
 include/sp/macros.h
 include/sp/rtti.h
@@ -141,9 +140,12 @@ include/sp/sptchar.h
 include/sp/types.h
 include/sp/xnew.h
 lib/libsp.a
+lib/libsp.so.1
 @comment lib/libsp.so.1.4
+share/doc/sp/Makefile
 share/doc/sp/archform.htm
 share/doc/sp/build.htm
+share/doc/sp/catalog
 share/doc/sp/catalog.htm
 share/doc/sp/charset.htm
 share/doc/sp/features.htm
@@ -157,8 +159,10 @@ share/doc/sp/sgmlnorm.htm
 share/doc/sp/sgmlsout.htm
 share/doc/sp/spam.htm
 share/doc/sp/spent.htm
+share/doc/sp/sx.htm
 share/doc/sp/sysdecl.htm
 share/doc/sp/sysid.htm
+share/doc/sp/xml.htm
 @comment @exec /sbin/ldconfig -m %D/lib
 @dirrm include/sp
 @dirrm share/doc/sp