From owner-svn-ports-all@FreeBSD.ORG Thu May 2 20:04:24 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 01CD790A; Thu, 2 May 2013 20:04:24 +0000 (UTC) (envelope-from stefan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E71921332; Thu, 2 May 2013 20:04:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42K4MUO001597; Thu, 2 May 2013 20:04:22 GMT (envelope-from stefan@svn.freebsd.org) Received: (from stefan@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42K4Lx6001593; Thu, 2 May 2013 20:04:21 GMT (envelope-from stefan@svn.freebsd.org) Message-Id: <201305022004.r42K4Lx6001593@svn.freebsd.org> From: Stefan Walter Date: Thu, 2 May 2013 20:04:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317145 - head/lang/gauche X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 May 2013 20:04:24 -0000 Author: stefan Date: Thu May 2 20:04:21 2013 New Revision: 317145 URL: http://svnweb.freebsd.org/changeset/ports/317145 Log: - Unbreak and update to 0.9.3.3. - Add option to enable gdbm support. - Update maintainer's e-mail address. PR: 177494 [1], 168407 [2] Submitted by: Hirohisa Yamaguchi [1] Vitaly Magerya [2] Approved by: Erik Greenwald (maintainer) Modified: head/lang/gauche/Makefile head/lang/gauche/distinfo head/lang/gauche/pkg-descr head/lang/gauche/pkg-plist Modified: head/lang/gauche/Makefile ============================================================================== --- head/lang/gauche/Makefile Thu May 2 19:51:08 2013 (r317144) +++ head/lang/gauche/Makefile Thu May 2 20:04:21 2013 (r317145) @@ -1,66 +1,92 @@ -# New ports collection makefile for: gauche -# Date created: 9 September 2002 -# Whom: Akinori MUSHA aka knu -# +# Created by: Akinori MUSHA aka knu # $FreeBSD$ -# PORTNAME= gauche -PORTVERSION= 0.9.2 # Keep databases/gauche-gdbm in sync with this +PORTVERSION= 0.9.3.3 # Keep databases/gauche-gdbm in sync with this CATEGORIES= lang scheme MASTER_SITES= SF/${PORTNAME}/Gauche/ DISTNAME= Gauche-${PORTVERSION} EXTRACT_SUFX= .tgz -MAINTAINER= erik@bz.bzflag.bz +MAINTAINER= erik@elfga.com COMMENT= Scheme script interpreter with multibyte character handling -# Choices are: "pthreads" and "no" -GAUCHE_THREADS?= pthreads -# Choices are: "utf-8", "euc-jp", "shift-jis" and "no" -GAUCHE_ENCODING?= utf-8 +OPTIONS_DEFINE= GDBM SLIB DOCS MANPAGES +OPTIONS_SINGLE= THREADS MULTIBYTE +OPTIONS_SINGLE_THREADS= PTHREADS NO_THREADS +OPTIONS_SINGLE_MULTIBYTE=UTF8 EUCJP SJIS NO_MULTIBYTE +OPTIONS_DEFAULT=PTHREADS UTF8 MANPAGES +SLIB_DESC= Create catalogue for SLIB port +PTHREADS_DESC= Enable POSIX thread support +NO_THREADS_DESC=No threading support +EUCJP_DESC= EUC-JP encoding support +SJIS_DESC= Shift_JIS encoding support +NO_MULTIBYTE_DESC=No multibyte character encoding support +NO_OPTIONS_SORT=yes # breaks in ext/uvecor.c on some locales MAKE_ENV= LANG=C # avoids a problem with with ccache's pre-processor optimization MAKE_ENV+= CCACHE_CPP2=1 -#INFOSECTION= The Algorithmic Language Scheme - DATADIR?= ${PREFIX}/share/${PORTNAME}-0.9 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-threads=${GAUCHE_THREADS} \ - --enable-multibyte=${GAUCHE_ENCODING} \ - --with-slib=${LOCALBASE}/share/slib \ - --with-iconv=${LOCALBASE} +CONFIGURE_ARGS= --enable-tls=none \ + --with-iconv=${LOCALBASE} PLIST_SUB= VERSION="${PORTVERSION}" \ TARGET="${CONFIGURE_TARGET}" - -# INFOSECTION="${INFOSECTION}" - USES= iconv USE_LDCONFIG= yes +MAKE_JOBS_UNSAFE=yes + +.include + +.if ${PORT_OPTIONS:MDOCS} +INFO= gauche-refe gauche-refj +.endif + +.if ${PORT_OPTIONS:MMANPAGES} MAN1= gosh.1 gauche-cesconv.1 gauche-config.1 gauche-install.1 \ gauche-package.1 -MAKE_JOBS_UNSAFE=yes - -.if !defined(NOPORTDOCS) -INFO= gauche-refe gauche-refj +.else +MANPREFIX= ${WRKDIR} .endif -.include +.if ${PORT_OPTIONS:MGDBM} +CONFIGURE_ARGS+=--with-local=${LOCALBASE} +LIB_DEPENDS+= gdbm:${PORTSDIR}/databases/gdbm +PLIST_SUB+= GDBM="" +.else +PLIST_SUB+= GDBM="@comment " +.endif -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 +.if ${PORT_OPTIONS:MSLIB} +BUILD_DEPENDS+= slib>=0:${PORTSDIR}/lang/slib +CONFIGURE_ARGS+=--with-slib=${LOCALBASE}/share/slib +PLIST_SUB+= SLIB="" +.else +CONFIGURE_ARGS+=--with-slib=${WRKDIR} +PLIST_SUB+= SLIB="@comment " .endif -.if ${ARCH} == "amd64" && ${OSVERSION} >= 900000 -MANUAL_PACKAGE_BUILD= segfaults on pointyhat +.if ${PORT_OPTIONS:MUTF8} +CONFIGURE_ARGS+= --enable-multibyte=utf-8 +.elif ${PORT_OPTIONS:MEUCJP} +CONFIGURE_ARGS+= --enable-multibyte=euc-jp +.elif ${PORT_OPTIONS:MSJIS} +CONFIGURE_ARGS+= --enable-multibyte=sjis +.else +CONFIGURE_ARGS+= --enable-multibyte=none .endif +.include + +NOT_FOR_ARCHS= ia64 powerpc sparc64 +NOT_FOR_ARCHS_REASON= Does not compile on ia64, powerpc, or sparc64 + post-patch: .if defined(NOPORTDOCS) @${REINPLACE_CMD} -e 's|all: info|all:|' ${WRKSRC}/doc/Makefile.in @@ -68,7 +94,6 @@ post-patch: post-install: ${STRIP_CMD} ${PREFIX}/bin/gosh - ${RM} -f ${PREFIX}/share/gauche/${PORTVERSION}/lib/slibcat ${MKDIR} ${PREFIX}/share/gauche/site/lib/.packages ${TOUCH} ${PREFIX}/share/gauche/site/lib/.packages/.keepme ${TOUCH} ${PREFIX}/lib/gauche-0.9/site/${CONFIGURE_TARGET}/.keepme @@ -78,9 +103,11 @@ post-install: ${TOUCH} ${DOCSDIR}/.keepme ${MKDIR} ${EXAMPLESDIR} ${TOUCH} ${EXAMPLESDIR}/.keepme - ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${MANPREFIX}/man/man1/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/*.info.gz ${WRKSRC}/doc/*.info-[1-7].gz ${PREFIX}/info/ .endif +regression-test: build + cd ${WRKSRC} && ${MAKE} check + .include Modified: head/lang/gauche/distinfo ============================================================================== --- head/lang/gauche/distinfo Thu May 2 19:51:08 2013 (r317144) +++ head/lang/gauche/distinfo Thu May 2 20:04:21 2013 (r317145) @@ -1,2 +1,2 @@ -SHA256 (Gauche-0.9.2.tgz) = 16c9dfc9fa3f556f75d13e9b5a701f95e9f7749379e6d007a3a6dc561a625736 -SIZE (Gauche-0.9.2.tgz) = 4452767 +SHA256 (Gauche-0.9.3.3.tgz) = 3d8b70075faa0f7a24f8d112cc102ee3e1066680cdd19d324d59f33fab79caac +SIZE (Gauche-0.9.3.3.tgz) = 5042189 Modified: head/lang/gauche/pkg-descr ============================================================================== --- head/lang/gauche/pkg-descr Thu May 2 19:51:08 2013 (r317144) +++ head/lang/gauche/pkg-descr Thu May 2 20:04:21 2013 (r317145) @@ -4,4 +4,4 @@ of daily tools like system management an It can handle multibyte character strings natively. Author: Shiro Kawai -WWW: http://www.shiro.dreamhost.com/scheme/gauche/index.html +WWW: http://practical-scheme.net/gauche/ Modified: head/lang/gauche/pkg-plist ============================================================================== --- head/lang/gauche/pkg-plist Thu May 2 19:51:08 2013 (r317144) +++ head/lang/gauche/pkg-plist Thu May 2 20:04:21 2013 (r317145) @@ -14,13 +14,13 @@ %%DATADIR%%/%%VERSION%%/lib/dbm.scm %%DATADIR%%/%%VERSION%%/lib/dbm/dump %%DATADIR%%/%%VERSION%%/lib/dbm/fsdbm.scm +%%GDBM%%%%DATADIR%%/%%VERSION%%/lib/dbm/gdbm.scm %%DATADIR%%/%%VERSION%%/lib/dbm/ndbm.scm %%DATADIR%%/%%VERSION%%/lib/dbm/restore %%DATADIR%%/%%VERSION%%/lib/file/filter.scm %%DATADIR%%/%%VERSION%%/lib/file/util.scm %%DATADIR%%/%%VERSION%%/lib/gauche-init.scm %%DATADIR%%/%%VERSION%%/lib/gauche/array.scm -%%DATADIR%%/%%VERSION%%/lib/gauche/auxsys.scm %%DATADIR%%/%%VERSION%%/lib/gauche/cgen.scm %%DATADIR%%/%%VERSION%%/lib/gauche/cgen/cise.scm %%DATADIR%%/%%VERSION%%/lib/gauche/cgen/literal.scm @@ -47,6 +47,7 @@ %%DATADIR%%/%%VERSION%%/lib/gauche/interactive.scm %%DATADIR%%/%%VERSION%%/lib/gauche/interactive/info.scm %%DATADIR%%/%%VERSION%%/lib/gauche/interpolate.scm +%%DATADIR%%/%%VERSION%%/lib/gauche/lazy.scm %%DATADIR%%/%%VERSION%%/lib/gauche/let-opt.scm %%DATADIR%%/%%VERSION%%/lib/gauche/libutil.scm %%DATADIR%%/%%VERSION%%/lib/gauche/listener.scm @@ -85,6 +86,7 @@ %%DATADIR%%/%%VERSION%%/lib/gauche/sortutil.scm %%DATADIR%%/%%VERSION%%/lib/gauche/stringutil.scm %%DATADIR%%/%%VERSION%%/lib/gauche/syslog.scm +%%DATADIR%%/%%VERSION%%/lib/gauche/sysutil.scm %%DATADIR%%/%%VERSION%%/lib/gauche/termios.scm %%DATADIR%%/%%VERSION%%/lib/gauche/test.scm %%DATADIR%%/%%VERSION%%/lib/gauche/threads.scm @@ -119,8 +121,10 @@ %%DATADIR%%/%%VERSION%%/lib/rfc/quoted-printable.scm %%DATADIR%%/%%VERSION%%/lib/rfc/sha.scm %%DATADIR%%/%%VERSION%%/lib/rfc/sha1.scm +%%DATADIR%%/%%VERSION%%/lib/rfc/tls.scm %%DATADIR%%/%%VERSION%%/lib/rfc/uri.scm %%DATADIR%%/%%VERSION%%/lib/rfc/zlib.scm +%%SLIB%%%%DATADIR%%/%%VERSION%%/lib/slibcat %%DATADIR%%/%%VERSION%%/lib/slib.scm %%DATADIR%%/%%VERSION%%/lib/srfi-0.scm %%DATADIR%%/%%VERSION%%/lib/srfi-1.scm @@ -197,9 +201,9 @@ bin/gauche-package bin/gosh lib/gauche-0.9/%%VERSION%%/%%TARGET%%/binary--io.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/crypt--bcrypt.so +%%GDBM%%lib/gauche-0.9/%%VERSION%%/%%TARGET%%/dbm--gdbm.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/dbm--ndbm.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/file--util.so -lib/gauche-0.9/%%VERSION%%/%%TARGET%%/gauche--auxsys.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/gauche--charconv.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/gauche--collection.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/gauche--fcntl.so @@ -223,6 +227,7 @@ lib/gauche-0.9/%%VERSION%%/%%TARGET%%/os lib/gauche-0.9/%%VERSION%%/%%TARGET%%/parser--peg.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/rfc--md5.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/rfc--sha.so +lib/gauche-0.9/%%VERSION%%/%%TARGET%%/rfc--tls.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/rfc--zlib.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/srfi-1.so lib/gauche-0.9/%%VERSION%%/%%TARGET%%/srfi-13.so @@ -254,6 +259,7 @@ lib/gauche-0.9/%%VERSION%%/include/gauch lib/gauche-0.9/%%VERSION%%/include/gauche/code.h lib/gauche-0.9/%%VERSION%%/include/gauche/collection.h lib/gauche-0.9/%%VERSION%%/include/gauche/config.h +lib/gauche-0.9/%%VERSION%%/include/gauche/config_threads.h lib/gauche-0.9/%%VERSION%%/include/gauche/exception.h lib/gauche-0.9/%%VERSION%%/include/gauche/extend.h lib/gauche-0.9/%%VERSION%%/include/gauche/extern.h @@ -284,6 +290,7 @@ lib/gauche-0.9/%%VERSION%%/include/gauch lib/gauche-0.9/%%VERSION%%/include/gauche/vm.h lib/gauche-0.9/%%VERSION%%/include/gauche/vminsn.h lib/gauche-0.9/%%VERSION%%/include/gauche/weak.h +lib/gauche-0.9/%%VERSION%%/include/gauche/wthread.h lib/gauche-0.9/%%VERSION%%/include/gauche/win-compat.h lib/gauche-0.9/%%VERSION%%/include/gc.h lib/gauche-0.9/%%VERSION%%/include/gc_allocator.h @@ -298,10 +305,10 @@ lib/gauche-0.9/%%VERSION%%/include/gc_ve lib/gauche-0.9/site/%%TARGET%%/.keepme lib/libgauche-0.9.so lib/libgauche-0.9.so.0 -lib/libgauche-0.9.so.0.2 +lib/libgauche-0.9.so.0.3 share/aclocal/gauche.m4 -share/doc/gauche/.keepme -share/examples/gauche/.keepme +%%DOCSDIR%%/.keepme +%%EXAMPLESDIR%%/.keepme share/gauche/%%VERSION%%/lib/.packages/.keepme share/gauche/site/lib/.packages/.keepme @dirrm share/gauche/site/lib/.packages