cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update devel/c2hs. All our patches have gone upstream :)

Browse Source
This commit is contained in:
dons 2005-03-25 05:53:21 +00:00
parent d92e6568e9
commit 93e06028d1
8 changed files with 19 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/c2hs/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2004/11/23 11:22:00 espie Exp $
# $OpenBSD: Makefile,v 1.4 2005/03/25 05:53:21 dons 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"
V= 0.12.0
V= 0.13.4
DISTNAME= c2hs-${V}
CATEGORIES= devel
MAINTAINER= Don Stewart <dons@openbsd.org>
@ -15,6 +15,7 @@ MODULES= lang/ghc
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --prefix=${PREFIX}
SUBST_VARS= V
post-build:
@(cd ${WRKSRC}/doc/c2hs && ${MAKE_PROGRAM} man1/c2hs-config.1 man1/c2hs.1)

8
devel/c2hs/distinfo
View File

@ -1,4 +1,4 @@
MD5 (c2hs-0.12.0.tar.gz) = 32327d4c531648bdace8c90d5c52b825
RMD160 (c2hs-0.12.0.tar.gz) = 0d6e3b73de03c4f52356d482ff8234fdc84aa545
SHA1 (c2hs-0.12.0.tar.gz) = 6b4aac0294585a7a0a28dee82d0d1f8d732399dd
SIZE (c2hs-0.12.0.tar.gz) = 383650
MD5 (c2hs-0.13.4.tar.gz) = a6c8a3b164c8abe944e762a732d03779
RMD160 (c2hs-0.13.4.tar.gz) = 124afb7bea05dbbaa2e2030c4d55045fb38b08b4
SHA1 (c2hs-0.13.4.tar.gz) = 766febb1d4e3fa1dab1e696f2672f50b1030839c
SIZE (c2hs-0.13.4.tar.gz) = 372471

16
devel/c2hs/patches/patch-c2hs_c2hs-config_in
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-c2hs_c2hs-config_in,v 1.1 2004/05/09 07:46:12 dons Exp $
Have the old (non-package) configuration tool report the correct paths
to the library
--- c2hs/c2hs-config.in.orig 2002-07-12 14:39:46.000000000 +1000
+++ c2hs/c2hs-config.in 2004-05-09 15:20:56.000000000 +1000
@@ -74,7 +74,7 @@ fi
if test x$has_pkg = xyes; then
if test "$echo_cflags" = "yes" -o "$echo_libs" = "yes"; then
if test "$pkg_added" != "yes"; then
- echo -n "-package-conf $pkg_conf "
+ echo -n ""
fi
echo "-package c2hs"
fi

