# HG changeset patch # User Niveditha Rau # Date 1444794067 25200 # Node ID 0ef00d8ed5cc8a4bec6878eb4b0ab0d98e3463e9 # Parent d9d54aa673b6c75c3ea99902452cc908061899cd 21803286 Move openjade from desktop to userland diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/Makefile Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,92 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# + +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= openjade +COMPONENT_VERSION= 1.3.2 +COMPONENT_PROJECT_URL= http://openjade.sourceforge.net/ +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= \ + sha256:1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 +COMPONENT_ARCHIVE_URL= http://prdownloads.sourceforge.net/openjade/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= utility/openjade + +TPNO= 9620 + +# Added to find the header files since they are not installed in build/* +PKG_PROTO_DIRS += $(COMPONENT_SRC)/style +PKG_PROTO_DIRS += $(COMPONENT_SRC)/groveoa +PKG_PROTO_DIRS += $(COMPONENT_SRC)/grove +PKG_PROTO_DIRS += $(COMPONENT_SRC)/spgrove +PKG_PROTO_DIRS += $(COMPONENT_SRC)/generic +PKG_PROTO_DIRS += $(COMPONENT_SRC)/dsssl + +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk + +COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) +CONFIGURE_SCRIPT = $(@D)/configure + +CXX += $(studio_NORUNPATH) + +CONFIGURE_OPTIONS += --enable-spincludedir=/usr/include/OpenSP +CONFIGURE_OPTIONS.32 += --enable-splibdir=/usr/lib +CONFIGURE_OPTIONS.64 += --enable-splibdir=/usr/lib/$(MACH64) +CONFIGURE_OPTIONS += --enable-mif +CONFIGURE_OPTIONS += --disable-http +CONFIGURE_OPTIONS += \ +--enable-default-catalog="CATALOG:/etc/sgml/catalog:usr/share/sgml/CATALOG" +CONFIGURE_OPTIONS += --datadir=/usr/share/sgml/$(COMPONENT_NAME) +CONFIGURE_OPTIONS += CXX="$(CXX)" +CONFIGURE_OPTIONS += CXXFLAGS="$(CXXFLAGS)" +CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" + +COMPONENT_TEST_DIR = $(BUILD_DIR)/$(MACH$(BITS))/testsuite +COMPONENT_TEST_ARGS = -k -i +COMPONENT_TEST_TARGETS =all + +COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master + +COMPONENT_INSTALL_TARGETS = install install-man + +ASLR_MODE = $(ASLR_ENABLE) + +configure: $(CONFIGURE_32_and_64) + +build: $(BUILD_32_and_64) + +install: $(INSTALL_32_and_64) + +test: $(TEST_32_and_64) + +system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED) + +REQUIRED_PACKAGES += developer/documentation-tool/opensp +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += system/library/c++-runtime +REQUIRED_PACKAGES += system/library/math diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/files/CATALOG.jade_dsl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/files/CATALOG.jade_dsl Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,5 @@ +PUBLIC "-//James Clark//DTD DSSSL Flow Object Tree//EN" "/usr/share/sgml/openjade/fot.dtd" +PUBLIC "ISO/IEC 10179:1996//DTD DSSSL Architecture//EN" "/usr/share/sgml/openjade/dsssl.dtd" +PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" "/usr/share/sgml/openjade/style-sheet.dtd" +PUBLIC "-//OpenJade//DTD DSSSL Style Sheet//EN" "/usr/share/sgml/openjade/style-sheet.dtd" +SYSTEM "builtins.dsl" "/usr/share/sgml/openjade/builtins.dsl" diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/files/CATALOG.openjade --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/files/CATALOG.openjade Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,5 @@ +PUBLIC "-//James Clark//DTD DSSSL Flow Object Tree//EN" "/usr/share/sgml/openjade/fot.dtd" +PUBLIC "ISO/IEC 10179:1996//DTD DSSSL Architecture//EN" "/usr/share/sgml/openjade/dsssl.dtd" +PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" "/usr/share/sgml/openjade/style-sheet.dtd" +PUBLIC "-//OpenJade//DTD DSSSL Style Sheet//EN" "/usr/share/sgml/openjade/style-sheet.dtd" +SYSTEM "builtins.dsl" "/usr/share/sgml/openjade/builtins.dsl" diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/files/jade_style-sheet.dtd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/files/jade_style-sheet.dtd Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/openjade.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/openjade.p5m Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,103 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability volatile> +set name=pkg.fmri \ + value=pkg:/developer/documentation-tool/openjade@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="The OpenJade group's SGML and XML parsing tools" +set name=com.oracle.info.description \ + value="OpenJade is an implementation of DSSSL - Document Style Semantics and Specification Language - an ISO standard for formatting SGML and XML documents." +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + value="org.opensolaris.category.2008:System/Text Tools" +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=LSARC/2009/475 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +link path=usr/bin/$(MACH64)/jade target=openjade +file path=usr/bin/$(MACH64)/openjade +link path=usr/bin/jade target=openjade +file path=usr/bin/openjade +dir path=usr/include/openjade +file DssslApp.h path=usr/include/openjade/DssslApp.h +file EventGenerator.h path=usr/include/openjade/EventGenerator.h +file FOTBuilder.h path=usr/include/openjade/FOTBuilder.h +file GroveApp.h path=usr/include/openjade/GroveApp.h +file GroveBuilder.h path=usr/include/openjade/GroveBuilder.h +file GroveManager.h path=usr/include/openjade/GroveManager.h +file Node.h path=usr/include/openjade/Node.h +file ParserEventGeneratorKit.h \ + path=usr/include/openjade/ParserEventGeneratorKit.h +file SGMLApplication.h path=usr/include/openjade/SGMLApplication.h +file dsssl_ns.h path=usr/include/openjade/dsssl_ns.h +link path=usr/lib/$(MACH64)/libogrove.so target=libogrove.so.0.0.1 +link path=usr/lib/$(MACH64)/libogrove.so.0 target=libogrove.so.0.0.1 +file path=usr/lib/$(MACH64)/libogrove.so.0.0.1 +link path=usr/lib/$(MACH64)/libospgrove.so target=libospgrove.so.0.0.1 +link path=usr/lib/$(MACH64)/libospgrove.so.0 target=libospgrove.so.0.0.1 +file path=usr/lib/$(MACH64)/libospgrove.so.0.0.1 +link path=usr/lib/$(MACH64)/libostyle.so target=libostyle.so.0.0.1 +link path=usr/lib/$(MACH64)/libostyle.so.0 target=libostyle.so.0.0.1 +file path=usr/lib/$(MACH64)/libostyle.so.0.0.1 +link path=usr/lib/libogrove.so target=libogrove.so.0.0.1 +link path=usr/lib/libogrove.so.0 target=libogrove.so.0.0.1 +file path=usr/lib/libogrove.so.0.0.1 +link path=usr/lib/libospgrove.so target=libospgrove.so.0.0.1 +link path=usr/lib/libospgrove.so.0 target=libospgrove.so.0.0.1 +file path=usr/lib/libospgrove.so.0.0.1 +link path=usr/lib/libostyle.so target=libostyle.so.0.0.1 +link path=usr/lib/libostyle.so.0 target=libostyle.so.0.0.1 +file path=usr/lib/libostyle.so.0.0.1 +file path=usr/share/man/man1/jade.1 +file path=usr/share/man/man1/openjade.1 +link path=usr/share/sgml/CATALOG.jade_dsl \ + target=../../../../var/lib/sgml/CATALOG.openjade +link path=usr/share/sgml/CATALOG.openjade \ + target=../../../../var/lib/sgml/CATALOG.openjade +link path=usr/share/sgml/ISO_IEC_10179:1996/dtd/DSSSL_Architecture \ + target=../../openjade/dsssl.dtd +link path=usr/share/sgml/James_Clark/dtd/DSSSL_Style_Sheet \ + target=../../openjade/jade_style-sheet.dtd +link path=usr/share/sgml/OpenJade/dtd/DSSSL_Style_Sheet \ + target=../../openjade/style-sheet.dtd +file builtins.dsl path=usr/share/sgml/openjade/builtins.dsl +file catalog path=usr/share/sgml/openjade/catalog +file dsssl.dtd path=usr/share/sgml/openjade/dsssl.dtd +file extensions.dsl path=usr/share/sgml/openjade/extensions.dsl +file fot.dtd path=usr/share/sgml/openjade/fot.dtd +file files/jade_style-sheet.dtd \ + path=usr/share/sgml/openjade/jade_style-sheet.dtd +link path=usr/share/sgml/openjade/japan.dcl target=../opensp/japan.dcl +link path=usr/share/sgml/openjade/japan.decl target=japan.dcl +link path=usr/share/sgml/openjade/sp_implied.dcl \ + target=../opensp/opensp-implied.dcl +link path=usr/share/sgml/openjade/sp_implied.decl target=sp_implied.dcl +file style-sheet.dtd path=usr/share/sgml/openjade/style-sheet.dtd +link path=usr/share/sgml/openjade/xml.dcl target=../opensp/xml.dcl +link path=usr/share/sgml/openjade/xml.decl target=xml.dcl +link path=usr/share/sgml/openjade/xml.soc target=../opensp/xml.soc +link path=var/lib/sgml/CATALOG.jade_dsl target=CATALOG.openjade +file files/CATALOG.openjade path=var/lib/sgml/CATALOG.openjade +license COPYING license=MIT diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/patches/openjade-01-macros.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/patches/openjade-01-macros.patch Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,112 @@ +# Existing set of patches from the desktop gate +# Can be potentially sent upstream if there is an active community + +--- openjade.orig/config/acinclude.m4 ++++ openjade/config/acinclude.m4 2002/04/08 23:13:37 +@@ -0,0 +1,61 @@ ++dnl Configure-time switch with default ++dnl ++dnl Each switch defines an --enable-FOO and --disable-FOO option in ++dnl the resulting configure script. ++dnl ++dnl Usage: ++dnl SMR_SWITCH(name, description, default, pos-def, neg-def) ++dnl ++dnl where: ++dnl ++dnl name name of switch; generates --enable-name & --disable-name ++dnl options ++dnl description help string is set to this prefixed by "enable" or ++dnl "disable", whichever is the non-default value ++dnl default either "on" or "off"; specifies default if neither ++dnl --enable-name nor --disable-name is specified ++dnl pos-def a symbol to AC_DEFINE if switch is on (optional) ++dnl neg-def a symbol to AC_DEFINE if switch is off (optional) ++dnl ++AC_DEFUN(SMR_SWITCH, [ ++ AC_MSG_CHECKING(whether to enable $2) ++ AC_ARG_ENABLE( ++ $1, ++ ifelse($3, on, ++ [ --disable-[$1] disable [$2]], ++ [ --enable-[$1] enable [$2]]), ++ [ if test "$enableval" = yes; then ++ AC_MSG_RESULT(yes) ++ ifelse($4, , , AC_DEFINE($4)) ++ else ++ AC_MSG_RESULT(no) ++ ifelse($5, , , AC_DEFINE($5)) ++ fi ], ++ ifelse($3, on, ++ [ AC_MSG_RESULT(yes) ++ ifelse($4, , , AC_DEFINE($4)) ], ++ [ AC_MSG_RESULT(no) ++ ifelse($5, , , AC_DEFINE($5))]))]) ++ ++dnl ++dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int ++dnl ++AC_DEFUN(OJ_SIZE_T_IS_UINT,[ ++ AC_REQUIRE([AC_TYPE_SIZE_T]) ++ AC_MSG_CHECKING(whether size_t is unsigned int) ++ ac_cv_size_t_is_uint=no ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ AC_TRY_COMPILE([#include ++ ++ template class foo { }; ++ ++ ], [ ++ foo x; ++ foo y; ++ x = y; ++ ],ac_cv_size_t_is_uint=yes) ++ AC_LANG_RESTORE ++ AC_MSG_RESULT($ac_cv_size_t_is_uint) ++ test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT) ++]) +--- openjade.orig/config/aclocal.m4 ++++ openjade/config/aclocal.m4 2002/04/08 23:18:36 +@@ -3352,7 +3352,7 @@ + dnl the resulting configure script. + dnl + dnl Usage: +-dnl smr_SWITCH(name, description, default, pos-def, neg-def) ++dnl SMR_SWITCH(name, description, default, pos-def, neg-def) + dnl + dnl where: + dnl +@@ -3365,7 +3365,7 @@ + dnl pos-def a symbol to AC_DEFINE if switch is on (optional) + dnl neg-def a symbol to AC_DEFINE if switch is off (optional) + dnl +-AC_DEFUN(smr_SWITCH, [ ++AC_DEFUN(SMR_SWITCH, [ + AC_MSG_CHECKING(whether to enable $2) + AC_ARG_ENABLE( + $1, + +--- openjade.orig/config/configure.in ++++ openjade/config/configure.in 2002/04/08 23:13:17 +@@ -171,8 +171,8 @@ + dnl + dnl optional backends + dnl +-smr_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY) +-smr_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY) ++SMR_SWITCH(mif, support for FrameMaker MIF output, on, JADE_MIF, DUMMY) ++SMR_SWITCH(html, support for HTML+CSS output, on, JADE_HTML, DUMMY) + + + dnl +--- openjade-1.3.2.orig/jade/Makefile.sub Thu Dec 25 20:59:39 2003 ++++ openjade-1.3.2/jade/Makefile.sub Thu Dec 25 20:59:54 2003 +@@ -4,7 +4,7 @@ + INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style + # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \ + # ../lib/libosp.a +-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a ++XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so + GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ + HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ + TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/patches/openjade-02-studio.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/patches/openjade-02-studio.patch Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,26 @@ +# Existing set of patches from the desktop gate for building with Studio +# Since this is for our build, probably not something we can get upstream. + +--- openjade-1.3.2.orig/config/configure.in Mon Jan 5 18:00:49 2004 ++++ openjade-1.3.2/config/configure.in Mon Jan 5 18:03:02 2004 +@@ -130,6 +130,9 @@ + [define this to compile explicit template instantiations]) + CXXFLAGS="$CXXFLAGS -fno-implicit-templates" + fi ++ else ++ AC_DEFINE(SP_DEFINE_TEMPLATES,1, ++ [define this to include template definitions in the headers]) + fi + ;; + esac +--- openjade-1.3.2/style/primitive.cxx.orig Tue Jan 6 05:45:14 2004 ++++ openjade-1.3.2/style/primitive.cxx Tue Jan 6 05:45:39 2004 +@@ -5047,7 +5047,7 @@ + if (!argv[1]->exactIntegerValue(n2)) + return argError(interp, loc, + InterpreterMessages::notAnExactInteger, 1, argv[1]); +- return new (interp) QuantityObj(pow(d1,n2), dim1*n2); ++ return new (interp) QuantityObj(pow(d1,(int)n2), dim1*n2); + } + else { + if ((q2 == ELObj::noQuantity) || (dim2 != 0)) diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/patches/openjade-03-manpages.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/patches/openjade-03-manpages.patch Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,27 @@ +# Existing set of patches from the desktop gate for building with Studio +# Since this is for our build, probably not something we can get upstream. + +/jds/bin/diff -uprN openjade-1.3.2.old/docsrc/Makefile openjade-1.3.2/docsrc/Makefile +--- openjade-1.3.2.old/docsrc/Makefile 2009-02-20 18:18:58.834938000 +0000 ++++ openjade-1.3.2/docsrc/Makefile 2009-02-20 18:20:04.751372000 +0000 +@@ -4,7 +4,7 @@ JADETEX=jadetex + PDFJADETEX=pdfjadetex + XMLDECL=/usr/share/sgml/xml.dcl + +-MAN_PAGES=openjade.1 ++MAN_PAGES=openjade.1 jade.1 + + all: $(MAN_PAGES) releasenotes.pdf releasenotes.html releasenotes.ps + +/jds/bin/diff -uprN openjade-1.3.2.old/Makefile.in openjade-1.3.2/Makefile.in +--- openjade-1.3.2.old/Makefile.in 2009-02-20 18:32:17.658221000 +0000 ++++ openjade-1.3.2/Makefile.in 2009-02-20 18:36:06.021949000 +0000 +@@ -38,7 +38,7 @@ transform = @program_transform_name@ + mkinstalldirs = $(SHELL) $(TOP)/config/mkinstalldirs + man1dir=$(mandir)/man1 + +-man_MANS = openjade.1 ++man_MANS = openjade.1 jade.1 + + MANS = $(man_MANS) + diff -r d9d54aa673b6 -r 0ef00d8ed5cc components/openjade/test/results-all.master --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openjade/test/results-all.master Tue Oct 13 20:41:07 2015 -0700 @@ -0,0 +1,22 @@ +make[1]: Entering directory `$(@D)/testsuite' +../jade/openjade -c ../dsssl/catalog -t sgml -d expr-lang.dsl null.sgml > expr-lang.actual +diff expr-lang.actual expr-lang.expected +7c7 +< (char #t +--- +> (char #f +10c10 +< (char<=? #\a #\A --> #t +--- +> (char<=? #\a #\A --> #f +13c13 +< (char>? #\a #\A --> #f +--- +> (char>? #\a #\A --> #t +16c16 +< (char>=? #\a #\A --> #f +--- +> (char>=? #\a #\A --> #t +make[1]: [expr-lang.expected] Error 1 (ignored) +All tests passed. +make[1]: Leaving directory `$(@D)/testsuite'