Revert to the freetype2.pc we had before.

There were local changes and I accidentally removed them.

ok matthieu@

Sorry for breaking the xenocara tree!
This commit is contained in:
dcoppa 2014-03-14 20:41:41 +00:00
parent 6842467b3b
commit c9a482a02a
2 changed files with 9 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2014/03/14 08:17:59 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2014/03/14 20:41:41 dcoppa Exp $
FREETYPESRC= ${.CURDIR}/src
@ -60,7 +60,8 @@ freetype2.pc: freetype2.in Makefile
sed -e s,%prefix%,${X11BASE}, -e s,%exec_prefix%,${X11BASE}, \
-e s,%ft_version%,${FT_VERSION_INFO}, \
-e s,%includedir%,${INCSDIR}, -e s,%libdir%,${LIBDIR}, \
-e s,%REQUIRES_PRIVATE%,zlib, -e s,%LIBS_PRIVATE%,, \
-e s,%LIBZ%,-lz, -e s,%FT2_EXTRA_LIBS%,, \
-e s,%LIBBZ2%,, \
< ${.CURDIR}/builds/unix/freetype2.in > freetype2.pc
freetype-config: freetype-config.in

View File

@ -1,14 +1,12 @@
prefix="%prefix%"
exec_prefix="%exec_prefix%"
libdir="%libdir%"
includedir="%includedir%/freetype2"
prefix=%prefix%
exec_prefix=%exec_prefix%
libdir=%libdir%
includedir=%includedir%/freetype2
Name: FreeType 2
URL: http://freetype.org
Description: A free, high-quality, and portable font engine.
Version: %ft_version%
Requires:
Requires.private: %REQUIRES_PRIVATE%
Libs: -L${libdir} -lfreetype
Libs.private: %LIBS_PRIVATE%
Libs: -L${libdir} -lfreetype %LIBZ%
Libs.private: %LIBBZ2% %FT2_EXTRA_LIBS%
Cflags: -I${includedir}