diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-30 06:05:45 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-30 06:05:45 +0000 |
commit | b4bb4bf90c6a5cfbafa8bdbaae39cc74241a9123 (patch) | |
tree | 58371532a687dad87b3fb894d3ec2ddb756c54c8 | |
parent | - Add documentation (diff) |
* Update to 2.1.5
* Assign maintainership to gnome@
* Disable the bytecode interpreter
I must say, fonts look amazing...
Notes
Notes:
svn path=/head/; revision=89872
-rw-r--r-- | print/freetype2/Makefile | 12 | ||||
-rw-r--r-- | print/freetype2/distinfo | 2 | ||||
-rw-r--r-- | print/freetype2/files/patch-builds::unix::freetype-config.in | 13 | ||||
-rw-r--r-- | print/freetype2/files/patch-include::freetype::config::ftoption.h | 14 | ||||
-rw-r--r-- | print/freetype2/files/patch-src_base_ftbdf.c | 20 | ||||
-rw-r--r-- | print/freetype2/pkg-plist | 4 |
6 files changed, 17 insertions, 48 deletions
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 28185e98fd40..7820f87076be 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= freetype2 -PORTVERSION= 2.1.4 -PORTREVISION= 1 +PORTVERSION= 2.1.5 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \ @@ -18,7 +17,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \ MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gnome@FreeBSD.org COMMENT= A free and portable TrueType font rendering engine USE_BZIP2= yes @@ -26,11 +25,16 @@ USE_GMAKE= yes MAKE_ENV= TOP="" INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOME= gnometarget +USE_REINPLACE= yes LIBTOOLFILES= builds/unix/configure CONFIGURE_ARGS= --disable-nls -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-unknown-freebsd${OSREL} CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix +pre-patch: + @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ + ${WRKSRC}/builds/unix/install.mk + post-configure: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup) diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index 5410ccb3ad0a..2766b993d625 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -1 +1 @@ -MD5 (freetype-2.1.4.tar.bz2) = 1fc0b188f1fe1216776e5855d2da141f +MD5 (freetype-2.1.5.tar.bz2) = 54537b518b84d04190a1eccd393a29df diff --git a/print/freetype2/files/patch-builds::unix::freetype-config.in b/print/freetype2/files/patch-builds::unix::freetype-config.in index 657eaba1519a..a1f100ca1c76 100644 --- a/print/freetype2/files/patch-builds::unix::freetype-config.in +++ b/print/freetype2/files/patch-builds::unix::freetype-config.in @@ -1,20 +1,17 @@ - -$FreeBSD$ - ---- builds/unix/freetype-config.in.orig Sat Feb 2 17:05:38 2002 -+++ builds/unix/freetype-config.in Mon Feb 11 21:05:10 2002 +--- 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 -I@includedir@ $cflags +- echo $cflags -I@includedir@ - else - echo $cflags - fi -+ cflags="-I@includedir@/freetype2 -I@includedir@" -+ echo $cflags ++ cflags="-I@includedir@/freetype2 -I@includedir@" ++ echo $cflags fi if test "$echo_libs" = "yes" ; then diff --git a/print/freetype2/files/patch-include::freetype::config::ftoption.h b/print/freetype2/files/patch-include::freetype::config::ftoption.h deleted file mode 100644 index e443eb8c57af..000000000000 --- a/print/freetype2/files/patch-include::freetype::config::ftoption.h +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- include/freetype/config/ftoption.h.orig Thu Nov 7 00:32:53 2002 -+++ include/freetype/config/ftoption.h Fri Jan 17 20:44:08 2003 -@@ -378,7 +378,7 @@ - /* do not #undef this macro here, since the build system might */ - /* define for certain configurations */ - /* */ --/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */ -+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - - - /*************************************************************************/ diff --git a/print/freetype2/files/patch-src_base_ftbdf.c b/print/freetype2/files/patch-src_base_ftbdf.c deleted file mode 100644 index cd88b5cdd9e7..000000000000 --- a/print/freetype2/files/patch-src_base_ftbdf.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/base/ftbdf.c.orig Thu Apr 17 15:06:41 2003 -+++ src/base/ftbdf.c Thu Apr 17 15:07:16 2003 -@@ -85,10 +85,13 @@ - FT_Driver driver = face->driver; - BDF_GetPropertyFunc func; - -- func = (BDF_GetPropertyFunc) driver->root.clazz->get_interface( -- FT_MODULE( driver ), "get_bdf_property" ); -- if ( func ) -- error = func( face, prop_name, aproperty ); -+ if (driver->root.clazz->get_interface) -+ { -+ func = (BDF_GetPropertyFunc) driver->root.clazz->get_interface( -+ FT_MODULE( driver ), "get_bdf_property" ); -+ if ( func ) -+ error = func( face, prop_name, aproperty ); -+ } - } - return error; - } diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index bf2f4c39913e..83777bcc9e32 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -32,7 +32,7 @@ include/freetype2/freetype/ftpfr.h include/freetype2/freetype/ftrender.h include/freetype2/freetype/ftsizes.h include/freetype2/freetype/ftsnames.h -include/freetype2/freetype/ftstroker.h +include/freetype2/freetype/ftstroke.h include/freetype2/freetype/ftsynth.h include/freetype2/freetype/ftsysio.h include/freetype2/freetype/ftsysmem.h @@ -71,10 +71,12 @@ include/freetype2/freetype/t1tables.h include/freetype2/freetype/ttnameid.h include/freetype2/freetype/tttables.h include/freetype2/freetype/tttags.h +include/freetype2/freetype/ttunpat.h include/ft2build.h lib/libfreetype.a lib/libfreetype.so lib/libfreetype.so.9 +libdata/pkgconfig/freetype2.pc share/aclocal/freetype2.m4 @dirrm include/freetype2/freetype/internal @dirrm include/freetype2/freetype/config |