diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 2efcc8d63a77..449082943d23 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcl
-PORTVERSION=	2.6.3
+PORTVERSION=	2.6.5
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcl
@@ -36,9 +36,10 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \
 	--disable-statsysbfd \
 	--disable-locbfd \
 	--enable-custreloc
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" C_INCLUDE_PATH=${PREFIX}/include LIBRARY_PATH=${PREFIX}/lib
 MAKEFILE=	makefile
 
-INFO=	gcl gcl-si gcl-tk
+INFO=	gcl-si gcl-tk
 
 PLIST_SUB=	GCL_VER=${PORTVERSION}
 
@@ -48,7 +49,7 @@ pre-configure:
 	${RM} -f ${WRKSRC}/configure
 	${SED} -i '' \
 		-e 's|@@CFLAGS@@|${CFLAGS} -I${LOCALBASE}/include|' \
-		-e 's|@@LOCALLIBS@@|-L${LOCALBASE}/lib -lm -lreadline|' \
+		-e 's|@@LOCALLIBS@@|-L${LOCALBASE}/lib -lgmp -lm -lreadline|' \
 		${WRKSRC}/h/FreeBSD.defs
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcl/distinfo b/lang/gcl/distinfo
index f83105ef417c..5486ea34ab18 100644
--- a/lang/gcl/distinfo
+++ b/lang/gcl/distinfo
@@ -1,2 +1,2 @@
-MD5 (gcl-2.6.3.tar.gz) = 951a6a3ab4431ccf39c068c2201e21e2
-SIZE (gcl-2.6.3.tar.gz) = 8175908
+MD5 (gcl-2.6.5.tar.gz) = e0852318b81c93b76bc7e012f036ec6c
+SIZE (gcl-2.6.5.tar.gz) = 8250164
diff --git a/lang/gcl/files/patch-configure.in b/lang/gcl/files/patch-configure.in
index a592e18a355e..1af3b22e66be 100644
--- a/lang/gcl/files/patch-configure.in
+++ b/lang/gcl/files/patch-configure.in
@@ -1,11 +1,11 @@
 Index: configure.in
 ===================================================================
 RCS file: /cvsroot/gcl/gcl/configure.in,v
-retrieving revision 1.112.4.1.2.2.2.47.2.3.2.1
-diff -u -d -b -B -r1.112.4.1.2.2.2.47.2.3.2.1 configure.in
---- configure.in	15 Jul 2004 16:27:09 -0000	1.112.4.1.2.2.2.47.2.3.2.1
-+++ configure.in	19 Jul 2004 13:19:10 -0000
-@@ -1637,15 +1637,15 @@
+retrieving revision 1.112.4.1.2.2.2.47.2.3.2.1.4.2
+diff -u -d -r1.112.4.1.2.2.2.47.2.3.2.1.4.2 configure.in
+--- configure.in	13 Aug 2004 16:15:26 -0000	1.112.4.1.2.2.2.47.2.3.2.1.4.2
++++ configure.in	18 Aug 2004 16:29:18 -0000
+@@ -1657,15 +1657,15 @@
  if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
    TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
    else
diff --git a/lang/gcl/files/patch-h_FreeBSD.defs b/lang/gcl/files/patch-h_FreeBSD.defs
index 8cf2a79ca109..e70cc2fe1098 100644
--- a/lang/gcl/files/patch-h_FreeBSD.defs
+++ b/lang/gcl/files/patch-h_FreeBSD.defs
@@ -2,9 +2,9 @@ Index: h/FreeBSD.defs
 ===================================================================
 RCS file: /cvsroot/gcl/gcl/h/FreeBSD.defs,v
 retrieving revision 1.2.6.1.4.1
-diff -u -d -b -B -r1.2.6.1.4.1 FreeBSD.defs
+diff -u -d -r1.2.6.1.4.1 FreeBSD.defs
 --- h/FreeBSD.defs	15 Jul 2004 16:28:43 -0000	1.2.6.1.4.1
-+++ h/FreeBSD.defs	19 Jul 2004 13:19:30 -0000
++++ h/FreeBSD.defs	18 Aug 2004 16:29:43 -0000
 @@ -1,12 +1,16 @@
 -# Machine dependent makefile definitions for intel 386,486 running 386bsd
 +# Machine dependent makefile definitions for 386bsd
@@ -20,7 +20,7 @@ diff -u -d -b -B -r1.2.6.1.4.1 FreeBSD.defs
 -#LIBS    = -lm -L/usr/local/lib
 +#CFLAGS	= @@.CFLAGS@@
 +CFLAGS	= @@CFLAGS@@
-+CFLAGS	+= -fwritable-strings -fomit-frame-pointer -fsigned-char -DVOL=volatile -I$(GCLDIR)/o -I${prefix}/include
++CFLAGS	+= -fomit-frame-pointer -fsigned-char -DVOL=volatile -I$(GCLDIR)/o -I${prefix}/include
 +#LIBS = @@.LOCALLIBS@@
 +LIBS = @@LOCALLIBS@@
  #ODIR_DEBUG=
