>From db60b5c7569737d58724c0999ac90c11514962dc Mon Sep 17 00:00:00 2001
From: Greg Steuck <g...@nest.cx>
Date: Sun, 23 Aug 2020 11:37:32 -0700
Subject: [PATCH 2/7] Use devel/cabal module for devel/cpphs and upgrade to
1.20.9.1
Removed do-test, it was pre-broken in the previous update as upstream
stopped shipping the tests.
TODO: since -lib port is getting removed, a quirk is probably required
to get rid of hs-cpphs packages
---
devel/cpphs/Makefile | 40 ++++--------------
devel/cpphs/distinfo | 8 +++-
devel/cpphs/pkg/{DESCR-main => DESCR} | 0
devel/cpphs/pkg/DESCR-lib | 1 -
devel/cpphs/pkg/PLIST | 4 ++
devel/cpphs/pkg/PLIST-lib | 59 ---------------------------
devel/cpphs/pkg/PLIST-main | 4 --
7 files changed, 19 insertions(+), 97 deletions(-)
rename devel/cpphs/pkg/{DESCR-main => DESCR} (100%)
delete mode 100644 devel/cpphs/pkg/DESCR-lib
create mode 100644 devel/cpphs/pkg/PLIST
delete mode 100644 devel/cpphs/pkg/PLIST-lib
delete mode 100644 devel/cpphs/pkg/PLIST-main
diff --git a/devel/cpphs/Makefile b/devel/cpphs/Makefile
index fdef2f9052a..6d0b8dd992d 100644
--- a/devel/cpphs/Makefile
+++ b/devel/cpphs/Makefile
@@ -1,47 +1,25 @@
# $OpenBSD: Makefile,v 1.48 2019/09/30 12:51:25 kili Exp $
-COMMENT-main = liberalised reimplementation of cpp in Haskell
-COMMENT-lib = cpphs library
+COMMENT = liberalised reimplementation of cpp in Haskell
-DISTNAME = cpphs-1.19.3
-PKGNAME-main = ${DISTNAME}
-REVISION-main = 0
-PKGNAME-lib = hs-${DISTNAME}
-REVISION-lib = 7
-CATEGORIES = devel
-MAINTAINER = Matthias Kilian <k...@openbsd.org>
+MODCABAL_STEM = cpphs
+MODCABAL_VERSION = 1.20.9.1
+MODCABAL_MANIFEST = polyparse 1.13 1
+CATEGORIES = devel
+MAINTAINER = Matthias Kilian <k...@openbsd.org>
# LGPL2.1
PERMIT_PACKAGE = Yes
-MULTI_PACKAGES = -main -lib
+MODULES = devel/cabal
-SUBST_VARS += DISTNAME
+WANTLIB = c charset ffi gmp m iconv pthread util
-MODULES = lang/ghc
-LIB_DEPENDS += converters/libiconv
-
-WANTLIB-main = c charset ffi gmp m iconv pthread util
-
-MODGHC_BUILD = hackage cabal haddock register
-MODGHC_PACKAGE_KEY = 3CUnFHz9uegIX6e6hlBlNd
-LIB_DEPENDS-main = ${LIB_DEPENDS} \
+LIB_DEPENDS = converters/libiconv \
devel/gmp \
devel/libffi
-RUN_DEPENDS-main =
-LIB_DEPENDS-lib =
-RUN_DEPENDS-lib = devel/hs-old-locale \
- devel/hs-old-time \
- lang/ghc=${MODGHC_VER} \
- textproc/hs-polyparse>=1.9
-BUILD_DEPENDS += ${RUN_DEPENDS-lib}
-WANTLIB-lib =
-DIST_SUBDIR =
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
-do-test:
- cd ${WRKSRC}/tests && /bin/sh ./runtests
-
.include <bsd.port.mk>
diff --git a/devel/cpphs/distinfo b/devel/cpphs/distinfo
index a69a8dd8800..4c9aab52ea9 100644
--- a/devel/cpphs/distinfo
+++ b/devel/cpphs/distinfo
@@ -1,2 +1,6 @@
-SHA256 (cpphs-1.19.3.tar.gz) = 4lRqo4LpwilCxcKEljHtxrHYy+osUHYvZrdAdV+vV9o=
-SIZE (cpphs-1.19.3.tar.gz) = 44306
+SHA256 (hackage/cpphs-1.20.9.1.tar.gz) =
f1mxC8M3QATO48BPpO5KG5DQ3KhKPQ5DbVhhoao7kZ8=
+SHA256 (hackage/polyparse-1.13.tar.gz) =
HExymA4eWk8H/qZcoIsjmVgdKmqiHrEHj3rShsJ5cHs=
+SHA256 (hackage/polyparse-1.13_1.cabal) =
aLk8AwrruIqr71sNyhlaHTW1DPL59U2HlZMOf42wTCY=
+SIZE (hackage/cpphs-1.20.9.1.tar.gz) = 45496
+SIZE (hackage/polyparse-1.13.tar.gz) = 33144
+SIZE (hackage/polyparse-1.13_1.cabal) = 2726
diff --git a/devel/cpphs/pkg/DESCR-main b/devel/cpphs/pkg/DESCR
similarity index 100%
rename from devel/cpphs/pkg/DESCR-main
rename to devel/cpphs/pkg/DESCR
diff --git a/devel/cpphs/pkg/DESCR-lib b/devel/cpphs/pkg/DESCR-lib
deleted file mode 100644
index c7a2a6defcd..00000000000
--- a/devel/cpphs/pkg/DESCR-lib
+++ /dev/null
@@ -1 +0,0 @@
-This library provides the functioninality of cpphs to other programs.
diff --git a/devel/cpphs/pkg/PLIST b/devel/cpphs/pkg/PLIST
new file mode 100644
index 00000000000..4cf55032ce5
--- /dev/null
+++ b/devel/cpphs/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST,v$
+@pkgpath devel/${MODCABAL_STEM}
+@bin bin/${MODCABAL_STEM}
+@man man/man1/${MODCABAL_STEM}.1
diff --git a/devel/cpphs/pkg/PLIST-lib b/devel/cpphs/pkg/PLIST-lib
deleted file mode 100644
index bf816c6c64d..00000000000
--- a/devel/cpphs/pkg/PLIST-lib
+++ /dev/null
@@ -1,59 +0,0 @@
-@comment $OpenBSD: PLIST-lib,v 1.11 2019/09/30 12:51:25 kili Exp $
-@tag ghc-pkg-recache
-lib/ghc/${DISTNAME}/
-lib/ghc/${DISTNAME}/Language/
-lib/ghc/${DISTNAME}/Language/Preprocessor/
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/CppIfdef.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/CppIfdef.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/HashDefine.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/HashDefine.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/HashDefine.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/MacroPass.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/MacroPass.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/MacroPass.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Options.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Options.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Options.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Position.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Position.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Position.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/ReadFirst.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/ReadFirst.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/ReadFirst.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/RunCpphs.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/RunCpphs.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/RunCpphs.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/SymTab.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/SymTab.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/SymTab.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Tokenise.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Tokenise.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/Tokenise.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Unlit.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Unlit.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Unlit.p_hi
-lib/ghc/cpphs-${MODGHC_HACKAGE_VERSION}/libHScpphs-${MODGHC_HACKAGE_VERSION}-${MODGHC_PACKAGE_KEY}-ghc${MODGHC_VER}.so
-lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a
-lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a
-lib/ghc/package.conf.d/${DISTNAME}.conf
-share/doc/hs-${DISTNAME}/
-share/doc/hs-${DISTNAME}/LICENCE-LGPL
-share/doc/hs-${DISTNAME}/html/
-share/doc/hs-${DISTNAME}/html/Language-Preprocessor-Cpphs.html
-share/doc/hs-${DISTNAME}/html/Language-Preprocessor-Unlit.html
-share/doc/hs-${DISTNAME}/html/cpphs.haddock
-share/doc/hs-${DISTNAME}/html/doc-index.html
-share/doc/hs-${DISTNAME}/html/haddock-bundle.min.js
-share/doc/hs-${DISTNAME}/html/hslogo-16.png
-share/doc/hs-${DISTNAME}/html/index.html
-share/doc/hs-${DISTNAME}/html/meta.json
-share/doc/hs-${DISTNAME}/html/minus.gif
-share/doc/hs-${DISTNAME}/html/ocean.css
-share/doc/hs-${DISTNAME}/html/plus.gif
-share/doc/hs-${DISTNAME}/html/quick-jump.css
-share/doc/hs-${DISTNAME}/html/synopsis.png
diff --git a/devel/cpphs/pkg/PLIST-main b/devel/cpphs/pkg/PLIST-main
deleted file mode 100644
index 4d8937ea234..00000000000
--- a/devel/cpphs/pkg/PLIST-main
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2010/09/26 13:32:44 kili Exp $
-@pkgpath devel/cpphs
-@bin bin/cpphs
-@man man/man1/cpphs.1
--
2.30.1
