Update to 0.15.0 and unbreak.

devel/c2hs/Makefile

@@ -1,40 +1,68 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/16 11:14:46 simon Exp $
+# $OpenBSD: Makefile,v 1.9 2007/11/18 16:30:36 kili Exp $
 # $FreeBSD: ports/devel/hs-c2hs/Makefile,v 1.20 2004/03/25 08:29:28 obraun Exp $
 
 COMMENT=		interface generator for Haskell to C bindings
 
-# Don't panic, this will be fixed soon.
+V=			0.15.0
-BROKEN=			Doesn't build with ghc-6.6.1
-
-V=			0.13.6
 DISTNAME=		c2hs-${V}
 CATEGORIES=		devel
-MAINTAINER=		Don Stewart <dons@openbsd.org>
+MAINTAINER=		Matthias Kilian <kili@openbsd.org>
 HOMEPAGE=		http://www.cse.unsw.edu.au/~chak/haskell/c2hs/
 MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES0=		http://openbsd.dead-parrot.de/distfiles/
+DISTFILES=		${DISTNAME}.tar.gz \
+			${DISTNAME}-doc.tgz:0 \
+			${DISTNAME}-tests.tgz:0
 
 MODULES=		lang/ghc
+MODGHC_RUNTIME=		No
 
-USE_GMAKE=		Yes
+SETUP_CONF_ARGS=	configure -g --prefix=${PREFIX}
-CONFIGURE_STYLE=	gnu
+SETUP_CONF_ENV=		HOME=${PORTHOME} ${CONFIGURE_ENV}
-CONFIGURE_ARGS+=	--prefix=${PREFIX}
+SETUP_PROG=		${WRKSRC}/Setup
 SUBST_VARS=		V
 