22
devel/c2hs/patches/patch-c2hs_c2hs_conf_in
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-c2hs_c2hs_conf_in,v 1.2 2004/05/09 07:46:12 dons Exp $
Better package.conf.in. add haskell98 6.2.1ism
--- c2hs/c2hs.conf.in.orig 2002-02-13 15:49:06.000000000 +1100
+++ c2hs/c2hs.conf.in 2004-05-09 15:20:56.000000000 +1000
@@ -1,4 +1,3 @@
-[
Package {
name = "c2hs",
import_dirs = ["@LIBDIR@/c2hs-@C2HS_VERSION@/@SYS@/import"],
@@ -8,9 +7,8 @@ Package {
extra_libraries = [],
include_dirs = [],
c_includes = [],
- package_deps = ["lang"],
+ package_deps = ["lang","haskell98"],
extra_ghc_opts = ["-fglasgow-exts"],
extra_cc_opts = [],
extra_ld_opts = []
}
-]

15
devel/c2hs/patches/patch-c2hs_c_CAttrs_hs
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-c2hs_c_CAttrs_hs,v 1.1.1.1 2004/05/08 07:21:03 dons Exp $
Extra comma
--- c2hs/c/CAttrs.hs.orig 2004-05-06 16:27:44.000000000 +1000
+++ c2hs/c/CAttrs.hs 2004-05-06 16:27:54.000000000 +1000
@@ -144,7 +144,7 @@ leaveRangeC ac = ac {
--
leaveObjRangeC :: AttrC -> AttrC
leaveObjRangeC ac = ac {
- defObjsAC = fst . leaveRange . defObjsAC $ ac,
+ defObjsAC = fst . leaveRange . defObjsAC $ ac
}
-- add another definitions to the object name space (EXPORTED)

15
devel/c2hs/patches/patch-c2hs_lib_Makefile
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-c2hs_lib_Makefile,v 1.1.1.1 2004/05/08 07:21:03 dons Exp $
Fix 'start-of-word' regex. \< looks like a linux-ism
--- c2hs/lib/Makefile.orig 2004-05-06 17:10:10.000000000 +1000
+++ c2hs/lib/Makefile 2004-05-06 17:10:19.000000000 +1000
@@ -77,7 +77,7 @@ depend:
ifeq ($(LEGACY_FFI),no)
$(GREP) -v -e CError -e CForeign -e CString\
-e ForeignPtr -e MarshalAlloc -e MarshalArray\
- -e MarshalError -e MarshalUtils -e "\<Ptr" .depend\
+ -e MarshalError -e MarshalUtils -e "[[:<:]]Ptr" .depend\
>.depend.new
$(MV) .depend.new .depend
# mkdependHS is a bit stupid here and does include files if present even if

15
devel/c2hs/patches/patch-c2hs_tests_Makefile
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-c2hs_tests_Makefile,v 1.1.1.1 2004/05/08 07:21:03 dons Exp $
Broken test, and non-portable test
--- c2hs/tests/Makefile.orig 2003-10-19 20:43:21.000000000 +1000
+++ c2hs/tests/Makefile 2004-05-08 15:26:07.000000000 +1000
@@ -46,7 +46,7 @@ cpp: Cpp.chs cpp.h
.PHONY: tests simple.run calls.build enums.run pointer.run structs.run\
marsh.run cpp.build
-tests: simple.run calls.build enums.run pointer.run structs.run marsh.run\
+tests: simple.run calls.build pointer.run marsh.run\
cpp.build
simple.run: simple

28
devel/c2hs/pkg/PLIST
View File

@ -1,21 +1,17 @@
@comment $OpenBSD: PLIST,v 1.4 2005/03/08 22:47:54 dons Exp $
@comment $OpenBSD: PLIST,v 1.5 2005/03/25 05:53:21 dons Exp $
bin/c2hs
bin/c2hs-config
lib/c2hs-0.12.0/
lib/c2hs-0.12.0/ghc6/
lib/c2hs-0.12.0/ghc6/c2hs.conf
lib/c2hs-0.12.0/ghc6/import/
lib/c2hs-0.12.0/ghc6/import/C2HS.hi
lib/c2hs-0.12.0/ghc6/import/C2HSBase.hi
lib/c2hs-0.12.0/ghc6/import/C2HSDeprecated.hi
lib/c2hs-0.12.0/ghc6/import/C2HSMarsh.hi
lib/c2hs-0.12.0/ghc6/import/NewStablePtr.hi
lib/c2hs-0.12.0/ghc6/import/NewStorable.hi
lib/c2hs-0.12.0/ghc6/libc2hs.a
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
@comment call ghc-pkg to register/unregister this library with ghc
@exec cat %D/lib/c2hs-0.12.0/ghc6/c2hs.conf | /usr/bin/env PREFIX=%D %D/bin/ghc-pkg -u
@exec /bin/rm -f %D/lib/ghc-6.2.2/package.conf.old
@exec /usr/bin/sed '1d;$d' %D/lib/c2hs-${V}/ghc6/c2hs.conf | /usr/bin/env PREFIX=%D %D/bin/ghc-pkg -u
@exec /bin/rm -f %D/lib/ghc-${V}/package.conf.old
@unexec %D/bin/ghc-pkg -r c2hs
@unexec /bin/rm -f %D/lib/ghc-6.2.2/package.conf.old
@unexec /bin/rm -f %D/lib/ghc-${V}/package.conf.old