diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-22 18:39:12 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-03-22 18:39:12 +0000 |
| commit | e6f7b03ab115edcb60023e08f50063bf0a402a0d (patch) | |
| tree | 0f8ddb370ec3b8086cf2eef13a989bb4b08fcaf6 /databases/grass | |
| parent | Fix build with freetype2-2.1.7. (diff) | |
Fix build with freetype2-2.1.7.
Reported by: bento via kris
Notes
Notes:
svn path=/head/; revision=104965
Diffstat (limited to 'databases/grass')
3 files changed, 35 insertions, 2 deletions
diff --git a/databases/grass/files/patch-configure.in b/databases/grass/files/patch-configure.in index aa1e4b63cc1e..b67abb9dbe8e 100644 --- a/databases/grass/files/patch-configure.in +++ b/databases/grass/files/patch-configure.in @@ -1,5 +1,5 @@ ---- configure.in.orig Sun Mar 16 21:25:19 2003 -+++ configure.in Thu Oct 9 23:00:51 2003 +--- configure.in.orig Sun Mar 16 07:25:19 2003 ++++ configure.in Mon Mar 22 13:35:29 2004 @@ -295,7 +295,7 @@ AC_MSG_ERROR([*** You must supply a directory list to --with-libs.]) ;; @@ -27,3 +27,12 @@ LOC_CHECK_LIBS(GLU,gluBeginCurve,GLU,$OPENGL_LIB_PATH,OPENGLULIB,$OPENGLLIB $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB,,,-lstdc++) +@@ -1054,7 +1054,7 @@ + + LOC_CHECK_INC_PATH(freetype,FreeType,FTINC) + +-LOC_CHECK_INCLUDES(freetype/freetype.h,FreeType,$FTINC) ++LOC_CHECK_INCLUDES(ft2build.h,FreeType,$FTINC) + + # With FreeType library directory + diff --git a/databases/grass/files/patch-src_display_d.text.freetype_main.c b/databases/grass/files/patch-src_display_d.text.freetype_main.c new file mode 100644 index 000000000000..1cf4e90da262 --- /dev/null +++ b/databases/grass/files/patch-src_display_d.text.freetype_main.c @@ -0,0 +1,12 @@ +--- src/display/d.text.freetype/main.c.orig Mon Mar 22 13:36:09 2004 ++++ src/display/d.text.freetype/main.c Mon Mar 22 13:36:46 2004 +@@ -28,7 +28,8 @@ + #ifdef HAVE_ICONV_H + #include <iconv.h> + #endif +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #include "gis.h" + #include "display.h" + #include "raster.h" diff --git a/databases/grass/files/patch-src_display_d.text.freetype_vflib_main.c b/databases/grass/files/patch-src_display_d.text.freetype_vflib_main.c new file mode 100644 index 000000000000..1a98b6b6aab6 --- /dev/null +++ b/databases/grass/files/patch-src_display_d.text.freetype_vflib_main.c @@ -0,0 +1,12 @@ +--- src/display/d.text.freetype/vflib/main.c.orig Mon Mar 22 13:37:39 2004 ++++ src/display/d.text.freetype/vflib/main.c Mon Mar 22 13:37:50 2004 +@@ -31,7 +31,8 @@ + #endif + + #ifndef VFlib +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #else + #include <VFlib-3_6.h> + #endif |