Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 89F917A285 for ; Tue, 20 Sep 2016 11:40:29 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 3699185EA6; Tue, 20 Sep 2016 11:40:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BD08D85E92 for ; Tue, 20 Sep 2016 11:40:28 +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 XMBOq3j22mJd for ; Tue, 20 Sep 2016 11:40:28 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 18D2285E6F for ; Tue, 20 Sep 2016 11:40:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 13C75FBD1; Tue, 20 Sep 2016 11:40:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474371628146160" MIME-Version: 1.0 Date: Tue, 20 Sep 2016 11:40:28 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/fonts/p5-Font-FreeType To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20160920114028.13C75FBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1474371628146160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Tue Sep 20 11:40:27 UTC 2016 Modified Files: pkgsrc/fonts/p5-Font-FreeType: Makefile distinfo pkgsrc/fonts/p5-Font-FreeType/patches: patch-Makefile.PL Removed Files: pkgsrc/fonts/p5-Font-FreeType/patches: patch-FreeType.xs Log Message: Updated fons/p5-Fonts-FreeType 0.04 to 0.07 -------------------------------------------- 0.07 2015-09-27 dmol@cpan.org - No changes since 0.07_2 0.07_2 2015-09-24 dmol@cpan.org - Try to support utf8_to_uvchr_buf for older perls 0.07_1 2015-09-24 dmol@cpan.org - Fix UTF-8 string usage on non-intel architectures (GH#17) 0.06 2015-01-27 dmol@cpan.org - No changes since 0.06_1 0.06_1 2015-01-27 dmol@cpan.org - Allow optionally fallback to missing glyph 0.05 2015-01-27 dmol@cpan.org - No changes since 0.05_02 0.05_2 2015-01-23 dmol@cpan.org - Be more tolerant in test for checking underline position (CT#9d93130c-a254-11e4-9a11-67e5227a829d) (Ivan Baidakou, basiliscos). - Get build options from freetype-config if it exists (RT#101654) (Zakariyya Mughal). 0.05_1 2015-01-21 dmol@cpan.org - Avoid clang warning (RT#101653). - Attempt to fix CT#939e0664-8c46-11e4-8147-dcee86cc0d3a. -------------------------------------------------------------------- (pkgsrc changes) - Drop patch-FreeType.xs (upstream implemented) - Modify patch-Makefile.PL Upstream implemented automatic environment config, with some testing, but testing part is redundent to pkgsrc, and yet harmfull, so remove that part. - Add buildlink to x11.buildlink3.mk to use freetype-config for automatic configuration To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/p5-Font-FreeType/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/p5-Font-FreeType/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/fonts/p5-Font-FreeType/patches/patch-FreeType.xs cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1474371628146160 Content-Disposition: inline Content-Length: 4655 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/p5-Font-FreeType/Makefile diff -u pkgsrc/fonts/p5-Font-FreeType/Makefile:1.5 pkgsrc/fonts/p5-Font-FreeType/Makefile:1.6 --- pkgsrc/fonts/p5-Font-FreeType/Makefile:1.5 Wed Jun 8 19:23:51 2016 +++ pkgsrc/fonts/p5-Font-FreeType/Makefile Tue Sep 20 11:40:27 2016 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2016/06/08 19:23:51 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2016/09/20 11:40:27 mef Exp $ # -DISTNAME= Font-FreeType-0.03 +DISTNAME= Font-FreeType-0.07 PKGNAME= p5-${DISTNAME} -PKGREVISION= 3 CATEGORIES= perl5 fonts graphics MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Font/} @@ -16,4 +15,6 @@ PERL5_PACKLIST= auto/Font/FreeType/.pac .include "../../graphics/freetype2/buildlink3.mk" .include "../../lang/perl5/module.mk" +# to find freetype-config +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/fonts/p5-Font-FreeType/distinfo diff -u pkgsrc/fonts/p5-Font-FreeType/distinfo:1.2 pkgsrc/fonts/p5-Font-FreeType/distinfo:1.3 --- pkgsrc/fonts/p5-Font-FreeType/distinfo:1.2 Tue Nov 3 20:44:38 2015 +++ pkgsrc/fonts/p5-Font-FreeType/distinfo Tue Sep 20 11:40:27 2016 @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 20:44:38 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/09/20 11:40:27 mef Exp $ -SHA1 (Font-FreeType-0.03.tar.gz) = 7309f72ddf569b5868c49a8b407a5739b158e4d1 -RMD160 (Font-FreeType-0.03.tar.gz) = 6bd13f34505a1c04a8050eec4b72dc763e284031 -SHA512 (Font-FreeType-0.03.tar.gz) = fb10e09e7ce1a85a23e3d4e4fc6fbcf05a910b61f75117d09f464c1d68f59b624343b079d03b0787df0493f003c80a8e4bf9c72557c2763a39ed9af2deb622cd -Size (Font-FreeType-0.03.tar.gz) = 95275 bytes -SHA1 (patch-FreeType.xs) = 7a42e516040e26aa692b4e4fdc520711aa57b148 -SHA1 (patch-Makefile.PL) = c7737c389acb0f38b8a1367118ba62c653536c9f +SHA1 (Font-FreeType-0.07.tar.gz) = ea1fd2d2bf0f5b422a9bc458cafae4f18ba19fe4 +RMD160 (Font-FreeType-0.07.tar.gz) = cbd5548387c3b0cd1815a2482e7d0e3cf0fabd65 +SHA512 (Font-FreeType-0.07.tar.gz) = f245f104f668eeb20fe84c8f05aa9132dd217f58f4d00c34d0318dc7de034ae9577c3f863191b27c52514fd8ef235d5018161015d246abafcc50d0eeb886c95e +Size (Font-FreeType-0.07.tar.gz) = 234507 bytes +SHA1 (patch-Makefile.PL) = 9f3b7b9eb26727837b82535c6a345ff125f18807 Index: pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL diff -u pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL:1.1 pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL:1.2 --- pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL:1.1 Mon Jan 27 06:07:59 2014 +++ pkgsrc/fonts/p5-Font-FreeType/patches/patch-Makefile.PL Tue Sep 20 11:40:27 2016 @@ -1,17 +1,41 @@ -$NetBSD: patch-Makefile.PL,v 1.1 2014/01/27 06:07:59 obache Exp $ +$NetBSD: patch-Makefile.PL,v 1.2 2016/09/20 11:40:27 mef Exp $ -* get freetype2 configuration with "freetype-config" command. - ---- Makefile.PL.orig 2004-09-10 00:43:29.000000000 +0000 -+++ Makefile.PL -@@ -5,8 +5,8 @@ WriteMakefile( - NAME => 'Font::FreeType', - AUTHOR => 'Geoff Richards ', - VERSION_FROM => 'lib/Font/FreeType.pm', -- LIBS => [ '-lfreetype' ], -- INC => '-I/usr/include/freetype2', -+ LIBS => `freetype-config --libs`, -+ INC => `freetype-config --cflags`, - NO_META => 1, - ); +Remove unnecessary (and yet harmful) configuration check. +In pkgsrc environment, it should always pass. + +--- Makefile.PL.orig 2015-09-27 20:56:20.000000000 +0900 ++++ Makefile.PL 2016-09-20 20:26:33.000000000 +0900 +@@ -24,20 +24,13 @@ for my $config_name (qw(ft_config)) { + %{ $config->{$config_name} }, + %header_config, + ); +- +- # test the configuration +- if( check_lib( %checklib_config ) ) { + $working_config_name = $config_name; +- } + } + + # if none of the tried configurations work, use the default + $working_config_name = 'default' if not defined $working_config_name; + + my $working_config = $config->{$working_config_name}; +-if( !exists $working_config->{LIBS} && exists $working_config->{lib} ) { +- $working_config->{LIBS} = "-l$working_config->{lib}"; +-} + + # MakeMaker build flags + my %MakeMakerFlags = ( +@@ -49,12 +42,6 @@ print STDERR "Build config: $working_con + print STDERR "Build flag LIB: $MakeMakerFlags{LIBS}\n"; + print STDERR "Build flag INC: $MakeMakerFlags{INC}\n"; +-# finally use check_lib_or_exit so that it gives appropriate warnings to the user +-check_lib_or_exit( +- %MakeMakerFlags, +- %header_config, +-); +- + WriteMakefile( + NAME => 'Font::FreeType', + AUTHOR => 'Geoff Richards ', --_----------=_1474371628146160--