Alexander Pyhalov
2015-11-24 e28f4f6a37d2e61c4fe651ca063efa94f8078edd
Import new prep logic from userland-gate
1 files deleted
3 files added
5 files modified
7 files renamed
610 ■■■■■ changed files
components/docbook/docbook-dtds/Makefile 89 ●●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-01-30-sgml-1.0.catalog.patch 4 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-02-31-sgml-1.0.catalog.patch_1 78 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-03-40-sgml-1.0.catalog.patch_2 10 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-04-41-sgml-1.0.catalog.patch_3 10 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-05-42-sgml-1.0.catalog.patch_5 6 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-06-4.2-euro-sgml.patch_5 6 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-06-4.2-euro-xml.patch 11 ●●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.3-sgml.patch_7 10 ●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.4-sgml.patch_9 10 ●●●● patch | view | raw | blame | history
components/gcc48/Makefile 6 ●●●● patch | view | raw | blame | history
components/gcc49/Makefile 6 ●●●● patch | view | raw | blame | history
make-rules/prep-download.mk 70 ●●●●● patch | view | raw | blame | history
make-rules/prep-patch.mk 107 ●●●●● patch | view | raw | blame | history
make-rules/prep-unpack.mk 70 ●●●●● patch | view | raw | blame | history
make-rules/prep.mk 117 ●●●●● patch | view | raw | blame | history
components/docbook/docbook-dtds/Makefile
@@ -18,18 +18,17 @@
COMPONENT_NAME= docbook-dtds
COMPONENT_VERSION= 1.0
COMPONENT_REVISION= 1
COMPONENT_SUBVERSION= 30.1
COMPONENT_SUMMARY= SGML and XML document type definitions for DocBook.
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_SRC= 3.0-sgml
COMPONENT_ARCHIVE= docbk30.zip
COMPONENT_ARCHIVE_HASH= \
  sha256:ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
COMPONENT_ARCHIVE_URL= \
  http://www.oasis-open.org/docbook/sgml/3.0/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL = http://www.oasis-open.org/docbook/
UNPACK_ARGS+=-r 3.0-sgml
CLEAN_PATHS+= 3.0-sgml
COMPONENT_POST_UNPACK_ACTION = ($(MKDIR) $(COMPONENT_SRC) && mv 3.0-sgml $(COMPONENT_SRC))
UNPACK_ARGS+=-r $(COMPONENT_SRC)
PATCH_EACH_ARCHIVE=1
PATCHDIR_PATCHES = patches/docbook-dtds-01-30-sgml-1.0.catalog.patch
@@ -40,9 +39,6 @@
    sha256:20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
COMPONENT_ARCHIVE_URL_1= http://www.oasis-open.org/docbook/sgml/3.1/$(COMPONENT_ARCHIVE_1)
UNPACK_ARGS_1+=-r $(COMPONENT_SRC_1)
CLEAN_PATHS+=$(COMPONENT_SRC_1)
COMPONENT_POST_UNPACK_ACTION_1 =  mv $(COMPONENT_SRC_1) $(COMPONENT_SRC)
PATCHDIR_PATCHES_1 = patches/docbook-dtds-02-31-sgml-1.0.catalog.patch
COMPONENT_SRC_2= 4.0-sgml
COMPONENT_ARCHIVE_2=    docbk40.zip
@@ -50,9 +46,6 @@
    sha256:dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb
COMPONENT_ARCHIVE_URL_2= http://www.oasis-open.org/docbook/sgml/4.0/$(COMPONENT_ARCHIVE_2)
UNPACK_ARGS_2+=-r $(COMPONENT_SRC_2)
CLEAN_PATHS+=$(COMPONENT_SRC_2)
COMPONENT_POST_UNPACK_ACTION_2 =  mv $(COMPONENT_SRC_2) $(COMPONENT_SRC)
PATCHDIR_PATCHES_3= patches/docbook-dtds-03-40-sgml-1.0.catalog.patch
COMPONENT_SRC_3= 4.1-sgml
COMPONENT_ARCHIVE_3=    docbk41.zip
@@ -60,9 +53,6 @@
    sha256:deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
COMPONENT_ARCHIVE_URL_3= http://www.oasis-open.org/docbook/sgml/4.1/$(COMPONENT_ARCHIVE_3)
UNPACK_ARGS_3+=-r $(COMPONENT_SRC_3)
CLEAN_PATHS+=$(COMPONENT_SRC_3)
COMPONENT_POST_UNPACK_ACTION_3 =  mv $(COMPONENT_SRC_3) $(COMPONENT_SRC)
PATCHDIR_PATCHES_4= patches/docbook-dtds-04-41-sgml-1.0.catalog.patch
COMPONENT_SRC_4= 4.1.2-xml
COMPONENT_ARCHIVE_4=   docbkx412.zip 
@@ -70,9 +60,6 @@
    sha256:30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772
