Minor portlint-spree, including fixes for package-building hs-tclhaskell-ghc

and hs-c2hs on the cluster (for 4.X).

10 files changed, 49 insertions, 52 deletions

diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 3a79e33..fabafc5 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_SUB=	"PORTVERSION=${PORTVERSION}"
+PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 .if !defined(NOPORTDOCS)
 post-build:
diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist
index e1f2995..9c87a7b 100644
--- a/devel/hs-alex/pkg-plist
+++ b/devel/hs-alex/pkg-plist
@@ -10,20 +10,20 @@ lib/alex-%%PORTVERSION%%/AlexWrapper-posn
 lib/alex-%%PORTVERSION%%/AlexWrapper-monad
 lib/alex-%%PORTVERSION%%/AlexWrapper-gscan
 @dirrm lib/alex-%%PORTVERSION%%
-%%PORTDOCS%%share/doc/alex/alex.ps
-%%PORTDOCS%%@dirrm share/doc/alex
-share/examples/alex/Makefile
-share/examples/alex/Tokens.x
-share/examples/alex/Tokens_gscan.x
-share/examples/alex/Tokens_posn.x
-share/examples/alex/examples.x
-share/examples/alex/haskell.x
-share/examples/alex/lit.x
-share/examples/alex/pp.x
-share/examples/alex/state.x
-share/examples/alex/tiny.y
-share/examples/alex/tkns.hs
-share/examples/alex/words.x
-share/examples/alex/words_monad.x
-share/examples/alex/words_posn.x
-@dirrm share/examples/alex
+%%PORTDOCS%%%%DOCSDIR%%/alex.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/Tokens.x
+%%EXAMPLESDIR%%/Tokens_gscan.x
+%%EXAMPLESDIR%%/Tokens_posn.x
+%%EXAMPLESDIR%%/examples.x
+%%EXAMPLESDIR%%/haskell.x
+%%EXAMPLESDIR%%/lit.x
+%%EXAMPLESDIR%%/pp.x
+%%EXAMPLESDIR%%/state.x
+%%EXAMPLESDIR%%/tiny.y
+%%EXAMPLESDIR%%/tkns.hs
+%%EXAMPLESDIR%%/words.x
+%%EXAMPLESDIR%%/words_monad.x
+%%EXAMPLESDIR%%/words_posn.x
+@dirrm %%EXAMPLESDIR%%
diff --git a/devel/hs-buddha/Makefile b/devel/hs-buddha/Makefile
index 4e2c5bb..1815276 100644
--- a/devel/hs-buddha/Makefile
+++ b/devel/hs-buddha/Makefile
@@ -18,9 +18,7 @@ COMMENT=	A declarative debugger for Haskell 98
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
-USE_REINPLACE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 MAN1=	buddha.1
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index d9e122f..c04b73b 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -35,7 +35,7 @@ RUN_DEPENDS=	${GHC}:${PORTSDIR}/lang/${GHCDEP}
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-GHC_VERSION=	`${LOCALBASE}/bin/${GHC} --numeric-version`
+GHC_VERSION=	${GHC:S/^ghc-//} # `${LOCALBASE}/bin/${GHC} --numeric-version`
 PLIST_SUB+=	C2HS_VERSION="${PORTVERSION}" GHC_VERSION="${GHC_VERSION}"
 PLIST_SUB+=	GHCMAJOR="${GHCMAJOR}"
 
diff --git a/devel/hs-green-card/Makefile b/devel/hs-green-card/Makefile
index b91963c..2151cb7 100644
--- a/devel/hs-green-card/Makefile
+++ b/devel/hs-green-card/Makefile
@@ -24,8 +24,8 @@ USE_GMAKE=	yes
 ALL_TARGET=	all
 
 do-install:
-	@(cd ${WRKSRC}/src && ${CP} green-card ${PREFIX}/bin)
-	-@mkdir ${PREFIX}/lib/green-card
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/green-card ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib/green-card
 	@(cd ${WRKSRC}/lib/ghc && ${CP} StdDIS.* libHSgreencard.a ${PREFIX}/lib/green-card)
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}/doc && ${CP} -R green-card ${PREFIX}/share/doc \
diff --git a/devel/hs-green-card/pkg-plist b/devel/hs-green-card/pkg-plist
index c593838..95ee28f 100644
--- a/devel/hs-green-card/pkg-plist
+++ b/devel/hs-green-card/pkg-plist
@@ -4,23 +4,23 @@ lib/green-card/StdDIS.hi
 lib/green-card/StdDIS.hs
 lib/green-card/StdDIS.o
 lib/green-card/libHSgreencard.a
