diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-14 11:16:45 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-14 11:16:45 +0000 |
| commit | d8543839e68b75223c5d597d6d47b9c2a28d56c1 (patch) | |
| tree | 520ef2a8e4549307b131d4654e216085fce34be7 /devel/wftk | |
| parent | Install includes into ${PREFIX}/include/freetype1/freetype instead of (diff) | |
Adjust in accordance with the new location of freetype1 includes
(${PREFIX}/include/freetype1/freetype, not ${PREFIX}/include/freetype).
Notes
Notes:
svn path=/head/; revision=56069
Diffstat (limited to 'devel/wftk')
| -rw-r--r-- | devel/wftk/Makefile | 1 | ||||
| -rw-r--r-- | devel/wftk/files/patch-aa | 32 |
2 files changed, 13 insertions, 20 deletions
diff --git a/devel/wftk/Makefile b/devel/wftk/Makefile index 36bff2579b0b..778279dac0bc 100644 --- a/devel/wftk/Makefile +++ b/devel/wftk/Makefile @@ -21,5 +21,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_FREETYPE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --prefix=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1" .include <bsd.port.mk> diff --git a/devel/wftk/files/patch-aa b/devel/wftk/files/patch-aa index 3633fcb70bb6..cf5ad2bb912d 100644 --- a/devel/wftk/files/patch-aa +++ b/devel/wftk/files/patch-aa @@ -1,5 +1,8 @@ ---- configure.orig Thu Apr 12 11:21:35 2001 -+++ configure Thu May 17 14:44:42 2001 + +$FreeBSD$ + +--- configure.orig Thu Apr 12 12:21:35 2001 ++++ configure Thu Mar 14 13:09:31 2002 @@ -7,6 +7,9 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -10,26 +13,15 @@ # Defaults: ac_help= ac_default_prefix=/usr/local -@@ -1829,8 +1832,8 @@ - LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ - LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ - DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ --$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \ -+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $lt_target \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } +@@ -3573,7 +3576,7 @@ - # Reload cache, that may have been modified by ltconfig -@@ -1844,7 +1847,7 @@ + CFLAGS= + CXXFLAGS= +-CPPFLAGS=-Wall ++CPPFLAGS="$CPPFLAGS -Wall" - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' + case $win32 in + true) @@ -4603,7 +4606,7 @@ no_sdl=yes else |