Date: Fri, 26 Sep 2014 03:33:05 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369303 - in head/lang/gcl: . files Message-ID: <201409260333.s8Q3X5tx086515@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Fri Sep 26 03:33:04 2014 New Revision: 369303 URL: http://svnweb.freebsd.org/changeset/ports/369303 QAT: https://qat.redports.org/buildarchive/r369303/ Log: Update to version 2.6.11. PR: ports/193898 Submitted by: Ports Fury Added: head/lang/gcl/files/patch-o__nsocket.c (contents, props changed) Deleted: head/lang/gcl/files/patch-gcl-tk__tkMain.c head/lang/gcl/files/patch-o-gcl_readline.d Modified: head/lang/gcl/Makefile head/lang/gcl/distinfo head/lang/gcl/files/patch-configure head/lang/gcl/files/patch-h_FreeBSD.h head/lang/gcl/files/patch-info_makefile head/lang/gcl/files/patch-o_file.d head/lang/gcl/files/patch-unixport_makefile Modified: head/lang/gcl/Makefile ============================================================================== --- head/lang/gcl/Makefile Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/Makefile Fri Sep 26 03:33:04 2014 (r369303) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gcl -PORTVERSION= 2.6.10 -PORTREVISION= 3 +PORTVERSION= 2.6.11 CATEGORIES= lang tcl tk MASTER_SITES= GNU @@ -13,19 +12,16 @@ COMMENT= GNU Common Lisp 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 makeinfo readline +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 \ @@ -34,7 +30,6 @@ CONFIGURE_ARGS= --enable-ansi \ --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=\ @@ -65,6 +60,29 @@ PLIST_DIRS= lib/${DISTNAME}/unixport \ 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 @@ -93,27 +111,7 @@ FILES_XGCL2= gcl_dwtest.lsp gcl_dwtestca .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: @@ -155,11 +153,14 @@ post-install: ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/pcl) .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/unixport -.for i in ${FILES_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} @@ -169,7 +170,11 @@ post-install: .endif .if ${PORT_OPTIONS:MX11} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${DISTNAME}/gcl-tk -.for i in ${FILES_GCLTK} +.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 Modified: head/lang/gcl/distinfo ============================================================================== --- head/lang/gcl/distinfo Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/distinfo Fri Sep 26 03:33:04 2014 (r369303) @@ -1,2 +1,2 @@ -SHA256 (gcl-2.6.10.tar.gz) = 79a1fb2f92b5e86f24988448db3e34116ab6ef7c93ad839848edd01ad06651ef -SIZE (gcl-2.6.10.tar.gz) = 5490689 +SHA256 (gcl-2.6.11.tar.gz) = 44058f029a631e8ebae38c6c5a25e2f986b5bfdd8e6283b32d7e56723efafb9c +SIZE (gcl-2.6.11.tar.gz) = 7047082 Modified: head/lang/gcl/files/patch-configure ============================================================================== --- head/lang/gcl/files/patch-configure Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/files/patch-configure Fri Sep 26 03:33:04 2014 (r369303) @@ -1,31 +1,32 @@ --- configure 2005-01-15 11:17:17.000000000 -0800 +++ configure 2007-09-22 18:17:38.000000000 -0700 -@@ -4998,7 +4998,7 @@ +@@ -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 | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'` -+ MP_INCLUDE=`$CPP $CPPFLAGS foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'` +- 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" -@@ -8399,15 +8399,15 @@ - 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 - 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 ${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then -+ TCL_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION} - fi - fi +@@ -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 Modified: head/lang/gcl/files/patch-h_FreeBSD.h ============================================================================== --- head/lang/gcl/files/patch-h_FreeBSD.h Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/files/patch-h_FreeBSD.h Fri Sep 26 03:33:04 2014 (r369303) @@ -28,6 +28,15 @@ #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 @@ -41,19 +50,3 @@ #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 \ Modified: head/lang/gcl/files/patch-info_makefile ============================================================================== --- head/lang/gcl/files/patch-info_makefile Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/files/patch-info_makefile Fri Sep 26 03:33:04 2014 (r369303) @@ -5,68 +5,21 @@ retrieving revision 1.23.6.4.2.1 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 -@@ -11,12 +11,12 @@ +@@ -12,12 +12,11 @@ -include ../makedefs --all: gcl-tk.info gcl-si.info $(GCL_DVI) $(GCL_HTML) #gcl.info +-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 + 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 \ -@@ -34,19 +34,16 @@ - 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 @@ +@@ -98,10 +97,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 @@ -74,9 +27,9 @@ diff -u -d -r1.23.6.4.2.1 makefile +# -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 *dvi $(DESTDIR)$(INFO_DIR)../doc +- -cp *pdf $(DESTDIR)$(INFO_DIR)../doc +# -cp -r gcl-si gcl-tk $(DESTDIR)$(INFO_DIR)../doc -+# -cp *dvi $(DESTDIR)$(INFO_DIR)../doc ++# -cp *pdf $(DESTDIR)$(INFO_DIR)../doc FILE=gcl-si.texi srcs: Added: head/lang/gcl/files/patch-o__nsocket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gcl/files/patch-o__nsocket.c Fri Sep 26 03:33:04 2014 (r369303) @@ -0,0 +1,11 @@ +--- o/nsocket.c.orig ++++ o/nsocket.c +@@ -328,7 +328,7 @@ + + + +-#define SOCKET_FD(strm) ((strm)->sm.sm_fp ? fileno((strm)->sm.sm_fp) : -1) ++#define SOCKET_FD(strm) ((strm)->sm.sm_fp ? fileno((FILE *)(strm)->sm.sm_fp) : -1) + + static void + check_socket(object x) Modified: head/lang/gcl/files/patch-o_file.d ============================================================================== --- head/lang/gcl/files/patch-o_file.d Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/files/patch-o_file.d Fri Sep 26 03:33:04 2014 (r369303) @@ -5,7 +5,7 @@ #include <signal.h> -#if defined(DARWIN) -+#if defined(BSD) ++#if defined(DARWIN) || defined(__FreeBSD__) #define on_exit(a,b) #else static void Modified: head/lang/gcl/files/patch-unixport_makefile ============================================================================== --- head/lang/gcl/files/patch-unixport_makefile Fri Sep 26 02:49:32 2014 (r369302) +++ head/lang/gcl/files/patch-unixport_makefile Fri Sep 26 03:33:04 2014 (r369303) @@ -1,15 +1,15 @@ --- unixport/makefile 2005-01-15 11:34:45.000000000 -0500 +++ unixport/makefile 2009-12-07 12:35:23.000000000 -0500 -@@ -18,7 +18,7 @@ - - LD_FLAGS=$(LDFLAGS) $(FIRST_FILE) - LD_LIBS_PRE=$(addprefix -u ,$(PATCHED_SYMBOLS)) --LD_LIBS_POST=$(LIBS) $(LIBC) -lgclp $(LAST_FILE) -+LD_LIBS_POST=-lgclp $(LIBS) $(LAST_FILE) - - ifeq ($(ARRS),) - ARRS:=ar rs -@@ -127,7 +127,7 @@ +@@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409260333.s8Q3X5tx086515>