-%%PORTDOCS%%share/doc/green-card/directives.html
-%%PORTDOCS%%share/doc/green-card/dis-std.html
-%%PORTDOCS%%share/doc/green-card/dis.html
-%%PORTDOCS%%share/doc/green-card/docbook.css
-%%PORTDOCS%%share/doc/green-card/extensions.html
-%%PORTDOCS%%share/doc/green-card/fill-in.html
-%%PORTDOCS%%share/doc/green-card/goals.html
-%%PORTDOCS%%share/doc/green-card/green-card.dvi.gz
-%%PORTDOCS%%share/doc/green-card/green-card.ps.gz
-%%PORTDOCS%%share/doc/green-card/greencard.html
-%%PORTDOCS%%share/doc/green-card/import.html
-%%PORTDOCS%%share/doc/green-card/invoking.html
-%%PORTDOCS%%share/doc/green-card/motivation.html
-%%PORTDOCS%%share/doc/green-card/overview.html
-%%PORTDOCS%%share/doc/green-card/proc-spec.html
-%%PORTDOCS%%share/doc/green-card/related.html
-%%PORTDOCS%%share/doc/green-card/type-sig.html
-%%PORTDOCS%%share/doc/green-card/using.html
-%%PORTDOCS%%@dirrm share/doc/green-card
+%%PORTDOCS%%%%DOCSDIR%%/directives.html
+%%PORTDOCS%%%%DOCSDIR%%/dis-std.html
+%%PORTDOCS%%%%DOCSDIR%%/dis.html
+%%PORTDOCS%%%%DOCSDIR%%/docbook.css
+%%PORTDOCS%%%%DOCSDIR%%/extensions.html
+%%PORTDOCS%%%%DOCSDIR%%/fill-in.html
+%%PORTDOCS%%%%DOCSDIR%%/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/green-card.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/green-card.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/greencard.html
+%%PORTDOCS%%%%DOCSDIR%%/import.html
+%%PORTDOCS%%%%DOCSDIR%%/invoking.html
+%%PORTDOCS%%%%DOCSDIR%%/motivation.html
+%%PORTDOCS%%%%DOCSDIR%%/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/proc-spec.html
+%%PORTDOCS%%%%DOCSDIR%%/related.html
+%%PORTDOCS%%%%DOCSDIR%%/type-sig.html
+%%PORTDOCS%%%%DOCSDIR%%/using.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/green-card
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 7fde8fd..dfc3fb8 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -10,8 +10,8 @@ PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/ \
 		http://www.mirror.ac.uk/sites/www.haskell.org/happy/dist/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 PKGNAMEPREFIX=	hs-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	An LALR(1) parser generator for the functional language Haskell
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile
index 2eb73d6..073522c 100644
--- a/devel/hs-tclhaskell-ghc/Makefile
+++ b/devel/hs-tclhaskell-ghc/Makefile
@@ -10,11 +10,16 @@ PORTREVISION=	2
 CATEGORIES=	devel haskell tcl83
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~meurig/TclHaskell/
 PKGNAMEPREFIX=	hs-
+PKGNAMESUFFIX=	-${GHCDEP}
 DISTNAME=	TclHaskell1_2
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Tcl/Tk binding for Haskell
 
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+BUILD_DEPENDS=	${GHC}:${PORTSDIR}/lang/${GHCDEP}
+RUN_DEPENDS=	${GHC}:${PORTSDIR}/lang/${GHCDEP}
+
 .if defined(WITH_GHC5)
 GHC=		ghc-5.04.3
 GHCDEP=		ghc5
@@ -22,17 +27,12 @@ GHCDEP=		ghc5
 GHC=		ghc-6.2.1
 GHCDEP=		ghc
 .endif
-PKGNAMESUFFIX=	-${GHCDEP}
-
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
-BUILD_DEPENDS=	${GHC}:${PORTSDIR}/lang/${GHCDEP}
-RUN_DEPENDS=	${GHC}:${PORTSDIR}/lang/${GHCDEP}
 
 WRKSRC=		${WRKDIR}/TclHaskell1.2/src
 USE_GMAKE=	YES
 USE_REINPLACE=	YES
 
-GHC_VERSION=	`${LOCALBASE}/bin/${GHC} --numeric-version`
+GHC_VERSION=	${GHC:S/^ghc-//} # `${LOCALBASE}/bin/${GHC} --numeric-version`
 GHC_LIB=	${LOCALBASE}/lib/${GHC}
 PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}"
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -61,6 +61,5 @@ post-install:
 .endif
 	@${SED} -e s,GHC_VERSION,${GHC_VERSION}, <${MASTERDIR}/pkg-install.in >${PKGINSTALL}
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} dummy POST-INSTALL
-	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/devel/hs-tclhaskell-ghc/pkg-install.in b/devel/hs-tclhaskell-ghc/pkg-install.in
index ec009b7..43f5673 100644
--- a/devel/hs-tclhaskell-ghc/pkg-install.in
+++ b/devel/hs-tclhaskell-ghc/pkg-install.in
@@ -19,4 +19,5 @@ Package
     extra_ld_opts = [ "-L$PKG_PREFIX/lib", "-lncurses"  ]
 }
 CONFEOF
+/bin/rm -f $PKG_PREFIX/lib/ghc-GHC_VERSION/package.conf.old
 fi
diff --git a/devel/hs-tclhaskell-ghc/pkg-plist b/devel/hs-tclhaskell-ghc/pkg-plist
index 67de6b6..9466f8c 100644
--- a/devel/hs-tclhaskell-ghc/pkg-plist
+++ b/devel/hs-tclhaskell-ghc/pkg-plist
@@ -63,6 +63,5 @@ lib/ghc-%%GHC_VERSION%%/HSTclHaskell_cbits.o
 @dirrm %%EXAMPLESDIR%%/images
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec ghc-pkg -r TclHaskell
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old