svn commit: r507727 - in head: Mk/Uses devel/hs-git-annex
Gleb Popov
arrowd at FreeBSD.org
Wed Jul 31 18:18:35 UTC 2019
Author: arrowd
Date: Wed Jul 31 18:18:33 2019
New Revision: 507727
URL: https://svnweb.freebsd.org/changeset/ports/507727
Log:
devel/hs-git-annex: Fix git-annex-shell and git-remote-tor-annex executables.
PR: 239289
Modified:
head/Mk/Uses/cabal.mk
head/devel/hs-git-annex/Makefile
head/devel/hs-git-annex/pkg-plist
Modified: head/Mk/Uses/cabal.mk
==============================================================================
--- head/Mk/Uses/cabal.mk Wed Jul 31 18:16:43 2019 (r507726)
+++ head/Mk/Uses/cabal.mk Wed Jul 31 18:18:33 2019 (r507727)
@@ -53,6 +53,7 @@ PKGNAMEPREFIX?= hs-
EXECUTABLES?= ${PORTNAME}
CABAL_HOME= ${WRKDIR}/cabal-home
+CABAL_LIBEXEC= libexec/cabal
CABAL_EXTRACT_SUFX= .tar.gz
. if !defined(CABAL_BOOTSTRAP)
@@ -157,11 +158,11 @@ do-build:
. if !target(do-install)
do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cabal
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}
. for exe in ${EXECUTABLES}
${INSTALL_PROGRAM} \
$$(find ${WRKSRC}/dist-newstyle -name ${exe} -type f -perm +111) \
- ${STAGEDIR}${PREFIX}/libexec/cabal/${exe}
+ ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/${exe}
${ECHO} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe}
${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
${ECHO} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
@@ -169,7 +170,7 @@ do-install:
${ECHO} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe}
. endfor
${ECHO} '' >> ${STAGEDIR}${PREFIX}/bin/${exe}
- ${ECHO} '${PREFIX}/libexec/cabal/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}
+ ${ECHO} '${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}
${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${exe}
. endfor
. endif
@@ -178,7 +179,7 @@ do-install:
cabal-post-install-script:
. for exe in ${EXECUTABLES}
${ECHO_CMD} 'bin/${exe}' >> ${TMPPLIST}
- ${ECHO_CMD} 'libexec/cabal/${exe}' >> ${TMPPLIST}
+ ${ECHO_CMD} '${CABAL_LIBEXEC}/${exe}' >> ${TMPPLIST}
. endfor
. endif
Modified: head/devel/hs-git-annex/Makefile
==============================================================================
--- head/devel/hs-git-annex/Makefile Wed Jul 31 18:16:43 2019 (r507726)
+++ head/devel/hs-git-annex/Makefile Wed Jul 31 18:18:33 2019 (r507727)
@@ -3,6 +3,7 @@
PORTNAME= git-annex
PORTVERSION= 7.20190626
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell at FreeBSD.org
@@ -288,7 +289,13 @@ post-install:
.endfor
post-stage:
- ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell
- ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex
+ ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/git-annex-shell
+ ${LN} -sf git-annex ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/git-remote-tor-annex
+ ${CP} ${STAGEDIR}${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-annex-shell
+ ${CP} ${STAGEDIR}${PREFIX}/bin/git-annex ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex
+ ${REINPLACE_CMD} 's|${PREFIX}/${CABAL_LIBEXEC}/git-annex|${PREFIX}/${CABAL_LIBEXEC}/git-annex-shell|' \
+ ${STAGEDIR}${PREFIX}/bin/git-annex-shell
+ ${REINPLACE_CMD} 's|${PREFIX}/${CABAL_LIBEXEC}/git-annex|${PREFIX}/${CABAL_LIBEXEC}/git-remote-tor-annex|' \
+ ${STAGEDIR}${PREFIX}/bin/git-remote-tor-annex
.include <bsd.port.mk>
Modified: head/devel/hs-git-annex/pkg-plist
==============================================================================
--- head/devel/hs-git-annex/pkg-plist Wed Jul 31 18:16:43 2019 (r507726)
+++ head/devel/hs-git-annex/pkg-plist Wed Jul 31 18:18:33 2019 (r507727)
@@ -1,5 +1,7 @@
bin/git-annex-shell
bin/git-remote-tor-annex
+libexec/cabal/git-annex-shell
+libexec/cabal/git-remote-tor-annex
man/man1/git-annex-add.1.gz
man/man1/git-annex-addunused.1.gz
man/man1/git-annex-addurl.1.gz
More information about the svn-ports-head
mailing list