Received: by mail.netbsd.org (Postfix, from userid 605) id 48A2B84E39; Mon, 14 May 2018 09:13:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C822184DD0 for ; Mon, 14 May 2018 09:13:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 4SppLqIZTn2P for ; Mon, 14 May 2018 09:13:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5436984D68 for ; Mon, 14 May 2018 09:13:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4F718FBEC; Mon, 14 May 2018 09:13:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_152628919669350" MIME-Version: 1.0 Date: Mon, 14 May 2018 09:13:16 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/graphics/freetype2 To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180514091316.4F718FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_152628919669350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon May 14 09:13:16 UTC 2018 Modified Files: pkgsrc/graphics/freetype2: Makefile PLIST Log Message: freetype2: Re-enable the freetype-config script. This is still used by dependencies that haven't yet switched over to using pkg-config, such as graphics/php-gd. Until all dependent packages have switched we can't remove this. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 pkgsrc/graphics/freetype2/Makefile cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/freetype2/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_152628919669350 Content-Disposition: inline Content-Length: 1753 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/freetype2/Makefile diff -u pkgsrc/graphics/freetype2/Makefile:1.115 pkgsrc/graphics/freetype2/Makefile:1.116 --- pkgsrc/graphics/freetype2/Makefile:1.115 Fri May 4 08:40:11 2018 +++ pkgsrc/graphics/freetype2/Makefile Mon May 14 09:13:16 2018 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.115 2018/05/04 08:40:11 adam Exp $ +# $NetBSD: Makefile,v 1.116 2018/05/14 09:13:16 jperkin Exp $ DISTNAME= freetype-2.9.1 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} MASTER_SITES+= http://download.savannah.gnu.org/releases/freetype/ @@ -22,6 +23,9 @@ CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-harfbuzz=no CONFIGURE_ENV+= ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q} +# Remove this when all dependent packages have switched to pkg-config +CONFIGURE_ARGS+= --enable-freetype-config + .if exists(/System/Library/Frameworks/Carbon.framework) LDFLAGS+= -framework Carbon .endif Index: pkgsrc/graphics/freetype2/PLIST diff -u pkgsrc/graphics/freetype2/PLIST:1.26 pkgsrc/graphics/freetype2/PLIST:1.27 --- pkgsrc/graphics/freetype2/PLIST:1.26 Fri May 4 08:40:11 2018 +++ pkgsrc/graphics/freetype2/PLIST Mon May 14 09:13:16 2018 @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.26 2018/05/04 08:40:11 adam Exp $ +@comment $NetBSD: PLIST,v 1.27 2018/05/14 09:13:16 jperkin Exp $ +bin/freetype-config include/freetype2/freetype/config/ftconfig.h include/freetype2/freetype/config/ftheader.h include/freetype2/freetype/config/ftmodule.h @@ -50,4 +51,5 @@ include/freetype2/freetype/tttags.h include/freetype2/ft2build.h lib/libfreetype.la lib/pkgconfig/freetype2.pc +man/man1/freetype-config.1 share/aclocal/freetype2.m4 --_----------=_152628919669350--