From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 12:02:29 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2ECFDA6C; Tue, 28 Jan 2014 12:02:29 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C0DF15A1; Tue, 28 Jan 2014 12:02:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SC2SKd053579; Tue, 28 Jan 2014 12:02:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SC2RCD053566; Tue, 28 Jan 2014 12:02:27 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401281202.s0SC2RCD053566@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 12:02:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341537 - in head/textproc: . aspell aspell-ispell X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 12:02:29 -0000 Author: bapt Date: Tue Jan 28 12:02:27 2014 New Revision: 341537 URL: http://svnweb.freebsd.org/changeset/ports/341537 QAT: https://qat.redports.org/buildarchive/r341537/ Log: Extract the ispell wrapper out of aspell into a dedicated port Cleanup up the aspell port Propertly strip aspell libraries Use short form of MASTER_SITES Added: head/textproc/aspell-ispell/ head/textproc/aspell-ispell/Makefile (contents, props changed) head/textproc/aspell-ispell/distinfo (contents, props changed) head/textproc/aspell-ispell/pkg-descr (contents, props changed) Modified: head/textproc/Makefile head/textproc/aspell/Makefile head/textproc/aspell/pkg-plist Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Tue Jan 28 11:56:48 2014 (r341536) +++ head/textproc/Makefile Tue Jan 28 12:02:27 2014 (r341537) @@ -31,6 +31,7 @@ SUBDIR += asciidoc SUBDIR += asm-xml SUBDIR += aspell + SUBDIR += aspell-ispell SUBDIR += ast-aspell SUBDIR += atom SUBDIR += ats-contrib-parcomb Added: head/textproc/aspell-ispell/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/aspell-ispell/Makefile Tue Jan 28 12:02:27 2014 (r341537) @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= aspell +PORTVERSION= 0.60.6.1 +CATEGORIES= textproc +MASTER_SITES= GNU/aspell +PKGNAMESUFFIX= -ispell + +MAINTAINER= office@FreeBSD.org +COMMENT= Ispell compatibility script for aspell + +LICENSE= LGPL21 + +CONFLICTS+= ispell* ??-ispell* + +RUN_DEPENDS= aspell:${PORTSDIR}/textproc/aspell + +NO_BUILD= yes +PLIST_FILES= bin/ispell \ + bin/spell + +post-patch: + @${REINPLACE_CMD} -e "s/^#CHECK/CHECK/g" ${WRKSRC}/scripts/ispell + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/ispell ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/spell ${STAGEDIR}${PREFIX}/bin + +.include Added: head/textproc/aspell-ispell/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/aspell-ispell/distinfo Tue Jan 28 12:02:27 2014 (r341537) @@ -0,0 +1,2 @@ +SHA256 (aspell-0.60.6.1.tar.gz) = f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 +SIZE (aspell-0.60.6.1.tar.gz) = 1878163 Added: head/textproc/aspell-ispell/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/aspell-ispell/pkg-descr Tue Jan 28 12:02:27 2014 (r341537) @@ -0,0 +1,3 @@ +Command line wrapper for aspell, behaving like ispell + +WWW: http://aspell.sourceforge.net/ Modified: head/textproc/aspell/Makefile ============================================================================== --- head/textproc/aspell/Makefile Tue Jan 28 11:56:48 2014 (r341536) +++ head/textproc/aspell/Makefile Tue Jan 28 12:02:27 2014 (r341537) @@ -3,21 +3,18 @@ PORTNAME= aspell PORTVERSION= 0.60.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= aspell +MASTER_SITES= GNU/aspell MAINTAINER= office@FreeBSD.org COMMENT= Spelling checker with better suggestion logic than ispell LICENSE= LGPL21 -OPTIONS_DEFINE= NLS DOCS ISPELL +OPTIONS_DEFINE= NLS DOCS OPTIONS_SUB= yes -ISPELL_DESC= Install the ispell wrapper - GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \ --enable-docdir=${DOCSDIR} \ @@ -28,6 +25,7 @@ USES= gmake iconv perl5 shebangfix USE_LDCONFIG= yes SHEBANG_FILES= scripts/aspell-import +INSTALL_TARGET= install-strip VERINST= ${PORTVERSION:R:R} SUB_FILES= aspell.ver PLIST_SUB= VER=${VERINST} @@ -35,28 +33,16 @@ SUB_LIST= VERINST=${VERINST} INFO= aspell-dev aspell NLS_USES= gettext -NLS_CONFIGURE_ARGS= --disable-nls +NLS_CONFIGURE_ENABLE= nls .include -.if ${PORT_OPTIONS:MISPELL} -CONFLICTS+= ispell* ??-ispell* -SCRIPTS= ispell spell -.endif - # Does not link without at least -O .if !defined(CFLAGS) || ${CFLAGS:M-O*} == "" CFLAGS+= -O .endif -post-install: ${DICT_TARGET} +post-install: @${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc -.if ${PORT_OPTIONS:MISPELL} - @${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${STAGEDIR}${PREFIX}/bin -.endif - @${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm lib/aspell-${VERINST}" >> ${TMPPLIST} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaspell.so.16 \ - ${STAGEDIR}${PREFIX}/lib/libpspell.so.16 .include Modified: head/textproc/aspell/pkg-plist ============================================================================== --- head/textproc/aspell/pkg-plist Tue Jan 28 11:56:48 2014 (r341536) +++ head/textproc/aspell/pkg-plist Tue Jan 28 12:02:27 2014 (r341537) @@ -1,13 +1,11 @@ bin/aspell bin/aspell-import -%%ISPELL%%bin/ispell bin/precat bin/preunzip bin/prezip bin/prezip-bin bin/pspell-config bin/run-with-aspell -%%ISPELL%%bin/spell bin/word-list-compress etc/aspell.ver include/aspell.h @@ -133,3 +131,5 @@ man/man1/word-list-compress.1.gz %%NLS%%@dirrmtry share/locale/fi %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ast +@dirrmtry %%DATADIR%% +@dirrm lib/aspell-%%VER%%