From 4efdc28752688eba2cac0ad6d843a2b049d10a5c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 30 Dec 2014 14:04:18 -0600 Subject: update to latest upstream version --- package/pango/Makefile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/package/pango/Makefile b/package/pango/Makefile index 0db83c2fa..8f7c5a155 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -1,26 +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 ${ADK_TOPDIR}/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.36.3 +PKG_VERSION:= 1.36.8 +PKG_EXTRAVER:= 1.36 PKG_RELEASE:= 1 -PKG_HASH:= ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 +PKG_HASH:= 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 PKG_DESCR:= library for laying out and rendering of text PKG_SECTION:= libs/fonts PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= libXft glib cairo harfbuzz libstdcxx fontconfig HOST_BUILDDEP:= cairo-host harfbuzz-host PKG_URL:= http://www.pango.org/ -PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.36/} +PKG_SITES:= $(MASTER_SITE_GNOME:=pango/$(PKG_EXTRAVER)/) PKG_OPTS:= dev -include ${ADK_TOPDIR}/mk/host.mk -include ${ADK_TOPDIR}/mk/package.mk +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk -$(eval $(call HOST_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call HOST_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,PANGO,pango,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIGURE_ENV+= ac_cv_path_EGREP="grep -E" CONFIGURE_ARGS+= --disable-man @@ -33,5 +34,5 @@ pango-install: $(CP) $(WRKINST)/usr/lib/pango/1.8.0/modules/*.so \ $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3