COMPONENT_ARCHIVE_URL_4= http://www.oasis-open.org/docbook/xml/4.1.2/$(COMPONENT_ARCHIVE_4)
UNPACK_ARGS_4+=-r $(COMPONENT_SRC_4)
CLEAN_PATHS+=$(COMPONENT_SRC_4)
COMPONENT_POST_UNPACK_ACTION_4 =  mv $(COMPONENT_SRC_4) $(COMPONENT_SRC)
PATCHDIR_PATCHES_5= patches/docbook-dtds-05-42-sgml-1.0.catalog.patch
COMPONENT_SRC_5= 4.2-sgml
COMPONENT_ARCHIVE_5=   docbook-4.2.zip
@@ -80,9 +67,6 @@
    sha256:67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3
COMPONENT_ARCHIVE_URL_5= http://www.oasis-open.org/docbook/sgml/4.2/$(COMPONENT_ARCHIVE_5)
UNPACK_ARGS_5+=-r $(COMPONENT_SRC_5)
CLEAN_PATHS+=$(COMPONENT_SRC_5)
COMPONENT_POST_UNPACK_ACTION_5 =  mv $(COMPONENT_SRC_5) $(COMPONENT_SRC)
PATCHDIR_PATCHES_5= patches/docbook-dtds-06-4.2-euro-sgml.patch
COMPONENT_SRC_6= 4.2-xml
COMPONENT_ARCHIVE_6=   docbook-xml-4.2.zip
@@ -90,9 +74,6 @@
    sha256:acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2
COMPONENT_ARCHIVE_URL_6= http://www.oasis-open.org/docbook/xml/4.2/$(COMPONENT_ARCHIVE_6)
UNPACK_ARGS_6+=-r $(COMPONENT_SRC_6)
CLEAN_PATHS+=$(COMPONENT_SRC_6)
COMPONENT_POST_UNPACK_ACTION_6 =  mv $(COMPONENT_SRC_6) $(COMPONENT_SRC)
PATCHDIR_PATCHES_6= patches/docbook-dtds-06-4.2-euro-xml.patch
COMPONENT_SRC_7=4.3-sgml
COMPONENT_ARCHIVE_7=   docbook-4.3.zip
@@ -100,9 +81,6 @@
    sha256:88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee
COMPONENT_ARCHIVE_URL_7= http://www.docbook.org/sgml/4.3/$(COMPONENT_ARCHIVE_7)
UNPACK_ARGS_7+=-r $(COMPONENT_SRC_7)
CLEAN_PATHS+=$(COMPONENT_SRC_7)
COMPONENT_POST_UNPACK_ACTION_7 =  mv $(COMPONENT_SRC_7) $(COMPONENT_SRC)
PATCHDIR_PATCHES_7= patches/docbook-dtds-07-ents-4.3-sgml.patch
COMPONENT_SRC_8=4.3-xml
COMPONENT_ARCHIVE_8=   docbook-xml-4.3.zip
@@ -110,8 +88,6 @@
    sha256:23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464
COMPONENT_ARCHIVE_URL_8= http://www.docbook.org/xml/4.3/$(COMPONENT_ARCHIVE_8)
UNPACK_ARGS_8+=-r $(COMPONENT_SRC_8)
CLEAN_PATHS+=$(COMPONENT_SRC_8)
COMPONENT_POST_UNPACK_ACTION_8 =  mv $(COMPONENT_SRC_8) $(COMPONENT_SRC)
COMPONENT_SRC_9=4.4-sgml
COMPONENT_ARCHIVE_9=   docbook-4.4.zip
@@ -119,9 +95,6 @@
    sha256:0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
COMPONENT_ARCHIVE_URL_9= http://www.docbook.org/sgml/4.4/$(COMPONENT_ARCHIVE_9)
UNPACK_ARGS_9+=-r $(COMPONENT_SRC_9)
CLEAN_PATHS+=$(COMPONENT_SRC_9)
COMPONENT_POST_UNPACK_ACTION_9 =  mv $(COMPONENT_SRC_9) $(COMPONENT_SRC)
PATCHDIR_PATCHES_9= patches/docbook-dtds-07-ents-4.4-sgml.patch
COMPONENT_SRC_10=4.4-xml
COMPONENT_ARCHIVE_10=   docbook-xml-4.4.zip
@@ -129,13 +102,11 @@
    sha256:02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090
