ports/81735: devel/hs-green-card: update to version 3.01

Johan van Selst johans at stack.nl
Tue May 31 18:40:02 UTC 2005


>Number:         81735
>Category:       ports
>Synopsis:       devel/hs-green-card: update to version 3.01
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 31 18:40:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Johan van Selst
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #3: Mon May 9 19:06:32 CEST 2005 root at mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	[Cc: maintainer, haskell at freebsd.org]

	Please consider this update to version 3.01.
	It is a beta version and comes with little (no) documentation,
	but it includes new features and doesn't require old ghc5

>How-To-Repeat:
	
>Fix:

	

	Update MASTER_SITES, BUILD_DEPENDS
	Remove special do-install target
	Introduce files/patch-lib_Makefile

diff -uNr hs-green-card/Makefile hs-green-card/Makefile
--- hs-green-card/Makefile	Fri Jul 16 17:44:18 2004
+++ hs-green-card/Makefile	Tue May 31 20:22:20 2005
@@ -6,30 +6,24 @@
 #
 
 PORTNAME=	green-card
-PORTVERSION=	2.05
-PORTREVISION=	1
+PORTVERSION=	3.01
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.galois.com/~sof/
+MASTER_SITES=	http://haskell.org/greencard/downloads/
 PKGNAMEPREFIX=	hs-
-DISTNAME=	gc-${PORTVERSION}-src
+DISTNAME=	greencard-${PORTVERSION}-src
 
 MAINTAINER=	haskell at FreeBSD.org
 COMMENT=	A foreign function interface preprocessor for Haskell
 
-BUILD_DEPENDS=	ghc-5.04.3:${PORTSDIR}/lang/ghc5
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 
-WRKSRC=		${WRKDIR}/gc-${PORTVERSION}
+WRKSRC=		${WRKDIR}/greencard-${PORTVERSION}
+GCLIBDIR=	${PREFIX}/lib/greencard-${PORTVERSION}
+PLIST_SUB+=	GC_VERSION=${PORTVERSION}
 
 USE_GMAKE=	yes
-ALL_TARGET=	all
 
-do-install:
-	@${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 \
-	  && ${CP} green-card.dvi.gz green-card.ps.gz ${DOCSDIR})
-.endif
+pre-install:
+	${MKDIR} ${GCLIBDIR}/Foreign ${GCLIBDIR}/imports/Foreign
 
 .include <bsd.port.mk>
diff -uNr hs-green-card/distinfo hs-green-card/distinfo
--- hs-green-card/distinfo	Sat Jan 31 12:16:45 2004
+++ hs-green-card/distinfo	Mon May 30 22:27:49 2005
@@ -1,2 +1,2 @@
-MD5 (gc-2.05-src.tar.gz) = 0cb2fb49d0c65be8dc790ae85b5ea394
-SIZE (gc-2.05-src.tar.gz) = 182113
+MD5 (greencard-3.01-src.tar.gz) = 6bd529a5a6e773afd44b3c68f0ee2a91
+SIZE (greencard-3.01-src.tar.gz) = 60628
diff -uNr hs-green-card/files/patch-lib_Makefile hs-green-card/files/patch-lib_Makefile
--- hs-green-card/files/patch-lib_Makefile	Thu Jan  1 01:00:00 1970
+++ hs-green-card/files/patch-lib_Makefile	Tue May 31 20:11:41 2005
@@ -0,0 +1,60 @@
+--- lib/Makefile.orig	Thu Jun  5 14:37:24 2003
++++ lib/Makefile	Tue May 31 20:00:59 2005
+@@ -3,7 +3,7 @@
+ ### User serviceable parts  ###
+ 
+ # Options to compile the sources with.
+-GHC_OPTS = -cpp -fglasgow-exts -fno-prune-tydecls 
++GHC_OPTS = -cpp -fglasgow-exts
+ 
+ PACKAGE=greencard
+ 
+@@ -40,7 +40,7 @@
+ 	$(HC) -package-name $(PACKAGE) $(GHC_OPTS) $(WAY_$(way)_GHC_OPTS) -c $< -o $@ -hisuf $(way_)hi
+ 
+ %.o : %.c
+-	$(HC) $(CC_OPTS) -c $< -o $@
++	$(HC) $(CC_OPTS) -I. -c $< -o $@
+ 
+ SRC_HC_OPTS 	+= -package-name $(PACKAGE)
+ 
+@@ -51,8 +51,8 @@
+ 	rm -f Foreign/GreenCard.$(way_)o Foreign/GreenCard_stub_ffi.o libHSgreencard.$(way_)a
+ 
+ install :: libHSgreencard.$(way_)a Foreign/GreenCard.$(way_)hi
+-	install -D Foreign/GreenCard.$(way_)hi $(libdir)/imports/Foreign/GreenCard.$(way_)hi
+-	install -D libHSgreencard.$(way_)a $(libdir)/libHSgreencard.$(way_)a
++	install Foreign/GreenCard.$(way_)hi $(libdir)/imports/Foreign/GreenCard.$(way_)hi
++	install libHSgreencard.$(way_)a $(libdir)/libHSgreencard.$(way_)a
+ 
+ uninstall ::
+ 	rm -f $(libdir)/imports/Foreign/GreenCard.$(way_)hi
+@@ -61,7 +61,7 @@
+ ifeq "$(way)" ""
+ 
+ install ::
+-	install -D Foreign/GreenCard.gc $(libdir)/Foreign/GreenCard.gc
++	install Foreign/GreenCard.gc $(libdir)/Foreign/GreenCard.gc
+ uninstall ::
+ 	rm -f $(libdir)/Foreign/GreenCard.gc 
+ 
+@@ -87,8 +87,8 @@
+ install :: all
+ 
+ install :: Foreign/GreenCard.hs
+-	install -D Foreign/GreenCard.gc $(libdir)/Foreign/GreenCard.gc
+-	install -D Foreign/GreenCard.hs $(libdir)/Foreign/GreenCard.hs
++	install Foreign/GreenCard.gc $(libdir)/Foreign/GreenCard.gc
++	install Foreign/GreenCard.hs $(libdir)/Foreign/GreenCard.hs
+ 
+ uninstall :: 
+ 	rm -f $(libdir)/Foreign/GreenCard.gc
+@@ -96,7 +96,7 @@
+ 
+ # No actual ffi in Foreign.GreenCard so nothing to install
+ # install :: Foreign/GreenCard.so
+-#         install -D Foreign/GreenCard.so $(libdir)/Foreign/GreenCard.so
++#         install Foreign/GreenCard.so $(libdir)/Foreign/GreenCard.so
+ # uninstall :: 
+ # 	rm -f $(libdir)/Foreign/GreenCard.so
+ 
diff -uNr hs-green-card/files/patch-src::Makefile hs-green-card/files/patch-src::Makefile
--- hs-green-card/files/patch-src::Makefile	Mon Aug 26 15:36:50 2002
+++ hs-green-card/files/patch-src::Makefile	Tue May 31 20:11:36 2005
@@ -1,12 +1,31 @@
---- src/Makefile.orig	Wed May  1 23:27:47 2002
-+++ src/Makefile	Wed May  1 23:28:02 2002
-@@ -1,9 +1,6 @@
- # (GNU) Makefile for Green Card (GHC)
+--- src/Makefile.orig	Tue May 31 20:11:19 2005
++++ src/Makefile	Tue May 31 20:01:39 2005
+@@ -47,7 +47,7 @@ clean ::
+ 	rm -f $(PROGRAM)
  
- ### User serviceable parts  ###
--HC      = /path/to/ghc
--CC      = gcc
--RM      = rm
+ install :: $(PROGRAM)
+-	install -D $(PROGRAM) $(bindir)/$(PROGRAM)
++	install $(PROGRAM) $(bindir)/$(PROGRAM)
  
- # Options to compile the sources with.
+ uninstall :: 
+ 	rm -f $(bindir)/$$i
+@@ -58,7 +58,7 @@ install :: all
+ 	for i in $(ALL_SRCS); do \
+ 		case $$i in \
+ 		  (*.hs | *.lhs) \
+-		    install -D $$i $(libdir)/src/$$i; \
++		    install $$i $(libdir)/src/$$i; \
+ 		esac; \
+ 	done
  
+@@ -98,8 +98,8 @@ all	:: greencard-bin
+ all     :: $(PROGRAM)
+ 
+ install :: all
+-	install -D greencard-bin $(libdir)/greencard-bin
+-	install -D $(PROGRAM) $(bindir)/$(PROGRAM)
++	install greencard-bin $(libdir)/greencard-bin
++	install $(PROGRAM) $(bindir)/$(PROGRAM)
+ 
+ uninstall ::
+ 	$(RM) $(libdir)/greencard-bin
diff -uNr hs-green-card/pkg-plist hs-green-card/pkg-plist
--- hs-green-card/pkg-plist	Fri Jul 16 17:44:18 2004
+++ hs-green-card/pkg-plist	Tue May 31 20:22:20 2005
@@ -1,26 +1,11 @@
-bin/green-card
-lib/green-card/StdDIS.gc
-lib/green-card/StdDIS.hi
-lib/green-card/StdDIS.hs
-lib/green-card/StdDIS.o
-lib/green-card/libHSgreencard.a
-%%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%%
- at dirrm lib/green-card
+bin/greencard
+lib/greencard-%%GC_VERSION%%/imports/Foreign/GreenCard.hi
+lib/greencard-%%GC_VERSION%%/imports/Foreign/GreenCard.p_hi
+lib/greencard-%%GC_VERSION%%/Foreign/GreenCard.gc
+lib/greencard-%%GC_VERSION%%/greencard-bin
+lib/greencard-%%GC_VERSION%%/libHSgreencard.p_a
+lib/greencard-%%GC_VERSION%%/libHSgreencard.a
+ at dirrm lib/greencard-%%GC_VERSION%%/imports/Foreign
+ at dirrm lib/greencard-%%GC_VERSION%%/imports
+ at dirrm lib/greencard-%%GC_VERSION%%/Foreign
+ at dirrm lib/greencard-%%GC_VERSION%%
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list