From owner-svn-ports-all@FreeBSD.ORG Wed Apr 30 16:09:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E57E7EB9; Wed, 30 Apr 2014 16:09:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C54F01387; Wed, 30 Apr 2014 16:09:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3UG95Xc014362; Wed, 30 Apr 2014 16:09:05 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3UG95cT014357; Wed, 30 Apr 2014 16:09:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404301609.s3UG95cT014357@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 30 Apr 2014 16:09:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352685 - in head/devel/libedit: . files 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.17 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: Wed, 30 Apr 2014 16:09:06 -0000 Author: bapt Date: Wed Apr 30 16:09:04 2014 New Revision: 352685 URL: http://svnweb.freebsd.org/changeset/ports/352685 QAT: https://qat.redports.org/buildarchive/r352685/ Log: Update libedit to the latest version Activate unconditionnaly unicode take maintainership [1] Approved by: rodrigo [1] (former maintainer) Added: head/devel/libedit/files/patch-src__chartype.h (contents, props changed) Deleted: head/devel/libedit/files/patch-common.c head/devel/libedit/files/patch-configure head/devel/libedit/files/patch-readline.c head/devel/libedit/files/patch-terminal head/devel/libedit/files/patch-vi.c Modified: head/devel/libedit/Makefile head/devel/libedit/distinfo head/devel/libedit/pkg-plist Modified: head/devel/libedit/Makefile ============================================================================== --- head/devel/libedit/Makefile Wed Apr 30 15:22:44 2014 (r352684) +++ head/devel/libedit/Makefile Wed Apr 30 16:09:04 2014 (r352685) @@ -2,29 +2,27 @@ # $FreeBSD$ PORTNAME= libedit -PORTVERSION= 2.6.10 -PORTREVISION= 2 +PORTVERSION= ${EDITVERSION}.${EDITDATE} +DISTVERSION= ${EDITDATE}-${EDITVERSION} CATEGORIES= devel -MASTER_SITES= ftp://ftp.astron.com/pub/libedit/ \ - http://www.canonware.com/download/libedit/ +MASTER_SITES= http://thrysoee.dk/editline/ -MAINTAINER= rodrigo@FreeBSD.org -COMMENT= Command line editing library +MAINTAINER= bapt@FreeBSD.org +COMMENT= Command line editor library -LICENSE= BSD +LICENSE= BSD2CLAUSE +USES= libtool pathfix +EDITVERSION= 3.1 +EDITDATE= 20140213 GNU_CONFIGURE= yes USE_LDCONFIG= yes +INSTALL_TARGET= install-strip +CONFIGURE_ARGS= --enable-widec -post-extract: - ${MV} ${WRKSRC}/readline ${WRKSRC}/editline +CPPFLAGS= -D__weakref_visible=extern post-patch: - @${REINPLACE_CMD} -e 's|$$(PREFIX)|$$(DESTDIR)&|g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|CFLAGS -O|CFLAGS|g ; \ - s|MAJOR="2"|MAJOR="6"|g' ${WRKSRC}/configure - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libedit.so + @${REINPLACE_CMD} -e "s/__weak_reference/__weak_extern/g" ${WRKSRC}/src/vi.c .include Modified: head/devel/libedit/distinfo ============================================================================== --- head/devel/libedit/distinfo Wed Apr 30 15:22:44 2014 (r352684) +++ head/devel/libedit/distinfo Wed Apr 30 16:09:04 2014 (r352685) @@ -1,2 +1,2 @@ -SHA256 (libedit-2.6.10.tar.gz) = 57507d1329158979e31807065e026ebc93f65600e18ed41fb355a1142d2a649b -SIZE (libedit-2.6.10.tar.gz) = 182917 +SHA256 (libedit-20140213-3.1.tar.gz) = ca3b8373c00afc78299147395a1bc3c6fb4c52629e89e4afe3881a0a7298301b +SIZE (libedit-20140213-3.1.tar.gz) = 484603 Added: head/devel/libedit/files/patch-src__chartype.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libedit/files/patch-src__chartype.h Wed Apr 30 16:09:04 2014 (r352685) @@ -0,0 +1,11 @@ +--- ./src/chartype.h.orig 2012-03-11 10:54:58.000000000 +0100 ++++ ./src/chartype.h 2014-04-30 18:03:31.469462010 +0200 +@@ -44,7 +44,7 @@ + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having + * been around since 2001... */ +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) ++#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__FreeBSD__) && !defined(__DragonFly__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other Modified: head/devel/libedit/pkg-plist ============================================================================== --- head/devel/libedit/pkg-plist Wed Apr 30 15:22:44 2014 (r352684) +++ head/devel/libedit/pkg-plist Wed Apr 30 16:09:04 2014 (r352685) @@ -1,15 +1,19 @@ -include/editline/history.h include/editline/readline.h include/histedit.h lib/libedit.a lib/libedit.so -lib/libedit.so.6 +lib/libedit.so.0 +lib/libedit.so.0.0.48 +libdata/pkgconfig/libedit.pc man/man3/editline.3.gz man/man3/el_deletestr.3.gz man/man3/el_end.3.gz man/man3/el_get.3.gz man/man3/el_getc.3.gz man/man3/el_gets.3.gz +man/man3/el_history.3.gz +man/man3/el_history_end.3.gz +man/man3/el_history_init.3.gz man/man3/el_init.3.gz man/man3/el_insertstr.3.gz man/man3/el_line.3.gz @@ -19,8 +23,10 @@ man/man3/el_reset.3.gz man/man3/el_resize.3.gz man/man3/el_set.3.gz man/man3/el_source.3.gz -man/man3/history.3.gz -man/man3/history_end.3.gz -man/man3/history_init.3.gz +man/man3/el_tok_end.3.gz +man/man3/el_tok_init.3.gz +man/man3/el_tok_line.3.gz +man/man3/el_tok_reset.3.gz +man/man3/el_tok_str.3.gz man/man5/editrc.5.gz -@dirrm include/editline +@dirrmtry include/editline