diff --git a/lang/gcl/files/patch-h_FreeBSD.h b/lang/gcl/files/patch-h_FreeBSD.h
new file mode 100644
index 000000000000..cd19f8d4630c
--- /dev/null
+++ b/lang/gcl/files/patch-h_FreeBSD.h
@@ -0,0 +1,19 @@
+Index: h/FreeBSD.h
+===================================================================
+RCS file: /cvsroot/gcl/gcl/h/FreeBSD.h,v
+retrieving revision 1.2.6.2.2.2
+diff -u -d -r1.2.6.2.2.2 FreeBSD.h
+--- h/FreeBSD.h	12 Jun 2004 16:28:15 -0000	1.2.6.2.2.2
++++ h/FreeBSD.h	18 Aug 2004 16:29:43 -0000
+@@ -32,6 +32,11 @@
+ #endif
+ #include "linux.h"
+ 
++#if defined(SET_SESSION_ID)
++#undef SET_SESSION_ID
++#endif
++#define SET_SESSION_ID() (setpgrp(0,0) ? -1 : 0)
++
+ #if defined(__i386__)
+ #define I386
+ #endif
diff --git a/lang/gcl/files/patch-h_linux.h b/lang/gcl/files/patch-h_linux.h
deleted file mode 100644
index ca6193c2d244..000000000000
--- a/lang/gcl/files/patch-h_linux.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: h/linux.h
-===================================================================
-RCS file: /cvsroot/gcl/gcl/h/linux.h,v
-retrieving revision 1.7.6.4
-diff -u -d -b -B -r1.7.6.4 linux.h
---- h/linux.h	3 May 2004 21:35:58 -0000	1.7.6.4
-+++ h/linux.h	19 Jul 2004 13:19:34 -0000
-@@ -138,8 +138,6 @@
-   sprintf(command, "ld -d -S -N -x -A %s -T %x %s %s -o %s", \
-             main,start,input,ldarg,output)
- 
--#define SET_SESSION_ID() (setpgrp() ? -1 : 0)
--
- #define CLEANUP_CODE \
-   setbuf(stdin,0); \
-    setbuf(stdout,0);
diff --git a/lang/gcl/files/patch-h_notcomp.h b/lang/gcl/files/patch-h_notcomp.h
deleted file mode 100644
index 45f45eb33e71..000000000000
--- a/lang/gcl/files/patch-h_notcomp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: h/notcomp.h
-===================================================================
-RCS file: /cvsroot/gcl/gcl/h/notcomp.h,v
-retrieving revision 1.15.6.3
-diff -u -d -b -B -r1.15.6.3 notcomp.h
---- h/notcomp.h	12 Feb 2004 05:23:13 -0000	1.15.6.3
-+++ h/notcomp.h	19 Jul 2004 13:19:38 -0000
-@@ -81,9 +81,21 @@
-    pack == LISP ? LISP_makefun(string,fname,argd) : \
-    error("Bad pack variable in MAKEFUN\n"))
- 
-+#if defined(__i386__)
-+#define __ELF_NATIVE_CLASS 32
-+#endif
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__ia64__)
-+#define __ELF_NATIVE_CLASS 64
-+#endif
-+
- #define mjoin(a_,b_) a_ ## b_
- #define Mjoin(a_,b_) mjoin(a_,b_)
- 
-+#if !defined(ElfW)
-+#define ElfW(a) Mjoin(Elf,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
-+#endif
-+#define ELFW(a) Mjoin(ELF,Mjoin(__ELF_NATIVE_CLASS,Mjoin(_,a)))
-+
- #define SI 0
- #define LISP 1
- 
diff --git a/lang/gcl/files/patch-info_gcl-si.texi b/lang/gcl/files/patch-info_gcl-si.texi
index cffd7422b7d0..35d7e496e505 100644
--- a/lang/gcl/files/patch-info_gcl-si.texi
+++ b/lang/gcl/files/patch-info_gcl-si.texi
@@ -2,9 +2,9 @@ Index: info/gcl-si.texi
 ===================================================================
 RCS file: /cvsroot/gcl/gcl/info/gcl-si.texi,v
 retrieving revision 1.3
-diff -u -d -b -B -r1.3 gcl-si.texi
+diff -u -d -r1.3 gcl-si.texi
 --- info/gcl-si.texi	19 Feb 2002 19:21:19 -0000	1.3
-+++ info/gcl-si.texi	19 Jul 2004 13:19:50 -0000
++++ info/gcl-si.texi	18 Aug 2004 16:29:48 -0000
 @@ -19,6 +19,10 @@
  
  @setchapternewpage odd
diff --git a/lang/gcl/files/patch-info_makefile b/lang/gcl/files/patch-info_makefile
index 365f176833f0..4a5819e97097 100644
--- a/lang/gcl/files/patch-info_makefile
+++ b/lang/gcl/files/patch-info_makefile
@@ -2,9 +2,9 @@ Index: info/makefile
 ===================================================================
 RCS file: /cvsroot/gcl/gcl/info/makefile,v
 retrieving revision 1.23.6.4.2.1
