Index: head/x11-fonts/Xft/Makefile =================================================================== --- head/x11-fonts/Xft/Makefile (revision 79635) +++ head/x11-fonts/Xft/Makefile (revision 79636) @@ -1,48 +1,48 @@ # New ports collection makefile for: Xft # Date created: 06 October 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} MAINTAINER= gnome@FreeBSD.org COMMENT= A client-sided font API for X applications LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ARGS= --with-fontconfig-config="pkg-config fontconfig" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft MAN3= Xft.3 .include .if ${XFREE86_VERSION} == 3 BROKEN= Xft2 requires XFree86 4.x to build. .endif pre-patch: @${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in pre-install: -${MKDIR} ${PREFIX}/include/X11/Xft post-install: @${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 .include Property changes on: head/x11-fonts/Xft/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/x11-fonts/Xft/files/patch-xftfreetype.c =================================================================== --- head/x11-fonts/Xft/files/patch-xftfreetype.c (nonexistent) +++ head/x11-fonts/Xft/files/patch-xftfreetype.c (revision 79636) @@ -0,0 +1,36 @@ +--- xftfreetype.c 2003/04/17 04:29:24 1.31 ++++ xftfreetype.c 2003/04/24 16:14:58 1.32 +@@ -638,6 +638,7 @@ + int alloc_size; + int ascent, descent, height; + int i; ++ int num_glyphs; + + if (!info) + return 0; +@@ -769,8 +770,13 @@ + rehash_value = 0; + } + ++ /* ++ * Sometimes the glyphs are numbered 1..n, other times 0..n-1, ++ * accept either numbering scheme by making room in the table ++ */ ++ num_glyphs = face->num_glyphs + 1; + alloc_size = (sizeof (XftFontInt) + +- face->num_glyphs * sizeof (XftGlyph *) + ++ num_glyphs * sizeof (XftGlyph *) + + hash_value * sizeof (XftUcsHash)); + font = malloc (alloc_size); + +@@ -867,8 +873,8 @@ + * Per glyph information + */ + font->glyphs = (XftGlyph **) (font + 1); +- memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *)); +- font->num_glyphs = face->num_glyphs; ++ memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *)); ++ font->num_glyphs = num_glyphs; + /* + * Unicode hash table information + */ Property changes on: head/x11-fonts/Xft/files/patch-xftfreetype.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/x11-fonts/libXft/Makefile =================================================================== --- head/x11-fonts/libXft/Makefile (revision 79635) +++ head/x11-fonts/libXft/Makefile (revision 79636) @@ -1,48 +1,48 @@ # New ports collection makefile for: Xft # Date created: 06 October 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= Xft PORTVERSION= 2.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-fonts MASTER_SITES= http://fontconfig.org/fontconfig/release/ DISTNAME= fcpackage.${PORTVERSION:S/./_/} MAINTAINER= gnome@FreeBSD.org COMMENT= A client-sided font API for X applications LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig USE_GMAKE= yes USE_X_PREFIX= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ARGS= --with-fontconfig-config="pkg-config fontconfig" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LIBS="-L${X11BASE}/lib" WRKSRC= ${WRKDIR}/${DISTNAME}/Xft MAN3= Xft.3 .include .if ${XFREE86_VERSION} == 3 BROKEN= Xft2 requires XFree86 4.x to build. .endif pre-patch: @${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in pre-install: -${MKDIR} ${PREFIX}/include/X11/Xft post-install: @${INSTALL_DATA} ${WRKSRC}/Xft.man ${PREFIX}/man/man3/Xft.3 .include Property changes on: head/x11-fonts/libXft/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.15 \ No newline at end of property +1.16 \ No newline at end of property Index: head/x11-fonts/libXft/files/patch-xftfreetype.c =================================================================== --- head/x11-fonts/libXft/files/patch-xftfreetype.c (nonexistent) +++ head/x11-fonts/libXft/files/patch-xftfreetype.c (revision 79636) @@ -0,0 +1,36 @@ +--- xftfreetype.c 2003/04/17 04:29:24 1.31 ++++ xftfreetype.c 2003/04/24 16:14:58 1.32 +@@ -638,6 +638,7 @@ + int alloc_size; + int ascent, descent, height; + int i; ++ int num_glyphs; + + if (!info) + return 0; +@@ -769,8 +770,13 @@ + rehash_value = 0; + } + ++ /* ++ * Sometimes the glyphs are numbered 1..n, other times 0..n-1, ++ * accept either numbering scheme by making room in the table ++ */ ++ num_glyphs = face->num_glyphs + 1; + alloc_size = (sizeof (XftFontInt) + +- face->num_glyphs * sizeof (XftGlyph *) + ++ num_glyphs * sizeof (XftGlyph *) + + hash_value * sizeof (XftUcsHash)); + font = malloc (alloc_size); + +@@ -867,8 +873,8 @@ + * Per glyph information + */ + font->glyphs = (XftGlyph **) (font + 1); +- memset (font->glyphs, '\0', face->num_glyphs * sizeof (XftGlyph *)); +- font->num_glyphs = face->num_glyphs; ++ memset (font->glyphs, '\0', num_glyphs * sizeof (XftGlyph *)); ++ font->num_glyphs = num_glyphs; + /* + * Unicode hash table information + */ Property changes on: head/x11-fonts/libXft/files/patch-xftfreetype.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property