summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspz <spz@pkgsrc.org>2020-10-21 17:08:59 +0000
committerspz <spz@pkgsrc.org>2020-10-21 17:08:59 +0000
commit35c35f461f8b21462db6f65182b30ad19a020154 (patch)
treead994cf6c6cfa5079e6ae58b3d6bb79ba077ae20
parentc4941e009fbbf8664553bfc7d785b7a2d9127d83 (diff)
downloadpkgsrc-35c35f461f8b21462db6f65182b30ad19a020154.tar.gz
Pullup ticket #6347 - requested by maya
pkgtools/x11-links: dependency-driven update Revisions pulled up: - pkgtools/x11-links/Makefile 1.203 - pkgtools/x11-links/buildlink3.mk 1.94 - pkgtools/x11-links/files/xorg.freetype2 1.28 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: maya Date: Wed Oct 21 15:18:30 UTC 2020 Modified Files: pkgsrc/pkgtools/x11-links: Makefile buildlink3.mk pkgsrc/pkgtools/x11-links/files: xorg.freetype2 Log Message: x11-links 1.32: updates for freetype 2.10.4 To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 pkgsrc/pkgtools/x11-links/Makefile cvs rdiff -u -r1.93 -r1.94 pkgsrc/pkgtools/x11-links/buildlink3.mk cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/x11-links/files/xorg.freetype2
-rw-r--r--pkgtools/x11-links/Makefile4
-rw-r--r--pkgtools/x11-links/buildlink3.mk4
-rw-r--r--pkgtools/x11-links/files/xorg.freetype25
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 21805a52e9b..f3026ab8b7b 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.202 2019/11/25 09:50:55 wiz Exp $
+# $NetBSD: Makefile,v 1.202.8.1 2020/10/21 17:08:59 spz Exp $
#
# NOTE: If you update this package, then you'll likely need to also update
# the x11-links dependency in buildlink3.mk to the correct version,
# usually the most recent.
-PKGNAME= x11-links-1.31
+PKGNAME= x11-links-1.32
CATEGORIES= pkgtools x11
MAINTAINER= pkgsrc-users@NetBSD.org
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index edb0512d33b..39718f9764a 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.93 2019/11/25 09:50:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.93.8.1 2020/10/21 17:08:59 spz Exp $
#
# Don't include this file manually! It will be included as necessary
# by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+= x11-links
.if !defined(X11_LINKS_BUILDLINK3_MK)
X11_LINKS_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.31
+BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.32
BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
BUILDLINK_DEPMETHOD.x11-links?= build
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index 52ef7c9c1be..b63399a6f5c 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.27 2019/07/21 21:30:14 rjs Exp $
+# $NetBSD: xorg.freetype2,v 1.27.10.1 2020/10/21 17:08:59 spz Exp $
#
bin/freetype-config
include/freetype2/config/ftconfig.h
@@ -14,6 +14,9 @@ include/freetype2/freetype/config/ftheader.h
include/freetype2/freetype/config/ftmodule.h
include/freetype2/freetype/config/ftoption.h
include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/config/integer-types.h
+include/freetype2/freetype/config/mac-support.h
+include/freetype2/freetype/config/public-macros.h
include/freetype2/freetype/freetype.h
include/freetype2/freetype/ftadvanc.h
include/freetype2/freetype/ftautoh.h