- Connect lang/gambit-c to the build after the repocopy.

- Update to 4.2.6
- Respect CFLAGS

PR:		ports/124087
Submitted by:	Timothy Beyer <beyert@cs.ucr.edu>
Approved by:	Captain Fourier <rzinkov@gmail.com> (old maintainer)

4 files changed, 83 insertions, 26 deletions

diff --git a/lang/Makefile b/lang/Makefile
index 3cbe2348db68..64836a160bf9 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -72,6 +72,7 @@
     SUBDIR += g95
     SUBDIR += gambas
     SUBDIR += gambc
+    SUBDIR += gambit-c
     SUBDIR += gauche
     SUBDIR += gawk
     SUBDIR += gcc-ooo
diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index f040dfa78808..d9819a85add2 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -6,27 +6,67 @@
 #
 
 PORTNAME=	gambc
-DISTVERSION=	4.0b20
-PORTREVISION=	1
+DISTVERSION=	v4_2_6
+PORTEPOCH=	1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.iro.umontreal.ca/~gambit/download/gambit/4.0/source/
+MASTER_SITES=	http://www.iro.umontreal.ca/~gambit/download/gambit/v4.2/source/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pmn@bakarika.net
 COMMENT=	Gambit programming system where the compiler generates portable C code
 
-CONFLICTS=	ghostscript-gpl-* ghostscript-gnu-*
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+MAKE_ARGS=	PREFIX="${PREFIX}"
 
 CONFIGURE_ARGS=	--enable-single-host --enable-gcc-opts
 
 INFO=	gambit-c
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^\(install: install-pre install-recursive\) install-post|\1|' ${WRKSRC}/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/lib/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/lib/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsi/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsi/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsc/makefile.in
+	@${REINPLACE_CMD} -e 's|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/gsc/makefile.in
+
 pre-configure:
-	@${REINPLACE_CMD} -e 's|/4.0b20||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/4.2.6||' ${WRKSRC}/configure
 
 post-configure:
-	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
+	@${CP} ${WRKSRC}/makefile ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/Makefile
+
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/include/makefile
+	@${REINPLACE_CMD} -e 's|/include|/include/Gambit-C|' ${WRKSRC}/include/makefile
+
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/lib/makefile
+
+	@${REINPLACE_CMD} -e 's|/lib/|tempstr|' ${WRKSRC}/lib/makefile
+	@${REINPLACE_CMD} -e 's|/lib|/lib/Gambit-C|' ${WRKSRC}/lib/makefile
+	@${REINPLACE_CMD} -e 's|tempstr|/lib/|' ${WRKSRC}/lib/makefile
+
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/bin/makefile
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/gsc/makefile
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/gsi/makefile
+	@${REINPLACE_CMD} -e 's| gsc | gsc-gambit |' ${WRKSRC}/bin/makefile
+	@${REINPLACE_CMD} -e 's|/gsc |/gsc-gambit |' ${WRKSRC}/bin/makefile
+	@${REINPLACE_CMD} -e 's|EXECUTABLE = gsc|EXECUTABLE = gsc-gambit|' ${WRKSRC}/gsc/makefile
+
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/doc/makefile
+
+	@${REINPLACE_CMD} -e 's|/doc|/share/doc/Gambit-C|' ${WRKSRC}/doc/makefile
+
+	@${REINPLACE_CMD} -e 's|PACKAGE_SUBDIR = /v4.2.6|PACKAGE_SUBDIR = |' ${WRKSRC}/misc/makefile
+
+	@${REINPLACE_CMD} -e 's|/v4.2.6|/share/emacs/site-lisp|' ${WRKSRC}/misc/makefile
+
+	@${REINPLACE_CMD} -e 's|/syntax-case.scm|/share/Gambit-C/syntax-case.scm|' ${WRKSRC}/misc/makefile
+	@${REINPLACE_CMD} -e 's|/v4.2.6||' ${WRKSRC}/makefile
 
 .include <bsd.port.mk>
diff --git a/lang/gambit-c/distinfo b/lang/gambit-c/distinfo
index 919c6fec79cc..d2949f08b4c5 100644
--- a/lang/gambit-c/distinfo
+++ b/lang/gambit-c/distinfo
@@ -1,3 +1,3 @@
-MD5 (gambc-4.0b20.tar.gz) = fb58e5bd67e52d88797672cbf04d34b3
-SHA256 (gambc-4.0b20.tar.gz) = 2ab46aead25b82b06d8f8dbe59b33896d32055f8340df2522ecfc11844ebb5a8
-SIZE (gambc-4.0b20.tar.gz) = 7025146
+MD5 (gambc-v4_2_6.tgz) = 0b11fe631de5cc777c971c11eb918644
+SHA256 (gambc-v4_2_6.tgz) = 905e0820d99b513f0bde0535aff104d27255fc786564012300824bbba1984bfc
+SIZE (gambc-v4_2_6.tgz) = 14147053
diff --git a/lang/gambit-c/pkg-plist b/lang/gambit-c/pkg-plist
index c3d9ba7668ad..df62aa5701b9 100644
--- a/lang/gambit-c/pkg-plist
+++ b/lang/gambit-c/pkg-plist
@@ -1,6 +1,6 @@
 bin/six
-bin/gsc
-bin/gsc-cc-o
+bin/gsc-cc-o.bat
+bin/gsc-gambit
 bin/gsc-script
 bin/gsi
 bin/gsi-script
@@ -9,18 +9,34 @@ bin/scheme-r4rs
 bin/scheme-r5rs
 bin/scheme-srfi-0
 bin/six-script
-current
-doc/gambit-c.html
-doc/gambit-c.pdf
-doc/gambit-c.txt
-include/gambit.h
-lib/_gambc.c
-lib/digest#.scm
-lib/digest.scm
-lib/gambit#.scm
-lib/libgambc.a
-lib/r4rs#.scm
-lib/r5rs#.scm
+share/doc/Gambit-C/gambit-c.html
+share/doc/Gambit-C/gambit-c.pdf
+share/doc/Gambit-C/gambit-c.txt
+include/Gambit-C/gambit.h
+lib/Gambit-C/_gambc.c
+lib/Gambit-C/_kernel#.scm
+lib/Gambit-C/_system#.scm
+lib/Gambit-C/_num#.scm
+lib/Gambit-C/_std#.scm
+lib/Gambit-C/_eval#.scm
+lib/Gambit-C/_io#.scm
+lib/Gambit-C/_nonstd#.scm
+lib/Gambit-C/_thread#.scm
+lib/Gambit-C/_repl#.scm
+lib/Gambit-C/_gambit#.scm
+lib/Gambit-C/digest#.scm
+lib/Gambit-C/digest.scm
+lib/Gambit-C/gambit#.scm
+lib/_gambcgsi.c
+lib/libgambcgsi.a
+lib/_gambcgsc.c
+lib/libgambcgsc.a
+lib/Gambit-C/libgambc.a
+lib/Gambit-C/r4rs#.scm
+lib/Gambit-C/r5rs#.scm
 share/emacs/site-lisp/gambit.el
-syntax-case.scm
-@dirrm doc
+share/Gambit-C/syntax-case.scm
+@dirrm include/Gambit-C
+@dirrm share/doc/Gambit-C
+@dirrm share/Gambit-C
+@dirrm lib/Gambit-C