CVS commit: pkgsrc/devel/hs-cpphs

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/hs-cpphs
From: "Masatake Daimon" <pho%netbsd.org@localhost>
Date: Sun, 25 Apr 2021 15:28:44 +0000

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 25 15:28:44 UTC 2021

Modified Files:
        pkgsrc/devel/hs-cpphs: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/hs-cpphs/patches: patch-cpphs.cabal

Log Message:
Update to cpphs-1.20.9.1

No change logs are provided by the upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/hs-cpphs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/hs-cpphs/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/hs-cpphs/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/hs-cpphs/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal

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

Modified files:

Index: pkgsrc/devel/hs-cpphs/Makefile
diff -u pkgsrc/devel/hs-cpphs/Makefile:1.13 pkgsrc/devel/hs-cpphs/Makefile:1.14
--- pkgsrc/devel/hs-cpphs/Makefile:1.13 Wed Aug 19 07:50:52 2020
+++ pkgsrc/devel/hs-cpphs/Makefile      Sun Apr 25 15:28:44 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2020/08/19 07:50:52 pho Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/25 15:28:44 pho Exp $
 
-DISTNAME=              cpphs-1.20.8
+DISTNAME=              cpphs-1.20.9.1
+#PKGNAME=              ${DISTNAME} # XXX: This should probably be renamed to devel/cpphs.
 CATEGORIES=            devel
 
 MAINTAINER=            esg%sdf.lonestar.org@localhost
@@ -12,14 +13,6 @@ INSTALLATION_DIRS+=  ${PKGMANDIR}/man1
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-# I don't know why but an rpath to ${WRKSRC}/dist/build/cpphs started
-# appearing in the resulting binary, even though there are no actual
-# libraries to find in that directory at runtime. Cabal seems to be
-# doing something strange. Will need to investigate it later. (pho@)
-CHECK_SHLIBS_SKIP+= bin/cpphs
-
-.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/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/hs-cpphs/PLIST
diff -u pkgsrc/devel/hs-cpphs/PLIST:1.3 pkgsrc/devel/hs-cpphs/PLIST:1.4
--- pkgsrc/devel/hs-cpphs/PLIST:1.3     Wed May 13 04:53:15 2020
+++ pkgsrc/devel/hs-cpphs/PLIST Sun Apr 25 15:28:44 2021
@@ -1,52 +1,55 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/13 04:53:15 rillig Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/25 15:28:44 pho Exp $
 bin/cpphs
-${HS_INTF}/package-description
-${HS_INTF}/package-id
-${HS_IMPL}/Language/Preprocessor/Cpphs.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/CppIfdef.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/HashDefine.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/MacroPass.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Options.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Options.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Options.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Position.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Position.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Position.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/ReadFirst.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/RunCpphs.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/SymTab.p_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.hi
-${HS_IMPL}/Language/Preprocessor/Cpphs/Tokenise.p_hi
-${HS_IMPL}/Language/Preprocessor/Unlit.dyn_hi
-${HS_IMPL}/Language/Preprocessor/Unlit.hi
-${HS_IMPL}/Language/Preprocessor/Unlit.p_hi
-${HS_IMPL}/libHS${HS_PKGID}.a
-${HS_IMPL}/libHS${HS_PKGID}_p.a
+lib/cpphs-${PKGVERSION}/${HS_VERSION}/package-description
+lib/cpphs-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/CppIfdef.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/HashDefine.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/MacroPass.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Options.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Position.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/ReadFirst.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/RunCpphs.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/SymTab.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Cpphs/Tokenise.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Language/Preprocessor/Unlit.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/TimeCompat.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
 lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 man/man1/cpphs.1
-${HS_DOCS}/LICENCE-LGPL
-${HS_DOCS}/html/Language-Preprocessor-Cpphs.html
-${HS_DOCS}/html/Language-Preprocessor-Unlit.html
-${HS_DOCS}/html/cpphs.haddock
-${HS_DOCS}/html/doc-index.html
-${HS_DOCS}/html/haddock-bundle.min.js
-${HS_DOCS}/html/index.html
-${HS_DOCS}/html/linuwial.css
-${HS_DOCS}/html/meta.json
-${HS_DOCS}/html/quick-jump.css
-${HS_DOCS}/html/synopsis.png
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/LICENCE-LGPL
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/Language-Preprocessor-Cpphs.html
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/Language-Preprocessor-Unlit.html
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/cpphs.haddock
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/cpphs-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-cpphs/buildlink3.mk
diff -u pkgsrc/devel/hs-cpphs/buildlink3.mk:1.12 pkgsrc/devel/hs-cpphs/buildlink3.mk:1.13
--- pkgsrc/devel/hs-cpphs/buildlink3.mk:1.12    Thu Jan  2 03:27:12 2020
+++ pkgsrc/devel/hs-cpphs/buildlink3.mk Sun Apr 25 15:28:44 2021
@@ -1,16 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.12 2020/01/02 03:27:12 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2021/04/25 15:28:44 pho Exp $
 
 BUILDLINK_TREE+=       hs-cpphs
 
 .if !defined(HS_CPPHS_BUILDLINK3_MK)
 HS_CPPHS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-cpphs+=       hs-cpphs>=1.20.8
-BUILDLINK_ABI_DEPENDS.hs-cpphs+=       hs-cpphs>=1.20.8
+BUILDLINK_API_DEPENDS.hs-cpphs+=       hs-cpphs>=1.20.9
+BUILDLINK_ABI_DEPENDS.hs-cpphs+=       hs-cpphs>=1.20.9.1
 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
 

Index: pkgsrc/devel/hs-cpphs/distinfo
diff -u pkgsrc/devel/hs-cpphs/distinfo:1.6 pkgsrc/devel/hs-cpphs/distinfo:1.7
--- pkgsrc/devel/hs-cpphs/distinfo:1.6  Thu Jan  2 03:27:12 2020
+++ pkgsrc/devel/hs-cpphs/distinfo      Sun Apr 25 15:28:44 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2020/01/02 03:27:12 pho Exp $
+$NetBSD: distinfo,v 1.7 2021/04/25 15:28:44 pho Exp $
 
-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
+SHA1 (cpphs-1.20.9.1.tar.gz) = 15a53e0c0e040b145dc4efeb3992e38c48dbf4a4
+RMD160 (cpphs-1.20.9.1.tar.gz) = 96be359b6b9e8572124d137dcab90ee04632a0c7
+SHA512 (cpphs-1.20.9.1.tar.gz) = bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
+Size (cpphs-1.20.9.1.tar.gz) = 45496 bytes
+SHA1 (patch-cpphs.cabal) = 274e5753325014d152da43daf195f7d65f7204d9

Added files:

Index: pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal
diff -u /dev/null pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal:1.1
--- /dev/null   Sun Apr 25 15:28:44 2021
+++ pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal     Sun Apr 25 15:28:44 2021
@@ -0,0 +1,39 @@
+$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

Prev by Date: CVS commit: pkgsrc/wm/xmonad-contrib
Next by Date: CVS commit: pkgsrc/sysutils/broot
Previous by Thread: CVS commit: pkgsrc/wm/xmonad-contrib
Next by Thread: CVS commit: pkgsrc/sysutils/broot
Indexes:

Home | Main Index | Thread Index | Old Index