CVS commit: pkgsrc/fonts/harfbuzz

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Nov 23 09:50:55 UTC 2018

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile distinfo options.mk
Added Files:
        pkgsrc/fonts/harfbuzz/patches: patch-src_hb.hh

Log Message:
Do not play _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/fonts/harfbuzz/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/fonts/harfbuzz/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/harfbuzz/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/fonts/harfbuzz/patches/patch-src_hb.hh

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

Modified files:

Index: pkgsrc/fonts/harfbuzz/Makefile
diff -u pkgsrc/fonts/harfbuzz/Makefile:1.101 pkgsrc/fonts/harfbuzz/Makefile:1.102
--- pkgsrc/fonts/harfbuzz/Makefile:1.101        Mon Nov 12 03:49:09 2018
+++ pkgsrc/fonts/harfbuzz/Makefile      Fri Nov 23 09:50:55 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2018/11/12 03:49:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.102 2018/11/23 09:50:55 abs Exp $
 
 DISTNAME=      harfbuzz-2.1.1
+PKGREVISION=   1
 CATEGORIES=    fonts
 MASTER_SITES=  http://www.freedesktop.org/software/harfbuzz/release/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/fonts/harfbuzz/distinfo
diff -u pkgsrc/fonts/harfbuzz/distinfo:1.79 pkgsrc/fonts/harfbuzz/distinfo:1.80
--- pkgsrc/fonts/harfbuzz/distinfo:1.79 Mon Nov 12 03:49:09 2018
+++ pkgsrc/fonts/harfbuzz/distinfo      Fri Nov 23 09:50:55 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.79 2018/11/12 03:49:09 ryoon Exp $
+$NetBSD: distinfo,v 1.80 2018/11/23 09:50:55 abs Exp $
 
 SHA1 (harfbuzz-2.1.1.tar.bz2) = 14178b5d53083ea38b420ab860d49189d438393f
 RMD160 (harfbuzz-2.1.1.tar.bz2) = 13937f4ff98d55169cb5a818cd045ed1b8b2789a
 SHA512 (harfbuzz-2.1.1.tar.bz2) = c3fc46eaeb8c02594e2430f853b6eebb762072638e3113e27ff9b5caefce2c06534e8056d57f35d87df6dbb1027cbc0c1a08f914dec7c6a715c3f0abc0a18933
 Size (harfbuzz-2.1.1.tar.bz2) = 4386396 bytes
+SHA1 (patch-src_hb.hh) = 368b8f553b8d9a77b8122e861249c5e4eb4d9223

Index: pkgsrc/fonts/harfbuzz/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.3 pkgsrc/fonts/harfbuzz/options.mk:1.4
--- pkgsrc/fonts/harfbuzz/options.mk:1.3        Fri Oct  4 14:34:53 2013
+++ pkgsrc/fonts/harfbuzz/options.mk    Fri Nov 23 09:50:55 2018
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2013/10/04 14:34:53 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2018/11/23 09:50:55 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
-PKG_SUPPORTED_OPTIONS+= icu
+PKG_SUPPORTED_OPTIONS+=        icu
 PKG_SUGGESTED_OPTIONS= icu
 
 .include "../../mk/bsd.options.mk"

Added files:

Index: pkgsrc/fonts/harfbuzz/patches/patch-src_hb.hh
diff -u /dev/null pkgsrc/fonts/harfbuzz/patches/patch-src_hb.hh:1.1
--- /dev/null   Fri Nov 23 09:50:55 2018
+++ pkgsrc/fonts/harfbuzz/patches/patch-src_hb.hh       Fri Nov 23 09:50:55 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hb.hh,v 1.1 2018/11/23 09:50:55 abs Exp $
+
+Do not play _POSIX_C_SOURCE games on NetBSD - causes issues with some pkgsrc gcc versions
+
+--- src/hb.hh.orig     2018-11-04 01:41:46.000000000 +0000
++++ src/hb.hh
+@@ -35,7 +35,7 @@
+ #include "config.h"
+ #endif
+ 
+-#ifndef _POSIX_C_SOURCE
++#if !defined(_POSIX_C_SOURCE) && !defined(__NetBSD__)
+ #define _POSIX_C_SOURCE 200809L
+ #endif
+