libX11: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/x11/lib/libX11/build

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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 2, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-export CC_FOR_BUILD="$HOST_CC"
-export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
-export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
-export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-secure-rpc \
-            --enable-loadable-i18n \
-            --enable-xthreads \
-            --disable-xcms \
-            --enable-xlocale \
-            --disable-xlocaledir \
-            --enable-xkb \
-            --with-keysymdefdir="$SYSROOT_PREFIX/usr/include/X11" \
-            --disable-xf86bigfont \
-            --enable-malloc0returnsnull \
-            --disable-specs \
-            --without-xmlto \
-            --without-fop \
-            --enable-composecache \
-            --disable-lint-library \
-            --disable-ipv6 \
-            --without-launchd \
-            --without-lint
-
-make
-make -C nls DESTDIR=`pwd`/.install install
-
-$MAKEINSTALL
-

packages/x11/lib/libX11/install

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  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 2, 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libX11*.so*T
-
-mkdir -p $INSTALL
-  cp -R $PKG_BUILD/.install/* $INSTALL
-
-mkdir -p $INSTALL/usr/lib/X11/locale/common
-  cp -R $PKG_BUILD/modules/*/*/.libs/*.so* $INSTALL/usr/lib/X11/locale/common
-  rm -rf $INSTALL/usr/lib/X11/locale/common/*.so.*T

packages/x11/lib/libX11/package.mk

@@ -26,11 +26,37 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain xproto:host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
+PKG_BUILD_DEPENDS_TARGET="toolchain xproto:host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libx11: The X11 library"
 PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-secure-rpc \
+                           --enable-loadable-i18n \
+                           --enable-xthreads \
+                           --disable-xcms \
+                           --enable-xlocale \
+                           --disable-xlocaledir \
+                           --enable-xkb \
+                           --with-keysymdefdir=$SYSROOT_PREFIX/usr/include/X11 \
+                           --disable-xf86bigfont \
+                           --enable-malloc0returnsnull \
+                           --disable-specs \
+                           --without-xmlto \
+                           --without-fop \
+                           --enable-composecache \
+                           --disable-lint-library \
+                           --disable-ipv6 \
+                           --without-launchd \
+                           --without-lint"
+
+pre_configure_target() {
+  export CC_FOR_BUILD="$HOST_CC"
+  export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
+  export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
+  export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
+}