We no longer need to run fc-cache here as this will be done by Xft. Also,

since XFree86 3.x is no longer supported in this release of pango, remove
references to it.

3 files changed, 17 insertions, 37 deletions

diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index dcb3b253421f..64175fc8316d 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -18,7 +18,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An open-source framework for the layout and rendering of i18n text
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft \
 		intl.4:${PORTSDIR}/devel/gettext
@@ -46,21 +46,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 PLIST_SUB=	VERSION="1.2.0"
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-PLIST_SUB+=	XFREE4:="@comment "
-.else
-PLIST_SUB+=	XFREE4:=""
-.endif
-
 post-patch:
-	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
-		's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g'
-	
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
+	@${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | ${XARGS} \
+		${REINPLACE_CMD} -e 's|internal/tterrors\.h|fterrors.h| ; \
+		s|TT_Err_|FT_Err_|g'
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/pango/pkg-install b/x11-toolkits/pango/pkg-install
deleted file mode 100644
index 62581669e328..000000000000
--- a/x11-toolkits/pango/pkg-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin:${PATH}
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
-    fc-cache -f >/dev/null 2>&1
-fi
diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist
index 6b2513e949e4..f7a040115eff 100644
--- a/x11-toolkits/pango/pkg-plist
+++ b/x11-toolkits/pango/pkg-plist
@@ -16,14 +16,14 @@ include/pango-1.0/pango/pango-indic.h
 include/pango-1.0/pango/pango-item.h
 include/pango-1.0/pango/pango-layout.h
 include/pango-1.0/pango/pango-modules.h
-%%XFREE4:%%include/pango-1.0/pango/pango-ot.h
+include/pango-1.0/pango/pango-ot.h
 include/pango-1.0/pango/pango-tabs.h
 include/pango-1.0/pango/pango-types.h
 include/pango-1.0/pango/pango-utils.h
 include/pango-1.0/pango/pango.h
 include/pango-1.0/pango/pangoft2.h
 include/pango-1.0/pango/pangox.h
-%%XFREE4:%%include/pango-1.0/pango/pangoxft.h
+include/pango-1.0/pango/pangoxft.h
 lib/libpango-1.0.a
 lib/libpango-1.0.so
 lib/libpango-1.0.so.200
@@ -33,33 +33,33 @@ lib/libpangoft2-1.0.so.200
 lib/libpangox-1.0.a
 lib/libpangox-1.0.so
 lib/libpangox-1.0.so.200
-%%XFREE4:%%lib/libpangoxft-1.0.a
-%%XFREE4:%%lib/libpangoxft-1.0.so
-%%XFREE4:%%lib/libpangoxft-1.0.so.200
+lib/libpangoxft-1.0.a
+lib/libpangoxft-1.0.so
+lib/libpangoxft-1.0.so.200
 lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so
 lib/pango/%%VERSION%%/modules/pango-arabic-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
+lib/pango/%%VERSION%%/modules/pango-arabic-xft.so
 lib/pango/%%VERSION%%/modules/pango-basic-ft2.so
 lib/pango/%%VERSION%%/modules/pango-basic-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-basic-xft.so
+lib/pango/%%VERSION%%/modules/pango-basic-xft.so
 lib/pango/%%VERSION%%/modules/pango-bengali-x.so
 lib/pango/%%VERSION%%/modules/pango-devanagari-x.so
 lib/pango/%%VERSION%%/modules/pango-gujarati-x.so
 lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hangul-xft.so
+lib/pango/%%VERSION%%/modules/pango-hangul-xft.so
 lib/pango/%%VERSION%%/modules/pango-hangul-x.so
 lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so
 lib/pango/%%VERSION%%/modules/pango-hebrew-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-indic-xft.so
+lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so
+lib/pango/%%VERSION%%/modules/pango-indic-xft.so
 lib/pango/%%VERSION%%/modules/pango-myanmar-x.so
 lib/pango/%%VERSION%%/modules/pango-tamil-x.so
 lib/pango/%%VERSION%%/modules/pango-thai-x.so
-%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-thai-xft.so
+lib/pango/%%VERSION%%/modules/pango-thai-xft.so
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangoft2.pc
 libdata/pkgconfig/pangox.pc
-%%XFREE4:%%libdata/pkgconfig/pangoxft.pc
+libdata/pkgconfig/pangoxft.pc
 share/doc/pango/home.png
 share/doc/pango/index.html
 share/doc/pango/index.sgml