From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 7 01:40:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB1AB16A4D0 for ; Wed, 7 Jul 2004 01:40:28 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04A0D43D55 for ; Wed, 7 Jul 2004 01:40:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i671eL1k097423 for ; Wed, 7 Jul 2004 01:40:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i671eLe5097422; Wed, 7 Jul 2004 01:40:21 GMT (envelope-from gnats) Resent-Date: Wed, 7 Jul 2004 01:40:21 GMT Resent-Message-Id: <200407070140.i671eLe5097422@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Koshy Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D5EC16A4CE for ; Wed, 7 Jul 2004 01:39:30 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 526A043D1D for ; Wed, 7 Jul 2004 01:39:30 +0000 (GMT) (envelope-from jkoshy@FreeBSD.org) Received: from freefall.freebsd.org (jkoshy@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i671dUAn097385 for ; Wed, 7 Jul 2004 01:39:30 GMT (envelope-from jkoshy@freefall.freebsd.org) Received: (from jkoshy@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i671dU3r097384; Wed, 7 Jul 2004 01:39:30 GMT (envelope-from jkoshy) Message-Id: <200407070139.i671dU3r097384@freefall.freebsd.org> Date: Wed, 7 Jul 2004 01:39:30 GMT From: Joseph Koshy To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/68747: [patch] upgrade print/freetype2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Joseph Koshy List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jul 2004 01:40:29 -0000 >Number: 68747 >Category: ports >Synopsis: [patch] upgrade print/freetype2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Jul 07 01:40:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Joseph Koshy >Release: FreeBSD 4.10-STABLE i386 >Organization: The FreeBSD Project >Environment: System: FreeBSD freefall.freebsd.org 4.10-STABLE FreeBSD 4.10-STABLE #13: Fri May 28 21:29:54 PDT 2004 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386 >Description: Update print/freetype2 to v2.1.9. >How-To-Repeat: >Fix: 1) rm files/patch-src::type1::t1load.c 2) apply the following patch Index: Makefile =================================================================== RCS file: /cvs/FreeBSD/ports/print/freetype2/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- Makefile 16 May 2004 21:07:21 -0000 1.56 +++ Makefile 3 Jul 2004 05:21:12 -0000 @@ -6,8 +6,7 @@ # PORTNAME= freetype2 -PORTVERSION= 2.1.7 -PORTREVISION= 3 +PORTVERSION= 2.1.9 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \ Index: distinfo =================================================================== RCS file: /cvs/FreeBSD/ports/print/freetype2/distinfo,v retrieving revision 1.24 diff -u -r1.24 distinfo --- distinfo 16 Mar 2004 20:28:44 -0000 1.24 +++ distinfo 3 Jul 2004 05:21:16 -0000 @@ -1,2 +1,2 @@ -MD5 (freetype-2.1.7.tar.bz2) = d71723948d7c0e44c401b5733c50857e -SIZE (freetype-2.1.7.tar.bz2) = 930766 +MD5 (freetype-2.1.9.tar.bz2) = ec1b903e4be5f073caa72458ea58c29c +SIZE (freetype-2.1.9.tar.bz2) = 992394 Index: pkg-plist =================================================================== RCS file: /cvs/FreeBSD/ports/print/freetype2/pkg-plist,v retrieving revision 1.28 diff -u -r1.28 pkg-plist --- pkg-plist 16 Mar 2004 20:28:44 -0000 1.28 +++ pkg-plist 7 Jul 2004 01:37:50 -0000 @@ -4,8 +4,8 @@ include/freetype2/freetype/cache/ftcglyph.h include/freetype2/freetype/cache/ftcimage.h include/freetype2/freetype/cache/ftcmanag.h +include/freetype2/freetype/cache/ftcmru.h include/freetype2/freetype/cache/ftcsbits.h -include/freetype2/freetype/cache/ftlru.h include/freetype2/freetype/config/ftconfig.h include/freetype2/freetype/config/ftheader.h include/freetype2/freetype/config/ftmodule.h @@ -23,6 +23,7 @@ include/freetype2/freetype/ftimage.h include/freetype2/freetype/ftincrem.h include/freetype2/freetype/ftlist.h +include/freetype2/freetype/ftlzw.h include/freetype2/freetype/ftmac.h include/freetype2/freetype/ftmm.h include/freetype2/freetype/ftmodapi.h @@ -48,6 +49,7 @@ include/freetype2/freetype/internal/ftgloadr.h include/freetype2/freetype/internal/ftmemory.h include/freetype2/freetype/internal/ftobjs.h +include/freetype2/freetype/internal/ftrfork.h include/freetype2/freetype/internal/ftserv.h include/freetype2/freetype/internal/ftstream.h include/freetype2/freetype/internal/fttrace.h @@ -64,6 +66,7 @@ include/freetype2/freetype/internal/svpscmap.h include/freetype2/freetype/internal/svpsinfo.h include/freetype2/freetype/internal/svsfnt.h +include/freetype2/freetype/internal/svttcmap.h include/freetype2/freetype/internal/svwinfnt.h include/freetype2/freetype/internal/svxf86nm.h include/freetype2/freetype/internal/t1types.h Index: files/patch-aa =================================================================== RCS file: /cvs/FreeBSD/ports/print/freetype2/files/patch-aa,v retrieving revision 1.4 diff -u -r1.4 patch-aa --- files/patch-aa 28 Jun 2002 14:37:52 -0000 1.4 +++ files/patch-aa 7 Jul 2004 01:25:03 -0000 @@ -1,18 +1,15 @@ - -$FreeBSD: ports/print/freetype2/files/patch-aa,v 1.4 2002/06/28 14:37:52 sobomax Exp $ - ---- builds/unix/detect.mk.orig Fri Jun 14 11:09:25 2002 -+++ builds/unix/detect.mk Fri Jun 28 13:35:48 2002 -@@ -76,10 +76,10 @@ +--- builds/unix/detect.mk.orig Sat Jul 3 10:51:32 2004 ++++ builds/unix/detect.mk Wed Jul 7 06:54:15 2004 +@@ -78,10 +78,10 @@ ifneq ($(have_mk),) # we are building FT2 not in the src tree - unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in + $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in - $(TOP_DIR)/builds/unix/configure $(CFG) -+# $(TOP_DIR)/builds/unix/configure $(CFG) ++ # $(TOP_DIR)/builds/unix/configure $(CFG) else - unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in + $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in - cd builds/unix; ./configure $(CFG) -+# cd builds/unix; ./configure $(CFG) ++ # cd builds/unix; ./configure $(CFG) endif endif # test PLATFORM unix Index: files/patch-builds::unix::freetype-config.in =================================================================== RCS file: /cvs/FreeBSD/ports/print/freetype2/files/patch-builds::unix::freetype-config.in,v retrieving revision 1.3 diff -u -r1.3 patch-builds::unix::freetype-config.in --- files/patch-builds::unix::freetype-config.in 30 Sep 2003 06:05:45 -0000 1.3 +++ files/patch-builds::unix::freetype-config.in 7 Jul 2004 01:29:24 -0000 @@ -1,17 +1,17 @@ ---- builds/unix/freetype-config.in.orig Thu Apr 24 01:45:59 2003 -+++ builds/unix/freetype-config.in Tue Sep 30 01:39:03 2003 -@@ -79,12 +79,8 @@ +--- builds/unix/freetype-config.in.orig Sun Apr 18 00:28:43 2004 ++++ builds/unix/freetype-config.in Wed Jul 7 06:58:56 2004 +@@ -105,12 +105,8 @@ fi if test "$echo_cflags" = "yes" ; then -- cflags="-I@includedir@/freetype2" -- if test "@includedir@" != "/usr/include" ; then -- echo $cflags -I@includedir@ -- else -- echo $cflags -- fi -+ cflags="-I@includedir@/freetype2 -I@includedir@" -+ echo $cflags +- cflags="-I$includedir/freetype2" +- if test "$includedir" != "/usr/include" ; then +- echo $cflags -I$includedir +- else +- echo $cflags +- fi ++ cflags="-I$includedir/freetype2 -I$includedir" ++ echo $cflags fi if test "$echo_libs" = "yes" ; then >Release-Note: >Audit-Trail: >Unformatted: