CVS commit: pkgsrc/misc/cabal-install

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Tue Oct 13 12:08:10 UTC 2020

Modified Files:
        pkgsrc/misc/cabal-install: Makefile distinfo
Added Files:
        pkgsrc/misc/cabal-install/patches: patch-Setup.hs

Log Message:
Fix the installation path for man pages


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/cabal-install/Makefile \
    pkgsrc/misc/cabal-install/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/cabal-install/patches/patch-Setup.hs

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

Modified files:

Index: pkgsrc/misc/cabal-install/Makefile
diff -u pkgsrc/misc/cabal-install/Makefile:1.1 pkgsrc/misc/cabal-install/Makefile:1.2
--- pkgsrc/misc/cabal-install/Makefile:1.1      Sun Jan 19 07:51:26 2020
+++ pkgsrc/misc/cabal-install/Makefile  Tue Oct 13 12:08:10 2020
@@ -1,13 +1,20 @@
-# $NetBSD: Makefile,v 1.1 2020/01/19 07:51:26 pho Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/13 12:08:10 pho Exp $
 
 DISTNAME=      cabal-install-3.0.0.0
 PKGNAME=       ${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    misc
 
 MAINTAINER=    pho%cielonegro.org@localhost
 COMMENT=       Command-line interface for Cabal and Hackage
 LICENSE=       modified-bsd
 
+SUBST_CLASSES+=                mandir
+SUBST_STAGE.mandir=    pre-configure
+SUBST_MESSAGE.mandir=  Fixing man page installation path
+SUBST_FILES.mandir+=   Setup.hs
+SUBST_VARS.mandir+=    PKGMANDIR
+
 .include "../../devel/hs-async/buildlink3.mk"
 .include "../../converters/hs-base16-bytestring/buildlink3.mk"
 .include "../../security/hs-cryptohash-sha256/buildlink3.mk"
Index: pkgsrc/misc/cabal-install/distinfo
diff -u pkgsrc/misc/cabal-install/distinfo:1.1 pkgsrc/misc/cabal-install/distinfo:1.2
--- pkgsrc/misc/cabal-install/distinfo:1.1      Sun Jan 19 07:51:26 2020
+++ pkgsrc/misc/cabal-install/distinfo  Tue Oct 13 12:08:10 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2020/01/19 07:51:26 pho Exp $
+$NetBSD: distinfo,v 1.2 2020/10/13 12:08:10 pho Exp $
 
 SHA1 (cabal-install-3.0.0.0.tar.gz) = 2fe37726db987af6c23b933bb0e9b81446061449
 RMD160 (cabal-install-3.0.0.0.tar.gz) = 7217d6334bdf98f18341fb0aff8208b20717f695
 SHA512 (cabal-install-3.0.0.0.tar.gz) = 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
 Size (cabal-install-3.0.0.0.tar.gz) = 654045 bytes
 SHA1 (patch-Distribution_Client_Security_HTTP.hs) = ba58ab3c0481b2b269e401121f2dc6f2b2bcf503
+SHA1 (patch-Setup.hs) = 0785a7a574d17447f8109263bbf52acec909fef6
 SHA1 (patch-cabal-install.cabal) = 33633ae6970f52fcdf2a842bdc98f641c308957b

Added files:

Index: pkgsrc/misc/cabal-install/patches/patch-Setup.hs
diff -u /dev/null pkgsrc/misc/cabal-install/patches/patch-Setup.hs:1.1
--- /dev/null   Tue Oct 13 12:08:10 2020
+++ pkgsrc/misc/cabal-install/patches/patch-Setup.hs    Tue Oct 13 12:08:10 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-Setup.hs,v 1.1 2020/10/13 12:08:10 pho Exp $
+
+Install man pages under PKGMANDIR. It's unfortunate that ./Setup has
+no options for changing the directory. The module
+Distribution.Simple.InstallDirs is a part of GHC, and we also don't
+want to change its default mandir because GHC isn't meant to be used
+solely within pkgsrc.
+
+Be careful not to modify this patch after running "bmake
+configure". It will break the patch.
+
+--- Setup.hs.orig      2020-10-13 11:50:11.049290780 +0000
++++ Setup.hs
+@@ -5,7 +5,7 @@ import Distribution.Simple ( defaultMain
+                            , postCopy
+                            , postInst
+                            )
+-import Distribution.Simple.InstallDirs ( mandir
++import Distribution.Simple.InstallDirs ( prefix
+                                        , CopyDest (NoCopyDest)
+                                        )
+ import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo(..)
+@@ -59,5 +59,5 @@ buildManpage lbi verbosity = do
+ 
+ installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO ()
+ installManpage pkg lbi verbosity copy = do
+-  let destDir = mandir (absoluteInstallDirs pkg lbi copy) </> "man1"
++  let destDir = prefix (absoluteInstallDirs pkg lbi copy) </> "@PKGMANDIR@" </> "man1"
+   installOrdinaryFiles verbosity destDir [(buildDir lbi </> "cabal", "cabal.1")]