mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Adjust in accordance with the new location of freetype1 includes

Browse Source 
(${PREFIX}/include/freetype1/freetype, not ${PREFIX}/include/freetype).
This commit is contained in:
Maxim Sobolev 2002-03-14 11:16:45 +00:00
parent 900ab41eb4
commit d8543839e6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=56069
27 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chinese/bg5ps/files/patch-aa
View File

@ -1,11 +1,14 @@
--- Makefile.orig Tue Feb 15 04:41:27 2000
+++ Makefile Tue Jan 30 22:01:34 2001
$FreeBSD$
--- Makefile.orig Mon Feb 14 22:41:27 2000
+++ Makefile Thu Mar 14 09:33:24 2002
@@ -19,21 +19,22 @@
CC = gcc
INSTALL = install
-CFLAGS =
+CFLAGS += -I${LOCALBASE}/include
+CFLAGS += -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include
LIBS = -lttf -lm
-INCLUDEDIR =
+LIBSDIR = -L${LOCALBASE}/lib

12
chinese/ttfm/files/patch-Makefile Normal file
View File

@ -0,0 +1,12 @@
$FreeBSD$
--- Makefile 2002/03/14 07:35:10 1.1
+++ Makefile 2002/03/14 07:35:23
@@ -1,5 +1,5 @@
FREETYPE_BASE=/usr/local
-FREETYPE_INCL=$(FREETYPE_BASE)/include
+FREETYPE_INCL=$(FREETYPE_BASE)/include/freetype1
FREETYPE_LIB=$(FREETYPE_BASE)/lib
prefix=/usr

2
chinese/vflib/Makefile
View File

@ -31,7 +31,7 @@ USE_XLIB= yes
USE_AUTOCONF= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-freetype \
--with-freetype-includedir=${PREFIX}/include/freetype \
--with-freetype-includedir=${PREFIX}/include/freetype1/freetype \
--with-freetype-libdir=${PREFIX}/lib
pre-patch:

1
devel/libuta/Makefile
View File

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

32
devel/libuta/files/patch-aa
View File

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

1
devel/wftk/Makefile
View File

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

32
devel/wftk/files/patch-aa
View File

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

3
games/adgali/Makefile
View File

@ -28,7 +28,8 @@ USE_GMAKE= yes
USE_LIBTOOL= yes
LIBTOOLFLAGS= --disable-ltlibs --release-ignore
CONFIGURE_ENV= SDL_CONFIG=${SDL_CONFIG} \
CPPFLAGS="-I${LOCALBASE}/include" \
CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-compile-type=optim
INSTALLS_SHLIB= yes

2
games/powerpak/files/Makefile.FreeBSD
View File

@ -1,6 +1,6 @@
CC?=gcc
LOCALBASE?=/usr/local
CFLAGS+=-Wall -I${LOCALBASE}/include
CFLAGS+=-Wall -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include
LIBS=-L${LOCALBASE}/lib -lm -lSDL -lttf
OBJECTS=powerpak.o img.o img_gif.o img_ppm.o img_tif.o img_pcx.o img_bmp.o img_png.o img_jpg.o img_xxx.o \
PowerDraw/powerdraw.o PowerDraw/gfx.o PowerDraw/primitives.o PowerDraw/sprites.o PowerDraw/truetype.o \

3
graphics/imlib2/Makefile
View File

@ -23,7 +23,8 @@ USE_X_PREFIX= yes
USE_FREETYPE= yes
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
.include <bsd.port.pre.mk>

3
graphics/p5-Imager/Makefile
View File

@ -24,7 +24,8 @@ LIB_DEPENDS= t1:${PORTSDIR}/devel/t1lib \
USE_FREETYPE= yes
PERL_CONFIGURE= yes
CONFIGURE_ENV= IM_LIBPATH="${LOCALBASE}/lib"
CONFIGURE_ENV= IM_LIBPATH="${LOCALBASE}/lib" \
IM_INCPATH="${LOCALBASE}/include/freetype1/freetype"
USE_GMAKE= yes
MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}

2
graphics/py-paint/Makefile
View File

@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
SHARE_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
PYDIST_SETUP= cd ${WRKSRC} && ${PYTHON_CMD} setup.py
INC_DIRS= ["${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype"]
INC_DIRS= ["${LOCALBASE}/include/freetype1","${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype"]
LIB_DIRS= ["${LOCALBASE}/lib","${X11BASE}/lib"]
REPATCH= cd ${WRKSRC} && ${SED}
REPATCHSUBST= -e 's@^\(.*libraries.*\)$$@\1include_dirs=${INC_DIRS},library_dirs=${LIB_DIRS},@g'

2
graphics/xpdf/Makefile
View File

@ -25,7 +25,7 @@ CONFIGURE_ARGS= --with-gzip --enable-opi \
--with-t1-library=${LOCALBASE}/lib \
--with-t1-includes=${LOCALBASE}/include \
--with-freetype-library=${LOCALBASE}/lib \
--with-freetype-includes=${LOCALBASE}/include/freetype
--with-freetype-includes=${LOCALBASE}/include/freetype1/freetype
.if defined(A4)
CONFIGURE_ARGS+= --enable-a4-paper
.endif

4
japanese/vflib/Makefile
View File

