[Midnightbsd-cvs] mports: x11-toolkits/pango: Update to 1.18.4

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 1.18.4

Modified Files:
--------------
    mports/x11-toolkits/pango:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/pango/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L x11-toolkits/pango/pkg-plist -L x11-toolkits/pango/pkg-plist -u -r1.3 -r1.4
--- x11-toolkits/pango/pkg-plist
+++ x11-toolkits/pango/pkg-plist
@@ -1,5 +1,6 @@
 bin/pango-querymodules
 %%X11%%bin/pango-view
+ at comment etc/pango/pango.modules
 %%X11%%etc/pango/pangox.aliases
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-break.h
@@ -15,6 +16,7 @@
 include/pango-1.0/pango/pango-glyph.h
 include/pango-1.0/pango/pango-gravity.h
 include/pango-1.0/pango/pango-item.h
+include/pango-1.0/pango/pango-language.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-matrix.h
 include/pango-1.0/pango/pango-modules.h
@@ -94,7 +96,6 @@
 libdata/pkgconfig/pangoft2.pc
 %%X11%%libdata/pkgconfig/pangox.pc
 %%X11%%libdata/pkgconfig/pangoxft.pc
- at unexec rm %D/etc/pango/pango.modules
 @dirrm lib/pango/%%VERSION%%/modules
 @dirrm lib/pango/%%VERSION%%
 @dirrm lib/pango
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/pango/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L x11-toolkits/pango/Makefile -L x11-toolkits/pango/Makefile -u -r1.7 -r1.8
--- x11-toolkits/pango/Makefile
+++ x11-toolkits/pango/Makefile
@@ -8,10 +8,10 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.16.5
-PORTREVISION=	1
+PORTVERSION=	1.18.4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/1.16,}
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
+	ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -42,8 +42,8 @@
 GLIB2_CFLAGS=	`pkg-config glib-2.0 --cflags`
 PLIST_SUB=	VERSION="1.6.0"
 
-FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
+FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
 MAN1=		pango-querymodules.1
 
@@ -54,8 +54,7 @@
 			LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB+=		X11="@comment "
 .else
-USE_XLIB+=		yes
-LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG+=		xft xrender
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 				${GLIB2_CFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/pango/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-toolkits/pango/distinfo -L x11-toolkits/pango/distinfo -u -r1.2 -r1.3
--- x11-toolkits/pango/distinfo
+++ x11-toolkits/pango/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/pango-1.16.5.tar.bz2) = d8d7da2ab854f6e257ec06bf552a6114
-SHA256 (gnome2/pango-1.16.5.tar.bz2) = 78ffda1dd67b16c6f558c918d2473de284091bfab075777a4f81e33752bc444d
-SIZE (gnome2/pango-1.16.5.tar.bz2) = 1345977
+MD5 (gnome2/pango-1.18.4.tar.bz2) = 5f4a24eb03789746a13e41beb7044776
+SHA256 (gnome2/pango-1.18.4.tar.bz2) = 6fd3c82eb7aa1fd410cde21189b005095e882d8ab381a5b85bb7483ab7e7efdd
+SIZE (gnome2/pango-1.18.4.tar.bz2) = 1406821