[package] libXfont: Disable docs

[openwrt/svn-archive/archive.git] / Xorg / xorg / lib / libXfont / Makefile

diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile
index 80aa9ec94514980ba3697793ed8584bc4e36e14f..a111681c134795fe5bcd302ebf6de9781605b4fa 100644 (file)
--- a/Xorg/xorg/lib/libXfont/Makefile
+++ b/Xorg/xorg/lib/libXfont/Makefile
@@ -1,49 +1,60 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org
 
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXfont
 PKG_NAME:=libXfont
-PKG_RELEASE:=2
-PKG_VERSION:=1.3.3
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
+PKG_RELEASE:=1
+PKG_VERSION:=1.4.1
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=4f2bed2a2be82e90a51a24bb3a22cdf0
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
+PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto xtrans
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXfont
   SECTION:=xorg-lib
   CATEGORY:=Xorg
-  SUBMENU:=lib
-  DEPENDS:= +zlib +xtrans +libfontenc +libfreetype
+  SUBMENU:=libraries
+  DEPENDS:=+zlib +libfontenc +libfreetype
   TITLE:=libXfont
   URL:=http://xorg.freedesktop.org/
 endef
 
-CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb
+define Build/Configure
+       $(call Build/Configure/Default, \
+               --disable-devel-docs \
+       )
+endef
 
-define Build/Compile
-       $(call $(PKG_NAME)/Compile)
-       make -C $(PKG_BUILD_DIR)
-       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-       find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts}
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+               $(1)/usr/lib/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+               $(1)/usr/lib/pkgconfig/
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \
+               $(1)/usr/include/X11/fonts/
 endef
 
 define Package/libXfont/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXfont))