aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/hs-green-card/Makefile25
-rw-r--r--devel/hs-green-card/distinfo4
-rw-r--r--devel/hs-green-card/files/patch-lib_Makefile60
-rw-r--r--devel/hs-green-card/files/patch-src::Makefile37
-rw-r--r--devel/hs-green-card/pkg-plist37
-rw-r--r--graphics/hs-HOpenGL/Makefile6
6 files changed, 116 insertions, 53 deletions
diff --git a/devel/hs-green-card/Makefile b/devel/hs-green-card/Makefile
index 2151cb7d9b35..d4fa7bd12590 100644
--- a/devel/hs-green-card/Makefile
+++ b/devel/hs-green-card/Makefile
@@ -6,30 +6,25 @@
#
PORTNAME= green-card
-PORTVERSION= 2.05
-PORTREVISION= 1
+PORTVERSION= 3.0.1
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-${GC_VERSION}-src
MAINTAINER= haskell@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-${GC_VERSION}
+GC_VERSION= 3.01
+GCLIBDIR= ${PREFIX}/lib/greencard-${GC_VERSION}
+PLIST_SUB+= GC_VERSION=${GC_VERSION}
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 --git a/devel/hs-green-card/distinfo b/devel/hs-green-card/distinfo
index ec40978d520e..1828b349cb60 100644
--- a/devel/hs-green-card/distinfo
+++ b/devel/hs-green-card/distinfo
@@ -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 --git a/devel/hs-green-card/files/patch-lib_Makefile b/devel/hs-green-card/files/patch-lib_Makefile
new file mode 100644
index 000000000000..27736af8948d
--- /dev/null
+++ b/devel/hs-green-card/files/patch-lib_Makefile
@@ -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 --git a/devel/hs-green-card/files/patch-src::Makefile b/devel/hs-green-card/files/patch-src::Makefile
index 9c168a15e363..1ed5aead6152 100644
--- a/devel/hs-green-card/files/patch-src::Makefile
+++ b/devel/hs-green-card/files/patch-src::Makefile
@@ -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 --git a/devel/hs-green-card/pkg-plist b/devel/hs-green-card/pkg-plist
index 95ee28ff72e8..09d1d4819e68 100644
--- a/devel/hs-green-card/pkg-plist
+++ b/devel/hs-green-card/pkg-plist
@@ -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%%
-@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
+@dirrm lib/greencard-%%GC_VERSION%%/imports/Foreign
+@dirrm lib/greencard-%%GC_VERSION%%/imports
+@dirrm lib/greencard-%%GC_VERSION%%/Foreign
+@dirrm lib/greencard-%%GC_VERSION%%
diff --git a/graphics/hs-HOpenGL/Makefile b/graphics/hs-HOpenGL/Makefile
index 7f31a375f26f..6806480ce2b1 100644
--- a/graphics/hs-HOpenGL/Makefile
+++ b/graphics/hs-HOpenGL/Makefile
@@ -12,7 +12,11 @@ CATEGORIES= graphics haskell
MASTER_SITES= http://haskell.cs.yale.edu/HOpenGL/releases/
PKGNAMEPREFIX= hs-
-MAINTAINER= ports@FreeBSD.org
+DEPRECATED= "part of lang/ghc, broken dependencies"
+BROKEN= ${DEPRECATED}
+EXPIRATION_DATE=2005-10-01
+
+MAINTAINER= haskell@FreeBSD.org
COMMENT= Binding for OpenGL and GLUT for the lazy functional language Haskell
BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc5 \
generated by cgit (git 2.34.1) at 2025-01-02 10:59:19 +0800