diff options
| author | David Coppa <dcoppa@cvs.openbsd.org> | 2014-03-14 20:41:42 +0000 |
|---|---|---|
| committer | David Coppa <dcoppa@cvs.openbsd.org> | 2014-03-14 20:41:42 +0000 |
| commit | c023620ef389e48543a15135bf11534b784cf9bf (patch) | |
| tree | 24a7387204aab4ec6bbf6e822a667bf979904ddf /lib | |
| parent | fec4780491ad6fc739c44222cf672c13e29ecc0d (diff) | |
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!
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/freetype/Makefile | 5 | ||||
| -rw-r--r-- | lib/freetype/builds/unix/freetype2.in | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/lib/freetype/Makefile b/lib/freetype/Makefile index b1ef21b30..6d6c0d6bc 100644 --- a/lib/freetype/Makefile +++ b/lib/freetype/Makefile @@ -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 diff --git a/lib/freetype/builds/unix/freetype2.in b/lib/freetype/builds/unix/freetype2.in index 6e7fb104f..a5829eaaf 100644 --- a/lib/freetype/builds/unix/freetype2.in +++ b/lib/freetype/builds/unix/freetype2.in @@ -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} |