diff -ruN -x CVS pkgsrc-2017Q2/textproc/openjade/distinfo pkgsrc/textproc/openjade/distinfo
--- pkgsrc-2017Q2/textproc/openjade/distinfo	2015-11-04 02:59:42.000000000 +0100
+++ pkgsrc/textproc/openjade/distinfo	2017-08-03 16:20:23.995483075 +0200
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 01:59:42 agc Exp $
+$NetBSD: distinfo,v 1.16 2017/07/15 14:34:15 wiz Exp $
 
 SHA1 (openjade-1.3.2.tar.gz) = 54e1999f41450fbd62c5d466002d79d3efca2321
 RMD160 (openjade-1.3.2.tar.gz) = 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2
 SHA512 (openjade-1.3.2.tar.gz) = c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 Size (openjade-1.3.2.tar.gz) = 894834 bytes
 SHA1 (patch-aa) = 4914f08b6598d25af7b7f99a58e1e6490d292609
-SHA1 (patch-ab) = cc5be75d416be38ada244301ba7171dc30751e75
+SHA1 (patch-ab) = 5e50562cf860c713b581247e223130ee7ef409b9
 SHA1 (patch-ac) = 2492ccb9bd736318ecd5c37f1b2a963f3ff188ab
 SHA1 (patch-ad) = f8c950cc4a0ffb5bdba315a298c14a3e7ebcd637
 SHA1 (patch-ae) = b67fde4062691b2d953cb4cb5b4ebd2428c3c285
diff -ruN -x CVS pkgsrc-2017Q2/textproc/openjade/Makefile pkgsrc/textproc/openjade/Makefile
--- pkgsrc-2017Q2/textproc/openjade/Makefile	2016-07-09 08:39:07.000000000 +0200
+++ pkgsrc/textproc/openjade/Makefile	2017-08-09 11:10:21.258871892 +0200
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2016/07/09 06:39:07 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2017/08/02 12:13:34 maya Exp $
 
 DISTNAME=	openjade-1.3.2
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openjade/}
 
@@ -20,7 +20,7 @@
 CONFIGURE_ARGS+=	--enable-default-catalog=${OPENJADE_DATA_DIR}/catalog
 CONFIGURE_ARGS+=	--enable-spincludedir=${BUILDLINK_PREFIX.opensp}/include/OpenSP
 CONFIGURE_ARGS+=	--enable-splibdir=${BUILDLINK_PREFIX.opensp}/lib
-CONFIGURE_ENV+=		CXXFLAGS=${CFLAGS:M*:Q}
+CONFIGURE_ENV+=         CXXFLAGS=${CFLAGS:M*:Q}
 
 SGML_CATALOGS=		${PREFIX}/share/sgml/openjade/catalog
 
@@ -31,6 +31,16 @@
 			${OPENJADE_DOC_DIR}/doc \
 			${OPENJADE_DOC_DIR}/jadedoc/images
 
+.include "../../mk/compiler.mk"
+# Segfaults building postgresql95-docs. see:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1306162
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69534#c9
+.if ${PKGSRC_COMPILER} == "gcc"
+# Both needed for proper work. For some reason.
+CFLAGS+=	-fno-tree-dse
+CXXFLAGS+=	-fno-tree-dse
+.endif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dsssl/* ${DESTDIR}${OPENJADE_DATA_DIR}
 	${INSTALL_DATA} ${WRKSRC}/pubtext/* ${DESTDIR}${OPENJADE_DATA_DIR}/pubtext
diff -ruN -x CVS pkgsrc-2017Q2/textproc/openjade/patches/patch-ab pkgsrc/textproc/openjade/patches/patch-ab
--- pkgsrc-2017Q2/textproc/openjade/patches/patch-ab	2006-12-11 00:02:40.000000000 +0100
+++ pkgsrc/textproc/openjade/patches/patch-ab	2017-08-03 16:20:23.995483075 +0200
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2006/12/10 23:02:40 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2017/07/15 14:34:15 wiz Exp $
 
---- Makefile.lib.in.orig	2002-01-22 03:57:53.000000000 -0800
+--- Makefile.lib.in.orig	2002-01-22 11:57:53.000000000 +0000
 +++ 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) \
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(LDFLAGS) -o lib$(LIB).la $(LT_OBJS) \
  	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
  
  install: