summaryrefslogtreecommitdiff
path: root/package/libXft/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/libXft/Makefile')
-rw-r--r--package/libXft/Makefile17
1 files changed, 3 insertions, 14 deletions
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
index 9a3cb5a75..100b9e3bc 100644
--- a/package/libXft/Makefile
+++ b/package/libXft/Makefile
@@ -5,21 +5,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libXft
PKG_VERSION:= 2.3.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 946a157090eec5c3041cf17530d93f59
PKG_DESCR:= X FreeType library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libXrender fontconfig
PKG_SITES:= ${MASTER_SITE_XORG}
-
-PKG_SUBPKGS:= LIBXFT LIBXFT_DEV
-PKGSD_LIBXFT_DEV:= X FreeType headers
-PKGSC_LIBXFT_DEV:= x11/devel
+PKG_OPTS:= dev
include $(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}))
+$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
@@ -27,11 +23,4 @@ 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