Fix build on -current and 64-bit machiens

PR:		ports/47985
Submitted by:	naddy

5 files changed, 40 insertions, 28 deletions

diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index ed60836a3ede..e2f906b095b8 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -15,12 +15,6 @@ MAINTAINER=	chuckr@FreeBSD.org
 USE_SUBMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500035
-BROKEN=		"Does not compile on 5.0"
-.endif
-
 post-install:
 	$(MKDIR) $(PREFIX)/include/sp
 	$(MKDIR) $(PREFIX)/share/doc/sp
@@ -28,4 +22,4 @@ post-install:
 	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.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/sp/files/patch-aa b/textproc/sp/files/patch-aa
index 0970cfee6c77..d53a56f9fc94 100644
--- a/textproc/sp/files/patch-aa
+++ b/textproc/sp/files/patch-aa
@@ -1,17 +1,12 @@
-*** include/config.h.orig	Wed Jun 12 11:56:06 1996
---- include/config.h	Tue Oct 15 17:08:09 1996
-***************
-*** 7,12 ****
---- 7,18 ----
-  #define SP_INCLUDE_UNISTD_H
-  #define SP_POSIX_FILENAMES
-  
-+ #if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
-+ #define SP_HAVE_LOCALE
-+ #define SP_HAVE_SOCKET
-+ #define SP_MULTI_BYTE
-+ #endif
-+ 
-  #ifdef __GNUG__
-  // It's not missing, but it pulls in libg++
-  #define SP_NEW_H_MISSING
+--- include/config.h.orig	Wed Oct 13 07:02:46 1999
++++ include/config.h	Wed Feb  5 23:27:11 2003
+@@ -29,6 +29,9 @@
+ #define SP_NO_STD_NAMESPACE
+ #undef SP_NEW_H_MISSING
+ #endif
++#if __GNUC__ > 2
++#undef SP_NO_STD_NAMESPACE
++#endif
+ 
+ #endif /* __GNUG__ */
+ 
diff --git a/textproc/sp/files/patch-ab b/textproc/sp/files/patch-ab
index b33e472bf38b..3296b56da5d3 100644
--- a/textproc/sp/files/patch-ab
+++ b/textproc/sp/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Oct 10 00:15:02 1998
-+++ Makefile	Sun Oct 27 01:05:00 2002
+--- Makefile.orig	Sat Oct 10 06:15:02 1998
++++ Makefile	Wed Feb  5 23:25:16 2003
 @@ -1,11 +1,12 @@
  # Copyright (c) 1994, 1995 James Clark
  # See the file COPYING for copying permission.
@@ -29,9 +29,10 @@
  #  which doesn't appropriately define sig_atomic_t).
  # Add -DJADE_MIF to include the Jade MIF backend
 -XDEFINES=
-+XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
- DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
+-DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE $(XDEFINES)
 -CXXFLAGS=-ansi $(DEBUG) $(WARN)
++XDEFINES=-DSGML_CATALOG_FILES_DEFAULT=\"/usr/local/share/sgml/catalog\"
++DEFINES=-DSP_HAVE_BOOL -DSP_ANSI_CLASS_INST -DSP_MULTI_BYTE -DSP_HAVE_LOCALE -DSP_HAVE_SOCKET $(XDEFINES)
 +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/files/patch-ah b/textproc/sp/files/patch-ah
new file mode 100644
index 000000000000..84ea75ed00c4
--- /dev/null
+++ b/textproc/sp/files/patch-ah
@@ -0,0 +1,11 @@
+--- nsgmls/RastEventHandler.h.orig	Thu Feb  6 00:13:48 2003
++++ nsgmls/RastEventHandler.h	Thu Feb  6 00:14:04 2003
+@@ -102,7 +102,7 @@
+ 
+ class RastEventHandler : public ErrorCountEventHandler,
+                          private RastSubdocState,
+-                         private Messenger {
++                         protected Messenger {
+ public:
+   RastEventHandler(SgmlParser *, Messenger *);
+   void data(DataEvent *);
diff --git a/textproc/sp/files/patch-ai b/textproc/sp/files/patch-ai
new file mode 100644
index 000000000000..d55a4e712010
--- /dev/null
+++ b/textproc/sp/files/patch-ai
@@ -0,0 +1,11 @@
+--- lib/parser_inst.m4.orig	Thu Feb  6 01:03:36 2003
++++ lib/parser_inst.m4	Thu Feb  6 01:04:17 2003
+@@ -164,7 +164,7 @@
+ __instantiate(Vector<ContentModelAmbiguity>)
+ __instantiate(Vector<Transition>)
+ __instantiate(Vector<LeafContentToken*>)
+-#if 0
++#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
+ __instantiate(Vector<size_t>)
+ #endif
+ __instantiate(Vector<unsigned int>)