pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/ghostscript Do not use bundled freetype, use pkg...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/44ecf04ab66a
branches:  trunk
changeset: 610026:44ecf04ab66a
user:      rumko <rumko%pkgsrc.org@localhost>
date:      Tue Oct 16 10:10:17 2012 +0000

description:
Do not use bundled freetype, use pkgsrc's.

The bundled freetype conflicts with pkgsrc's and results in build errors.
Closes PR pkg/47063.

Ok@ wiz

diffstat:

 print/ghostscript/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r 9e6db5aad823 -r 44ecf04ab66a print/ghostscript/Makefile
--- a/print/ghostscript/Makefile        Tue Oct 16 10:01:47 2012 +0000
+++ b/print/ghostscript/Makefile        Tue Oct 16 10:10:17 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2012/10/08 11:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2012/10/16 10:10:17 rumko Exp $
 
 DISTNAME=      ghostscript-${GS_VERSION}
 CATEGORIES=    print
@@ -89,6 +89,7 @@
        ${RM} -rf ${WRKSRC}/libpng
 #      ${RM} -rf ${WRKSRC}/tiff
 #      ${RM} -rf ${WRKSRC}/zlib
+       ${RM} -rf ${WRKSRC}/freetype
 #
 #  To allow outside customization, rename cidfmap
 #       (if you look at inside of the file, it is logically empty)
@@ -103,6 +104,7 @@
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 # pkgsrc jasper is too new
 #.include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index