Attachment #147643 for bug #193898

View | Details | Raw Unified | Return to bug 193898
Collapse All | Expand All




# $FreeBSD: head/lang/gcl/Makefile 367888 2014-09-10 20:50:31Z gerald $

PORTNAME=	gcl
PORTVERSION=	2.6.11
PORTREVISION=	3
CATEGORIES=	lang tcl tk
MASTER_SITES=	GNU


LICENSE=	GPLv2 LGPL21
LICENSE_COMB=	multi

BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp

OPTIONS_DEFINE=	EMACS X11 DOCS
OPTIONS_DEFAULT=EMACS X11
EMACS_DESC=	Install Emacs syntax files

ONLY_FOR_ARCHS=	amd64 i386

WRKSRC=		${WRKDIR}/${PORTNAME}

USES=		gmake readline
USE_GCC=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	ac_cv_prog_AWK="${LOCALBASE}/bin/gawk" \
		C_INCLUDE_PATH="${PREFIX}/include" LIBRARY_PATH="${PREFIX}/lib"
CONFIGURE_ARGS=	--enable-ansi \
		--enable-machine=${OPSYS} \
		--enable-emacsdir=${PREFIX}/share/emacs/site-lisp/gcl \

		--disable-dynsysbfd \
		--disable-statsysbfd \
		--enable-custreloc
CONFIGURE_ENV=	C_INCLUDE_PATH="${PREFIX}/include" LIBRARY_PATH="${PREFIX}/lib"
MAKEFILE=	makefile
INSTALL_TARGET=	install-command
LATE_INSTALL_ARGS=\

		lib/${DISTNAME}/clcs \
		lib/${DISTNAME}

ONLY_FOR_ARCHS=	amd64 i386

OPTIONS_DEFINE=		DOCS EMACS X11
OPTIONS_DEFAULT=	EMACS X11

EMACS_DESC=		Install Emacs syntax files
EMACS_USE=		emacs=yes
EMACS_PLIST_FILES=	${FILES_ELISP:S|^|%%EMACS_SITE_LISPDIR%%/gcl/|}
EMACS_PLIST_DIRS=	%%EMACS_SITE_LISPDIR%%/gcl
X11_USES=		tk
X11_USE=		xorg=x11
X11_CONFIGURE_ON=	--enable-tclconfig=${TCL_LIBDIR} \
			--enable-tkconfig=${TK_LIBDIR} \
			--with-x
X11_CONFIGURE_OFF=	--disable-xgcl
X11_LDFLAGS=		-lX11
X11_PLIST_FILES=	${FILES_GCLTK:S|^|lib/gcl-${PORTVERSION}/gcl-tk/|} \
			${FILES_GCLTK_DEMOS:S|^|lib/gcl-${PORTVERSION}/gcl-tk/demos/|} \
			${FILES_XGCL2:S|^|lib/gcl-${PORTVERSION}/xgcl-2/|}
X11_PLIST_DIRS=		lib/${DISTNAME}/xgcl-2 \
			lib/${DISTNAME}/gcl-tk/demos \
			lib/${DISTNAME}/gcl-tk

FILES_CLCS=	sys-proclaim.lisp
FILES_CMPNEW=	gcl_cmpmain.lsp gcl_cmpopt.lsp gcl_collectfn.lsp \
		gcl_collectfn.o gcl_lfun_list.lsp sys-proclaim.lisp

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MEMACS}
USE_EMACS=	yes
EMACS_NO_BUILD_DEPENDS=yes
PLIST_FILES+=	${FILES_ELISP:S|^|%%EMACS_SITE_LISPDIR%%/gcl/|}
PLIST_DIRS+=	%%EMACS_SITE_LISPDIR%%/gcl
.endif

.if ${PORT_OPTIONS:MX11}
USES+=		tk
USE_XORG=	x11
CONFIGURE_ARGS+=--enable-tclconfig=${TCL_LIBDIR} \
		--enable-tkconfig=${TK_LIBDIR} \
		--with-x
LDFLAGS+=	-lX11
PLIST_FILES+=	${FILES_GCLTK:S|^|lib/gcl-${PORTVERSION}/gcl-tk/|} \
		${FILES_GCLTK_DEMOS:S|^|lib/gcl-${PORTVERSION}/gcl-tk/demos/|} \
		${FILES_XGCL2:S|^|lib/gcl-${PORTVERSION}/xgcl-2/|}
PLIST_DIRS+=	lib/${DISTNAME}/xgcl-2 \
		lib/${DISTNAME}/gcl-tk/demos \
		lib/${DISTNAME}/gcl-tk
.else
CONFIGURE_ARGS+=--disable-xgcl
.endif

post-patch:

		${STAGEDIR}${PREFIX}/lib/${DISTNAME}/pcl)
