4 files changed, 69 insertions, 22 deletions

diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index ed40dab281a2..8d3710f7df1d 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -6,32 +6,42 @@
 #
 
 PORTNAME=	openjade
-PORTVERSION=	1.3.2
-PORTREVISION=	7
+PORTVERSION=	1.3.3p1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/-pre/}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
-LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
+LIB_DEPENDS=	osp.5:${PORTSDIR}/textproc/opensp
 RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 USE_PERL5=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
-		--datadir=${PREFIX}/share/sgml/openjade
-INSTALLS_SHLIB=	yes
-PLIST_SUB=	XMLCATMGR=${XMLCATMGR}
-PLIST_SUB+=	CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
+		--datadir=${DATADIR}
+INSTALL_TARGET=	install install-man
+PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
+		CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML}
 
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 
+MAN1=		openjade.1
+DATADIR=	${PREFIX}/share/sgml/openjade
+
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/dsssl/* ${PREFIX}/share/sgml/openjade
+	@${CAT} ${PLIST} | \
+		${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | \
+		${AWK} '/^@comment INSTALL_DATA:/ \
+			{printf "if ! ${GREP} -q \"%s\" ${PLIST}; then ${ECHO_CMD} \"%s\" >> %s; fi;  %s %s/%s %s/%s\n", \
+			$$4, $$4, "${TMPPLIST}", "${INSTALL_DATA}", \
+			"${WRKSRC}", $$3, "${PREFIX}", $$4}' | \
+		${SH}
 	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG openjade/catalog
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/openjade/distinfo b/textproc/openjade/distinfo
index f547a62540e8..bdb7ec9a8849 100644
--- a/textproc/openjade/distinfo
+++ b/textproc/openjade/distinfo
@@ -1,3 +1,3 @@
-MD5 (openjade-1.3.2.tar.gz) = 7df692e3186109cc00db6825b777201e
-SHA256 (openjade-1.3.2.tar.gz) = 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-SIZE (openjade-1.3.2.tar.gz) = 894834
+MD5 (openjade-1.3.3-pre1.tar.gz) = cbf3d8be3e3516dcb12b751de822b48c
+SHA256 (openjade-1.3.3-pre1.tar.gz) = a15bbed48a4a6bc50d17abdb5e101eb1c60ba1ed52d5a0aff52f2d3aef9568e4
+SIZE (openjade-1.3.3-pre1.tar.gz) = 1058451
diff --git a/textproc/openjade/files/patch-Makefile.comm.in b/textproc/openjade/files/patch-Makefile.comm.in
new file mode 100644
index 000000000000..4cc8733e2a14
--- /dev/null
+++ b/textproc/openjade/files/patch-Makefile.comm.in
@@ -0,0 +1,11 @@
+--- Makefile.comm.in.orig	Mon Jan  8 00:28:27 2007
++++ Makefile.comm.in	Mon Jan  8 00:29:02 2007
+@@ -32,7 +32,7 @@
+ INCS=-I$(srcdir) -I$(srcdir)/../include -I$(spincludedir) -I$(spincludedir)/.. $(INCLUDE)
+ CXXFLAGS=@CXXFLAGS@ $(INCS) $(DEBUG) $(DEFS)
+ CFLAGS=@CFLAGS@ $(DEBUG) $(DEFS)
+-LDFLAGS=@LDFLAGS@
++LDFLAGS=@LDFLAGS@ -lintl
+ MSGGENFLAGS= -l jstyleModule
+ CXXDEPGENFLAGS=-MM
+ 
diff --git a/textproc/openjade/pkg-plist b/textproc/openjade/pkg-plist
index 66a8c72e93bd..5fe7a459b936 100644
--- a/textproc/openjade/pkg-plist
+++ b/textproc/openjade/pkg-plist
@@ -12,14 +12,40 @@ lib/libostyle.a
 lib/libostyle.la
 lib/libostyle.so
 lib/libostyle.so.0
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove openjade/catalog
-share/sgml/openjade/README.jadetex
-share/sgml/openjade/builtins.dsl
-share/sgml/openjade/catalog
-share/sgml/openjade/demo.dsl
-share/sgml/openjade/demo.sgm
-share/sgml/openjade/dsssl.dtd
-share/sgml/openjade/extensions.dsl
-share/sgml/openjade/fot.dtd
-share/sgml/openjade/style-sheet.dtd
+@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG openjade/catalog
+@comment INSTALL_DATA: dsssl/README.jadetex %%DATADIR%%/README.jadetex
+@comment INSTALL_DATA: dsssl/builtins.dsl %%DATADIR%%/builtins.dsl
+@comment INSTALL_DATA: dsssl/catalog %%DATADIR%%/catalog
+@comment INSTALL_DATA: dsssl/demo.dsl %%DATADIR%%/demo.dsl
+@comment INSTALL_DATA: dsssl/demo.sgm %%DATADIR%%/demo.sgm
+@comment INSTALL_DATA: dsssl/dsssl.dtd %%DATADIR%%/dsssl.dtd
+@comment INSTALL_DATA: dsssl/extensions.dsl %%DATADIR%%/extensions.dsl
+@comment INSTALL_DATA: dsssl/fot.dtd %%DATADIR%%/fot.dtd
+@comment INSTALL_DATA: dsssl/lineNumber.dsl %%DATADIR%%/lineNumber.dsl
+@comment INSTALL_DATA: dsssl/lineNumber.sgml %%DATADIR%%/lineNumber.sgml
+@comment INSTALL_DATA: dsssl/ps.dsl %%DATADIR%%/ps.dsl
+@comment INSTALL_DATA: dsssl/ps.fot %%DATADIR%%/ps.fot
+@comment INSTALL_DATA: dsssl/ps.sgml %%DATADIR%%/ps.sgml
+@comment INSTALL_DATA: dsssl/psalig.dsl %%DATADIR%%/psalig.dsl
+@comment INSTALL_DATA: dsssl/pscs.dsl %%DATADIR%%/pscs.dsl
+@comment INSTALL_DATA: dsssl/pscspb.dsl %%DATADIR%%/pscspb.dsl
+@comment INSTALL_DATA: dsssl/pscspb.sgml %%DATADIR%%/pscspb.sgml
+@comment INSTALL_DATA: dsssl/psemb.dsl %%DATADIR%%/psemb.dsl
+@comment INSTALL_DATA: dsssl/psempha.dsl %%DATADIR%%/psempha.dsl
+@comment INSTALL_DATA: dsssl/psglyp.dsl %%DATADIR%%/psglyp.dsl
+@comment INSTALL_DATA: dsssl/psglyp2.dsl %%DATADIR%%/psglyp2.dsl
+@comment INSTALL_DATA: dsssl/psinc.dsl %%DATADIR%%/psinc.dsl
+@comment INSTALL_DATA: dsssl/psinc.sgml %%DATADIR%%/psinc.sgml
+@comment INSTALL_DATA: dsssl/psinc2.dsl %%DATADIR%%/psinc2.dsl
+@comment INSTALL_DATA: dsssl/psmulti.dsl %%DATADIR%%/psmulti.dsl
+@comment INSTALL_DATA: dsssl/psmulti2.dsl %%DATADIR%%/psmulti2.dsl
+@comment INSTALL_DATA: dsssl/psmulti3.dsl %%DATADIR%%/psmulti3.dsl
+@comment INSTALL_DATA: dsssl/psradical.dsl %%DATADIR%%/psradical.dsl
+@comment INSTALL_DATA: dsssl/pssbs.dsl %%DATADIR%%/pssbs.dsl
+@comment INSTALL_DATA: dsssl/pssbsi.dsl %%DATADIR%%/pssbsi.dsl
+@comment INSTALL_DATA: dsssl/sps.dsl %%DATADIR%%/sps.dsl
+@comment INSTALL_DATA: dsssl/sps.sgml %%DATADIR%%/sps.sgml
+@comment INSTALL_DATA: dsssl/spsanch.dsl %%DATADIR%%/spsanch.dsl
+@comment INSTALL_DATA: dsssl/spsanch.sgml %%DATADIR%%/spsanch.sgml
+@comment INSTALL_DATA: dsssl/style-sheet.dtd %%DATADIR%%/style-sheet.dtd
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG openjade/catalog