From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 15:52:51 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EAD0372; Fri, 27 Dec 2013 15:52:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3A6031928; Fri, 27 Dec 2013 15:52:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRFqpHo000117; Fri, 27 Dec 2013 15:52:51 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRFqof4000114; Fri, 27 Dec 2013 15:52:50 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312271552.rBRFqof4000114@svn.freebsd.org> From: Koop Mast Date: Fri, 27 Dec 2013 15:52:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337743 - in head/x11-fonts/fontconfig: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Dec 2013 15:52:51 -0000 Author: kwm Date: Fri Dec 27 15:52:50 2013 New Revision: 337743 URL: http://svnweb.freebsd.org/changeset/ports/337743 Log: Update to 2.11.0. Stagify. Deleted: head/x11-fonts/fontconfig/files/patch-src_fcfreetype.c head/x11-fonts/fontconfig/files/patch-src_fcxml.c Modified: head/x11-fonts/fontconfig/Makefile head/x11-fonts/fontconfig/distinfo head/x11-fonts/fontconfig/pkg-plist Modified: head/x11-fonts/fontconfig/Makefile ============================================================================== --- head/x11-fonts/fontconfig/Makefile Fri Dec 27 15:41:00 2013 (r337742) +++ head/x11-fonts/fontconfig/Makefile Fri Dec 27 15:52:50 2013 (r337743) @@ -3,7 +3,7 @@ # $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $ PORTNAME= fontconfig -PORTVERSION= 2.10.95 +PORTVERSION= 2.11.0 PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts @@ -20,7 +20,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ libexpat.so:${PORTSDIR}/textproc/expat2 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool +GNU_CONFIGURE= yes USES= gmake pathfix pkgconfig USE_GNOME= ltverhack CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ @@ -36,11 +36,10 @@ CONFIGURE_ARGS= --with-configdir=${PREFI MAKE_ENV= LC_ALL=C PKGINSTALL= ${WRKDIR}/pkg-install -MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1 -MAN5= fonts-conf.5 +MAN1PAGES= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1 +MAN5PAGES= fonts-conf.5 PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt -NO_STAGE= yes .include # work around fc-cache crash on arm platform @@ -50,26 +49,19 @@ USE_GCC= any post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .endif - ${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5 -.for manpage in ${MAN1} - ${INSTALL_MAN} ${FILESDIR}/${manpage} ${PREFIX}/man/man1 + ${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${PREFIX}/man/man5 +.for manpage in ${MAN1PAGES} + ${INSTALL_MAN} ${FILESDIR}/${manpage} ${STAGEDIR}${PREFIX}/man/man1 .endfor - if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ - else \ - ${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \ - fi + ${INSTALL_DATA} ${WRKSRC}/fonts.conf \ + ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.default @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ > ${PKGINSTALL} -.if !defined(PACKAGE_BUILDING) - -@${LDCONFIG} -m ${PREFIX}/lib - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfontconfig.so.1 .include Modified: head/x11-fonts/fontconfig/distinfo ============================================================================== --- head/x11-fonts/fontconfig/distinfo Fri Dec 27 15:41:00 2013 (r337742) +++ head/x11-fonts/fontconfig/distinfo Fri Dec 27 15:52:50 2013 (r337743) @@ -1,2 +1,2 @@ -SHA256 (fontconfig-2.10.95.tar.bz2) = abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b -SIZE (fontconfig-2.10.95.tar.bz2) = 1529849 +SHA256 (fontconfig-2.11.0.tar.bz2) = cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467 +SIZE (fontconfig-2.11.0.tar.bz2) = 1541382 Modified: head/x11-fonts/fontconfig/pkg-plist ============================================================================== --- head/x11-fonts/fontconfig/pkg-plist Fri Dec 27 15:41:00 2013 (r337742) +++ head/x11-fonts/fontconfig/pkg-plist Fri Dec 27 15:52:50 2013 (r337743) @@ -63,6 +63,13 @@ lib/libfontconfig.la lib/libfontconfig.so lib/libfontconfig.so.1 libdata/pkgconfig/fontconfig.pc +man/man1/fc-cache.1.gz +man/man1/fc-cat.1.gz +man/man1/fc-list.1.gz +man/man1/fc-match.1.gz +man/man1/fc-query.1.gz +man/man1/fc-scan.1.gz +man/man5/fonts-conf.5.gz @dirrm include/fontconfig @dirrmtry etc/fonts/conf.d @dirrmtry etc/fonts/conf.avail