mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

Gak! I committed freetype instead of freetype2. Of course, there were

Browse Source 
no changes in freetype so that was a no-op.

Update to 2.1.9.  Note: this version is ABI compatible with 2.1.7, so no
ports need to be recompiled for this update.

PR:		78385
Submitted by:	lesi
Commit blunder reported by:	ahze
This commit is contained in:
Joe Marcus Clarke 2005-03-10 00:52:03 +00:00
parent f7f1fc1826
commit 9174cb9a31
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=130760
8 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print/freetype2/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= freetype2
PORTVERSION= 2.1.7
PORTREVISION= 4
PORTVERSION= 2.1.9
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@ -36,10 +35,10 @@ CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
CFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
.endif
.if defined(WITH_CJK)
PATCH_SITES+= http://bsdchat.com/dist/firefly-cjk-patchset/
PATCHFILES+= cjk-patch-freetype2-20041115.diff.gz
.endif
#.if defined(WITH_CJK)
#PATCH_SITES+= http://bsdchat.com/dist/firefly-cjk-patchset/
#PATCHFILES+= cjk-patch-freetype2-20041115.diff.gz
#.endif
pre-everything::
.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)

4
print/freetype2/distinfo
View File

@ -1,4 +1,4 @@
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
MD5 (cjk-patch-freetype2-20041115.diff.gz) = c1e52458b877a78636a4cdbb97badb11
SIZE (cjk-patch-freetype2-20041115.diff.gz) = 16052

13
print/freetype2/files/patch-aa
View File

@ -1,16 +1,13 @@
$FreeBSD$
--- 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 Sun Jan 9 21:12:51 2005
+++ builds/unix/detect.mk Sun Jan 9 21:13:42 2005
@@ -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

22
print/freetype2/files/patch-builds::unix::freetype-config.in
View File

@ -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 Jan 9 21:18:15 2005
+++ builds/unix/freetype-config.in Sun Jan 9 21:18:57 2005
@@ -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

8
print/freetype2/files/patch-builds::unix::freetype2.in Normal file
View File

@ -0,0 +1,8 @@
--- builds/unix/freetype2.in.orig Wed Mar 2 20:22:23 2005
+++ builds/unix/freetype2.in Wed Mar 2 20:22:53 2005
@@ -8,4 +8,4 @@
Version: @ft_version@
Requires:
Libs: -L${libdir} -lfreetype @LIBZ@
-Cflags: -I${includedir}/freetype2
+Cflags: -I${includedir}/freetype2 -I${includedir}

22
print/freetype2/files/patch-src::truetype::ttgload.c Normal file
View File

@ -0,0 +1,22 @@
Index: src/truetype/ttgload.c
===================================================================
RCS file: /cvsroot/freetype/freetype2/src/truetype/ttgload.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- src/truetype/ttgload.c 13 Oct 2004 05:15:44 -0000 1.131
+++ src/truetype/ttgload.c 19 Nov 2004 10:35:52 -0000 1.132
@@ -797,12 +797,10 @@
if ( IS_HINTED( load->load_flags ) )
{
FT_Pos x = zone->org[n_points-4].x;
- FT_Pos y = zone->org[n_points-2].y;
x = FT_PIX_ROUND( x ) - x;
- y = FT_PIX_ROUND( y ) - y;
- translate_array( n_points, zone->org, x, y );
+ translate_array( n_points, zone->org, x, 0 );
org_to_cur( n_points, zone );

14
print/freetype2/files/patch-src::type1::t1load.c
View File

@ -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 )

5
print/freetype2/pkg-plist
View File

@ -4,8 +4,8 @@ include/freetype2/freetype/cache/ftccmap.h
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/ftgzip.h
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/ftdriver.h
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/svpostnm.h
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