- Update to 2.4

- Makefile cleanup
- Update pkg-message.

PR:		ports/120279
Submitted by:	Felippe de Meirelles Motta <lippemail@gmail.com>
Approved by:	Hirohisa Yamaguchi (maintainer)

3 files changed, 17 insertions, 22 deletions

diff --git a/lang/haskell-mode.el/Makefile b/lang/haskell-mode.el/Makefile
index 53323d7b0e08..ec128b1de2ff 100644
--- a/lang/haskell-mode.el/Makefile
+++ b/lang/haskell-mode.el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	haskell-mode
-PORTVERSION=	2.3
+PORTVERSION=	2.4
 CATEGORIES=	lang elisp
 MASTER_SITES=	http://www.iro.umontreal.ca/~monnier/elisp/
 
@@ -15,32 +15,25 @@ COMMENT=	An Emacs lisp mode for editing haskell programs
 
 NO_BUILD=	yes
 
+PORTDOCS=	ChangeLog NEWS fontlock.hs indent.hs README
+
 ELISPDIR=	${PREFIX}/${PLIST_DIRS}
-ELISPFILES=	haskell-cabal.el haskell-decl-scan.el haskell-doc.el \
-		haskell-font-lock.el haskell-ghci.el haskell-hugs.el \
-		haskell-indent.el haskell-mode.el haskell-simple-indent.el \
-		haskell-site-file.el inf-haskell.el
+ELISPFILES=	haskell-c.el haskell-cabal.el haskell-decl-scan.el \
+		haskell-doc.el haskell-font-lock.el haskell-ghci.el \
+		haskell-hugs.el haskell-indent.el haskell-mode.el \
+		haskell-simple-indent.el haskell-site-file.el inf-haskell.el
 
 PLIST_DIRS=	share/emacs/site-lisp/${PORTNAME}/
 PLIST_FILES=	${ELISPFILES:C/^| [^ ]/${PLIST_DIRS}/g}
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	ChangeLog NEWS fontlock.hs indent.hs \
-		README
-.endif
-
 do-install:
-	${MKDIR} ${ELISPDIR}
-.for i in ${ELISPFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${ELISPDIR}
-.endfor
+	@${MKDIR} ${ELISPDIR}
+	@${INSTALL_DATA} ${ELISPFILES:S,^,${WRKSRC}/,} ${ELISPDIR}/
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.  for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
-.  endfor
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/haskell-mode.el/distinfo b/lang/haskell-mode.el/distinfo
index 866bf7a4bf51..d7dfde5ecec7 100644
--- a/lang/haskell-mode.el/distinfo
+++ b/lang/haskell-mode.el/distinfo
@@ -1,3 +1,3 @@
-MD5 (haskell-mode-2.3.tar.gz) = 83b966f84e00f593f490680c5302021d
-SHA256 (haskell-mode-2.3.tar.gz) = 9261eaebc49f9629184f2cb9f247fa268b69d7b45194e8646b8bb61932649d89
-SIZE (haskell-mode-2.3.tar.gz) = 77903
+MD5 (haskell-mode-2.4.tar.gz) = de5ff32478154a39bea3adb3b7ce0e94
+SHA256 (haskell-mode-2.4.tar.gz) = 8549e4d3540ae105b151e18f963d420c117a06e97d0ff20f5618544e19684de8
+SIZE (haskell-mode-2.4.tar.gz) = 89256
diff --git a/lang/haskell-mode.el/pkg-message b/lang/haskell-mode.el/pkg-message
index 963d313a24b8..7cb77833751c 100644
--- a/lang/haskell-mode.el/pkg-message
+++ b/lang/haskell-mode.el/pkg-message
@@ -14,8 +14,10 @@ Add the following lines according to which modules you want to use:
 
 (add-hook 'haskell-mode-hook 'turn-on-haskell-decl-scan)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
+(add-hook 'haskell-mode-hook 'turn-on-haskell-ghci)
+(add-hook 'haskell-mode-hook 'turn-on-haskell-hugs)
 (add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-;(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
+(add-hook 'haskell-mode-hook 'turn-on-haskell-simple-indent)
 (add-hook 'haskell-mode-hook 'turn-on-font-lock)
 
 Note that the two indentation modules are mutually exclusive - add at