Update to version 4.7.3.

PR:		ports/193039
Submitted by:	Ports Fury.

4 files changed, 67 insertions, 70 deletions

diff --git a/lang/gambit-c/Makefile b/lang/gambit-c/Makefile
index 609f4b9aa41e..86b06366a7b3 100644
--- a/lang/gambit-c/Makefile
+++ b/lang/gambit-c/Makefile
@@ -2,51 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	gambit-c
-DISTVERSION=	v4_6_6
+DISTVERSION=	v4_7_3
 PORTEPOCH=	1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/
+MASTER_SITES=	http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/
 DISTNAME=	gambc-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gambit programming system where the compiler generates portable C code
 
-LICENSE=	APACHE20
+LICENSE=	APACHE20 LGPL21
+LICENSE_COMB=	dual
 
-MAN1=		gsi.1
-
-USES=		gmake tar:tgz
+USES=		compiler gmake tar:tgz
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-single-host --enable-gcc-opts
-CONFIGURE_ARGS+=--prefix=${PREFIX} --docdir=${PREFIX}/share/doc/gambit-c
-CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/gambit-c/ --includedir=${PREFIX}/include/gambit-c
-CONFIGURE_ARGS+=--enable-interpreter-name=gsi-gambit  --enable-compiler-name=gsc-gambit
+CONFIGURE_ARGS=	--enable-single-host \
+		--enable-gcc-opts \
+		--docdir=${DOCSDIR} \
+		--includedir=${PREFIX}/include/gambit-c \
+		--libdir=${PREFIX}/lib/gambit-c \
+		--enable-compiler-name=gsc-gambit \
+		--enable-interpreter-name=gsi-gambit
+MAKEFILE=	makefile
+USE_LDCONFIG=	${PREFIX}/lib/gambit-c
 
 INFO=		gambit-c
 
+OPTIONS_DEFINE=	DOCS
 
-USE_LDCONFIG=	${PREFIX}/lib/gambit-c
-
-PLIST_SUB+=	GSI_INC=include/gambit-c
-PLIST_SUB+=	GSI_DOC=share/doc/gambit-c
-PLIST_SUB+=	GSI_LIB=lib/gambit-c
+.include <bsd.port.pre.mk>
 
+.if ${COMPILER_TYPE} == gcc
 # This is needed because 4.2 < gcc -v < 4.4 has optimisations that make the
 # build take more than 20Gb of virtual memory.
 CFLAGS+=	-fno-move-loop-invariants
+.endif
 
-NO_STAGE=	yes
 post-patch:
-	@${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
-
-post-configure:
-	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
-
-.include <bsd.port.mk>
+.for i in makefile.in gsc/makefile.in gsi/makefile.in lib/makefile.in
+	@${REINPLACE_CMD} -e \
+		's|^\(FLAGS_OBJ = \).*|\1 ${CFLAGS}| ; \
+		 s|^\(FLAGS_DYN = \).*|\1 ${CFLAGS}|' ${WRKSRC}/${i}
+.endfor
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs[ci]-gambit
+
+.include <bsd.port.post.mk>
diff --git a/lang/gambit-c/distinfo b/lang/gambit-c/distinfo
index 343da6b39cd1..cf89a549fe73 100644
--- a/lang/gambit-c/distinfo
+++ b/lang/gambit-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gambc-v4_6_6.tgz) = 4e8b18bb350124138d1f9bf143dda0ab5e55f3c3d489a6dc233a15a003f161d2
-SIZE (gambc-v4_6_6.tgz) = 10738338
+SHA256 (gambc-v4_7_3.tgz) = 59c4c62f2cfaf698b54a862e7af9c1b3e4cc27e46d386f31c66e00fed4701777
+SIZE (gambc-v4_7_3.tgz) = 11462024
diff --git a/lang/gambit-c/pkg-descr b/lang/gambit-c/pkg-descr
index 9cd75aa58c47..03d52e013929 100644
--- a/lang/gambit-c/pkg-descr
+++ b/lang/gambit-c/pkg-descr
@@ -1,13 +1,12 @@
 The Gambit programming system is a full implementation of the Scheme
-language which conforms to the R4RS and IEEE Scheme standards.  It
+language which conforms to the R4RS and IEEE Scheme standards. It
 consists of two main programs: gsi-gambit, the Gambit Scheme
 interpreter, and gsc-gambit, the Gambit Scheme compiler.
 
