Merge branch '2.4' of crux:/home/crux/scm/ports/opt into 2.4

iso-codes/.footprint

@@ -0,0 +1,15 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/iso-codes.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/iso-codes/
+-rw-r--r--	root/root	usr/share/iso-codes/iso_3166.tab
+-rw-r--r--	root/root	usr/share/iso-codes/iso_639.tab
+drwxr-xr-x	root/root	usr/share/xml/
+drwxr-xr-x	root/root	usr/share/xml/iso-codes/
+-rw-r--r--	root/root	usr/share/xml/iso-codes/iso_3166.xml
+-rw-r--r--	root/root	usr/share/xml/iso-codes/iso_3166_2.xml
+-rw-r--r--	root/root	usr/share/xml/iso-codes/iso_4217.xml
+-rw-r--r--	root/root	usr/share/xml/iso-codes/iso_639.xml
+-rw-r--r--	root/root	usr/share/xml/iso-codes/iso_639_3.xml

iso-codes/.md5sum

@@ -0,0 +1 @@
+e0445c4cf79b81f119c00688f3f416b6  iso-codes-1.0.tar.bz2

iso-codes/Pkgfile

@@ -0,0 +1,18 @@
+# Description: ISO Country/Language/Currency codes
+# URL: http://pkg-isocodes.alioth.debian.org/
+# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Packager: Matt Housh, jaeger at morpheus dot net
+# Depends on: gettext
+
+name=iso-codes
+version=1.0
+release=1
+source=(http://crux.nu/files/$name-$version.tar.bz2)
+
+build() {
+  cd $name-$version
+  ./configure --prefix=/usr
+  make
+  make pkgconfigdir=/usr/lib/pkgconfig DESTDIR=$PKG install
+  rm -rf $PKG/usr/share/locale
+}

libxklavier/.footprint

@@ -0,0 +1,17 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/libxklavier/
+-rw-r--r--	root/root	usr/include/libxklavier/xkl_config_item.h
+-rw-r--r--	root/root	usr/include/libxklavier/xkl_config_rec.h
+-rw-r--r--	root/root	usr/include/libxklavier/xkl_config_registry.h
+-rw-r--r--	root/root	usr/include/libxklavier/xkl_engine.h
+-rw-r--r--	root/root	usr/include/libxklavier/xkl_engine_marshal.h
+-rw-r--r--	root/root	usr/include/libxklavier/xklavier.h
+drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/libxklavier.la
+lrwxrwxrwx	root/root	usr/lib/libxklavier.so -> libxklavier.so.12.2.0
+lrwxrwxrwx	root/root	usr/lib/libxklavier.so.12 -> libxklavier.so.12.2.0
+-rwxr-xr-x	root/root	usr/lib/libxklavier.so.12.2.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/libxklavier.pc
+drwxr-xr-x	root/root	usr/share/

libxklavier/.md5sum

@@ -0,0 +1 @@
+e4f1b9e600c4159f39d38ab94d56cf9b  libxklavier-3.8.tar.bz2

libxklavier/Pkgfile

@@ -0,0 +1,22 @@
+# Description: utility library for X keyboard-related projects
+# URL: http://freedesktop.org/Software/LibXklavier
+# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Packager: Matt Housh, jaeger at morpheus dot net
+# Depends on: libxml2, iso-codes
+
+name=libxklavier
+version=3.8
+release=1
+source=(http://download.gnome.org/sources/$name/$version/$name-$version.tar.bz2)
+
+build() {
+  cd $name-$version
+  ./configure --prefix=/usr \
+              --disable-static \
+              --disable-doxygen \
+              --with-xkb-base=/etc/X11/xkb \
+              --with-x
+  make
+  make DESTDIR=$PKG install
+  rm -rf $PKG/usr/share/gtk-doc
+}