libxml2-dev: Add bin/xml2-config

Introduce TERMUX_PKG_INCLUDE_IN_DEVPACKAGE as a method of
specifying additional files for -dev packages, and use that to
add bin/xml2-config (which is needed to e.g. install the python
lxml package) to libxml2-dev.

Should fix https://github.com/termux/termux-app/issues/8

Also change subpackage containing xmllint to libxml2-utils to
match debian.

diff --git a/build-package.sh b/build-package.sh
index d5eeccc..a862244 100755 (executable)
--- a/build-package.sh
+++ b/build-package.sh
@@ -177,6 +177,7 @@ TERMUX_PKG_KEEP_HEADER_FILES="false"
 TERMUX_PKG_ESSENTIAL=""
 TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts
 TERMUX_PKG_CONFFILES=""
+TERMUX_PKG_INCLUDE_IN_DEVPACKAGE=""
 # Set if a host build should be done in TERMUX_PKG_HOSTBUILD_DIR:
 TERMUX_PKG_HOSTBUILD=""
 TERMUX_PKG_MAINTAINER="Fredrik Fornwall <fredrik@fornwall.net>"
@@ -441,7 +442,7 @@ termux_step_massage () {
         if [ -d include -a -z "${TERMUX_PKG_NO_DEVELSPLIT}" ]; then
                 # Add virtual -dev sub package if there are include files:
                 _DEVEL_SUBPACKAGE_FILE=$TERMUX_PKG_TMPDIR/${TERMUX_PKG_NAME}-dev.subpackage.sh
-                echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal\" > $_DEVEL_SUBPACKAGE_FILE
+                echo TERMUX_SUBPKG_INCLUDE=\"include share/man/man3 lib/pkgconfig share/aclocal $TERMUX_PKG_INCLUDE_IN_DEVPACKAGE\" > $_DEVEL_SUBPACKAGE_FILE
                 echo TERMUX_SUBPKG_DESCRIPTION=\"Development files for ${TERMUX_PKG_NAME}\" >> $_DEVEL_SUBPACKAGE_FILE
                 echo TERMUX_SUBPKG_DEPENDS=\"$TERMUX_PKG_NAME\" >> $_DEVEL_SUBPACKAGE_FILE
         fi

diff --git a/packages/libxml2/build.sh b/packages/libxml2/build.sh
index 3181969..34f39c5 100644 (file)
--- a/packages/libxml2/build.sh
+++ b/packages/libxml2/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://www.xmlsoft.org
 TERMUX_PKG_DESCRIPTION="Library for parsing XML documents"
 TERMUX_PKG_VERSION=2.9.2
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=4
 TERMUX_PKG_SRCURL=ftp://xmlsoft.org/libxml2/libxml2-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-python"
-TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc bin/xml2-config bin/xmlcatalog lib/xml2Conf.sh share/man/man1/xml2-config.1 share/man/man1/xmlcatalog.1"
+TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc"
+TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="bin/xml2-config share/man/man1/xml2-config.1 lib/cmake lib/xml2Conf.sh"
 TERMUX_PKG_DEPENDS="liblzma"

diff --git a/packages/libxml2/libxml2-utils.subpackage.sh b/packages/libxml2/libxml2-utils.subpackage.sh
new file mode 100644 (file)
index 0000000..892b72c
--- /dev/null
+++ b/packages/libxml2/libxml2-utils.subpackage.sh
@@ -0,0 +1,3 @@
+TERMUX_SUBPKG_INCLUDE="bin/xmllint bin/xmlcatalog share/man/man1/xmllint.1 share/man/man1/xmlcatalog.1"
+TERMUX_SUBPKG_DESCRIPTION="XML utilities"
+TERMUX_SUBPKG_DEPENDS="libxml2"

diff --git a/packages/libxml2/xmllint.subpackage.sh b/packages/libxml2/xmllint.subpackage.sh
deleted file mode 100644 (file)
index 06790bc..0000000
--- a/packages/libxml2/xmllint.subpackage.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-TERMUX_SUBPKG_INCLUDE="bin share/man"
-TERMUX_SUBPKG_DESCRIPTION="Command line XML tool"
-TERMUX_SUBPKG_DEPENDS="libxml2"