Sun Apr 25 15:28:44 2021 UTC ()
Update to cpphs-1.20.9.1

No change logs are provided by the upstream.


(pho)
diff -r1.13 -r1.14 pkgsrc/devel/hs-cpphs/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/hs-cpphs/PLIST
diff -r1.12 -r1.13 pkgsrc/devel/hs-cpphs/buildlink3.mk
diff -r1.6 -r1.7 pkgsrc/devel/hs-cpphs/distinfo
diff -r0 -r1.1 pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal
cvs diff -r1.13 -r1.14 pkgsrc/devel/hs-cpphs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hs-cpphs/Makefile 2020/08/19 07:50:52 1.13
+++ pkgsrc/devel/hs-cpphs/Makefile 2021/04/25 15:28:44 1.14
@@ -1,25 +1,18 @@ @@ -1,25 +1,18 @@
1# $NetBSD: Makefile,v 1.13 2020/08/19 07:50:52 pho Exp $ 1# $NetBSD: Makefile,v 1.14 2021/04/25 15:28:44 pho Exp $
2 2
3DISTNAME= cpphs-1.20.8 3DISTNAME= cpphs-1.20.9.1
 4#PKGNAME= ${DISTNAME} # XXX: This should probably be renamed to devel/cpphs.
4CATEGORIES= devel 5CATEGORIES= devel
5 6
6MAINTAINER= esg@sdf.lonestar.org 7MAINTAINER= esg@sdf.lonestar.org
7COMMENT= Liberalised re-implementation of cpp, the C pre-processor 8COMMENT= Liberalised re-implementation of cpp, the C pre-processor
8LICENSE= gnu-lgpl-v2.1 9LICENSE= gnu-lgpl-v2.1
9 10
10INSTALLATION_DIRS+= ${PKGMANDIR}/man1 11INSTALLATION_DIRS+= ${PKGMANDIR}/man1
11 12
12post-install: 13post-install:
13 ${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 14 ${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
14 15
15# I don't know why but an rpath to ${WRKSRC}/dist/build/cpphs started 
16# appearing in the resulting binary, even though there are no actual 
17# libraries to find in that directory at runtime. Cabal seems to be 
18# doing something strange. Will need to investigate it later. (pho@) 
19CHECK_SHLIBS_SKIP+= bin/cpphs 
20 
21.include "../../mk/haskell.mk" 
22.include "../../devel/hs-old-locale/buildlink3.mk" 
23.include "../../time/hs-old-time/buildlink3.mk" 
24.include "../../textproc/hs-polyparse/buildlink3.mk" 16.include "../../textproc/hs-polyparse/buildlink3.mk"
 17.include "../../mk/haskell.mk"
25.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/hs-cpphs/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/hs-cpphs/PLIST 2020/05/13 04:53:15 1.3
+++ pkgsrc/devel/hs-cpphs/PLIST 2021/04/25 15:28:44 1.4
@@ -1,52 +1,55 @@ @@ -1,52 +1,55 @@
1@comment $NetBSD: PLIST,v 1.3 2020/05/13 04:53:15 rillig Exp $ 1@comment $NetBSD: PLIST,v 1.4 2021/04/25 15:28:44 pho Exp $
2bin/cpphs 2bin/cpphs
3${HS_INTF}/package-description 3lib/cpphs-${PKGVERSION}/${HS_VERSION}/package-description
4${HS_INTF}/package-id 4lib/cpphs-${PKGVERSION}/${HS_VERSION}/package-id
5${HS_IMPL}/Language/Preprocessor/Cpphs.dyn_hi 5lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.dyn_hi
6${HS_IMPL}/Language/Preprocessor/Cpphs.hi 6lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.hi
7${HS_IMPL}/Language/Preprocessor/Cpphs.p_hi 7lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.p_hi
8${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi 8lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi
9${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.hi 9lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.hi
10${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.p_hi 10lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.p_hi
11${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.dyn_hi 11lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.dyn_hi
12${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.hi 12lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.hi
13${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.p_hi 13lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.p_hi
14${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.dyn_hi 14lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.dyn_hi
15${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.hi 15lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.hi
16${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.p_hi 16lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.p_hi
17${HS_IMPL}/Language/Preprocessor/Cpphs/Options.dyn_hi 17lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.dyn_hi
18${HS_IMPL}/Language/Preprocessor/Cpphs/Options.hi 18lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.hi
19${HS_IMPL}/Language/Preprocessor/Cpphs/Options.p_hi 19lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.p_hi
20${HS_IMPL}/Language/Preprocessor/Cpphs/Position.dyn_hi 20lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.dyn_hi
21${HS_IMPL}/Language/Preprocessor/Cpphs/Position.hi 21lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.hi
22${HS_IMPL}/Language/Preprocessor/Cpphs/Position.p_hi 22lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.p_hi
23${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.dyn_hi 23lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.dyn_hi
24${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.hi 24lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.hi
25${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.p_hi 25lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.p_hi
26${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.dyn_hi 26lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.dyn_hi
27${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.hi 27lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.hi
28${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.p_hi 28lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.p_hi
29${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.dyn_hi 29lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.dyn_hi
30${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.hi 30lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.hi
31${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.p_hi 31lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.p_hi
32${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.dyn_hi 32lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.dyn_hi
33${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.hi 33lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.hi
34${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.p_hi 34lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.p_hi
35${HS_IMPL}/Language/Preprocessor/Unlit.dyn_hi 35lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.dyn_hi
36${HS_IMPL}/Language/Preprocessor/Unlit.hi 36lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.hi
37${HS_IMPL}/Language/Preprocessor/Unlit.p_hi 37lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.p_hi
38${HS_IMPL}/libHS${HS_PKGID}.a 38lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.dyn_hi
39${HS_IMPL}/libHS${HS_PKGID}_p.a 39lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.hi
 40lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.p_hi
 41lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 42lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
40lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 43lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
41man/man1/cpphs.1 44man/man1/cpphs.1
42${HS_DOCS}/LICENCE-LGPL 45share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/LICENCE-LGPL
43${HS_DOCS}/html/Language-Preprocessor-Cpphs.html 46share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/Language-Preprocessor-Cpphs.html
44${HS_DOCS}/html/Language-Preprocessor-Unlit.html 47share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/Language-Preprocessor-Unlit.html
45${HS_DOCS}/html/cpphs.haddock 48share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/cpphs.haddock
46${HS_DOCS}/html/doc-index.html 49share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/doc-index.html
47${HS_DOCS}/html/haddock-bundle.min.js 50share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/haddock-bundle.min.js
48${HS_DOCS}/html/index.html 51share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/index.html
49${HS_DOCS}/html/linuwial.css 52share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/linuwial.css
50${HS_DOCS}/html/meta.json 53share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/meta.json
51${HS_DOCS}/html/quick-jump.css 54share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/quick-jump.css
52${HS_DOCS}/html/synopsis.png 55share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/synopsis.png
cvs diff -r1.12 -r1.13 pkgsrc/devel/hs-cpphs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/hs-cpphs/buildlink3.mk 2020/01/02 03:27:12 1.12
+++ pkgsrc/devel/hs-cpphs/buildlink3.mk 2021/04/25 15:28:44 1.13
@@ -1,17 +1,15 @@ @@ -1,17 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.12 2020/01/02 03:27:12 pho Exp $ 1# $NetBSD: buildlink3.mk,v 1.13 2021/04/25 15:28:44 pho Exp $
2 2
3BUILDLINK_TREE+= hs-cpphs 3BUILDLINK_TREE+= hs-cpphs
4 4
5.if !defined(HS_CPPHS_BUILDLINK3_MK) 5.if !defined(HS_CPPHS_BUILDLINK3_MK)
6HS_CPPHS_BUILDLINK3_MK:= 6HS_CPPHS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.hs-cpphs+= hs-cpphs>=1.20.8 8BUILDLINK_API_DEPENDS.hs-cpphs+= hs-cpphs>=1.20.9
9BUILDLINK_ABI_DEPENDS.hs-cpphs+= hs-cpphs>=1.20.8 9BUILDLINK_ABI_DEPENDS.hs-cpphs+= hs-cpphs>=1.20.9.1
10BUILDLINK_PKGSRCDIR.hs-cpphs?= ../../devel/hs-cpphs 10BUILDLINK_PKGSRCDIR.hs-cpphs?= ../../devel/hs-cpphs
11 11
12.include "../../devel/hs-old-locale/buildlink3.mk" 
13.include "../../time/hs-old-time/buildlink3.mk" 
14.include "../../textproc/hs-polyparse/buildlink3.mk" 12.include "../../textproc/hs-polyparse/buildlink3.mk"
15.endif # HS_CPPHS_BUILDLINK3_MK 13.endif # HS_CPPHS_BUILDLINK3_MK
16 14
17BUILDLINK_TREE+= -hs-cpphs 15BUILDLINK_TREE+= -hs-cpphs
cvs diff -r1.6 -r1.7 pkgsrc/devel/hs-cpphs/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/hs-cpphs/distinfo 2020/01/02 03:27:12 1.6
+++ pkgsrc/devel/hs-cpphs/distinfo 2021/04/25 15:28:44 1.7
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.6 2020/01/02 03:27:12 pho Exp $ 1$NetBSD: distinfo,v 1.7 2021/04/25 15:28:44 pho Exp $
2 2
3SHA1 (cpphs-1.20.8.tar.gz) = 5227d9fcc762812c9b494834a13ca6b76896a43c 3SHA1 (cpphs-1.20.9.1.tar.gz) = 15a53e0c0e040b145dc4efeb3992e38c48dbf4a4
4RMD160 (cpphs-1.20.8.tar.gz) = 6f966d9ff14f8f485e7897a7cef3ae16766d2a5e 4RMD160 (cpphs-1.20.9.1.tar.gz) = 96be359b6b9e8572124d137dcab90ee04632a0c7
5SHA512 (cpphs-1.20.8.tar.gz) = ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747 5SHA512 (cpphs-1.20.9.1.tar.gz) = bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
6Size (cpphs-1.20.8.tar.gz) = 45108 bytes 6Size (cpphs-1.20.9.1.tar.gz) = 45496 bytes
 7SHA1 (patch-cpphs.cabal) = 274e5753325014d152da43daf195f7d65f7204d9
File Added: pkgsrc/devel/hs-cpphs/patches/Attic/patch-cpphs.cabal
$NetBSD: patch-cpphs.cabal,v 1.1 2021/04/25 15:28:44 pho Exp $

This is probably a Cabal bug. When a package defines both a library
and an executable, and they share the same set of modules, Cabal
embeds an rpath to the build directory to the executable. We don't
appreciate that.

--- cpphs.cabal.orig	2001-09-09 01:46:40.000000000 +0000
+++ cpphs.cabal
@@ -71,7 +71,7 @@ Library
         TimeCompat
 
 Executable cpphs
-    Build-Depends: base>=3&&<6, directory <1.4, polyparse>=1.13 && <1.14
+    Build-Depends: base>=3&&<6, directory <1.4, polyparse>=1.13 && <1.14, cpphs
     Main-Is: cpphs.hs
 
     if flag(old-locale)
@@ -84,20 +84,6 @@ Executable cpphs
       Build-Depends: time >=1.5 && <1.11
       Hs-Source-Dirs: . new
 
-    Other-Modules:
-        Language.Preprocessor.Cpphs
-        Language.Preprocessor.Unlit
-        Language.Preprocessor.Cpphs.CppIfdef
-        Language.Preprocessor.Cpphs.HashDefine
-        Language.Preprocessor.Cpphs.MacroPass
-        Language.Preprocessor.Cpphs.Options
-        Language.Preprocessor.Cpphs.Position
-        Language.Preprocessor.Cpphs.ReadFirst
-        Language.Preprocessor.Cpphs.RunCpphs
-        Language.Preprocessor.Cpphs.SymTab
-        Language.Preprocessor.Cpphs.Tokenise
-        TimeCompat
-
 Source-Repository head
     Type:     git
     Location: https://github.com/hackage-trustees/malcolm-wallace-universe