COMPONENT_ARCHIVE_URL_10= http://www.docbook.org/xml/4.4/$(COMPONENT_ARCHIVE_10)
UNPACK_ARGS_10+=-r $(COMPONENT_SRC_10)
CLEAN_PATHS+=$(COMPONENT_SRC_10)
COMPONENT_POST_UNPACK_ACTION_10 =  mv $(COMPONENT_SRC_10) $(COMPONENT_SRC)
CLEAN_PATHS+=$(COMPONENT_NAME)-$(COMPONENT_VERSION)
CLEAN_PATHS+=$(BUILD_DIR)
COMPONENT_PREP_ACTION= ( $(GSED) -i -e's,\(NAMELEN\ \ *\)44,\1256,' $(COMPONENT_SRC)/*/docbook.dcl )
COMPONENT_PREP_ACTION= ( $(GSED) -i -e's,\(NAMELEN\ \ *\)44,\1256,' $(COMPONENT_DIR)/*/docbook.dcl )
include $(WS_TOP)/make-rules/prep.mk
include $(WS_TOP)/make-rules/ips.mk
@@ -147,42 +118,42 @@
# install the built source into a prototype area
$(BUILD_DIR)/%/.installed:      $(BUILD_DIR)/%/.built
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/3.0-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/3.0-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/3.0-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/3.0-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/3.1-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/3.1-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/3.1-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/3.1-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-3.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.0-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.0-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.0-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.0-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.0-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.1-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.1-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.1-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.1-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.1-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_SRC)/4.1.2-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.1.2-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_SRC)/4.1.2-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_DIR)/4.1.2-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.1.2-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.1.2-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.1.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.2-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.2-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.2-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.2-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_SRC)/4.2-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.2-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_SRC)/4.2-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_DIR)/4.2-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.2-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.2-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.2-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.3-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.3-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.3-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.3-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_SRC)/4.3-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.3-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_SRC)/4.3-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_DIR)/4.3-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.3-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.3-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.3-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.4-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.4-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.4-sgml/*.{dcl,dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.4-sgml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/sgml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(MKDIR) $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_SRC)/4.4-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_SRC)/4.4-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_SRC)/4.4-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(INSTALL) $(COMPONENT_DIR)/4.4-xml/*.{dtd,mod} $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
    $(INSTALL) $(COMPONENT_DIR)/4.4-xml/docbook.cat $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/catalog
    $(INSTALL) $(COMPONENT_DIR)/4.4-xml/ent/* $(PROTO_DIR)/usr/share/sgml/docbook/xml-dtd-4.4-$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)/ent
    $(TOUCH) $@
CONFIGURE_PREFIX= /usr/clang/$(COMPONENT_VERSION)
components/docbook/docbook-dtds/patches/docbook-dtds-01-30-sgml-1.0.catalog.patch
@@ -1,5 +1,5 @@
--- docbook-dtds/3.0-sgml/docbook.cat    Tue Dec 10 16:35:22 1996
+++ docbook-dtds/3.0-sgml/catalog    Mon Jun  5 11:08:34 2000
--- 3.0-sgml/docbook.cat    Tue Dec 10 16:35:22 1996
+++ 3.0-sgml/catalog    Mon Jun  5 11:08:34 2000
@@ -27,7 +27,7 @@
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
components/docbook/docbook-dtds/patches/docbook-dtds-02-31-sgml-1.0.catalog.patch_1
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-02-31-sgml-1.0.catalog.patch
@@ -1,41 +1,41 @@
--- docbook-dtds/3.1-sgml/docbook.cat    Tue Feb  2 06:53:32 1999
+++ docbook-dtds/3.1-sgml/catalog    Thu May 25 11:45:01 2000
--- 3.1-sgml/docbook.cat    Tue Feb  2 06:53:32 1999
+++ 3.1-sgml/catalog    Thu May 25 11:45:01 2000
@@ -19,7 +19,7 @@
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
 PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
 PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
 PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
-
-  -- ...................................................................... --
-  -- ISO entity sets ...................................................... --
-
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
   -- End of catalog data for DocBook V3.1 ................................. --
   -- ...................................................................... --
 PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
 PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
 PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
-
-  -- ...................................................................... --
-  -- ISO entity sets ...................................................... --
-
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
   -- End of catalog data for DocBook V3.1 ................................. --
   -- ...................................................................... --
components/docbook/docbook-dtds/patches/docbook-dtds-03-40-sgml-1.0.catalog.patch_2
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-03-40-sgml-1.0.catalog.patch
@@ -1,12 +1,12 @@
--- docbook-dtds-1.0/4.0-sgml/docbook.cat    Mon May 22 22:38:05 2000
+++ docbook-dtds-1.0/4.0-sgml/catalog    Mon May 22 22:12:36 2000
--- 4.0-sgml/docbook.cat    Mon May 22 22:38:05 2000
+++ 4.0-sgml/catalog    Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
@@ -36,6 +36,6 @@
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
   -- End of catalog data for DocBook V4.0 ................................. --
   -- ...................................................................... --
components/docbook/docbook-dtds/patches/docbook-dtds-04-41-sgml-1.0.catalog.patch_3
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-04-41-sgml-1.0.catalog.patch
@@ -1,12 +1,12 @@
--- docbook-dtds-1.0/4.1-sgml/docbook.cat    Mon May 22 22:38:05 2000
+++ docbook-dtds-1.0/4.1-sgml/catalog    Mon May 22 22:12:36 2000
--- 4.1-sgml/docbook.cat    Mon May 22 22:38:05 2000
+++ 4.1-sgml/catalog    Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
@@ -36,6 +36,6 @@
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
   -- End of catalog data for DocBook V4.1 ................................. --
   -- ...................................................................... --
components/docbook/docbook-dtds/patches/docbook-dtds-05-42-sgml-1.0.catalog.patch_5
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-05-42-sgml-1.0.catalog.patch
@@ -1,9 +1,9 @@
--- docbook-dtds-1.0/4.2-sgml/docbook.cat.orig    2002-07-17 17:14:28.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbook.cat    2002-07-17 21:58:24.000000000 +0100
--- 4.2-sgml/docbook.cat.orig    2002-07-17 17:14:28.000000000 +0100
+++ 4.2-sgml/docbook.cat    2002-07-17 21:58:24.000000000 +0100
@@ -49,65 +49,5 @@
 PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
        "dbcentx.mod"
-  -- ...................................................................... --
-  -- ISO entity sets ...................................................... --
-
components/docbook/docbook-dtds/patches/docbook-dtds-06-4.2-euro-sgml.patch_5
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-06-4.2-euro-sgml.patch
@@ -1,8 +1,8 @@
--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro    2003-07-15 09:07:58.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd    2003-07-15 09:08:12.000000000 +0100
--- 4.2-sgml/docbookx.dtd.euro    2003-07-15 09:07:58.000000000 +0100
+++ 4.2-sgml/docbookx.dtd    2003-07-15 09:08:12.000000000 +0100
@@ -106,7 +106,7 @@
 <![%dbcent.module;[
 <![%sgml.features;[
-<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
components/docbook/docbook-dtds/patches/docbook-dtds-06-4.2-euro-xml.patch
File was deleted
components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.3-sgml.patch_7
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.3-sgml.patch
@@ -1,17 +1,17 @@
--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents    2005-12-13 13:14:24.000000000 +0000
+++ docbook-dtds-1.0/4.3-sgml/docbook.cat    2005-12-13 13:14:38.000000000 +0000
--- 4.3-sgml/docbook.cat.ents    2005-12-13 13:14:24.000000000 +0000
+++ 4.3-sgml/docbook.cat    2005-12-13 13:14:38.000000000 +0000
@@ -51,6 +51,7 @@
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
+--
 PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
        "iso-dia.gml"
@@ -109,5 +110,6 @@
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
        "iso-cyr2.gml"
+--
   -- End of catalog data for DocBook V4.3 ................................. --
   -- ...................................................................... --
components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.4-sgml.patch_9
File was renamed from components/docbook/docbook-dtds/patches/docbook-dtds-07-ents-4.4-sgml.patch
@@ -1,17 +1,17 @@
--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents    2005-12-13 13:14:51.000000000 +0000
+++ docbook-dtds-1.0/4.4-sgml/docbook.cat    2005-12-13 13:14:59.000000000 +0000
--- 4.4-sgml/docbook.cat.ents    2005-12-13 13:14:51.000000000 +0000
+++ 4.4-sgml/docbook.cat    2005-12-13 13:14:59.000000000 +0000
@@ -54,6 +54,7 @@
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
+--
 PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
        "iso-dia.gml"
@@ -112,5 +113,6 @@
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
        "iso-cyr2.gml"
+--
   -- End of catalog data for DocBook V4.4 ................................. --
   -- ...................................................................... --
components/gcc48/Makefile
@@ -41,7 +41,7 @@
COMPONENT_ARCHIVE_HASH_1= \
    sha256:79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b
CLEAN_PATHS += $(COMPONENT_SRC_1)
COMPONENT_POST_UNPACK_ACTION_1 += mv $(COMPONENT_SRC_1) $(COMPONENT_SRC)/$(MPFR_NAME)
COMPONENT_POST_UNPACK_ACTION_1 += ( $(RM) -r $(COMPONENT_SRC)/$(MPFR_NAME) && $(CP) -r $(COMPONENT_SRC_1) $(COMPONENT_SRC)/$(MPFR_NAME) )
COMPONENT_SRC_2= $(MPC_NAME)-$(MPC_VERSION)
COMPONENT_ARCHIVE_2= $(COMPONENT_SRC_2).tar.gz
@@ -49,7 +49,7 @@
COMPONENT_ARCHIVE_HASH_2= \
    sha256:ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff
CLEAN_PATHS += $(COMPONENT_SRC_2)
COMPONENT_POST_UNPACK_ACTION_2 += mv $(COMPONENT_SRC_2) $(COMPONENT_SRC)/$(MPC_NAME)
COMPONENT_POST_UNPACK_ACTION_2 += ( $(RM) -r $(COMPONENT_SRC)/$(MPC_NAME) && $(CP) -r $(COMPONENT_SRC_2) $(COMPONENT_SRC)/$(MPC_NAME) )
COMPONENT_SRC_3= $(GMP_NAME)-$(GMP_VERSION)
COMPONENT_ARCHIVE_3= $(COMPONENT_SRC_3).tar.bz2
@@ -57,7 +57,7 @@
COMPONENT_ARCHIVE_HASH_3= \
    sha256:1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
CLEAN_PATHS += $(COMPONENT_SRC_3)
COMPONENT_POST_UNPACK_ACTION_3 += mv $(COMPONENT_SRC_3) $(COMPONENT_SRC)/$(GMP_NAME)
COMPONENT_POST_UNPACK_ACTION_3 += ( $(RM) -r $(COMPONENT_SRC)/$(GMP_NAME) && $(CP) -r $(COMPONENT_SRC_3) $(COMPONENT_SRC)/$(GMP_NAME) )
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
components/gcc49/Makefile
@@ -41,7 +41,7 @@
COMPONENT_ARCHIVE_HASH_1= \
    sha256:f63bb459157cacd223caac545cb816bcdb5a0de28b809e7748b82e9eb89b0afd
CLEAN_PATHS += $(COMPONENT_SRC_1)
COMPONENT_POST_UNPACK_ACTION_1 += mv $(COMPONENT_SRC_1) $(COMPONENT_SRC)/$(MPFR_NAME)
COMPONENT_POST_UNPACK_ACTION_1 += ( $(RM) -r $(COMPONENT_SRC)/$(MPFR_NAME) && $(CP) -r $(COMPONENT_SRC_1) $(COMPONENT_SRC)/$(MPFR_NAME) )
COMPONENT_SRC_2= $(MPC_NAME)-$(MPC_VERSION)
COMPONENT_ARCHIVE_2= $(COMPONENT_SRC_2).tar.gz
@@ -49,7 +49,7 @@
COMPONENT_ARCHIVE_HASH_2= \
    sha256:617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
CLEAN_PATHS += $(COMPONENT_SRC_2)
COMPONENT_POST_UNPACK_ACTION_2 += mv $(COMPONENT_SRC_2) $(COMPONENT_SRC)/$(MPC_NAME)
COMPONENT_POST_UNPACK_ACTION_2 += ( $(RM) -r $(COMPONENT_SRC)/$(MPC_NAME) && $(CP) -r $(COMPONENT_SRC_2) $(COMPONENT_SRC)/$(MPC_NAME) )
COMPONENT_SRC_3= $(GMP_NAME)-$(GMP_VERSION)
COMPONENT_ARCHIVE_3= $(COMPONENT_SRC_3).tar.bz2
@@ -57,7 +57,7 @@
COMPONENT_ARCHIVE_HASH_3= \
    sha256:1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9
CLEAN_PATHS += $(COMPONENT_SRC_3)
COMPONENT_POST_UNPACK_ACTION_3 += mv $(COMPONENT_SRC_3) $(COMPONENT_SRC)/$(GMP_NAME)
COMPONENT_POST_UNPACK_ACTION_3 += ( $(RM) -r $(COMPONENT_SRC)/$(GMP_NAME) && $(CP) -r $(COMPONENT_SRC_3) $(COMPONENT_SRC)/$(GMP_NAME) )
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
make-rules/prep-download.mk
New file
@@ -0,0 +1,70 @@
#
# 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) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
FETCH =        $(WS_TOOLS)/userland-fetch
#
# Anything that we download must have a COMPONENT_ARCHIVE_URL{_[0-9]+} macro
# that tells us where the canonical source for the archive can be found.  The
# macro for the first archive is typically un-suffixed.  By convention,
# subsequent archives will include a _[0-9]+ in the macro name.  This allows
# an abitrary number of archives to be downloaded for a particular component
# Makefile.  It is also important to note that there is a corresponding
# COMPONENT_ARCHIVE macro defining a local file name for the archive, and
# optional COMPONENT_ARCHIVE_HASH and COMPONENT_SIG_URL containing a hash of
# the file and signature for verification of its contents.
#
URL_SUFFIXES = $(subst COMPONENT_ARCHIVE_URL_,, \
        $(filter COMPONENT_ARCHIVE_URL_%, $(.VARIABLES)))
# Template for download rules.
define download-rules
ifdef COMPONENT_ARCHIVE_URL$(1)
ARCHIVES += $$(COMPONENT_ARCHIVE$(1))
CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1))
download::    $$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1))
$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)):    $(MAKEFILE_PREREQ)
    $$(FETCH) --file $$@ \
        $$(COMPONENT_ARCHIVE_URL$(1):%=--url %) \
        $$(COMPONENT_ARCHIVE_HASH$(1):%=--hash %) \
        $$(COMPONENT_SIG_URL$(1):%=--sigurl %)
    $$(TOUCH) $$@
REQUIRED_PACKAGES += runtime/python-26
endif
endef
#
# Define the rules required to download any source archives and augment any
# cleanup macros.
#
$(eval $(call download-rules,))
$(foreach suffix, $(URL_SUFFIXES), $(eval $(call download-rules,_$(suffix))))
# Needed for signature validation of downloads
REQUIRED_PACKAGES += crypto/gnupg
make-rules/prep-patch.mk
New file
@@ -0,0 +1,107 @@
#
# 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) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
GPATCH =    /usr/gnu/bin/patch
PATCH_LEVEL ?=    1
GPATCH_BACKUP =    --backup --version-control=numbered
GPATCH_FLAGS =    --strip=$(PATCH_LEVEL) $(GPATCH_BACKUP)
#
# Rules for patching source that is downloaded and unpacked or pulled from
# a source repository.  Patches should be named
# patches/{patch-file-name}.patch{version} where {patch-file-name} is a
# meaningful name for the patch contents and {version} corresponds to the
# COMPONENT_NAME{version} of the source to be patched.  Typically, version
# would be something like "_1", "_2", ...  After all {version} patches have
# been applied, a final set of patches without a {version} suffix may be
# applied.
#
# PATCH_DIR can be overridden to move patches to a different location
# PATCH_PATTERN can be overridden to adjust the patch naming scheme that the
#     build recognizes.
# EXTRA_PATCHES{version} can be defined in the component Makefile to include
#     additional patches.
#
PATCH_PATTERN ?=    *.patch*
PATCH_DIR ?=        patches
# patches specific to parfait builds.
ifeq   ($(strip $(PARFAIT_BUILD)),yes)
PARFAIT_PATCH_DIR =    parfait
endif
PATCHES =    $(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f \
             -name '$(PATCH_PATTERN)' 2>/dev/null | \
                LC_COLLATE=C sort)
PCH_SUFFIXES = $(patsubst .patch_%,%, $(filter-out .patch,$(suffix $(PATCHES))))
define patch-rule
ifeq ($(1),_0)
PATCH_PATTERN$(1) ?=    %.patch
PATCHES$(1) = $(filter %.patch,$(PATCHES))
else
PATCH_PATTERN$(1) ?=    %.patch$(1)
PATCHES$(1) = $(filter %.patch$(1),$(PATCHES))
endif
ifneq ($$(PATCHES$(1)),)
PATCH_STAMPS$(1) += $$(PATCHES$(1):$(PATCH_DIR)/%=$$(SOURCE_DIR$(1))/.patched-%)
ifeq   ($(strip $(PARFAIT_BUILD)),yes)
PATCH_STAMPS$(1) += $$(PATCHES$(1):$(PARFAIT_PATCH_DIR)/%=$$(SOURCE_DIR$(1))/.patched-%)
endif
# We should unpack the source that we patch before we patch it.
$$(PATCH_STAMPS$(1)::    $$(UNPACK_STAMP$(1)) unpack
# Adding MAKEFILE_PREREQ because gmake seems to evaluate the need to patch
# before re-unpacking if the Makefile changed.  The various stamps are
# removed as part of the unpacking process, and it doesn't appear to
# re-evaluate the need for patching.  If we ever move the stamps to the build
# directory, we may not need the dependency any more.
$$(SOURCE_DIR$(1))/.patched-%:    $(PATCH_DIR)/% $(MAKEFILE_PREREQ)
    $(GPATCH) -d $$(@D) $$(GPATCH_FLAGS) < $$<
    $(TOUCH) $$(@)
$$(SOURCE_DIR$(1))/.patched-%:    $(PARFAIT_PATCH_DIR)/% $(MAKEFILE_PREREQ)
    $(GPATCH) -d $$(@D) $$(GPATCH_FLAGS) < $$<
    $(TOUCH) $$(@)
$$(SOURCE_DIR$(1))/.patched:    $$(PATCH_STAMPS$(1))
    $(TOUCH) $$(@)
patch::    $$(SOURCE_DIR$(1))/.patched
REQUIRED_PACKAGES += text/gnu-patch
endif
endef
#
# Define the rules required to download any source archives and augment any
# cleanup macros.
#
$(foreach suffix, $(PCH_SUFFIXES), $(eval $(call patch-rule,_$(suffix))))
$(eval $(call patch-rule,))    # this must be last so we don't drop *.patch_%.
make-rules/prep-unpack.mk
New file
@@ -0,0 +1,70 @@
#
# 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) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
UNPACK =        $(WS_TOOLS)/userland-unpack
#
# Anything that we downloaded and want to unpack must have a
# COMPONENT_ARCHIVE{_[0-9]+} macro.
#
PCK_SUFFIXES = $(subst COMPONENT_ARCHIVE_,, \
                $(filter COMPONENT_ARCHIVE_%, $(.VARIABLES)))
# Template for unpacking rules.
define unpack-rules
ifdef COMPONENT_ARCHIVE$(1)
ifdef COMPONENT_SRC$(1)
CLEAN_PATHS += $$(COMPONENT_SRC$(1))
SOURCE_DIR$(1) = $$(COMPONENT_DIR)/$(COMPONENT_SRC$(1))
UNPACK_STAMP$(1) =    $$(SOURCE_DIR$(1))/.unpacked
$$(UNPACK_STAMP$(1)):    $$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)) download
    $$(RM) -r $$(SOURCE_DIR$(1))
    $$(UNPACK) $$(UNPACK_ARGS$(1)) $$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1))
    $$(COMPONENT_POST_UNPACK_ACTION$(1))
    $$(TOUCH) $$@
unpack::    $$(UNPACK_STAMP$(1))
REQUIRED_PACKAGES += archiver/gnu-tar
REQUIRED_PACKAGES += compress/bzip2
REQUIRED_PACKAGES += compress/gzip
REQUIRED_PACKAGES += compress/p7zip
REQUIRED_PACKAGES += compress/unzip
REQUIRED_PACKAGES += compress/xz
REQUIRED_PACKAGES += compress/zip
REQUIRED_PACKAGES += developer/java/jdk
REQUIRED_PACKAGES += runtime/ruby
endif
endif
endef
#
# Define the rules required to download any source archives and augment any
# cleanup macros.
#
$(eval $(call unpack-rules,))
$(foreach suffix, $(PCK_SUFFIXES), $(eval $(call unpack-rules,_$(suffix))))
make-rules/prep.mk
@@ -18,124 +18,29 @@
#
# CDDL HEADER END
#
# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
#
# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
# One must do all unpack and patch in sequence.
.NOTPARALLEL: (SOURCE_DIR)/.prep
include $(WS_MAKE_RULES)/prep-download.mk
include $(WS_MAKE_RULES)/prep-unpack.mk
include $(WS_MAKE_RULES)/prep-patch.mk
UNPACK =    $(WS_TOOLS)/userland-unpack
FETCH =        $(WS_TOOLS)/userland-fetch
download::
ARCHIVES += $(COMPONENT_ARCHIVE)
CLEAN_PATHS += $(SOURCE_DIR)
unpack::    download
# In order to override PATCH_DIR and PATCH_PATTERN in component makefiles, they
# need to be conditionally set here.  This means that the override needs to
# happen prior to including prep.mk.  Otherwise other variables set here which
# are based on those will be expanded too early for the override to take
# effect.
# You also can't override PATCHES after including prep.mk; if you want to
# append filenames to PATCHES, you'll have to set $(EXTRA_PATCHES) prior to
# inclusion.
PATCH_DIR ?=    patches
patch::        unpack
# we may need patches only for use with parfait
ifeq   ($(strip $(PARFAIT_BUILD)),yes)
PARFAIT_PATCH_DIR =    parfait
endif
PATCH_PATTERN ?=    *.patch
PATCHES =    $(shell find $(PATCH_DIR) $(PARFAIT_PATCH_DIR) -type f -name '$(PATCH_PATTERN)' \
                2>/dev/null | sort) $(EXTRA_PATCHES)
# Rule to perform the patching.
$(SOURCE_DIR)/.%ed:    $(PATCH_DIR)/%
    $(GPATCH) -d $(@D) $(GPATCH_FLAGS) < $<
    $(TOUCH) $@
# Parfait patches rule: TODO - Integrate with other patch rules
ifeq   ($(strip $(PARFAIT_BUILD)),yes)
$(SOURCE_DIR)/.%ed:    $(PARFAIT_PATCH_DIR)/%
    $(GPATCH) -d $(@D) $(GPATCH_FLAGS) < $<
    $(TOUCH) $@
endif
# Template for download rules.
define download-rule
ARCHIVES += $$(COMPONENT_ARCHIVE$(1))
CLOBBER_PATHS += $$(COMPONENT_ARCHIVE$(1))
$$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1)):    Makefile
    $$(FETCH) --file $$@ \
        $$(COMPONENT_ARCHIVE_URL$(1):%=--url %) \
        $$(COMPONENT_ARCHIVE_HASH$(1):%=--hash %)
    $$(TOUCH) $$@
endef
# Template for patching rules, note that patching is actually done by the
# %.ed pattern rule above.
# To maintain backwards compatibility, the flag PATCH_EACH_ARCHIVE must
# be non-empty in order to activate individual archive patching.
define patch-rule
ifneq ($(strip $$(PATCH_EACH_ARCHIVE)),)
# Prepend the patch directory to each archive patch.
#$$(COMPONENT_PATCHES$(1):%=$$(PATCH_DIR)/%)
#PATCHDIR_PATCHES$(1) += $$(COMPONENT_PATCHES)
PATCHDIR_PATCHES$(1) += $$(foreach patch,$$(COMPONENT_PATCHES$(1)), \
                         $$(PATCH_DIR)/$$(patch))
else
PATCHDIR_PATCHES = $$(PATCHES)
endif
# Substitute the patch dir for the source dir on the patches
STAMPS$(1)+= $$(PATCHDIR_PATCHES$(1):$$(PATCH_DIR)/%=$$(SOURCE_DIR)/.%ed)
ifeq   ($(strip $(PARFAIT_BUILD)),yes)
STAMPS$(1)+= $$(PATCHDIR_PATCHES$(1):$$(PARFAIT_PATCH_DIR)/%=$$(SOURCE_DIR)/.%ed)
endif
$$(SOURCE_DIR)/.patched$(1): $$(SOURCE_DIR)/.unpacked$(1) $$(STAMPS$(1))
    $$(TOUCH) $$@
endef
# Template for unpacking rules.
define unpack-rule
$$(SOURCE_DIR)/.unpacked$(1): download Makefile $$(PATCHDIR_PATCHES$(1))
    $$(RM) -r $$(COMPONENT_SRC$(1))
    $$(UNPACK) $$(UNPACK_ARGS$(1)) \
        $$(USERLAND_ARCHIVES)$$(COMPONENT_ARCHIVE$(1))
    $$(COMPONENT_POST_UNPACK_ACTION$(1))
    $$(TOUCH) $$@
endef
# If an archive is defined, create a download, unpack and patch rule.
define archive-rule
ifneq ($(strip $$(COMPONENT_ARCHIVE$(1))),)
$(eval $(call download-rule,$(1)))
$(eval $(call unpack-rule,$(1)))
$(eval $(call patch-rule,$(1)))
ARCHIVE_STAMPS +=$$(SOURCE_DIR)/.patched$(1)
endif
endef
# Calculate the number of defined archives.
# Always generate at least the basic prep rules.
# Work out if there are any other archives to be downloaded and patched.
$(eval $(call archive-rule,))
ifneq ($(strip $(PATCH_EACH_ARCHIVE)),)
$(foreach suffix,$(NUM_EXTRA_ARCHIVES), \
    $(eval $(call archive-rule,_$(suffix))))
else
# Backwards compatibility - only download, do not unpack or patch automatically
$(foreach suffix,$(NUM_EXTRA_ARCHIVES), \
    $(eval $(call download-rule,_$(suffix))))
endif
$(SOURCE_DIR)/.prep: $(ARCHIVE_STAMPS)
$(SOURCE_DIR)/.prep:    download unpack patch
    $(COMPONENT_PREP_ACTION)
    $(TOUCH) $@
prep::    $(SOURCE_DIR)/.prep
download::    $(ARCHIVES:%=$(USERLAND_ARCHIVES)%)
clean::
    $(PRE_CLEAN_ACTION)
    $(RM) -r $(CLEAN_PATHS)
clobber::    clean