Unbreak this. Sort of. Shared libraries are still disabled

until I can figure out what is going on with them.

An assortment of other small messes were cleaned up.

6 files changed, 58 insertions, 24 deletions

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 45ac15a73f0d..6bd4526d88fa 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		June 19, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.2 1997/06/29 09:49:49 obrien Exp $
+# $Id: Makefile,v 1.3 1997/07/06 02:54:02 jfieber Exp $
 #
 
 DISTNAME=	jade0_8
@@ -14,8 +14,6 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
-BROKEN=		C++ library problems on pre and post 2.2.1 systems
-
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 EXTRACT_CMD=	unzip
@@ -25,11 +23,11 @@ NO_WRKSUBDIR=	yes
 # Unfortunately, jade needs a more modern C++ compiler than
 # comes with FreeBSD 2.1.x.
 .if !exists(/usr/lib/libstdc++.a)
-BROKEN=		yes
+BROKEN=		Requires FreeBSD 2.2 or later.
 .endif
 
-
-post-install:
-	/sbin/ldconfig -m ${PREFIX}/lib
+# Shared libraries are currently broken for this port.
+# post-install:
+# 	/sbin/ldconfig -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/textproc/jade/files/patch-ac b/textproc/jade/files/patch-ac
new file mode 100644
index 000000000000..98730d62feb5
--- /dev/null
+++ b/textproc/jade/files/patch-ac
@@ -0,0 +1,19 @@
+*** lib/instmac.m4.orig	Sun Jul  6 20:20:04 1997
+--- lib/instmac.m4	Sun Jul  6 20:20:54 1997
+***************
+*** 75,81 ****
+  __undefine(`undefine')__dnl
+  __undefine(`undivert')__dnl
+  __undefine(`unix')__dnl
+! __dnl __changequote(,)__dnl disable quoting
+  
+  #ifdef SP_NAMESPACE
+  }
+--- 75,81 ----
+  __undefine(`undefine')__dnl
+  __undefine(`undivert')__dnl
+  __undefine(`unix')__dnl
+! __dnl __changequote(,)__dnl
+  
+  #ifdef SP_NAMESPACE
+  }
diff --git a/textproc/jade/pkg-plist b/textproc/jade/pkg-plist
index 2d2d1ff68075..b976eabc5340 100644
--- a/textproc/jade/pkg-plist
+++ b/textproc/jade/pkg-plist
@@ -140,13 +140,13 @@ include/sp/sptchar.h
 include/sp/types.h
 include/sp/xnew.h
 lib/libgrove.a
-lib/libgrove.so.1.4
+@comment lib/libgrove.so.1.4
 lib/libspgrove.a
-lib/libspgrove.so.1.4
+@comment lib/libspgrove.so.1.4
 lib/libstyle.a
-lib/libstyle.so.1.4
+@comment lib/libstyle.so.1.4
 lib/libsp.a
-lib/libsp.so.1.4
+@comment lib/libsp.so.1.4
 share/doc/jade/TeX.htm
 share/doc/jade/archform.htm
 share/doc/jade/build.htm
@@ -176,7 +176,7 @@ share/sgml/jade/demoMaster.tex
 share/sgml/jade/dsssl.dtd
 share/sgml/jade/fot.dtd
 share/sgml/jade/style-sheet.dtd
-@exec /sbin/ldconfig -m %D/lib
+@comment @exec /sbin/ldconfig -m %D/lib
 @dirrm include/sp
 @dirrm share/doc/jade
 @dirrm share/sgml/jade
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 45ac15a73f0d..6bd4526d88fa 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		June 19, 1997
 # Whom:			jfieber
 #
-# $Id: Makefile,v 1.2 1997/06/29 09:49:49 obrien Exp $
+# $Id: Makefile,v 1.3 1997/07/06 02:54:02 jfieber Exp $
 #
 
 DISTNAME=	jade0_8
@@ -14,8 +14,6 @@ EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jfieber@FreeBSD.ORG
 
-BROKEN=		C++ library problems on pre and post 2.2.1 systems
-
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 EXTRACT_CMD=	unzip
@@ -25,11 +23,11 @@ NO_WRKSUBDIR=	yes
 # Unfortunately, jade needs a more modern C++ compiler than
 # comes with FreeBSD 2.1.x.
 .if !exists(/usr/lib/libstdc++.a)
-BROKEN=		yes
+BROKEN=		Requires FreeBSD 2.2 or later.
 .endif
 
-
-post-install:
-	/sbin/ldconfig -m ${PREFIX}/lib
+# Shared libraries are currently broken for this port.
+# post-install:
+# 	/sbin/ldconfig -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/textproc/openjade/files/patch-ac b/textproc/openjade/files/patch-ac
new file mode 100644
index 000000000000..98730d62feb5
--- /dev/null
+++ b/textproc/openjade/files/patch-ac
@@ -0,0 +1,19 @@
+*** lib/instmac.m4.orig	Sun Jul  6 20:20:04 1997
+--- lib/instmac.m4	Sun Jul  6 20:20:54 1997
+***************
+*** 75,81 ****
+  __undefine(`undefine')__dnl
+  __undefine(`undivert')__dnl
+  __undefine(`unix')__dnl
+! __dnl __changequote(,)__dnl disable quoting
+  
+  #ifdef SP_NAMESPACE
+  }
+--- 75,81 ----
+  __undefine(`undefine')__dnl
+  __undefine(`undivert')__dnl
+  __undefine(`unix')__dnl
+! __dnl __changequote(,)__dnl
+  
+  #ifdef SP_NAMESPACE
+  }
diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist
index 2d2d1ff68075..b976eabc5340 100644
--- a/textproc/openjade/pkg-plist
+++ b/textproc/openjade/pkg-plist
@@ -140,13 +140,13 @@ include/sp/sptchar.h
 include/sp/types.h
 include/sp/xnew.h
 lib/libgrove.a
-lib/libgrove.so.1.4
+@comment lib/libgrove.so.1.4
 lib/libspgrove.a
-lib/libspgrove.so.1.4
+@comment lib/libspgrove.so.1.4
 lib/libstyle.a
-lib/libstyle.so.1.4
+@comment lib/libstyle.so.1.4
 lib/libsp.a
-lib/libsp.so.1.4
+@comment lib/libsp.so.1.4
 share/doc/jade/TeX.htm
 share/doc/jade/archform.htm
 share/doc/jade/build.htm
@@ -176,7 +176,7 @@ share/sgml/jade/demoMaster.tex
 share/sgml/jade/dsssl.dtd
 share/sgml/jade/fot.dtd
 share/sgml/jade/style-sheet.dtd
-@exec /sbin/ldconfig -m %D/lib
+@comment @exec /sbin/ldconfig -m %D/lib
 @dirrm include/sp
 @dirrm share/doc/jade
 @dirrm share/sgml/jade