This package uses libintl if available, so just add a dependency on it

via buildlink.mk, and mark as USE_BUILDLINK_ONLY.  Also disable the -O2
optimization in the package Makefile, instead of removing _all_ the
CXXFLAGS passed to configure.  This allows other CXXFLAGS to get through.
Lastly, prefer using a shell loop versus a make loop in the package
Makefile.

3 files changed, 31 insertions, 16 deletions

diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index c3908cb2060..0b53e5c1f55 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/23 15:37:38 skrll Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/25 03:47:38 jlam Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/01/31 11:15:57 dirk Exp
 #
 
@@ -16,20 +16,25 @@ COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
 CONFLICTS+=	sp-*
 
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE= \
-		${WRKSRC}/config/ltconfig
+USE_BUILDLINK_ONLY=	yes
+GNU_CONFIGURE=		yes
+#USE_LIBINTL=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 
-CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
-CONFIGURE_ARGS=	--disable-shared
-CONFIGURE_ARGS+= --enable-default-catalog=${PREFIX}/share/sgml/jade/catalog
-CONFIGURE_ARGS+= --enable-mif
+JADE_CATALOG_DIR=	${PREFIX}/share/sgml/jade/catalog
+
+CONFIGURE_ARGS=		--disable-shared
+CONFIGURE_ARGS+=	--enable-default-catalog=${JADE_CATALOG_DIR}
+CONFIGURE_ARGS+=	--enable-mif
+
+CXXFLAGS+=		${CFLAGS}
 
 post-install:
-.for i in jade nsgmls sgmlnorm spam spent sx
-	strip ${PREFIX}/bin/$i
-.endfor
+	@for prog in jade nsgmls sgmlnorm spam spent sx; do		\
+		${ECHO_MSG} "strip ${PREFIX}/bin/$${prog}";		\
+		strip ${PREFIX}/bin/$${prog};				\
+	done
 	${INSTALL_DATA_DIR} ${PREFIX}/include/sp
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/sp
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jade
@@ -37,4 +42,14 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sgml/jade
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/jade
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
+
+# Turn off C++ optimization as there seem to be problems with the generated
+# code: jade dumps core on some files if compiled with -O2.  This might be
+# a compiler bug, or something deep inside the code...
+#
+# This is placed after the inclusion of bsd.pkg.mk to force this option to
+# be the last optimization flag specified.
+#
+CXXFLAGS+=		-O0
diff --git a/textproc/jade/distinfo b/textproc/jade/distinfo
index a558b73a633..b03ede5b9b7 100644
--- a/textproc/jade/distinfo
+++ b/textproc/jade/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:04:59 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/06/25 03:47:38 jlam Exp $
 
 SHA1 (jade-1.2.1.tar.gz) = 4326e73b7f0b865515e1bb90c622a8b2aa6ecd06
 Size (jade-1.2.1.tar.gz) = 1092062 bytes
-SHA1 (patch-aa) = a7a500f614f752bf889df4005751fde8550443c0
+SHA1 (patch-aa) = 11457de7520b6f1f473fb9b81aa9593d0987846b
 SHA1 (patch-ab) = 1742175ec89ea8e796b4e874a488225850cf78e1
 SHA1 (patch-ac) = c96ca44b40bbcc9c588dfe40045f4d386e32998d
diff --git a/textproc/jade/patches/patch-aa b/textproc/jade/patches/patch-aa
index aa1af1eb9a7..443d7302e15 100644
--- a/textproc/jade/patches/patch-aa
+++ b/textproc/jade/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 1999/06/27 14:05:48 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/25 03:47:39 jlam Exp $
 
 --- configure.orig	Tue Oct 13 06:05:00 1998
 +++ configure	Sat Jun 26 01:52:18 1999
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1 1999/06/27 14:05:48 drochner Exp $
 -  CXXFLAGS="-O2"
 -fi
 +#if test "$CXXFLAGS" = ""; then 
-+  CXXFLAGS=""
++#  CXXFLAGS="-O2"
 +#fi
  
  LTVERSION=`cat VERSION | cut -d'.' -f1,2 | sed 's/\./:/g'`