@ -27,8 +27,8 @@ USE_XLIB= yes
USE_AUTOCONF_VER=213
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --with-freetype \
--with-freetype-includedir=${PREFIX}/include/freetype \
--with-freetype-libdir=${PREFIX}/lib
--with-freetype-includedir=${LOCALBASE}/include/freetype1/freetype \
--with-freetype-libdir=${LOCALBASE}/lib
pre-install:
@(cd ${WRKSRC}/tools; \

2
korean/ftghostscript5/files/patch-aa
View File

@ -94,7 +94,7 @@
# We don't include -ansi, because this gets in the way of the platform-
# specific stuff that <math.h> typically needs; nevertheless, we expect
# gcc to accept ANSI-style function prototypes and function definitions.
! XCFLAGS=-I$(prefix)/include -I$(prefix)/include/freetype
! XCFLAGS=-I$(prefix)/include -I$(prefix)/include/freetype1/freetype
! CFLAGS+=-O $(GCFLAGS) $(XCFLAGS)

2
korean/ghostscript55httf/files/patch-aa
View File

@ -47,7 +47,7 @@
XCFLAGS=
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+CFLAGS+=-I$(prefix)/include/freetype1
# Define platform flags for ld.
# SunOS 4.n may need -Bstatic.

16
misc/magicpoint/files/patch-configure Normal file
View File

@ -0,0 +1,16 @@
$FreeBSD$
--- configure 2002/03/14 10:49:01 1.1
+++ configure 2002/03/14 10:50:56
@@ -1777,8 +1777,8 @@
ac_cv_ft_lib="$dir/lib"
ac_cv_ft_libpath="libttf.a"
fi
- if test -d $dir/include -a -f $dir/include/freetype.h; then
- ac_cv_ft_include="$dir/include"
+ if test -d $dir/include/freetype1/freetype -a -f $dir/include/freetype1/freetype/freetype.h; then
+ ac_cv_ft_include="$dir/include/freetype1/freetype"
elif test -d $dir/include/freetype -a -f $dir/include/freetype/freetype.h; then
ac_cv_ft_include="$dir/include/freetype"
fi

3
print/gfontview/Makefile
View File

@ -21,7 +21,8 @@ USE_X_PREFIX= yes
USE_GNOME= yes
USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include" \
SPOOLER="/usr/bin/lpr" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \

2
print/perlftlib/files/patch-ac
View File

@ -5,6 +5,6 @@
'LIBS' => ['-L/usr/local/lib -lttf'], # e.g., '-lm'
'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
- 'INC' => '-I/usr/local/include', # e.g., '-I/usr/include/other'
+ 'INC' => '-I/usr/local/include/freetype', # e.g., '-I/usr/include/other'
+ 'INC' => '-I/usr/local/include/freetype1/freetype', # e.g., '-I/usr/include/other'
);

2
print/py-freetype/files/patch-Setup.w32
View File

@ -7,4 +7,4 @@ $FreeBSD$
#[MGW32]swig_options.extend(['-shadow', '-docstring'])
-freetypec freetype_wrap.c -I../../lib -I../../lib/extend -L../../lib -lttf.dll
+*shared*
+freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype -L${LOCALBASE}/lib -lttf
+freetypec freetype_wrap.c -I${LOCALBASE}/include/freetype1/freetype -L${LOCALBASE}/lib -lttf

2
print/ttftot42/Makefile
View File

@ -14,6 +14,6 @@ MAINTAINER= nakai@FreeBSD.org
USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= "CFLAGS=-I${LOCALBASE}/include/freetype"
CONFIGURE_ENV= "CFLAGS=-I${LOCALBASE}/include/freetype1/freetype"
.include <bsd.port.mk>

2
x11-fonts/ttmkfdir/Makefile
View File

@ -18,7 +18,7 @@ USE_X_PREFIX= yes
USE_FREETYPE= yes
do-build:
cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype \
cd ${WRKSRC}; ${CC} ${CFLAGS} -I${LOCALBASE}/include/freetype1/freetype \
ttmkfdir.c -o ttmkfdir -L${LOCALBASE}/lib -lttf
do-install:

2
x11-fonts/xmbdfed/files/patch-aa
View File

@ -18,7 +18,7 @@
-#FTYPE_INCS = -I/usr/local/include
-#FTYPE_LIBS = -L/user/local/lib -lttf
-#FTYPE_DEFS = -DHAVE_FREETYPE
+FTYPE_INCS = -I${LOCALBASE}/include/freetype
+FTYPE_INCS = -I${LOCALBASE}/include/freetype1/freetype
+FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
+FTYPE_DEFS = -DHAVE_FREETYPE

2
x11-servers/XttXF86srv-common/files/Imakefile
View File

@ -35,7 +35,7 @@ initialize::
${ECHO_MSG} " Now checking your XFree86 environment."; \
rm -f ${CONFFILE}; \
${ECHO} "#define FreeTypeLibDir ${LOCALBASE}/lib" >> ${CONFFILE}; \
${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype" >> ${CONFFILE}; \
${ECHO} "#define FreeTypeIncDir ${LOCALBASE}/include/freetype1/freetype" >> ${CONFFILE}; \
${ECHO} "#undef XF86SVGAServer" >> ${CONFFILE}; \
${ECHO} "#undef XF86VGA16Server" >> ${CONFFILE}; \
${ECHO} "#undef XF86VGA16DualServer" >> ${CONFFILE}; \

3
x11-wm/e16/Makefile
View File

@ -36,7 +36,8 @@ USE_IMLIB= yes
USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -lxpg4"
.include <bsd.port.pre.mk>

3
x11-wm/enlightenment-devel/Makefile
View File

@ -36,7 +36,8 @@ USE_IMLIB= yes
USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -lxpg4"
.include <bsd.port.pre.mk>

3
x11-wm/enlightenment/Makefile
View File

@ -36,7 +36,8 @@ USE_IMLIB= yes
USE_FREETYPE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-fsstd --with-included-gettext
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype1 \
-I${LOCALBASE}/include -I${X11BASE}/include" \
LIBS="-L${LOCALBASE}/lib -lxpg4"
.include <bsd.port.pre.mk>