Update to cpphs-1.20.8

Version 1.20
------------
  * bugfixes for #if defined(FOO) && FOO(a,b)
  * (1.20.1): fix version number
  * (1.20.2): ensure all input/output is UTF8, regardless of locale
  * (1.20.3): detect an absolute windows path with a drive letter in a #include
  * (1.20.4): more windows path handling
  * (1.20.5): revert change in 1.20.4
  * (1.20.6): minor bugfix for crash in obscure corner case
  * (1.20.7): bugfix for windows drive letter in #include
  * (1.20.8): another bugfix for windows drive letter in #include

Version 1.19
------------
  * (1.19.3): bugfix for hlint ticket #161 - interaction of --unlit/--linepragma

4 files changed, 14 insertions, 44 deletions

diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 54670283b01..edede792f1d 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2019/11/03 10:39:14 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/01/02 03:27:12 pho Exp $
 
-DISTNAME=		cpphs-1.19.2
-PKGREVISION=		1
+DISTNAME=		cpphs-1.20.8
 CATEGORIES=		devel
 
 MAINTAINER=		esg@sdf.lonestar.org
@@ -14,5 +13,7 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/haskell.mk"
+.include "../../devel/hs-old-locale/buildlink3.mk"
+.include "../../time/hs-old-time/buildlink3.mk"
 .include "../../textproc/hs-polyparse/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/hs-cpphs/PLIST b/devel/hs-cpphs/PLIST
deleted file mode 100644
index 67d48400250..00000000000
--- a/devel/hs-cpphs/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/07/25 10:52:17 szptvlfn Exp $
-bin/cpphs
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/HScpphs-${PKGVERSION}.o
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/CppIfdef.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/HashDefine.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/MacroPass.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/Options.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/Position.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/ReadFirst.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/RunCpphs.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/SymTab.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Cpphs/Tokenise.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/Language/Preprocessor/Unlit.hi
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/libHScpphs-${PKGVERSION}.a
-lib/cpphs-${PKGVERSION}/${HASKELL_VERSION}/package-description
-man/man1/cpphs.1
-share/doc/cpphs-${PKGVERSION}/LICENCE-LGPL
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/Language-Preprocessor-Cpphs.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/Language-Preprocessor-Unlit.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/cpphs.haddock
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/mini_Language-Preprocessor-Cpphs.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/mini_Language-Preprocessor-Unlit.html
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/cpphs-${PKGVERSION}/html/synopsis.png
diff --git a/devel/hs-cpphs/buildlink3.mk b/devel/hs-cpphs/buildlink3.mk
index 7ed3998eb62..48847f48d91 100644
--- a/devel/hs-cpphs/buildlink3.mk
+++ b/devel/hs-cpphs/buildlink3.mk
@@ -1,14 +1,16 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:03 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2020/01/02 03:27:12 pho Exp $
 
 BUILDLINK_TREE+=	hs-cpphs
 
 .if !defined(HS_CPPHS_BUILDLINK3_MK)
 HS_CPPHS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-cpphs+=	hs-cpphs>=1.19.2
-BUILDLINK_ABI_DEPENDS.hs-cpphs+=	hs-cpphs>=1.19.2nb1
+BUILDLINK_API_DEPENDS.hs-cpphs+=	hs-cpphs>=1.20.8
+BUILDLINK_ABI_DEPENDS.hs-cpphs+=	hs-cpphs>=1.20.8
 BUILDLINK_PKGSRCDIR.hs-cpphs?=		../../devel/hs-cpphs
 
+.include "../../devel/hs-old-locale/buildlink3.mk"
+.include "../../time/hs-old-time/buildlink3.mk"
 .include "../../textproc/hs-polyparse/buildlink3.mk"
 .endif	# HS_CPPHS_BUILDLINK3_MK
 
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 1c03b290e37..7c74ee65350 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:32 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/01/02 03:27:12 pho Exp $
 
-SHA1 (cpphs-1.19.2.tar.gz) = 7387dda05f8758c0fc5e95bb6df9ff761ca9c32a
-RMD160 (cpphs-1.19.2.tar.gz) = 721653303c9ff3a37657417593e08cd9608cf1b0
-SHA512 (cpphs-1.19.2.tar.gz) = 5c4df42b61f44eaf95dfb00eac1a3a34b8cee2c65f5c8bcbc4a4c4f857e5f52a69aa48a90e79239fbb06194862308735c06e2f1dfd25071ca82c79ca4bb4e076
-Size (cpphs-1.19.2.tar.gz) = 44003 bytes
+SHA1 (cpphs-1.20.8.tar.gz) = 5227d9fcc762812c9b494834a13ca6b76896a43c
+RMD160 (cpphs-1.20.8.tar.gz) = 6f966d9ff14f8f485e7897a7cef3ae16766d2a5e
+SHA512 (cpphs-1.20.8.tar.gz) = ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
+Size (cpphs-1.20.8.tar.gz) = 45108 bytes