docbook-utils: Convert package to new layout.

diff --git a/docbook-utils/docbook-utils.nm b/docbook-utils/docbook-utils.nm
new file mode 100644 (file)
index 0000000..6f1c8a8
--- /dev/null
+++ b/docbook-utils/docbook-utils.nm
@@ -0,0 +1,51 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = docbook-utils
+version    = 0.6.14
+release    = 1
+
+groups     = Applications/Text
+url        = http://sources.redhat.com/docbook-tools/
+license    = GPLv2+
+summary    = Shell scripts for managing DocBook documents.
+
+description
+       This package contains scripts are for easy conversion from DocBook
+       files to other formats, and for comparing SGML files.
+end
+
+# Manual list patches because they need to be applied in specical order
+patches = \
+       %{name}-spaces.patch \
+       %{name}-2ndspaces.patch \
+       %{name}-w3mtxtconvert.patch \
+       %{name}-grepnocolors.patch \
+       %{name}-sgmlinclude.patch \
+       %{name}-rtfmanpage.patch \
+       %{name}-papersize.patch \
+       %{name}-nofinalecho.patch \
+       %{name}-newgrep.patch
+
+build
+       requires
+               docbook-dsssl
+               docbook-dtds
+               openjade
+               sgml-common
+       end
+
+       configure_options += \
+               --libdir=/usr/lib \
+               --mandir=/usr/share/man
+end
+
+packages
+       package %{name}
+               requires
+                       docbook-dtds
+               end
+       end
+end

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-2ndspaces.patch b/docbook-utils/patches/docbook-utils-2ndspaces.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-2ndspaces.patch
rename to docbook-utils/patches/docbook-utils-2ndspaces.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-grepnocolors.patch b/docbook-utils/patches/docbook-utils-grepnocolors.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-grepnocolors.patch
rename to docbook-utils/patches/docbook-utils-grepnocolors.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-newgrep.patch b/docbook-utils/patches/docbook-utils-newgrep.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-newgrep.patch
rename to docbook-utils/patches/docbook-utils-newgrep.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-nofinalecho.patch b/docbook-utils/patches/docbook-utils-nofinalecho.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-nofinalecho.patch
rename to docbook-utils/patches/docbook-utils-nofinalecho.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-papersize.patch b/docbook-utils/patches/docbook-utils-papersize.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-papersize.patch
rename to docbook-utils/patches/docbook-utils-papersize.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-rtfmanpage.patch b/docbook-utils/patches/docbook-utils-rtfmanpage.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-rtfmanpage.patch
rename to docbook-utils/patches/docbook-utils-rtfmanpage.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-sgmlinclude.patch b/docbook-utils/patches/docbook-utils-sgmlinclude.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-sgmlinclude.patch
rename to docbook-utils/patches/docbook-utils-sgmlinclude.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-spaces.patch b/docbook-utils/patches/docbook-utils-spaces.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-spaces.patch
rename to docbook-utils/patches/docbook-utils-spaces.patch

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch b/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch
similarity index 100%
rename from pkgs/core/docbook-utils/patches/docbook-utils-w3mtxtconvert.patch
rename to docbook-utils/patches/docbook-utils-w3mtxtconvert.patch

diff --git a/pkgs/core/docbook-utils/docbook-utils.nm b/pkgs/core/docbook-utils/docbook-utils.nm
deleted file mode 100644 (file)
index 0eed3c3..0000000
--- a/pkgs/core/docbook-utils/docbook-utils.nm
+++ /dev/null
@@ -1,60 +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       = docbook-utils
-PKG_VER        = 0.6.14
-PKG_REL        = 0
-
-PKG_MAINTAINER =
-PKG_GROUP      = Applications/Text
-PKG_URL        = http://sources.redhat.com/docbook-tools/
-PKG_LICENSE    = GPLv2+
-PKG_SUMMARY    = Shell scripts for managing DocBook documents.
-
-PKG_BUILD_DEPS+= docbook-dtds docbook-dsssl openjade sgml-common
-PKG_DEPS      += docbook-dtds
-
-define PKG_DESCRIPTION
-       This package contains scripts are for easy conversion from DocBook \
-       files to other formats, and for comparing SGML files.
-endef
-
-PKG_TARBALL    = $(THISAPP).tar.gz
-
-# Manual list patches because they need to be applied in specical order
-PKG_PATCHES    = $(PKG_NAME)-spaces.patch
-PKG_PATCHES   += $(PKG_NAME)-2ndspaces.patch
-PKG_PATCHES   += $(PKG_NAME)-w3mtxtconvert.patch
-PKG_PATCHES   += $(PKG_NAME)-grepnocolors.patch
-PKG_PATCHES   += $(PKG_NAME)-sgmlinclude.patch
-PKG_PATCHES   += $(PKG_NAME)-rtfmanpage.patch
-PKG_PATCHES   += $(PKG_NAME)-papersize.patch
-PKG_PATCHES   += $(PKG_NAME)-nofinalecho.patch
-PKG_PATCHES   += $(PKG_NAME)-newgrep.patch
-
-CONFIGURE_OPTIONS += \
-       --libdir=/usr/lib \
-       --mandir=/usr/share/man \

diff --git a/pkgs/core/docbook-utils/patches/docbook-utils b/pkgs/core/docbook-utils/patches/docbook-utils
deleted file mode 160000 (submodule)
index a11a395..0000000
--- a/pkgs/core/docbook-utils/patches/docbook-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a11a395bf1842817f5bc42f4d7ee20b75cd03d98