Attachment 158129 Details for Bug 201170 – Patch to be applied to latest non-removed lang/haskell-mode.el to stage and update

[patch] Patch to be applied to latest non-removed lang/haskell-mode.el to stage and update

haskell-mode.el.diff (text/plain), 4.46 KB, created by Klaus Aehlig on 2015-06-28 17:50:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2015-06-28 17:50:47 UTC

Size: 4.46 KB

patch

obsolete

>diff -ruN haskell-mode.el.orig/Makefile haskell-mode.el/Makefile
>--- haskell-mode.el.orig/Makefile	2015-06-28 17:49:38.077116000 +0200
>+++ haskell-mode.el/Makefile	2015-06-28 19:45:17.074263000 +0200
>@@ -2,48 +2,59 @@
> # $FreeBSD: head/lang/haskell-mode.el/Makefile 362717 2014-07-23 17:30:45Z bapt $
> 
> PORTNAME=	haskell-mode
>-PORTVERSION=	2.9.1
>+PORTVERSION=	13.14.2
> CATEGORIES=	lang elisp
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	aehlig@linta.de
> COMMENT=	Emacs lisp mode for editing haskell programs
> 
> LICENSE=	GPLv3
> 
>+BUILD_DEPENDS=	emacs:${PORTSDIR}/editors/emacs
>+
> OPTIONS_DEFINE=	DOCS
> 
> GH_ACCOUNT=	haskell
>-GH_COMMIT=	166ec39
>-GH_TAGNAME=	${PORTVERSION:S/./_/g}
>-NO_BUILD=	yes
>-PORTDOCS=	NEWS fontlock.hs indent.hs README.md
>+GH_TAGNAME=	v${PORTVERSION}
>+PORTDOCS=	NEWS README.md
> USE_GITHUB=	yes
>+USES=		gmake
>+ALL_TARGET=	haskell-mode-autoloads.el
> 
> ELISPDIR=	${PREFIX}/${PLIST_DIRS}
>-ELISPFILES=	ghc-core.el haskell-align-imports.el haskell-c.el \
>-		haskell-cabal.el haskell-checkers.el haskell-decl-scan.el \
>-		haskell-doc.el haskell-font-lock.el haskell-ghci.el \
>-		haskell-hugs.el haskell-indent.el haskell-indentation.el \
>-		haskell-interactive-mode.el haskell-mode.el \
>-		haskell-move-nested.el  haskell-navigate-imports.el \
>-		haskell-package.el haskell-process.el haskell-session.el \
>-		haskell-show.el haskell-simple-indent.el haskell-site-file.el \
>-		haskell-sort-imports.el haskell-string.el inf-haskell.el
>+ELISPFILES=	ghc-core.el ghci-script-mode.el haskell-align-imports.el \
>+		haskell-bot.el haskell-cabal.el haskell-checkers.el \
>+		haskell-collapse.el haskell-commands.el haskell-compat.el \
>+		haskell-compile.el haskell-compile.el \
>+		haskell-complete-module.el haskell-customize.el \
>+		haskell-debug.el haskell-decl-scan.el \
>+		haskell-doc.el haskell-font-lock.el \
>+		haskell-indent.el haskell-indentation.el \
>+		haskell-interactive-mode.el haskell-load.el \
>+		haskell-menu.el haskell-mode-pkg.el haskell-mode.el \
>+		haskell-mode-autoloads.el haskell-modules.el \
>+		haskell-move-nested.el haskell-navigate-imports.el \
>+		haskell-package.el haskell-presentation-mode.el \
>+		haskell-process.el haskell-repl.el haskell-sandbox.el \
>+		haskell-session.el haskell-simple-indent.el \
>+		haskell-sort-imports.el haskell-string.el \
>+		haskell-unicode-input-method.el haskell-utils.el \
>+		haskell.el highlight-uses-mode.el inf-haskell.el \
>+		w3m-haddock.el
> 
> PLIST_DIRS=	share/emacs/site-lisp/${PORTNAME}/
> PLIST_FILES=	${ELISPFILES:C/^| [^ ]/${PLIST_DIRS}/g}
> SUB_FILES=	pkg-message
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> do-install:
>-	@${MKDIR} ${ELISPDIR}
>-	@${INSTALL_DATA} ${ELISPFILES:S,^,${WRKSRC}/,} ${ELISPDIR}/
>+	@${MKDIR} ${STAGEDIR}${ELISPDIR}
>+	${INSTALL_DATA} ${ELISPFILES:S,^,${WRKSRC}/,} ${STAGEDIR}${ELISPDIR}/
> 
> post-install:
> .if ${PORT_OPTIONS:MDOCS}
>-	@${MKDIR} ${DOCSDIR}
>-	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -ruN haskell-mode.el.orig/distinfo haskell-mode.el/distinfo
>--- haskell-mode.el.orig/distinfo	2015-06-28 17:49:38.077384000 +0200
>+++ haskell-mode.el/distinfo	2015-06-28 18:21:30.631817000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (haskell-mode-2.9.1.tar.gz) = 90dd5590162583f099a900f2f71b06625f5e48cdce1b566fc5fd8d248c6f1242
>-SIZE (haskell-mode-2.9.1.tar.gz) = 123603
>+SHA256 (haskell-haskell-mode-13.14.2-v13.14.2_GH0.tar.gz) = 5b2577b60be74147af09d90d93bacfac295ad881c8e490761322ac8da417accf
>+SIZE (haskell-haskell-mode-13.14.2-v13.14.2_GH0.tar.gz) = 371973
>diff -ruN haskell-mode.el.orig/files/pkg-message.in haskell-mode.el/files/pkg-message.in
>--- haskell-mode.el.orig/files/pkg-message.in	2015-06-28 17:49:38.074425000 +0200
>+++ haskell-mode.el/files/pkg-message.in	2015-06-28 19:42:04.282653000 +0200
>@@ -1,13 +1,13 @@
> To use haskell-mode in Emacs, add the following lines to your ~/.emacs:
> 
>-(load "%%PREFIX%%/share/emacs/site-lisp/haskell-mode/haskell-site-file")
>+(add-to-list 'load-path "%%PREFIX%%/share/emacs/site-lisp/haskell-mode/")
>+(require 'haskell-mode-autoloads)
> 
> Add the following lines according to which modules you want to use:
> 
> (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
> (add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
> (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
>-(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
> (add-hook 'haskell-mode-hook 'font-lock-mode)
> 
> Note that the three indentation modules are mutually exclusive - add at

Flags:

rakuco: maintainer-approval+

Actions: View | Diff

Attachments on bug 201170: 158129 | 168098