1 files changed, 11 insertions, 21 deletions
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index b412fa882..0a775b268 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -1,37 +1,27 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include $(TOPDIR)/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libXft
-PKG_VERSION:=		2.1.9
+PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		0a1e129b1d8b2d3905dc02a64255b781
-PKG_DESCR:=		X FreeType library
+PKG_HASH:=		26cdddcc70b187833cbe9dc54df1864ba4c03a7175b2ca9276de9f05dce74507
+PKG_DESCR:=		freetype library
 PKG_SECTION:=		x11/libs
 PKG_BUILDDEP:=		libXrender fontconfig
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		http://www.x.org/releases/individual/lib/
+PKG_LIBNAME:=		libxft
+PKG_OPTS:=		dev
 
-PKG_SUBPKGS:=		LIBXFT LIBXFT_DEV
-PKGSD_LIBXFT_DEV:=	X FreeType headers
-PKGSC_LIBXFT_DEV:=	x11/devel
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-include $(TOPDIR)/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXFT_DEV,libxft-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXFT_DEV},${PKGSC_LIBXFT_DEV}))
-
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 libxft-install:
 	${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib
 
-libxft-dev-install:
-	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/include
-	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXFT_DEV}/usr/include
-	${INSTALL_DIR} ${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
-	$(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc \
-		${IDIR_LIBXFT_DEV}/usr/lib/pkgconfig
-
-include ${TOPDIR}/mk/pkg-bottom.mk
+include ${ADK_TOPDIR}/mk/pkg-bottom.mk