.endfor
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport
.for i in saved_ansi_gcl
	(cd ${WRKSRC}/unixport && ${INSTALL_PROGRAM} ${i} \
		${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport)
.endfor
.for i in ${FILES_UNIXPORT:Nsaved_ansi_gcl}
	(cd ${WRKSRC}/unixport && ${INSTALL_DATA} ${i} \
		${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport)
.endfor
	@${CHMOD} a+x ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport/saved_ansi_gcl
.if ${PORT_OPTIONS:MEMACS}
	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/gcl
.for i in ${FILES_ELISP}

.endif
.if ${PORT_OPTIONS:MX11}
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk
.for i in gcltkaux
	(cd ${WRKSRC}/gcl-tk && ${INSTALL_LIB} ${i} \
		${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk)
.endfor
.for i in ${FILES_GCLTK:Ngcltkaux}
	(cd ${WRKSRC}/gcl-tk && ${INSTALL_DATA} ${i} \
		${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk)
.endfor

Lines 1-2 Link Here

(-)lang/gcl/distinfo (-2 / +2 lines)
1	SHA256 (gcl-2.6.10.tar.gz) = 79a1fb2f92b5e86f24988448db3e34116ab6ef7c93ad839848edd01ad06651ef	1	SHA256 (gcl-2.6.11.tar.gz) = 44058f029a631e8ebae38c6c5a25e2f986b5bfdd8e6283b32d7e56723efafb9c
2	SIZE (gcl-2.6.10.tar.gz) = 5490689	2	SIZE (gcl-2.6.11.tar.gz) = 7047082




--- configure	2005-01-15 11:17:17.000000000 -0800
+++ configure	2007-09-22 18:17:38.000000000 -0700
@@ -5087,7 +5087,7 @@
 				TLIBS="$TLIBS -lgmp"
 				echo "#include \"gmp.h\"" >foo.c
 				echo "int main() {return 0;}" >>foo.c
-				MP_INCLUDE=`cpp foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
+				MP_INCLUDE=`$CPP $CPPFLAGS foo.c | $AWK '/(\/|\\\\)gmp.h/ {if (!i) print $3;i=1}' | tr -d '"'`
 				rm -f foo.c
 else
   echo "Cannot use dynamic gmp lib"
@@ -9043,16 +9043,16 @@
    if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then
       TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include
    else
-      if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
-        TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+      if test -f ${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
+        TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
       fi
    fi
 
    if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
       TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
    else
-      if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
-        TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+      if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
+        TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
       fi
    fi
 




--- gcl-tk/tkMain.c.orig
+++ gcl-tk/tkMain.c
@@ -206,7 +206,7 @@
 
     if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (const char **)argv, argTable, 0)
 	    != TCL_OK) {
-	fprintf(stderr, "%s\n", interp->result);
+	fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
 	exit(1);
     }
     if (name == NULL) {
@@ -290,7 +290,7 @@
      */
 
     if (Tcl_AppInit(interp) != TCL_OK) {
-	fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
+	fprintf(stderr, "Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
     }
 
     /*
@@ -300,7 +300,7 @@
     if (geometry != NULL) {
 	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
 	if (code != TCL_OK) {
-	    fprintf(stderr, "%s\n", interp->result);
+	    fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
 	}
     }
 
@@ -330,13 +330,13 @@
     
 	    fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
 	    if (fullName == NULL) {
-		fprintf(stderr, "%s\n", interp->result);
+		fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
 	    } else {
 		f = fopen(fullName, "r");
 		if (f != NULL) {
 		    code = Tcl_EvalFile(interp, fullName);
 		    if (code != TCL_OK) {
-			fprintf(stderr, "%s\n", interp->result);
+			fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
 		    }
 		    fclose(f);
 		}
@@ -371,7 +371,7 @@
 error:
     msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
     if (msg == NULL) {
-	msg = interp->result;
+	msg = Tcl_GetStringResult(interp);
     }
     dfprintf(stderr, "%s\n", msg);
     Tcl_Eval(interp, errorExitCmd);
@@ -502,7 +502,7 @@
 	      bcopy(msg->msg_id,p,3);
 	      /* end header */
 	      if(sock_write_str2(dsfd, m_reply, buf, 4 ,
-				 interp->result, strlen(interp->result))
+				 Tcl_GetStringResult(interp), strlen(Tcl_GetStringResult(interp)))
 		 < 0)
 		{		/* what do we want to do if the write failed */}
 	      
@@ -686,7 +686,7 @@
   code = Tcl_Eval(interp, szCmd);
   if (code != TCL_OK)
     {
-      dfprintf(stderr, "TCL Error int bind : %s\n", interp->result);
+      dfprintf(stderr, "TCL Error int bind : %s\n", Tcl_GetStringResult(interp));
 
     }
   return code;




 #define I386
 #endif
 
@@ -48,7 +56,7 @@
 	int c = 0;						\
 								\
 	if (							\
-		(fp)->_r <= 0 &&				\
+		((FILE *)fp)->_r <= 0 &&				\
 		(ioctl(((FILE *)fp)->_file, FIONREAD, &c), c <= 0)	\
 	)							\
 		return(FALSE);					\
@@ -68,7 +76,11 @@
 #ifdef CLOCKS_PER_SEC
 #define HZ CLOCKS_PER_SEC

 #endif
 /* #define ss_base ss_sp */
 
@@ -79,6 +91,7 @@
 #define HAVE_SIGPROCMASK
 #define SIG_STACK_SIZE (SIGSTKSZ/sizeof(double))
 
+/*
 #undef SETUP_SIG_STACK
 #define SETUP_SIG_STACK {					\
 	static struct sigaltstack estack;			\
@@ -90,6 +103,7 @@
 	if (sigaltstack(&estack, 0) < 0)			\
 		perror("sigaltstack");				\
 }
+ */
 
 #undef INSTALL_SEGMENTATION_CATCHER
 #define INSTALL_SEGMENTATION_CATCHER				\




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	18 Aug 2004 16:29:48 -0000
@@ -12,12 +12,11 @@
 
 -include ../makedefs
 
-all: gcl-tk.info gcl-si.info  $(GCL_PDF) $(GCL_HTML) #gcl.info
+all: gcl-tk.info gcl-si.info
 
 .texi.info:
 	rm -f $*.*gz
 	-$(MAKEINFO) $*.texi
-	- gzip $*.info-*
+	rm -f $*gz
+	rm -f $*.info
+	-$(MAKEINFO) --no-split $*.texi
 
 GCL_SI= number.texi sequence.texi character.texi list.texi io.texi \
 	form.texi compile.texi symbol.texi system.texi structure.texi \
@@ -98,10 +97,10 @@
 	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-si.texi || true
 
 gcl-si.info: ${GCL_SI} gcl-si.texi
-	-$(MAKEINFO) gcl-si.texi	
 
 gcl-tk.dvi: ${GCL_TK} gcl-tk.texi
 	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-tk.texi || true
 
 gcl-tk.info: ${GCL_TK} gcl-tk.texi
-	-$(MAKEINFO) gcl-tk.texi
 
 gcl.dvi: ${GCL_MAN} gcl.texi
 	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl.texi || true
 
 gcl.info: ${GCL_MAN} gcl.texi
-	-$(MAKEINFO) gcl.texi
 
 #gcl-si_toc.html: ${GCL_SI} gcl-si.texi
 #	$(HTML_CMD) gcl-si.texi
@@ -69,15 +66,15 @@
 install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
 	cp *.html /d/www/gcl
 
-install: $(GCL_DVI) $(GCL_HTML)
+install: 
 	mkdir -p $(DESTDIR)${INFO_DIR}
-	[ -f $(DESTDIR)$(INFO_DIR)dir ] || touch $(DESTDIR)$(INFO_DIR)dir
-	grep gcl-si $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
-	echo "* GCL Doc: (gcl-si.info).	GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}dir
-	grep gcl-tk $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
-	echo "* GCL TK Doc: (gcl-tk.info).	TK window GCL interface." >> $(DESTDIR)${INFO_DIR}dir
-	grep gcl.info $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 || \
-	echo "* GCL Ansi Doc: (gcl.info).  Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}dir
+	[ -f $(DESTDIR)$(INFO_DIR)/dir ] || touch $(DESTDIR)$(INFO_DIR)/dir
+	grep gcl-si $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+	echo "* GCL Doc: (gcl-si.info).	GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}/dir
+	grep gcl-tk $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+	echo "* GCL TK Doc: (gcl-tk.info).	TK window GCL interface." >> $(DESTDIR)${INFO_DIR}/dir
+	grep gcl.info $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 || \
+	echo "* GCL Ansi Doc: (gcl.info).  Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}/dir
 	-cp *.info* $(DESTDIR)${INFO_DIR}
 #	-mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
 #	-mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
@@ -88,10 +85,10 @@
 #	-cp gcl/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
 #	-cp gcl-si/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
 #	-cp gcl-tk/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html

+#	-mkdir -p $(DESTDIR)$(INFO_DIR)../doc
 #	-cp -r gcl-si gcl gcl-tk $(DESTDIR)$(INFO_DIR)../doc
-	-cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
-	-cp *pdf $(DESTDIR)$(INFO_DIR)../doc
+#	-cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
+#	-cp *pdf $(DESTDIR)$(INFO_DIR)../doc
 
 FILE=gcl-si.texi
 srcs:




--- o/gcl_readline.d.orig
+++ o/gcl_readline.d
@@ -221,7 +221,7 @@
    in case we want to do some simple parsing.  Return the array of matches,
    or NULL if there aren't any. */
 /* extern char **rl_completion_matches(char *,char *(*)(char *,int)); */
-static char **rl_completion(char *text, int start, int end) {
+static char **rl_completion(const char *text, int start, int end) {
 	return rl_completion_matches(text, (rl_compentry_func_t *)rl_completion_words_new);
 }
 #endif
@@ -469,7 +469,7 @@
   char *pn="GCL",*cp=getenv("TERM");
   rl_readline_name=pn;
 #ifdef RL_COMPLETION
-  rl_attempted_completion_function = (CPPFunction *)rl_completion;
+  rl_attempted_completion_function = rl_completion;
 #endif		
   if (isatty(0) && (!cp || strcmp(cp,"dumb")))
     readline_on=1;

Line 0 Link Here

(-)lang/gcl/files/patch-o__nsocket.c (+11 lines)
	1	--- o/nsocket.c.orig
	2	+++ o/nsocket.c
	3	@@ -328,7 +328,7 @@
	4
	5
	6
	7	-#define SOCKET_FD(strm) ((strm)->sm.sm_fp ? fileno((strm)->sm.sm_fp) : -1)
	8	+#define SOCKET_FD(strm) ((strm)->sm.sm_fp ? fileno((FILE *)(strm)->sm.sm_fp) : -1)
	9
	10	static void
	11	check_socket(object x)

Lines 5-11 Link Here

(-)lang/gcl/files/patch-o_file.d (-1 / +1 lines)
5	#include <signal.h>	5	#include <signal.h>
6		6
7	-#if defined(DARWIN)	7	-#if defined(DARWIN)
8	+#if defined(BSD)	8	+#if defined(DARWIN) \|\| defined(__FreeBSD__)
9	#define on_exit(a,b)	9	#define on_exit(a,b)
10	#else	10	#else
11	static void	11	static void




--- unixport/makefile	2005-01-15 11:34:45.000000000 -0500
+++ unixport/makefile	2009-12-07 12:35:23.000000000 -0500
@@ -21,7 +21,7 @@
 LD_FLAGS:=$(LD_FLAGS) $(ODIR)/$(FIRST_FILE)
 endif
 LD_LIBS_PRE:=$(addprefix -u ,$(PATCHED_SYMBOLS))
-LD_LIBS_POST:=$(LIBS) $(LIBC) -lgclp
+LD_LIBS_POST:=-lgclp $(LIBS) $(LIBC)
 ifneq ($(LAST_FILE),)
 LD_LIBS_POST:=$(LD_LIBS_POST) $(ODIR)/$(LAST_FILE)
 endif
@@ -139,7 +139,7 @@
 	$(CC) $(LD_FLAGS) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
 
 msys: msys.c

Return to bug 193898

Lines 2-9 Link Here

(-)lang/gcl/Makefile (-33 / +38 lines)
2	# $FreeBSD: head/lang/gcl/Makefile 367888 2014-09-10 20:50:31Z gerald $	2	# $FreeBSD: head/lang/gcl/Makefile 367888 2014-09-10 20:50:31Z gerald $
3		3
4	PORTNAME= gcl	4	PORTNAME= gcl
5	PORTVERSION= 2.6.10	5	PORTVERSION= 2.6.11
6	PORTREVISION= 3
7	CATEGORIES= lang tcl tk	6	CATEGORIES= lang tcl tk
8	MASTER_SITES= GNU	7	MASTER_SITES= GNU
9		8
Lines 13-31 Link Here
13	LICENSE= GPLv2 LGPL21	12	LICENSE= GPLv2 LGPL21
14	LICENSE_COMB= multi	13	LICENSE_COMB= multi
15		14
		15	BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
16	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp	16	LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp
17		17
18	OPTIONS_DEFINE= EMACS X11 DOCS
19	OPTIONS_DEFAULT=EMACS X11
20	EMACS_DESC= Install Emacs syntax files
21
22	ONLY_FOR_ARCHS= amd64 i386
23
24	WRKSRC= ${WRKDIR}/${PORTNAME}	18	WRKSRC= ${WRKDIR}/${PORTNAME}
25		19
26	USES= gmake makeinfo readline	20	USES= gmake readline
27	USE_GCC= yes	21	USE_GCC= yes
28	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
		23	CONFIGURE_ENV= ac_cv_prog_AWK="${LOCALBASE}/bin/gawk" \
		24	C_INCLUDE_PATH="${PREFIX}/include" LIBRARY_PATH="${PREFIX}/lib"
29	CONFIGURE_ARGS= --enable-ansi \	25	CONFIGURE_ARGS= --enable-ansi \
30	--enable-machine=${OPSYS} \	26	--enable-machine=${OPSYS} \
31	--enable-emacsdir=${PREFIX}/share/emacs/site-lisp/gcl \	27	--enable-emacsdir=${PREFIX}/share/emacs/site-lisp/gcl \
Lines 34-40 Link Here
34	--disable-dynsysbfd \	30	--disable-dynsysbfd \
35	--disable-statsysbfd \	31	--disable-statsysbfd \
36	--enable-custreloc	32	--enable-custreloc
37	CONFIGURE_ENV= C_INCLUDE_PATH="${PREFIX}/include" LIBRARY_PATH="${PREFIX}/lib"
38	MAKEFILE= makefile	33	MAKEFILE= makefile
39	INSTALL_TARGET= install-command	34	INSTALL_TARGET= install-command
40	LATE_INSTALL_ARGS=\	35	LATE_INSTALL_ARGS=\
Lines 65-70 Link Here
65	lib/${DISTNAME}/clcs \	60	lib/${DISTNAME}/clcs \
66	lib/${DISTNAME}	61	lib/${DISTNAME}
67		62
		63	ONLY_FOR_ARCHS= amd64 i386
		64
		65	OPTIONS_DEFINE= DOCS EMACS X11
		66	OPTIONS_DEFAULT= EMACS X11
		67
		68	EMACS_DESC= Install Emacs syntax files
		69	EMACS_USE= emacs=yes
		70	EMACS_PLIST_FILES= ${FILES_ELISP:S\|^\|%%EMACS_SITE_LISPDIR%%/gcl/\|}
		71	EMACS_PLIST_DIRS= %%EMACS_SITE_LISPDIR%%/gcl
		72	X11_USES= tk
		73	X11_USE= xorg=x11
		74	X11_CONFIGURE_ON= --enable-tclconfig=${TCL_LIBDIR} \
		75	--enable-tkconfig=${TK_LIBDIR} \
		76	--with-x
		77	X11_CONFIGURE_OFF= --disable-xgcl
		78	X11_LDFLAGS= -lX11
		79	X11_PLIST_FILES= ${FILES_GCLTK:S\|^\|lib/gcl-${PORTVERSION}/gcl-tk/\|} \
		80	${FILES_GCLTK_DEMOS:S\|^\|lib/gcl-${PORTVERSION}/gcl-tk/demos/\|} \
		81	${FILES_XGCL2:S\|^\|lib/gcl-${PORTVERSION}/xgcl-2/\|}
		82	X11_PLIST_DIRS= lib/${DISTNAME}/xgcl-2 \
		83	lib/${DISTNAME}/gcl-tk/demos \
		84	lib/${DISTNAME}/gcl-tk
		85
68	FILES_CLCS= sys-proclaim.lisp	86	FILES_CLCS= sys-proclaim.lisp
69	FILES_CMPNEW= gcl_cmpmain.lsp gcl_cmpopt.lsp gcl_collectfn.lsp \	87	FILES_CMPNEW= gcl_cmpmain.lsp gcl_cmpopt.lsp gcl_collectfn.lsp \
70	gcl_collectfn.o gcl_lfun_list.lsp sys-proclaim.lisp	88	gcl_collectfn.o gcl_lfun_list.lsp sys-proclaim.lisp
Lines 93-119 Link Here
93	.include <bsd.port.options.mk>	111	.include <bsd.port.options.mk>
94		112
95	.if ${PORT_OPTIONS:MEMACS}	113	.if ${PORT_OPTIONS:MEMACS}
96	USE_EMACS= yes
97	EMACS_NO_BUILD_DEPENDS=yes	114	EMACS_NO_BUILD_DEPENDS=yes
98	PLIST_FILES+= ${FILES_ELISP:S\|^\|%%EMACS_SITE_LISPDIR%%/gcl/\|}
99	PLIST_DIRS+= %%EMACS_SITE_LISPDIR%%/gcl
100	.endif
101
102	.if ${PORT_OPTIONS:MX11}
103	USES+= tk
104	USE_XORG= x11
105	CONFIGURE_ARGS+=--enable-tclconfig=${TCL_LIBDIR} \
106	--enable-tkconfig=${TK_LIBDIR} \
107	--with-x
108	LDFLAGS+= -lX11
109	PLIST_FILES+= ${FILES_GCLTK:S\|^\|lib/gcl-${PORTVERSION}/gcl-tk/\|} \
110	${FILES_GCLTK_DEMOS:S\|^\|lib/gcl-${PORTVERSION}/gcl-tk/demos/\|} \
111	${FILES_XGCL2:S\|^\|lib/gcl-${PORTVERSION}/xgcl-2/\|}
112	PLIST_DIRS+= lib/${DISTNAME}/xgcl-2 \
113	lib/${DISTNAME}/gcl-tk/demos \
114	lib/${DISTNAME}/gcl-tk
115	.else
116	CONFIGURE_ARGS+=--disable-xgcl
117	.endif	115	.endif
118		116
119	post-patch:	117	post-patch:
Lines 155-165 Link Here
155	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/pcl)	153	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/pcl)
156	.endfor	154	.endfor
157	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport	155	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport
158	.for i in ${FILES_UNIXPORT}	156	.for i in saved_ansi_gcl
		157	(cd ${WRKSRC}/unixport && ${INSTALL_PROGRAM} ${i} \
		158	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport)
		159	.endfor
		160	.for i in ${FILES_UNIXPORT:Nsaved_ansi_gcl}
159	(cd ${WRKSRC}/unixport && ${INSTALL_DATA} ${i} \	161	(cd ${WRKSRC}/unixport && ${INSTALL_DATA} ${i} \
160	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport)	162	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport)
161	.endfor	163	.endfor
162	@${CHMOD} a+x ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport/saved_ansi_gcl
163	.if ${PORT_OPTIONS:MEMACS}	164	.if ${PORT_OPTIONS:MEMACS}
164	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/gcl	165	@${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/gcl
165	.for i in ${FILES_ELISP}	166	.for i in ${FILES_ELISP}
Lines 169-175 Link Here
169	.endif	170	.endif
170	.if ${PORT_OPTIONS:MX11}	171	.if ${PORT_OPTIONS:MX11}
171	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk	172	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk
172	.for i in ${FILES_GCLTK}	173	.for i in gcltkaux
		174	(cd ${WRKSRC}/gcl-tk && ${INSTALL_LIB} ${i} \
		175	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk)
		176	.endfor
		177	.for i in ${FILES_GCLTK:Ngcltkaux}
173	(cd ${WRKSRC}/gcl-tk && ${INSTALL_DATA} ${i} \	178	(cd ${WRKSRC}/gcl-tk && ${INSTALL_DATA} ${i} \
174	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk)	179	${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk)
175	.endfor	180	.endfor

Lines 1-31 Link Here

(-)lang/gcl/files/patch-configure (-22 / +23 lines)
1	--- configure 2005-01-15 11:17:17.000000000 -0800	1	--- configure 2005-01-15 11:17:17.000000000 -0800
2	+++ configure 2007-09-22 18:17:38.000000000 -0700	2	+++ configure 2007-09-22 18:17:38.000000000 -0700
3	@@ -4998,7 +4998,7 @@	3	@@ -5087,7 +5087,7 @@
4	TLIBS="$TLIBS -lgmp"	4	TLIBS="$TLIBS -lgmp"
5	echo "#include \"gmp.h\"" >foo.c	5	echo "#include \"gmp.h\"" >foo.c
6	echo "int main() {return 0;}" >>foo.c	6	echo "int main() {return 0;}" >>foo.c
7	- MP_INCLUDE=`cpp foo.c \| grep /gmp.h \| head -n 1 \| $AWK '{print $3}' \| tr -d '"'`	7	- MP_INCLUDE=`cpp foo.c \| $AWK '/(\/\|\\\\)gmp.h/ {if (!i) print $3;i=1}' \| tr -d '"'`
8	+ MP_INCLUDE=`$CPP $CPPFLAGS foo.c \| grep /gmp.h \| head -n 1 \| $AWK '{print $3}' \| tr -d '"'`	8	+ MP_INCLUDE=`$CPP $CPPFLAGS foo.c \| $AWK '/(\/\|\\\\)gmp.h/ {if (!i) print $3;i=1}' \| tr -d '"'`
9	rm -f foo.c	9	rm -f foo.c
10	else	10	else
11	echo "Cannot use dynamic gmp lib"	11	echo "Cannot use dynamic gmp lib"
12	@@ -8399,15 +8399,15 @@	12	@@ -9043,16 +9043,16 @@
13	if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then	13	if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then
14	TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include	14	TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include
15	else	15	else
16	- if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then	16	- if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
17	- TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}	17	- TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
18	+ if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then	18	+ if test -f ${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
19	+ TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}	19	+ TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
20	fi	20	fi
21	fi	21	fi
22	if test -f ${TCL_CONFIG_PREFIX}/../include/tcl.h ; then	22
23	TCL_INCLUDE=-I${TCL_CONFIG_PREFIX}/../include	23	if test -f ${TK_CONFIG_PREFIX}/../include/tk.h ; then
24	else	24	TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../include
25	- if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then	25	else
26	- TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}	26	- if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
27	+ if test -f ${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then	27	- TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
28	+ TCL_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}	28	+ if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
29	fi	29	+ TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
30	fi	30	fi
		31	fi
31		32

Lines 1-72 Link Here

(-)lang/gcl/files/patch-gcl-tk__tkMain.c (-72 lines)
1	--- gcl-tk/tkMain.c.orig
2	+++ gcl-tk/tkMain.c
3	@@ -206,7 +206,7 @@
4
5	if (Tk_ParseArgv(interp, (Tk_Window) NULL, &argc, (const char **)argv, argTable, 0)
6	!= TCL_OK) {
7	- fprintf(stderr, "%s\n", interp->result);
8	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
9	exit(1);
10	}
11	if (name == NULL) {
12	@@ -290,7 +290,7 @@
13	*/
14
15	if (Tcl_AppInit(interp) != TCL_OK) {
16	- fprintf(stderr, "Tcl_AppInit failed: %s\n", interp->result);
17	+ fprintf(stderr, "Tcl_AppInit failed: %s\n", Tcl_GetStringResult(interp));
18	}
19
20	/*
21	@@ -300,7 +300,7 @@
22	if (geometry != NULL) {
23	code = Tcl_VarEval(interp, "wm geometry . ", geometry, (char *) NULL);
24	if (code != TCL_OK) {
25	- fprintf(stderr, "%s\n", interp->result);
26	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
27	}
28	}
29
30	@@ -330,13 +330,13 @@
31
32	fullName = Tcl_TildeSubst(interp, tcl_RcFileName, &buffer);
33	if (fullName == NULL) {
34	- fprintf(stderr, "%s\n", interp->result);
35	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
36	} else {
37	f = fopen(fullName, "r");
38	if (f != NULL) {
39	code = Tcl_EvalFile(interp, fullName);
40	if (code != TCL_OK) {
41	- fprintf(stderr, "%s\n", interp->result);
42	+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
43	}
44	fclose(f);
45	}
46	@@ -371,7 +371,7 @@
47	error:
48	msg = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
49	if (msg == NULL) {
50	- msg = interp->result;
51	+ msg = Tcl_GetStringResult(interp);
52	}
53	dfprintf(stderr, "%s\n", msg);
54	Tcl_Eval(interp, errorExitCmd);
55	@@ -502,7 +502,7 @@
56	bcopy(msg->msg_id,p,3);
57	/* end header */
58	if(sock_write_str2(dsfd, m_reply, buf, 4 ,
59	- interp->result, strlen(interp->result))
60	+ Tcl_GetStringResult(interp), strlen(Tcl_GetStringResult(interp)))
61	< 0)
62	{ /* what do we want to do if the write failed */}
63
64	@@ -686,7 +686,7 @@
65	code = Tcl_Eval(interp, szCmd);
66	if (code != TCL_OK)
67	{
68	- dfprintf(stderr, "TCL Error int bind : %s\n", interp->result);
69	+ dfprintf(stderr, "TCL Error int bind : %s\n", Tcl_GetStringResult(interp));
70
71	}
72	return code;

Lines 28-33 Link Here

(-)lang/gcl/files/patch-h_FreeBSD.h (-16 / +9 lines)
28	#define I386	28	#define I386
29	#endif	29	#endif
30		30
		31	@@ -48,7 +56,7 @@
		32	int c = 0; \
		33	\
		34	if ( \
		35	- (fp)->_r <= 0 && \
		36	+ ((FILE *)fp)->_r <= 0 && \
		37	(ioctl(((FILE *)fp)->_file, FIONREAD, &c), c <= 0) \
		38	) \
		39	return(FALSE); \
31	@@ -68,7 +76,11 @@	40	@@ -68,7 +76,11 @@
32	#ifdef CLOCKS_PER_SEC	41	#ifdef CLOCKS_PER_SEC
33	#define HZ CLOCKS_PER_SEC	42	#define HZ CLOCKS_PER_SEC
Lines 41-59 Link Here
41	#endif	50	#endif
42	/* #define ss_base ss_sp */	51	/* #define ss_base ss_sp */
43		52
44	@@ -79,6 +91,7 @@
45	#define HAVE_SIGPROCMASK
46	#define SIG_STACK_SIZE (SIGSTKSZ/sizeof(double))
47
48	+/*
49	#undef SETUP_SIG_STACK
50	#define SETUP_SIG_STACK { \
51	static struct sigaltstack estack; \
52	@@ -90,6 +103,7 @@
53	if (sigaltstack(&estack, 0) < 0) \
54	perror("sigaltstack"); \
55	}
56	+ */
57
58	#undef INSTALL_SEGMENTATION_CATCHER
59	#define INSTALL_SEGMENTATION_CATCHER \

Lines 5-72 Link Here

(-)lang/gcl/files/patch-info_makefile (-54 / +7 lines)
5	diff -u -d -r1.23.6.4.2.1 makefile	5	diff -u -d -r1.23.6.4.2.1 makefile
6	--- info/makefile 25 Jun 2004 22:40:25 -0000 1.23.6.4.2.1	6	--- info/makefile 25 Jun 2004 22:40:25 -0000 1.23.6.4.2.1
7	+++ info/makefile 18 Aug 2004 16:29:48 -0000	7	+++ info/makefile 18 Aug 2004 16:29:48 -0000
8	@@ -11,12 +11,12 @@	8	@@ -12,12 +12,11 @@
9		9
10	-include ../makedefs	10	-include ../makedefs
11		11
12	-all: gcl-tk.info gcl-si.info $(GCL_DVI) $(GCL_HTML) #gcl.info	12	-all: gcl-tk.info gcl-si.info $(GCL_PDF) $(GCL_HTML) #gcl.info
13	+all: gcl-tk.info gcl-si.info	13	+all: gcl-tk.info gcl-si.info
14		14
15	.texi.info:	15	.texi.info:
16	- rm -f $.gz	16	rm -f $.gz
17	- -$(MAKEINFO) $*.texi	17	-$(MAKEINFO) $*.texi
18	- - gzip $.info-	18	- - gzip $.info-
19	+ rm -f $*gz
20	+ rm -f $*.info
21	+ -$(MAKEINFO) --no-split $*.texi
22		19
23	GCL_SI= number.texi sequence.texi character.texi list.texi io.texi \	20	GCL_SI= number.texi sequence.texi character.texi list.texi io.texi \
24	form.texi compile.texi symbol.texi system.texi structure.texi \	21	form.texi compile.texi symbol.texi system.texi structure.texi \
25	@@ -34,19 +34,16 @@	22	@@ -98,10 +97,10 @@
26	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-si.texi \|\| true
27
28	gcl-si.info: ${GCL_SI} gcl-si.texi
29	- -$(MAKEINFO) gcl-si.texi
30
31	gcl-tk.dvi: ${GCL_TK} gcl-tk.texi
32	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl-tk.texi \|\| true
33
34	gcl-tk.info: ${GCL_TK} gcl-tk.texi
35	- -$(MAKEINFO) gcl-tk.texi
36
37	gcl.dvi: ${GCL_MAN} gcl.texi
38	TEXINPUTS=.:$$TEXINPUTS tex --interaction nonstopmode gcl.texi \|\| true
39
40	gcl.info: ${GCL_MAN} gcl.texi
41	- -$(MAKEINFO) gcl.texi
42
43	#gcl-si_toc.html: ${GCL_SI} gcl-si.texi
44	# $(HTML_CMD) gcl-si.texi
45	@@ -69,15 +66,15 @@
46	install-html: gcl-tk_toc.html gcl-si_toc.html gcl_toc.html
47	cp *.html /d/www/gcl
48
49	-install: $(GCL_DVI) $(GCL_HTML)
50	+install:
51	mkdir -p $(DESTDIR)${INFO_DIR}
52	- [ -f $(DESTDIR)$(INFO_DIR)dir ] \|\| touch $(DESTDIR)$(INFO_DIR)dir
53	- grep gcl-si $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 \|\| \
54	- echo "* GCL Doc: (gcl-si.info). GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}dir
55	- grep gcl-tk $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 \|\| \
56	- echo "* GCL TK Doc: (gcl-tk.info). TK window GCL interface." >> $(DESTDIR)${INFO_DIR}dir
57	- grep gcl.info $(DESTDIR)${INFO_DIR}dir >/dev/null 2>&1 \|\| \
58	- echo "* GCL Ansi Doc: (gcl.info). Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}dir
59	+ [ -f $(DESTDIR)$(INFO_DIR)/dir ] \|\| touch $(DESTDIR)$(INFO_DIR)/dir
60	+ grep gcl-si $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 \|\| \
61	+ echo "* GCL Doc: (gcl-si.info). GNU Common Lisp specific Documentation." >> $(DESTDIR)${INFO_DIR}/dir
62	+ grep gcl-tk $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 \|\| \
63	+ echo "* GCL TK Doc: (gcl-tk.info). TK window GCL interface." >> $(DESTDIR)${INFO_DIR}/dir
64	+ grep gcl.info $(DESTDIR)${INFO_DIR}/dir >/dev/null 2>&1 \|\| \
65	+ echo "* GCL Ansi Doc: (gcl.info). Ansi Common Lisp Specification." >> $(DESTDIR)${INFO_DIR}/dir
66	-cp .info $(DESTDIR)${INFO_DIR}
67	# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
68	# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
69	@@ -88,10 +85,10 @@
70	# -cp gcl/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html	23	# -cp gcl/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl.html
71	# -cp gcl-si/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html	24	# -cp gcl-si/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-si.html
72	# -cp gcl-tk/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html	25	# -cp gcl-tk/* $(DESTDIR)$(INFO_DIR)../doc/gcl-doc/gcl-tk.html
Lines 74-82 Link Here
74	+# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc	27	+# -mkdir -p $(DESTDIR)$(INFO_DIR)../doc
75	# -cp -r gcl-si gcl gcl-tk $(DESTDIR)$(INFO_DIR)../doc	28	# -cp -r gcl-si gcl gcl-tk $(DESTDIR)$(INFO_DIR)../doc
76	- -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc	29	- -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
77	- -cp *dvi $(DESTDIR)$(INFO_DIR)../doc	30	- -cp *pdf $(DESTDIR)$(INFO_DIR)../doc
78	+# -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc	31	+# -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc
79	+# -cp *dvi $(DESTDIR)$(INFO_DIR)../doc	32	+# -cp *pdf $(DESTDIR)$(INFO_DIR)../doc
80		33
81	FILE=gcl-si.texi	34	FILE=gcl-si.texi
82	srcs:	35	srcs:

Lines 1-20 Link Here

(-)lang/gcl/files/patch-o-gcl_readline.d (-20 lines)
1	--- o/gcl_readline.d.orig
2	+++ o/gcl_readline.d
3	@@ -221,7 +221,7 @@
4	in case we want to do some simple parsing. Return the array of matches,
5	or NULL if there aren't any. */
6	/* extern char *rl_completion_matches(char ,char ()(char ,int)); /
7	-static char *rl_completion(char text, int start, int end) {
8	+static char *rl_completion(const char text, int start, int end) {
9	return rl_completion_matches(text, (rl_compentry_func_t *)rl_completion_words_new);
10	}
11	#endif
12	@@ -469,7 +469,7 @@
13	char pn="GCL",cp=getenv("TERM");
14	rl_readline_name=pn;
15	#ifdef RL_COMPLETION
16	- rl_attempted_completion_function = (CPPFunction *)rl_completion;
17	+ rl_attempted_completion_function = rl_completion;
18	#endif
19	if (isatty(0) && (!cp \|\| strcmp(cp,"dumb")))
20	readline_on=1;

Lines 1-15 Link Here

(-)lang/gcl/files/patch-unixport_makefile (-10 / +10 lines)
1	--- unixport/makefile 2005-01-15 11:34:45.000000000 -0500	1	--- unixport/makefile 2005-01-15 11:34:45.000000000 -0500
2	+++ unixport/makefile 2009-12-07 12:35:23.000000000 -0500	2	+++ unixport/makefile 2009-12-07 12:35:23.000000000 -0500
3	@@ -18,7 +18,7 @@	3	@@ -21,7 +21,7 @@
4		4	LD_FLAGS:=$(LD_FLAGS) $(ODIR)/$(FIRST_FILE)
5	LD_FLAGS=$(LDFLAGS) $(FIRST_FILE)	5	endif
6	LD_LIBS_PRE=$(addprefix -u ,$(PATCHED_SYMBOLS))	6	LD_LIBS_PRE:=$(addprefix -u ,$(PATCHED_SYMBOLS))
7	-LD_LIBS_POST=$(LIBS) $(LIBC) -lgclp $(LAST_FILE)	7	-LD_LIBS_POST:=$(LIBS) $(LIBC) -lgclp
8	+LD_LIBS_POST=-lgclp $(LIBS) $(LAST_FILE)	8	+LD_LIBS_POST:=-lgclp $(LIBS) $(LIBC)
9		9	ifneq ($(LAST_FILE),)
10	ifeq ($(ARRS),)	10	LD_LIBS_POST:=$(LD_LIBS_POST) $(ODIR)/$(LAST_FILE)
11	ARRS:=ar rs	11	endif
12	@@ -127,7 +127,7 @@	12	@@ -139,7 +139,7 @@
13	$(CC) $(LD_FLAGS) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)	13	$(CC) $(LD_FLAGS) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM) $(SPECIAL_RSYM)
14		14
15	msys: msys.c	15	msys: msys.c