-
 Gambit-C is a version of the Gambit programming system in which the
 compiler generates portable C code, making the whole Gambit-C system
 and the programs compiled with it easily portable to many computer
-architectures for which a C compiler is available.  With appropriate
+architectures for which a C compiler is available. With appropriate
 declarations in the source code the executable programs generated by
 the compiler run roughly as fast as equivalent C programs.
 
diff --git a/lang/gambit-c/pkg-plist b/lang/gambit-c/pkg-plist
index da2dab8feca2..9b4fbb7f0a24 100644
--- a/lang/gambit-c/pkg-plist
+++ b/lang/gambit-c/pkg-plist
@@ -10,40 +10,39 @@ bin/scheme-r5rs
 bin/scheme-srfi-0
 bin/six
 bin/six-script
-%%GSI_INC%%/gambit-not406006.h
-%%GSI_INC%%/gambit.h
-%%GSI_LIB%%/_asm#.scm
-%%GSI_LIB%%/_assert#.scm
-%%GSI_LIB%%/_codegen#.scm
-%%GSI_LIB%%/_eval#.scm
-%%GSI_LIB%%/_gambc.c
-%%GSI_LIB%%/_gambcgsc.c
-%%GSI_LIB%%/_gambcgsi.c
-%%GSI_LIB%%/_gambit#.scm
-%%GSI_LIB%%/_io#.scm
-%%GSI_LIB%%/_kernel#.scm
-%%GSI_LIB%%/_nonstd#.scm
-%%GSI_LIB%%/_num#.scm
-%%GSI_LIB%%/_repl#.scm
-%%GSI_LIB%%/_std#.scm
-%%GSI_LIB%%/_system#.scm
-%%GSI_LIB%%/_thread#.scm
-%%GSI_LIB%%/_x86#.scm
-%%GSI_LIB%%/digest#.scm
-%%GSI_LIB%%/digest.scm
-%%GSI_LIB%%/gambit#.scm
-%%GSI_LIB%%/libgambc.a
-%%GSI_LIB%%/libgambcgsc.a
-%%GSI_LIB%%/libgambcgsi.a
-%%GSI_LIB%%/r4rs#.scm
-%%GSI_LIB%%/r5rs#.scm
-%%GSI_LIB%%/syntax-case.scm
-%%GSI_DOC%%/gambit-c.html
-%%GSI_DOC%%/gambit-c.pdf
-%%GSI_DOC%%/gambit-c.txt
+include/gambit-c/gambit.h
+include/gambit-c/gambit-not407003.h
+lib/gambit-c/_asm#.scm
+lib/gambit-c/_assert#.scm
+lib/gambit-c/_codegen#.scm
+lib/gambit-c/_eval#.scm
+lib/gambit-c/_gambc.c
+lib/gambit-c/_gambcgsc.c
+lib/gambit-c/_gambcgsi.c
+lib/gambit-c/_gambit#.scm
+lib/gambit-c/_io#.scm
+lib/gambit-c/_kernel#.scm
+lib/gambit-c/_nonstd#.scm
+lib/gambit-c/_num#.scm
+lib/gambit-c/_repl#.scm
+lib/gambit-c/_std#.scm
+lib/gambit-c/_system#.scm
+lib/gambit-c/_thread#.scm
+lib/gambit-c/_x86#.scm
+lib/gambit-c/digest#.scm
+lib/gambit-c/digest.scm
+lib/gambit-c/gambit#.scm
+lib/gambit-c/libgambc.a
+lib/gambit-c/libgambcgsc.a
+lib/gambit-c/libgambcgsi.a
+lib/gambit-c/r4rs#.scm
+lib/gambit-c/r5rs#.scm
+lib/gambit-c/syntax-case.scm
+man/man1/gsi.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/gambit-c.html
+%%PORTDOCS%%%%DOCSDIR%%/gambit-c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/gambit-c.txt
 share/emacs/site-lisp/gambit.el
-@dirrmtry share/emacs/site-lisp
-@dirrmtry share/emacs
-@dirrm %%GSI_LIB%%
-@dirrm %%GSI_INC%%
-@dirrm %%GSI_DOC%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry lib/gambit-c
+@dirrmtry include/gambit-c