sgml-common: Convert package to new layout.

diff --git a/pkgs/core/sgml-common/sgml-common b/pkgs/core/sgml-common/sgml-common
deleted file mode 160000 (submodule)
index a4242a8..0000000
--- a/pkgs/core/sgml-common/sgml-common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4242a87060c597a990d7b77c55de28a19a39202

diff --git a/pkgs/core/sgml-common/sgml-common.nm b/pkgs/core/sgml-common/sgml-common.nm
deleted file mode 100644 (file)
index c3deec7..0000000
--- a/pkgs/core/sgml-common/sgml-common.nm
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME       = sgml-common
-PKG_VER        = 0.6.3
-PKG_REL        = 0
-
-PKG_MAINTAINER =
-PKG_GROUP      = Applications/Text
-
-#Actually - there is no homepage of this project, on that URL
-#page you could get complete ISO 8879 listing as was on the
-#old page - only part of it is included in sgml-common package.
-PKG_URL        = http://www.w3.org/2003/entities/
-PKG_LICENSE    = GPL+
-PKG_SUMMARY    = Common SGML catalog and DTD files.
-
-PKG_BUILD_DEPS+= autoconf automake libxml2-devel
-
-define PKG_DESCRIPTION
-       The sgml-common package contains a collection of entities and DTDs \
-       that are useful for processing SGML, but that don't need to be \
-       included in multiple packages.  Sgml-common also includes an \
-       up-to-date Open Catalog file.
-endef
-
-PKG_TARBALL    = $(THISAPP).tgz
-
-CONFIGURE_OPTIONS += \
-       --mandir=/usr/share/man \
-       --sysconfdir=/etc
-
-PKG_PACKAGES  += xml-common
-PKG_SUMMARY-xml-common = Common XML catalog and DTD files.
-define PKG_DESCRIPTION-xml-common
-       The xml-common is a subpackage of sgml-common which contains \
-       a collection XML catalogs that are useful for processing XML, \
-       but that don't need to be included in main package.
-endef
-
-define PKG_FILES-xml-common
-       /etc/xml
-       /etc/sgml/docbook/xmlcatalog
-       /usr/share/sgml/docbook/xmlcatalog
-endef
-
-define STAGE_PREPARE_CMDS
-       for i in COPYING INSTALL install-sh missing mkinstalldirs; do \
-               cd $(DIR_APP) && rm -f $${i}; \
-               cd $(DIR_APP) && cp -pvf /usr/share/automake*/$${i} .; \
-       done
-endef
-
-define STAGE_INSTALL_CMDS
-       -mkdir -pv $(BUILDROOT)/etc/{sg,x}ml/docbook
-       -mkdir -pv $(BUILDROOT)/usr/share/sgml/docbook
-       # Touch SGML catalog
-       touch $(BUILDROOT)/etc/sgml/catalog
-       # Create an empty XML catalog.
-       xmlcatalog --noout --create $(BUILDROOT)/etc/xml/catalog
-       # Now put the common DocBook entries in it
-       xmlcatalog --noout --add "delegatePublic" \
-               "-//OASIS//ENTITIES DocBook XML" \
-               "file:///etc/sgml/docbook/xmlcatalog" $(BUILDROOT)/etc/xml/catalog
-       xmlcatalog --noout --add "delegatePublic" \
-               "-//OASIS//DTD DocBook XML" \
-               "file:///etc/sgml/docbook/xmlcatalog" $(BUILDROOT)/etc/xml/catalog
-       xmlcatalog --noout --add "delegatePublic" \
-               "ISO 8879:1986" \
-               "file:///etc/sgml/docbook/xmlcatalog" $(BUILDROOT)/etc/xml/catalog
-       xmlcatalog --noout --add "delegateSystem" \
-               "http://www.oasis-open.org/docbook/" \
-               "file:///etc/sgml/docbook/xmlcatalog" $(BUILDROOT)/etc/xml/catalog
-       xmlcatalog --noout --add "delegateURI" \
-               "http://www.oasis-open.org/docbook/" \
-               "file:///etc/sgml/docbook/xmlcatalog" $(BUILDROOT)/etc/xml/catalog
-       # Also create the common DocBook catalog
-       xmlcatalog --noout --create \
-               $(BUILDROOT)/etc/sgml/docbook/xmlcatalog
-       ln -svf ../../../../etc/sgml/docbook/xmlcatalog \
-               $(BUILDROOT)/usr/share/sgml/docbook/xmlcatalog
-
-       rm -f $(BUILDROOT)/usr/share/sgml/xml.dcl
-       install -p -m0644 $(DIR_SOURCE)/*.dcl $(DIR_SOURCE)/*.soc \
-               $(BUILDROOT)/usr/share/sgml
-       rm -rf $(BUILDROOT)/usr/share/xml/*
-endef

diff --git a/pkgs/core/sgml-common/MLCATALOG b/sgml-common/MLCATALOG
similarity index 100%
rename from pkgs/core/sgml-common/MLCATALOG
rename to sgml-common/MLCATALOG

diff --git a/pkgs/core/sgml-common/html.dcl b/sgml-common/html.dcl
similarity index 100%
rename from pkgs/core/sgml-common/html.dcl
rename to sgml-common/html.dcl

diff --git a/pkgs/core/sgml-common/html.soc b/sgml-common/html.soc
similarity index 100%
rename from pkgs/core/sgml-common/html.soc
rename to sgml-common/html.soc

diff --git a/pkgs/core/sgml-common/patches/sgml-common-quotes.patch b/sgml-common/patches/sgml-common-quotes.patch
similarity index 100%
rename from pkgs/core/sgml-common/patches/sgml-common-quotes.patch
rename to sgml-common/patches/sgml-common-quotes.patch

diff --git a/pkgs/core/sgml-common/patches/sgml-common-umask.patch b/sgml-common/patches/sgml-common-umask.patch
similarity index 100%
rename from pkgs/core/sgml-common/patches/sgml-common-umask.patch
rename to sgml-common/patches/sgml-common-umask.patch

diff --git a/pkgs/core/sgml-common/patches/sgml-common-xmldir.patch b/sgml-common/patches/sgml-common-xmldir.patch
similarity index 100%
rename from pkgs/core/sgml-common/patches/sgml-common-xmldir.patch
rename to sgml-common/patches/sgml-common-xmldir.patch

diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm
new file mode 100644 (file)
index 0000000..3942178
--- /dev/null
+++ b/sgml-common/sgml-common.nm
@@ -0,0 +1,111 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = sgml-common
+version    = 0.6.3
+release    = 1
+
+groups     = Applications/Text
+url        =
+license    = GPL+
+summary    = Common SGML catalog and DTD files.
+
+desciption
+       The sgml-common package contains a collection of entities and DTDs
+       that are useful for processing SGML, but that don't need to be
+       included in multiple packages.  Sgml-common also includes an
+       up-to-date Open Catalog file.
+end
+
+source_dl =
+sources   = %{thisapp}.tgz
+
+build
+       requires
+               autoconf
+               automake
+               libxml2-devel
+       end
+
+       configure_options += \
+               --mandir=/usr/share/man \
+               --sysconfdir=/etc
+
+       prepare_cmds
+               for i in COPYING INSTALL install-sh missing mkinstalldirs; do \
+                       rm -f ${i}; \
+                       cp -pvf /usr/share/automake*/${i} .; \
+               done
+       end
+
+       install_cmds
+               mkdir -pv %{BUILDROOT}/etc/{sg,x}ml/docbook
+               mkdir -pv %{BUILDROOT}/usr/share/sgml/docbook
+       
+               # Touch SGML catalog
+               touch %{BUILDROOT}/etc/sgml/catalog
+
+               # Create an empty XML catalog.
+               xmlcatalog --noout --create %{BUILDROOT}/etc/xml/catalog
+
+               # Now put the common DocBook entries in it
+               xmlcatalog --noout --add "delegatePublic" \
+                       "-//OASIS//ENTITIES DocBook XML" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegatePublic" \
+                       "-//OASIS//DTD DocBook XML" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegatePublic" \
+                       "ISO 8879:1986" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegateSystem" \
+                       "http://www.oasis-open.org/docbook/" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               xmlcatalog --noout --add "delegateURI" \
+                       "http://www.oasis-open.org/docbook/" \
+                       "file:///etc/sgml/docbook/xmlcatalog" %{BUILDROOT}/etc/xml/catalog
+
+               # Also create the common DocBook catalog
+               xmlcatalog --noout --create \
+                       %{BUILDROOT}/etc/sgml/docbook/xmlcatalog
+
+               ln -svf ../../../../etc/sgml/docbook/xmlcatalog \
+                       %{BUILDROOT}/usr/share/sgml/docbook/xmlcatalog
+
+               rm -f %{BUILDROOT}/usr/share/sgml/xml.dcl
+
+               install -p -m0644 %{DIR_SOURCE}/*.dcl %{DIR_SOURCE}/*.soc \
+                       %{BUILDROOT}/usr/share/sgml
+
+               rm -rf %{BUILDROOT}/usr/share/xml/*
+       end
+end
+
+packages
+       package %{name}
+               requires
+                       xml-common
+               end
+       end
+
+       package xml-common
+               summary = Common XML catalog and DTD files.
+               description
+                       The xml-common is a subpackage of sgml-common which contains
+                       a collection XML catalogs that are useful for processing XML,
+                       but that don't need to be included in main package.
+               end
+
+               files
+                       /etc/xml
+                       /etc/sgml/docbook/xmlcatalog
+                       /usr/share/sgml/docbook/xmlcatalog
+               end
+       end
+end

diff --git a/pkgs/core/sgml-common/xml.dcl b/sgml-common/xml.dcl
similarity index 100%
rename from pkgs/core/sgml-common/xml.dcl
rename to sgml-common/xml.dcl

diff --git a/pkgs/core/sgml-common/xml.soc b/sgml-common/xml.soc
similarity index 100%
rename from pkgs/core/sgml-common/xml.soc
rename to sgml-common/xml.soc