-post-build:
-	@cd ${WRKSRC}/doc/c2hs && ${MAKE_PROGRAM} man1/c2hs-config.1 man1/c2hs.1
-
-post-install:
-	@cd ${WRKSRC}/doc/c2hs/man1 && \
-		${INSTALL_MAN} c2hs-config.1 c2hs.1 ${PREFIX}/man/man1
-
-do-regress:
-	@cd ${WRKDIST}/c2hs/tests && ${MAKE_PROGRAM}
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c gmp m
+
+WANTLIB=		c m
+
+LIB_DEPENDS=		gmp::devel/gmp
+
+BUILD_DEPENDS=		::textproc/sgmlformat
+
+do-configure:
+	@cd ${WRKSRC} && ghc --make -o ${SETUP_PROG} Setup.hs
+	@cd ${WRKBUILD} && exec ${SETENV} ${SETUP_CONF_ENV} \
+		${SETUP_PROG} ${SETUP_CONF_ARGS}
+
+do-build:
+	@cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${SETUP_PROG} build
+
+post-build:
+	@cd ${WRKSRC}/doc/c2hs && \
+		sed 's!@VERSION@!$V!g;s!@DOCDIR@!${PREFIX}/share/doc/c2hs!g' \
+			man1/c2hs.1.in > man1/c2hs.1 && \
+		sgmlfmt -f html c2hs.sgml
+
+do-install:
+	@cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} \
+		${SETUP_PROG} copy --destdir=${DESTDIR}
+
+post-install:
+	@cd ${WRKSRC}/doc/c2hs && \
+		${INSTALL_MAN} man1/c2hs.1 ${PREFIX}/man/man1
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/c2hs
+	@${INSTALL_DATA} ${WRKSRC}/doc/c2hs/*.html ${PREFIX}/share/doc/c2hs
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/c2hs/lib
+	@${INSTALL_DATA} ${WRKSRC}/doc/c2hs/lib/*.hs \
+		${PREFIX}/share/doc/c2hs/lib
+
+do-regress:
+	@cd ${WRKDIST}/c2hs/tests && ${MAKE_PROGRAM}
 
 .include <bsd.port.mk>

devel/c2hs/distinfo

@@ -1,5 +1,15 @@
-MD5 (c2hs-0.13.6.tar.gz) = Cs61dP2xrCjXWjw2dESgvw==
+MD5 (c2hs-0.15.0-doc.tgz) = 9NmK+EYmLXuPszJmlMl28A==
-RMD160 (c2hs-0.13.6.tar.gz) = SZx8pI5IZ1c2mp+UjJqiLjvrzcI=
+MD5 (c2hs-0.15.0-tests.tgz) = phwl3RuFhI2o7NA2er3jLQ==
-SHA1 (c2hs-0.13.6.tar.gz) = /Tp11q1Typ7uA7nVuZgEN+ElGrg=
+MD5 (c2hs-0.15.0.tar.gz) = OotWR1lbvR0qAv8o2lLWLA==
-SHA256 (c2hs-0.13.6.tar.gz) = zg0jbu3FeBiV1XlpOuMrU/TpO7ipz2iTcaVlWZizPBQ=
+RMD160 (c2hs-0.15.0-doc.tgz) = BtNxT7fBYW8kRJTiBOf5Rqus7RU=
-SIZE (c2hs-0.13.6.tar.gz) = 375162
+RMD160 (c2hs-0.15.0-tests.tgz) = jpM/6+W0NGdpnhnqg/hs1RI7XC8=
+RMD160 (c2hs-0.15.0.tar.gz) = NUzL0e2RqwGiQdBXXM8x4GCnHD4=
+SHA1 (c2hs-0.15.0-doc.tgz) = 8BhURc0qeCDOViZsvbGLA8TzL5A=
+SHA1 (c2hs-0.15.0-tests.tgz) = 1vGtCbNp98I4snlWHNUzdulSf2w=
+SHA1 (c2hs-0.15.0.tar.gz) = ue7+wPhRi8EcTEZvp+XrgAFZi5o=
+SHA256 (c2hs-0.15.0-doc.tgz) = q0yH9yAQcwkDm0IvSSfCFWSoL2piKvuDSF/C1HZyTMQ=
+SHA256 (c2hs-0.15.0-tests.tgz) = nHe/ysh/KtAwU5OanwG7MdmyHpcJBJeQjgLxl5YfxEA=
+SHA256 (c2hs-0.15.0.tar.gz) = hM0UiTpJzVirwMSnWjsXgF4mlIcr0Uw+tgIf4yN4ys0=
+SIZE (c2hs-0.15.0-doc.tgz) = 32230
+SIZE (c2hs-0.15.0-tests.tgz) = 5339
+SIZE (c2hs-0.15.0.tar.gz) = 180115

devel/c2hs/patches/patch-c2hs_toplevel_C2HSConfig_hs

@@ -0,0 +1,12 @@
+$OpenBSD: patch-c2hs_toplevel_C2HSConfig_hs,v 1.1 2007/11/18 16:30:36 kili Exp $
+--- c2hs/toplevel/C2HSConfig.hs.orig	Fri Aug 31 12:54:31 2007
++++ c2hs/toplevel/C2HSConfig.hs	Sun Nov 18 17:24:02 2007
+@@ -59,7 +59,7 @@ cpp  = "cpp"
+ cppopts :: String
+ cppopts  = case os of
+   "darwin" -> "-x=c"   --why oh why must gcc on OSX be different!?
+-  _        -> "-x c"
++  _        -> "-xc"
+ 
+ -- |C2HS Library file name
+ --

devel/c2hs/pkg/DESCR

@@ -1,9 +1,9 @@
-C->Haskell is an interface generator that simplifies the development
+c2hs is an interface generator that simplifies the development of
-of Haskell bindings to C libraries.  The tool processes existing C
+Haskell bindings to C libraries.  The tool processes existing C
-header files that determine data layout and function signatures on the
+header files that determine data layout and function signatures on
-C side, in conjunction with Haskell modules that specify Haskell-side
+the C side, in conjunction with Haskell modules that specify
-type signatures and marshaling details. Hooks embedded in the Haskell
+Haskell-side type signatures and marshaling details. Hooks embedded
-code signal access to C structures and functions; they are expanded by
+in the Haskell code signal access to C structures and functions;
-the interfacing tool in conjunction with information in the
+they are expanded by the interfacing tool in conjunction with
-corresponding C header file.  A noteworthy property is the lightweight
+information in the corresponding C header file.  A noteworthy
-nature of the approach.
+property is the lightweight nature of the approach.

devel/c2hs/pkg/MESSAGE

@@ -1,5 +0,0 @@
-To link against the c2hs library components, add:
-
-  -package c2hs
-
-to the GHC command line

devel/c2hs/pkg/PLIST

@@ -1,17 +1,67 @@
-@comment $OpenBSD: PLIST,v 1.5 2005/03/25 05:53:21 dons Exp $
+@comment $OpenBSD: PLIST,v 1.6 2007/11/18 16:30:36 kili Exp $
 bin/c2hs
-bin/c2hs-config
-lib/c2hs-${V}/
-lib/c2hs-${V}/ghc6/
-lib/c2hs-${V}/ghc6/c2hs.conf
-lib/c2hs-${V}/ghc6/import/
-lib/c2hs-${V}/ghc6/import/C2HS.hi
-lib/c2hs-${V}/ghc6/import/C2HSBase.hi
-lib/c2hs-${V}/ghc6/import/C2HSMarsh.hi
-lib/c2hs-${V}/ghc6/libc2hs.a
-@man man/man1/c2hs-config.1
 @man man/man1/c2hs.1
-@exec /usr/bin/sed '1d;$d' %D/lib/c2hs-${V}/ghc6/c2hs.conf | /usr/bin/env PREFIX=%D %D/bin/ghc-pkg -u
+share/c2hs-${V}/
-@exec /bin/rm -f %D/lib/ghc-${V}/package.conf.old
+share/c2hs-${V}/C2HS.hs
-@unexec %D/bin/ghc-pkg -r c2hs
+share/doc/c2hs/
-@unexec /bin/rm -f %D/lib/ghc-${V}/package.conf.old
+share/doc/c2hs/c2hs.html
+share/doc/c2hs/c2hs1.html
+share/doc/c2hs/c2hs10.html
+share/doc/c2hs/c2hs11.html
+share/doc/c2hs/c2hs12.html
+share/doc/c2hs/c2hs13.html
+share/doc/c2hs/c2hs14.html
+share/doc/c2hs/c2hs15.html
+share/doc/c2hs/c2hs16.html
+share/doc/c2hs/c2hs17.html
+share/doc/c2hs/c2hs18.html
+share/doc/c2hs/c2hs19.html
+share/doc/c2hs/c2hs2.html
+share/doc/c2hs/c2hs20.html
+share/doc/c2hs/c2hs21.html
+share/doc/c2hs/c2hs22.html
+share/doc/c2hs/c2hs23.html
+share/doc/c2hs/c2hs24.html
+share/doc/c2hs/c2hs25.html
+share/doc/c2hs/c2hs26.html
+share/doc/c2hs/c2hs27.html
+share/doc/c2hs/c2hs28.html
+share/doc/c2hs/c2hs29.html
+share/doc/c2hs/c2hs3.html
+share/doc/c2hs/c2hs30.html
+share/doc/c2hs/c2hs31.html
+share/doc/c2hs/c2hs32.html
+share/doc/c2hs/c2hs33.html
+share/doc/c2hs/c2hs34.html
+share/doc/c2hs/c2hs35.html
+share/doc/c2hs/c2hs36.html
+share/doc/c2hs/c2hs37.html
+share/doc/c2hs/c2hs38.html
+share/doc/c2hs/c2hs39.html
+share/doc/c2hs/c2hs4.html
+share/doc/c2hs/c2hs40.html
+share/doc/c2hs/c2hs41.html
+share/doc/c2hs/c2hs42.html
+share/doc/c2hs/c2hs5.html
+share/doc/c2hs/c2hs6.html
+share/doc/c2hs/c2hs7.html
+share/doc/c2hs/c2hs8.html
+share/doc/c2hs/c2hs9.html
+share/doc/c2hs/c2hs_toc.html
+share/doc/c2hs/lib/
+share/doc/c2hs/lib/CError.hs
+share/doc/c2hs/lib/CForeign.hs
+share/doc/c2hs/lib/CString.hs
+share/doc/c2hs/lib/CTypes.hs
+share/doc/c2hs/lib/CTypesISO.hs
+share/doc/c2hs/lib/Foreign.hs
+share/doc/c2hs/lib/ForeignPtr.hs
+share/doc/c2hs/lib/Int.hs
+share/doc/c2hs/lib/MarshalAlloc.hs
+share/doc/c2hs/lib/MarshalArray.hs
+share/doc/c2hs/lib/MarshalError.hs
+share/doc/c2hs/lib/MarshalUtils.hs
+share/doc/c2hs/lib/Ptr.hs
+share/doc/c2hs/lib/StablePtr.hs
+share/doc/c2hs/lib/Storable.hs
+share/doc/c2hs/lib/Word.hs