diff options
| author | tron <tron> | 2008-04-24 11:18:13 +0000 |
|---|---|---|
| committer | tron <tron> | 2008-04-24 11:18:13 +0000 |
| commit | 00143503c32da93c04f96a549049bd77f8f75bc4 (patch) | |
| tree | 7ef57756ed592cc25d856a4a68a7cb7f588ce11c | |
| parent | dbe22d6029b256cdb38dad7dfb0e1906b08d3587 (diff) | |
| download | pkgsrc-00143503c32da93c04f96a549049bd77f8f75bc4.tar.gz | |
Backout last change. It breaks the build on system which use a builtin
"freetype2" and provide a "freetype2.pc" (e.g. Mac OS X Leopard or
any uptodate Linux distribution).
| -rw-r--r-- | graphics/freetype2/builtin.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/graphics/freetype2/builtin.mk b/graphics/freetype2/builtin.mk index 19aaa667241..ff321dc54b9 100644 --- a/graphics/freetype2/builtin.mk +++ b/graphics/freetype2/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.10 2008/04/24 01:11:15 jnemeth Exp $ +# $NetBSD: builtin.mk,v 1.11 2008/04/24 11:18:13 tron Exp $ BUILTIN_PKG:= freetype2 @@ -81,35 +81,6 @@ BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.3 BUILDLINK_PREFIX.freetype2= ${X11BASE} . include "../../mk/x11.buildlink3.mk" . include "../../mk/x11.builtin.mk" - -. if !empty(USE_TOOLS:C/:.*//:Mpkg-config) -do-configure-pre-hook: override-freetype2-pkgconfig - -BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig -FREETYPE2_PKGCFGF= freetype2.pc - -override-freetype2-pkgconfig: override-message-freetype2-pkgconfig -override-message-freetype2-pkgconfig: - @${STEP_MSG} "Installing freetype2.pc." - -override-freetype2-pkgconfig: - ${_PKG_SILENT}${_PKG_DEBUG}set -e; \ - ${MKDIR} ${BLKDIR_PKGCFG}; \ - { \ - ${ECHO} "prefix=${X11BASE}"; \ - ${ECHO} "exec_prefix=\$${prefix}"; \ - ${ECHO} "libdir=\$${exec_prefix}/lib"; \ - ${ECHO} "includedir=\$${prefix}/include"; \ - ${ECHO} ""; \ - ${ECHO} "Name: Freetype 2"; \ - ${ECHO} "Description: A free, high-quality, and portable font engine."; \ - ${ECHO} "Version: ${BUILTIN_VERSION.freetype2}"; \ - ${ECHO} "Libs: -Wl,-R\$${libdir} -L\$${libdir} -lfreetype -lz"; \ - ${ECHO} "Cflags: -I\$${includedir}/freetype2 -I\$${includedir}"; \ - } >> ${BLKDIR_PKGCFG}/${FREETYPE2_PKGCFGF}; - -. endif # pkg-config - . endif .endif # CHECK_BUILTIN.freetype2 |