diff options
| author | vs <vs@FreeBSD.org> | 2004-07-16 23:44:18 +0800 |
|---|---|---|
| committer | vs <vs@FreeBSD.org> | 2004-07-16 23:44:18 +0800 |
| commit | ff4ab7b1562094857de1edd9af735d32f4626654 (patch) | |
| tree | 03cfb2b67451a237a8235690d4706fb433b142d5 /devel/hs-tclhaskell-ghc | |
| parent | 17bad88ff330906c07ab4c267a445b9f04e2ac5e (diff) | |
| download | freebsd-ports-gnome-ff4ab7b1562094857de1edd9af735d32f4626654.tar.gz freebsd-ports-gnome-ff4ab7b1562094857de1edd9af735d32f4626654.tar.zst freebsd-ports-gnome-ff4ab7b1562094857de1edd9af735d32f4626654.zip | |
Minor portlint-spree, including fixes for package-building hs-tclhaskell-ghc
and hs-c2hs on the cluster (for 4.X).
Diffstat (limited to 'devel/hs-tclhaskell-ghc')
| -rw-r--r-- | devel/hs-tclhaskell-ghc/Makefile | 13 | ||||
| -rw-r--r-- | devel/hs-tclhaskell-ghc/pkg-install.in | 1 | ||||
| -rw-r--r-- | devel/hs-tclhaskell-ghc/pkg-plist | 1 |
3 files changed, 7 insertions, 8 deletions
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile index 2eb73d6b2e90..073522c32712 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 ec009b71e3b4..43f567372418 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 67de6b620da4..9466f8ceb9ed 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 |