aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorvs <vs@FreeBSD.org>2005-04-18 20:17:28 +0800
committervs <vs@FreeBSD.org>2005-04-18 20:17:28 +0800
commitf4adc0facf421463b4b5b516664ad7a78d523089 (patch)
treefcd392d7aa0175ea6416a6990a9d1371f751ff31 /devel
parent9bc0ac877a301cfe5e9a490901b6412eb55eaff8 (diff)
downloadfreebsd-ports-gnome-f4adc0facf421463b4b5b516664ad7a78d523089.tar.gz
freebsd-ports-gnome-f4adc0facf421463b4b5b516664ad7a78d523089.tar.zst
freebsd-ports-gnome-f4adc0facf421463b4b5b516664ad7a78d523089.zip
Unbreak: track package.conf-format changes
Diffstat (limited to 'devel')
-rw-r--r--devel/hs-tclhaskell-ghc/Makefile14
-rw-r--r--devel/hs-tclhaskell-ghc/files/patch-Makefile61
-rw-r--r--devel/hs-tclhaskell-ghc/files/pkg-install.in27
-rw-r--r--devel/hs-tclhaskell-ghc/pkg-install.in23
4 files changed, 48 insertions, 77 deletions
diff --git a/devel/hs-tclhaskell-ghc/Makefile b/devel/hs-tclhaskell-ghc/Makefile
index 7f572902218a..72170c7aca1a 100644
--- a/devel/hs-tclhaskell-ghc/Makefile
+++ b/devel/hs-tclhaskell-ghc/Makefile
@@ -20,8 +20,6 @@ LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
BUILD_DEPENDS= ${GHC}:${PORTSDIR}/lang/${GHCDEP}
RUN_DEPENDS= ${GHC}:${PORTSDIR}/lang/${GHCDEP}
-BROKEN= Does not build
-
.if defined(WITH_GHC5)
GHC= ghc-5.04.3
GHCDEP= ghc5
@@ -30,9 +28,10 @@ GHC= ghc-6.4
GHCDEP= ghc
.endif
+SUB_FILES= pkg-install
+SUB_LIST= GHC_VERSION="${GHC_VERSION}"
WRKSRC= ${WRKDIR}/TclHaskell1.2/src
USE_GMAKE= YES
-USE_REINPLACE= YES
GHC_VERSION= ${GHC:S/^ghc-//} # `${LOCALBASE}/bin/${GHC} --numeric-version`
GHC_LIB= ${LOCALBASE}/lib/${GHC}
@@ -40,6 +39,11 @@ PLIST_SUB+= GHC_VERSION="${GHC_VERSION}"
PKGINSTALL= ${WRKDIR}/pkg-install
MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" \
MKDIR="${MKDIR}" GHC="${GHC}"
+MAKE_ARGS+= CC="${CC}" GHC="${GHC}" CC_OPTS="${CFLAGS}" \
+ CC_INC="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3" \
+ CCLIB="-L${X11BASE}/lib/X11 -L${LOCALBASE}/lib" \
+ IMPORTS="${GHC_LIB}/imports/tclhaskell" TCLLIBS="-ltk83 -ltcl83" \
+ TCL_REQ="-ltk83 -ltcl83" PREFIX="${GHC_LIB}"
pre-everything::
@${ECHO}
@@ -48,9 +52,6 @@ pre-everything::
@${ECHO} "WITH_GHC5=YES."
@${ECHO}
-post-patch:
- ${REINPLACE_CMD} -e "s,/local.*tclhaskell,${GHC_LIB}," ${WRKSRC}/Makefile
-
post-install:
@${MKDIR} ${EXAMPLESDIR}/images
.for f in licence.txt demo
@@ -61,7 +62,6 @@ post-install:
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}/
.endif
- @${SED} -e s,GHC_VERSION,${GHC_VERSION}, <${MASTERDIR}/pkg-install.in >${PKGINSTALL}
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} dummy POST-INSTALL
.include <bsd.port.mk>
diff --git a/devel/hs-tclhaskell-ghc/files/patch-Makefile b/devel/hs-tclhaskell-ghc/files/patch-Makefile
index 705008943b89..b1086924144c 100644
--- a/devel/hs-tclhaskell-ghc/files/patch-Makefile
+++ b/devel/hs-tclhaskell-ghc/files/patch-Makefile
@@ -1,50 +1,8 @@
---- Makefile.orig Wed Oct 3 16:58:55 2001
-+++ Makefile Thu Mar 6 11:50:51 2003
-@@ -11,10 +11,10 @@
- LIBDIR = $(PREFIX)
-
- # where to install the TclHaskell interface files
--IMPORTS = $(PREFIX)/imports
-+IMPORTS = $(PREFIX)/imports/tclhaskell
-
- # the library files to use - change for different version
--TCLLIBS = -ltk8.3 -ltcl8.3
-+TCLLIBS = -ltk83 -ltcl83
-
- # Ununcomment this line to support concurrency.
- # This support does NOT work with ghci. It does not currently export
-@@ -36,9 +36,9 @@
- #
- #######################################################################
-
--CC = gcc
--CC_OPTS = -O
--CC_INC = -I/usr/X11/include -I/usr/local/include
-+CC ?= gcc
-+CC_OPTS = $(CFLAGS)
-+CC_INC = -I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3 -I${LOCALBASE}/include/tk8.3
-
- # ld options for generating shared libraries for Hugs:
-
-@@ -48,15 +48,15 @@
-
- # The directories containing the X11, Tcl and Tk (binary) libraries:
-
--CCLIB = -L /usr/lib/X11 -L /usr/local/lib
-+CCLIB = -L${X11BASE}/lib/X11 -L${LOCALBASE}/lib
-
-
- # the libraries required by Tcl/Tk:
-
- #TCLREQ = -ltk8.3 -ltcl8.3 -lX11 -lm -lsocket -lnsl -lintl -lw # (Solaris)
--TCL_REQ = -ltk8.3 -ltcl8.3 -lm -lc # (OSF/1+Linux)
-+TCL_REQ = $(TCLLIBS) # -lm -lc # (OSF/1+Linux)
-
--GHC = ghc
-+GHC ?= ghc
-
- RM = rm -f
-
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
@@ -72,7 +72,7 @@
HIS = *.hi
@@ -75,3 +33,12 @@
pkg :
ghc-pkg -a < tclhaskell.conf
+@@ -134,7 +134,7 @@
+ @:
+
+ TclCompatibilityGhc.o: Check.h TclPrim.hi
+- $(GHC) $(GHC_OPTS) $(GHC_INC) '-#include "Check.h"' -c $(SUPPORTCONCURRENCY) -ohi TclCompatibility.hi -o $@
++ $(GHC) $(GHC_OPTS) $(GHC_INC) -c $(SUPPORTCONCURRENCY) -ohi TclCompatibility.hi -o $@
+
+
+
diff --git a/devel/hs-tclhaskell-ghc/files/pkg-install.in b/devel/hs-tclhaskell-ghc/files/pkg-install.in
new file mode 100644
index 000000000000..211bddec726c
--- /dev/null
+++ b/devel/hs-tclhaskell-ghc/files/pkg-install.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+GHC_LIB=$PKG_PREFIX/lib/ghc-%%GHC_VERSION%%
+
+if [ x"$2" = xPOST-INSTALL ]; then
+cat << CONFEOF | $PKG_PREFIX/bin/ghc-pkg -a
+name: TclHaskell
+version: 1.2
+maintainer:
+exposed: True
+exposed-modules: Tcl,ConcTcl, ExtArray, GUIMonad, PlacePos, Remover, Tcl, TclCompatibility, TclConf, TclGUI, TclHandle, TclPrim, TclPrimCore, TclPrimExports, TclPrimImpl, TclPrimWidgets, TclTime, TclTrie, TclWidgets, TrieIO, Utils
+
+hidden-modules:
+import-dirs: "$GHC_LIB/imports/tclhaskell"
+library-dirs: "$GHC_LIB"
+hs-libraries: "HSTclHaskell"
+extra-libraries: "tcl83","tk83","HSTclHaskell_cbits"
+include-dirs: "$GHC_LIB/include"
+includes:
+depends: "haskell98","lang","concurrent"
+hugs-options:
+cc-options: "-fglasgow-exts", "-fvia-C"
+ld-options: "-L$PKG_PREFIX/lib", "-lncurses"
+CONFEOF
+/bin/rm -f $PKG_PREFIX/lib/ghc-%%GHC_VERSION%%/package.conf.old
+fi
+
diff --git a/devel/hs-tclhaskell-ghc/pkg-install.in b/devel/hs-tclhaskell-ghc/pkg-install.in
deleted file mode 100644
index 43f567372418..000000000000
--- a/devel/hs-tclhaskell-ghc/pkg-install.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-GHC_LIB=$PKG_PREFIX/lib/ghc-GHC_VERSION
-
-if [ x"$2" = xPOST-INSTALL ]; then
-cat << CONFEOF | $PKG_PREFIX/bin/ghc-pkg -a
-Package
- {name = "TclHaskell",
- import_dirs = ["$GHC_LIB/imports/tclhaskell/"],
- source_dirs = [],
- library_dirs = ["$GHC_LIB/"],
- hs_libraries = ["HSTclHaskell"],
- extra_libraries = ["tcl83","tk83","HSTclHaskell_cbits"],
- include_dirs = ["$GHC_LIB/include"],
- c_includes = [],
- package_deps = [ "rts","lang","concurrent","data" ],
- extra_ghc_opts = [ "-fglasgow-exts", "-fvia-C" ],
- extra_cc_opts = [],
- extra_ld_opts = [ "-L$PKG_PREFIX/lib", "-lncurses" ]
-}
-CONFEOF
-/bin/rm -f $PKG_PREFIX/lib/ghc-GHC_VERSION/package.conf.old
-fi