Date: Wed, 21 Jul 2004 08:40:27 GMT From: Eric Anholt <eta@lclark.edu> To: gnome@FreeBSD.org Subject: Re: ports/68747 Message-ID: <200407210840.i6L8eRSQ002434@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/68747; it has been noted by GNATS.
From: Eric Anholt <eta@lclark.edu>
To: gnats <freebsd-gnats-submit@FreeBSD.ORG>
Cc:
Subject: Re: ports/68747
Date: Wed, 21 Jul 2004 01:36:15 -0700
--=-ShaU6slw6+neSBnrAtL8
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Here's my take on the diff. The difference is that retaining the change
for freetype-config appears unnecessary, while the addition of
${prefix}/include is missed in the pkgconfig file it seems.
Note that 2.1.8 or better seems to be required for X.org CVS. I
understand if there are rendering concerns, though.
--
Eric Anholt eta@lclark.edu
http://people.freebsd.org/~anholt/ anholt@FreeBSD.org
--=-ShaU6slw6+neSBnrAtL8
Content-Disposition: attachment; filename=freetype219.diff
Content-Type: text/x-patch; name=freetype219.diff; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Index: Makefile
===================================================================
RCS file: /home/ncvs/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 18 Jul 2004 05:37:19 -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: /home/ncvs/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 18 Jul 2004 03:13:49 -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: /home/ncvs/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 18 Jul 2004 05:17:04 -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: /home/ncvs/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 18 Jul 2004 03:16:46 -0000
@@ -1,16 +1,13 @@
-
-$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 Tue Apr 13 01:35:05 2004
++++ builds/unix/detect.mk Sat Jul 17 20:16:32 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)
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)
endif
Index: files/patch-builds::unix::freetype-config.in
===================================================================
RCS file: files/patch-builds::unix::freetype-config.in
diff -N files/patch-builds::unix::freetype-config.in
--- files/patch-builds::unix::freetype-config.in 30 Sep 2003 06:05:45 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- 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 @@
- 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
- fi
-
- if test "$echo_libs" = "yes" ; then
Index: files/patch-builds::unix::freetype2.in
===================================================================
RCS file: files/patch-builds::unix::freetype2.in
diff -N files/patch-builds::unix::freetype2.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-builds::unix::freetype2.in 18 Jul 2004 04:46:19 -0000
@@ -0,0 +1,8 @@
+--- builds/unix/freetype2.in.orig Sat Jul 17 21:46:04 2004
++++ builds/unix/freetype2.in Sat Jul 17 21:46:11 2004
+@@ -8,4 +8,4 @@
+ Version: @ft_version@
+ Requires:
+ Libs: -L${libdir} -lfreetype @LIBZ@
+-Cflags: -I${includedir}/freetype2
++Cflags: -I${includedir}/freetype2 -I${includedir}
Index: files/patch-src::type1::t1load.c
===================================================================
RCS file: files/patch-src::type1::t1load.c
diff -N files/patch-src::type1::t1load.c
--- files/patch-src::type1::t1load.c 18 Apr 2004 04:53:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
---- src/type1/t1load.c.orig Sat Apr 17 21:32:53 2004
-+++ src/type1/t1load.c Sat Apr 17 21:34:43 2004
-@@ -1527,6 +1527,11 @@
- parser->root.cursor = cur2;
- }
-
-+ /* look for `eexec' */
-+ else if ( *cur == 'e' && cur + 5 < limit &&
-+ ft_strncmp( (char*)cur, "eexec", 5 ) == 0 )
-+ break;
-+
- /* look for `closefile' which ends the eexec section */
- else if ( *cur == 'c' && cur + 9 < limit &&
- ft_strncmp( (char*)cur, "closefile", 9 ) == 0 )
--=-ShaU6slw6+neSBnrAtL8--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407210840.i6L8eRSQ002434>