Make this package build on Darwin.

  - Link with the C++ compiler because this is written in C++.
  - Link with all the required libraries to prevent undefined symbols.
  - Add only libtool libraries to LT_LIBS.

Based on patches provided by Ben Collver in PR 34495.

6 files changed, 77 insertions, 1 deletions

diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index 91d634e36b6..4ac44dd66c2 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:48:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/12/10 23:02:39 minskim Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
 Size (openjade-1.3.2.tar.gz) = 894834 bytes
 SHA1 (patch-aa) = 4914f08b6598d25af7b7f99a58e1e6490d292609
+SHA1 (patch-ab) = cc5be75d416be38ada244301ba7171dc30751e75
+SHA1 (patch-ac) = 535d81d8c04e5133878e329b274a00b910c61c96
+SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
+SHA1 (patch-ae) = e31ad542ad9316e166a6c463e7cd12cfc3b7aa39
+SHA1 (patch-af) = 1e0db04b5b85ad3b71066e55f94bf3144d69efe5
diff --git a/textproc/openjade/patches/patch-ab b/textproc/openjade/patches/patch-ab
new file mode 100644
index 00000000000..3d33baa5274
--- /dev/null
+++ b/textproc/openjade/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/12/10 23:02:40 minskim Exp $
+
+--- Makefile.lib.in.orig	2002-01-22 03:57:53.000000000 -0800
++++ Makefile.lib.in
+@@ -23,7 +23,7 @@ Makefile.lt:
+ 	echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
+ 
+ lib$(LIB).la: $(LT_OBJS)
+-	$(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+ 	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
+ 
+ install:
diff --git a/textproc/openjade/patches/patch-ac b/textproc/openjade/patches/patch-ac
new file mode 100644
index 00000000000..3e83f316ea6
--- /dev/null
+++ b/textproc/openjade/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.3 2006/12/10 23:02:40 minskim Exp $
+
+--- spgrove/Makefile.sub.orig	2002-11-15 14:46:50.000000000 -0800
++++ spgrove/Makefile.sub
+@@ -1,7 +1,8 @@
+ LTVERSION=0:1:0
+ LIB=ospgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
++DEPLIBS=$(TOP)/grove/libogrove.la \
++	-lm -losp -L$(TOP)/grove -L$(TOP)/grove/.libs \
+ 	-L$(TOP)/lib -L$(TOP)/lib/.libs \
+ 	$(LIB_THREADS)
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
diff --git a/textproc/openjade/patches/patch-ad b/textproc/openjade/patches/patch-ad
new file mode 100644
index 00000000000..e4dc7ad8c45
--- /dev/null
+++ b/textproc/openjade/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.5 2006/12/10 23:02:40 minskim Exp $
+
+--- style/Makefile.sub.orig	2002-11-15 14:46:50.000000000 -0800
++++ style/Makefile.sub
+@@ -1,6 +1,7 @@
+ LTVERSION=0:1:0
+ LIB=ostyle
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \
++  -lm -losp -L$(TOP)/grove -L$(TOP)/grove/.libs \
+   -L$(TOP)/lib -L$(TOP)/lib/.libs \
+   -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs 
+ OBJS=LangObj.o \
diff --git a/textproc/openjade/patches/patch-ae b/textproc/openjade/patches/patch-ae
new file mode 100644
index 00000000000..418f9a58f03
--- /dev/null
+++ b/textproc/openjade/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2006/12/10 23:02:40 minskim Exp $
+
+--- Makefile.prog.in.orig	2002-01-22 03:57:53.000000000 -0800
++++ Makefile.prog.in
+@@ -12,14 +12,14 @@ LINKFLAGS = @LINKFLAGS@
+ 
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g|sed 's/(^| )-l[0-9a-z]*//g'` >Makefile.lt
+ 
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
+-	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(DEPLIBS)
+ 
+ install: $(PROG)
+ 	-test -d $(DESTDIR)$(bindir) || \
diff --git a/textproc/openjade/patches/patch-af b/textproc/openjade/patches/patch-af
new file mode 100644
index 00000000000..ed3581c2409
--- /dev/null
+++ b/textproc/openjade/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1 2006/12/10 23:02:40 minskim Exp $
+
+--- jade/Makefile.sub.orig	2002-11-15 14:46:50.000000000 -0800
++++ jade/Makefile.sub
+@@ -1,4 +1,5 @@
+ PROG=openjade
++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la $(TOP)/style/libostyle.la
+ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuilder.o HtmlFOTBuilder.o \
+   TeXFOTBuilder.o TransformFOTBuilder.o MifFOTBuilder.o
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style