CVS commit: pkgsrc/fonts/ttmkfdir2

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Sat May  5 03:56:48 UTC 2018

Modified Files:
        pkgsrc/fonts/ttmkfdir2: Makefile distinfo
        pkgsrc/fonts/ttmkfdir2/patches: patch-aa

Log Message:
fonts/ttmkfdir2: Make this build with freetype2-2.9.1

Use pkg-config instead of freetype-config.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/fonts/ttmkfdir2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/fonts/ttmkfdir2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/ttmkfdir2/patches/patch-aa

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

Modified files:

Index: pkgsrc/fonts/ttmkfdir2/Makefile
diff -u pkgsrc/fonts/ttmkfdir2/Makefile:1.21 pkgsrc/fonts/ttmkfdir2/Makefile:1.22
--- pkgsrc/fonts/ttmkfdir2/Makefile:1.21        Tue Jun  4 22:16:03 2013
+++ pkgsrc/fonts/ttmkfdir2/Makefile     Sat May  5 03:56:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/06/04 22:16:03 tron Exp $
+# $NetBSD: Makefile,v 1.22 2018/05/05 03:56:48 minskim Exp $
 #
 
 DISTNAME=      ttmkfdir2.20021109
@@ -16,7 +16,7 @@ CONFLICTS=    ttmkfdir-[0-9]*
 
 WRKSRC=                ${WRKDIR}/${PKGBASE}
 USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake lex
+USE_TOOLS+=    gmake lex pkg-config
 USE_LANGUAGES= c c++
 
 MAKE_ENV+=     FREETYPE_CONFIG=${FREETYPE_CONFIG:Q}

Index: pkgsrc/fonts/ttmkfdir2/distinfo
diff -u pkgsrc/fonts/ttmkfdir2/distinfo:1.12 pkgsrc/fonts/ttmkfdir2/distinfo:1.13
--- pkgsrc/fonts/ttmkfdir2/distinfo:1.12        Tue Nov  3 20:45:24 2015
+++ pkgsrc/fonts/ttmkfdir2/distinfo     Sat May  5 03:56:48 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2015/11/03 20:45:24 agc Exp $
+$NetBSD: distinfo,v 1.13 2018/05/05 03:56:48 minskim Exp $
 
 SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0
 RMD160 (ttmkfdir2.20021109.tar.bz2) = 878fb57f80e7223ebb3f4214ed58621a9087e404
 SHA512 (ttmkfdir2.20021109.tar.bz2) = 3e666c0f7faa46fd308896b52d0fb185267fef7ac909fd1fc7feac11ebd916fdb021bd9b81f10173a4f3915254ebdf0f7863c0b55985eb721b703a0356cf8fd8
 Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes
-SHA1 (patch-aa) = ae2cb207635678d68d010e54de6ad6905fc3e38b
+SHA1 (patch-aa) = 9865371addd3a3b43bbcac630fd187ef50e2ef94
 SHA1 (patch-ab) = ceca1a96bc91c514abaf3be5450cb07f4573a641
 SHA1 (patch-ac) = c29cd845647d67102a89476d931e5ee6bae63078
 SHA1 (patch-ad) = 586a00c9b8ec5346b88f641fb80ebecc6d9b0beb

Index: pkgsrc/fonts/ttmkfdir2/patches/patch-aa
diff -u pkgsrc/fonts/ttmkfdir2/patches/patch-aa:1.3 pkgsrc/fonts/ttmkfdir2/patches/patch-aa:1.4
--- pkgsrc/fonts/ttmkfdir2/patches/patch-aa:1.3 Sat Sep 18 07:55:31 2004
+++ pkgsrc/fonts/ttmkfdir2/patches/patch-aa     Sat May  5 03:56:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/09/18 07:55:31 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2018/05/05 03:56:48 minskim Exp $
 
 --- Makefile.orig      Wed Nov  6 23:28:44 2002
 +++ Makefile
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 2004/09/18 07:55
 -DEBUG=-ggdb
 -CXX=g++
 -CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
-+FREETYPE_INCL=`$(FREETYPE_CONFIG) --cflags`
-+FREETYPE_LIB=`$(FREETYPE_CONFIG) --libs`
++FREETYPE_INCL=`pkg-config --cflags freetype2`
++FREETYPE_LIB=`pkg-config --libs freetype2`
  
 -LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
 +CXXFLAGS+=$(FREETYPE_INCL)