Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Mar 2014 07:42:16 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r347450 - head/x11-toolkits/pango
Message-ID:  <201403080742.s287gGXW010096@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Sat Mar  8 07:42:15 2014
New Revision: 347450
URL: http://svnweb.freebsd.org/changeset/ports/347450
QAT: https://qat.redports.org/buildarchive/r347450/

Log:
  Stagify
  Use new lib_depend syntax.
  Switch to USES=libtool
  Other ports may install pango modules, deal with the fact that
  etc/pango/pango.modules might have changed since install.
  
  Requested by:	miwi
  Obtained from:	GNOME dev repo.

Modified:
  head/x11-toolkits/pango/Makefile
  head/x11-toolkits/pango/pkg-plist

Modified: head/x11-toolkits/pango/Makefile
==============================================================================
--- head/x11-toolkits/pango/Makefile	Sat Mar  8 04:26:25 2014	(r347449)
+++ head/x11-toolkits/pango/Makefile	Sat Mar  8 07:42:15 2014	(r347450)
@@ -1,6 +1,6 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11-toolkits/pango/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom: ports/trunk/x11-toolkits/pango/Makefile 19012 2014-03-08 07:21:34Z kwm $
 
 PORTNAME=	pango
 PORTVERSION=	1.34.1
@@ -10,24 +10,23 @@ MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An open-source framework for the layout and rendering of i18n text
+COMMENT=	Open-source framework for the layout and rendering of i18n text
 
 USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS=	fontconfig>=2.10.91:${PORTSDIR}/x11-fonts/fontconfig
-LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
-		freetype:${PORTSDIR}/print/freetype2 \
-		harfbuzz:${PORTSDIR}/print/harfbuzz \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	glib20 gnomehier ltverhack referencehack introspection:build
+GNU_CONFIGURE=	yes
+USE_GNOME=	cairo glib20 introspection:build referencehack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -36,17 +35,14 @@ PLIST_SUB=	VERSION="1.8.0"
 FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
-MAN1=		pango-view.1 pango-querymodules.1
-
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG+=	xft xrender
-#CONFIGURE_ARGS=--with-xft
+#CONFIGURE_ARGS+=--with-xft
 PLIST_SUB+=	X11=""
 .else
 CONFIGURE_ARGS+=--without-xft
@@ -59,6 +55,11 @@ pre-configure:
 	@${FALSE}
 .endif
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/pango/
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpango*-1.0.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pango/*/modules/pango-*.so
+
 .include <bsd.port.mk>
 
 .endif

Modified: head/x11-toolkits/pango/pkg-plist
==============================================================================
--- head/x11-toolkits/pango/pkg-plist	Sat Mar  8 04:26:25 2014	(r347449)
+++ head/x11-toolkits/pango/pkg-plist	Sat Mar  8 07:42:15 2014	(r347450)
@@ -1,6 +1,6 @@
+@unexec /bin/rm %D/etc/pango/pango.modules
 bin/pango-querymodules
 bin/pango-view
-etc/pango/pango.modules
 include/pango-1.0/pango/pango-attributes.h
 include/pango-1.0/pango/pango-bidi-type.h
 include/pango-1.0/pango/pango-break.h
@@ -38,35 +38,34 @@ lib/girepository-1.0/Pango-1.0.typelib
 lib/girepository-1.0/PangoCairo-1.0.typelib
 lib/girepository-1.0/PangoFT2-1.0.typelib
 %%X11%%lib/girepository-1.0/PangoXft-1.0.typelib
-lib/libpango-1.0.a
 lib/libpango-1.0.la
 lib/libpango-1.0.so
 lib/libpango-1.0.so.0
-lib/libpangocairo-1.0.a
+lib/libpango-1.0.so.0.3400.1
 lib/libpangocairo-1.0.la
 lib/libpangocairo-1.0.so
 lib/libpangocairo-1.0.so.0
-lib/libpangoft2-1.0.a
+lib/libpangocairo-1.0.so.0.3400.1
 lib/libpangoft2-1.0.la
 lib/libpangoft2-1.0.so
 lib/libpangoft2-1.0.so.0
-%%X11%%lib/libpangoxft-1.0.a
+lib/libpangoft2-1.0.so.0.3400.1
 %%X11%%lib/libpangoxft-1.0.la
 %%X11%%lib/libpangoxft-1.0.so
 %%X11%%lib/libpangoxft-1.0.so.0
-lib/pango/%%VERSION%%/modules/pango-arabic-lang.a
+%%X11%%lib/libpangoxft-1.0.so.0.3400.1
 lib/pango/%%VERSION%%/modules/pango-arabic-lang.la
 lib/pango/%%VERSION%%/modules/pango-arabic-lang.so
-lib/pango/%%VERSION%%/modules/pango-basic-fc.a
 lib/pango/%%VERSION%%/modules/pango-basic-fc.la
 lib/pango/%%VERSION%%/modules/pango-basic-fc.so
-lib/pango/%%VERSION%%/modules/pango-indic-lang.a
 lib/pango/%%VERSION%%/modules/pango-indic-lang.la
 lib/pango/%%VERSION%%/modules/pango-indic-lang.so
 libdata/pkgconfig/pango.pc
 libdata/pkgconfig/pangocairo.pc
 libdata/pkgconfig/pangoft2.pc
 %%X11%%libdata/pkgconfig/pangoxft.pc
+man/man1/pango-querymodules.1.gz
+man/man1/pango-view.1.gz
 share/gir-1.0/Pango-1.0.gir
 share/gir-1.0/PangoCairo-1.0.gir
 share/gir-1.0/PangoFT2-1.0.gir
@@ -142,3 +141,4 @@ share/gtk-doc/html/pango/up.png
 @dirrm include/pango-1.0/pango
 @dirrm include/pango-1.0
 @dirrm etc/pango
+@exec %%LOCALBASE%%/bin/pango-querymodules > %D/etc/pango/pango.modules



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403080742.s287gGXW010096>