On 02/25/17 21:48, Matthias Kilian wrote:
> Hi,
>
> the diff below should make devel/cpphs ghc-only. This is needed because
> of the removal of lang/nhc98.
>
> It would be nice if anyone with a clean (wrt hs-port) tree could give
> this a try on amd64 or i386 -- my tree is too polluted with diffs
> related to a ghc update ;-)
>
> Ciao,
> Kili
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/cpphs/Makefile,v
> retrieving revision 1.41
> diff -u -p -r1.41 Makefile
> --- Makefile 12 Sep 2016 17:51:07 - 1.41
> +++ Makefile 25 Feb 2017 20:44:16 -
> @@ -3,8 +3,6 @@
> COMMENT-main = liberalised reimplementation of cpp in Haskell
> COMMENT-lib =cpphs library
>
> -ONLY_FOR_ARCHS-lib = i386 amd64
> -
> DISTNAME = cpphs-1.19.3
> PKGNAME-main = ${DISTNAME}
> PKGNAME-lib =hs-${DISTNAME}
> @@ -20,8 +18,6 @@ WANTLIB-main = ${WANTLIB} c m pthread
>
> SUBST_VARS +=DISTNAME
>
> -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
> -# GHC: use cabal to build both the executable and the library.
> WANTLIB-main += util
> MODULES =lang/ghc
> LIB_DEPENDS += converters/libiconv
> @@ -37,21 +33,6 @@ RUN_DEPENDS-lib = devel/hs-old-locale \
> BUILD_DEPENDS += ${RUN_DEPENDS-lib}
> WANTLIB-lib =
> DIST_SUBDIR =
> -.else
> -MASTER_SITES =
> http://hackage.haskell.org/packages/archive/cpphs/${DISTNAME:S/cpphs-//}/
> -# NHC: use the good old makefile for now (though it *should* be possible
> -# to build with cabal, too).
> -BUILD_DEPENDS += devel/hmake \
> - lang/nhc98
> -HC = hmake
> -HC_OPTS =-nhc98 -package base
> -
> -do-build:
> - cd ${WRKSRC} && ${HC} ${HC_OPTS} cpphs
> -
> -do-install:
> - ${INSTALL_PROGRAM} ${WRKSRC}/cpphs${PREFIX}/bin
> -.endif
>
> post-install:
> ${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
>
It builds, packages and installs fine on OpenBSD-current amd64 with up
to date ports tree.
Kind regards,
Martijn Rijkeboer
