CVS commit: pkgsrc/graphics/freetype2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 14 09:13:16 UTC 2018

Modified Files:
        pkgsrc/graphics/freetype2: Makefile PLIST

Log Message:
freetype2: Re-enable the freetype-config script.

This is still used by dependencies that haven't yet switched over to
using pkg-config, such as graphics/php-gd.  Until all dependent packages
have switched we can't remove this.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/graphics/freetype2/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/freetype2/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/freetype2/Makefile
diff -u pkgsrc/graphics/freetype2/Makefile:1.115 pkgsrc/graphics/freetype2/Makefile:1.116
--- pkgsrc/graphics/freetype2/Makefile:1.115    Fri May  4 08:40:11 2018
+++ pkgsrc/graphics/freetype2/Makefile  Mon May 14 09:13:16 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.115 2018/05/04 08:40:11 adam Exp $
+# $NetBSD: Makefile,v 1.116 2018/05/14 09:13:16 jperkin Exp $
 
 DISTNAME=      freetype-2.9.1
 PKGNAME=       ${DISTNAME:S/-/2-/}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freetype/}
 MASTER_SITES+= http://download.savannah.gnu.org/releases/freetype/
@@ -22,6 +23,9 @@ CONFIGURE_ARGS+=      --enable-shared
 CONFIGURE_ARGS+=       --with-harfbuzz=no
 CONFIGURE_ENV+=                ac_cv_path_GREP=${GREP:Q} ac_cv_path_EGREP=${EGREP:Q}
 
+# Remove this when all dependent packages have switched to pkg-config
+CONFIGURE_ARGS+=       --enable-freetype-config
+
 .if exists(/System/Library/Frameworks/Carbon.framework)
 LDFLAGS+=      -framework Carbon
 .endif

Index: pkgsrc/graphics/freetype2/PLIST
diff -u pkgsrc/graphics/freetype2/PLIST:1.26 pkgsrc/graphics/freetype2/PLIST:1.27
--- pkgsrc/graphics/freetype2/PLIST:1.26        Fri May  4 08:40:11 2018
+++ pkgsrc/graphics/freetype2/PLIST     Mon May 14 09:13:16 2018
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.26 2018/05/04 08:40:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2018/05/14 09:13:16 jperkin Exp $
+bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
 include/freetype2/freetype/config/ftheader.h
 include/freetype2/freetype/config/ftmodule.h
@@ -50,4 +51,5 @@ include/freetype2/freetype/tttags.h
 include/freetype2/ft2build.h
 lib/libfreetype.la
 lib/pkgconfig/freetype2.pc
+man/man1/freetype-config.1
 share/aclocal/freetype2.m4