-diff -u -d -b -B -r1.23.6.4.2.1 makefile
+diff -u -d -r1.23.6.4.2.1 makefile
 --- info/makefile	25 Jun 2004 22:40:25 -0000	1.23.6.4.2.1
-+++ info/makefile	19 Jul 2004 13:19:54 -0000
++++ info/makefile	18 Aug 2004 16:29:48 -0000
 @@ -11,12 +11,12 @@
  
  -include ../makedefs
diff --git a/lang/gcl/files/patch-makedefc.in b/lang/gcl/files/patch-makedefc.in
index 3572bd252f89..995ab77099af 100644
--- a/lang/gcl/files/patch-makedefc.in
+++ b/lang/gcl/files/patch-makedefc.in
@@ -2,9 +2,9 @@ Index: makedefc.in
 ===================================================================
 RCS file: /cvsroot/gcl/gcl/makedefc.in,v
 retrieving revision 1.15.6.3
-diff -u -d -b -B -r1.15.6.3 makedefc.in
+diff -u -d -r1.15.6.3 makedefc.in
 --- makedefc.in	10 Mar 2004 22:51:36 -0000	1.15.6.3
-+++ makedefc.in	19 Jul 2004 13:19:14 -0000
++++ makedefc.in	18 Aug 2004 16:29:20 -0000
 @@ -16,13 +16,18 @@
  prefix=@prefix@
  
diff --git a/lang/gcl/files/patch-makefile b/lang/gcl/files/patch-makefile
deleted file mode 100644
index fbbded6dbad2..000000000000
--- a/lang/gcl/files/patch-makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: makefile
-===================================================================
-RCS file: /cvsroot/gcl/gcl/makefile,v
-retrieving revision 1.73.4.2.2.21
-diff -u -d -b -B -r1.73.4.2.2.21 makefile
---- makefile	26 May 2004 02:22:25 -0000	1.73.4.2.2.21
-+++ makefile	19 Jul 2004 13:19:18 -0000
-@@ -165,10 +165,11 @@
- 	mkdir -p $(DESTDIR)$(prefix)/lib 
- 	mkdir -p $(DESTDIR)$(prefix)/bin
- 	mkdir -p $(DESTDIR)$(INSTALL_LIB_DIR)
-+	mkdir -p $(DESTDIR)$(prefix)/info
- 	MINSTALL_LIB_DIR=`echo $(INSTALL_LIB_DIR) | sed -e 'sX^\([a-z]\):X/\1Xg'` ; \
- 	$(MAKE) install-command "INSTALL_LIB_DIR=$(INSTALL_LIB_DIR)" "prefix=$(prefix)" "DESTDIR=$(DESTDIR)" "BINDIR=$$MINSTALL_LIB_DIR/unixport"
- 	rm -f $(DESTDIR)$(prefix)/bin/gcl.exe
--	tar cf - $(PORTDIR)/$(FLISP)$(EXE) info/*.info* $(LISP_LIB) \
-+	tar cf - $(PORTDIR)/$(FLISP)$(EXE) $(LISP_LIB) \
- 	$(TCL_EXES)  |  (cd $(DESTDIR)$(INSTALL_LIB_DIR) ;tar xf -)
- 	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
- 	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
diff --git a/lang/gcl/pkg-plist b/lang/gcl/pkg-plist
index c379275d3992..6053e93286f5 100644
--- a/lang/gcl/pkg-plist
+++ b/lang/gcl/pkg-plist
@@ -37,6 +37,8 @@ lib/gcl-%%GCL_VER%%/gcl-tk/tinfo.o
 lib/gcl-%%GCL_VER%%/gcl-tk/tk-package.lsp
 lib/gcl-%%GCL_VER%%/gcl-tk/tkl.o
 lib/gcl-%%GCL_VER%%/h/cmpinclude.h
+lib/gcl-%%GCL_VER%%/info/gcl-si.info
+lib/gcl-%%GCL_VER%%/info/gcl-tk.info
 lib/gcl-%%GCL_VER%%/lsp/gcl_auto_new.lsp
 lib/gcl-%%GCL_VER%%/lsp/gcl_autoload.lsp
 lib/gcl-%%GCL_VER%%/lsp/gcl_export.lsp
@@ -64,6 +66,7 @@ share/emacs/site-lisp/sshell.el
 @dirrm lib/gcl-%%GCL_VER%%/gcl-tk/demos
 @dirrm lib/gcl-%%GCL_VER%%/gcl-tk
 @dirrm lib/gcl-%%GCL_VER%%/h
+@dirrm lib/gcl-%%GCL_VER%%/info
 @dirrm lib/gcl-%%GCL_VER%%/lsp
 @dirrm lib/gcl-%%GCL_VER%%/pcl
 @dirrm lib/gcl-%%GCL_VER%%/unixport