Date: Mon, 24 Sep 2012 21:23:51 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304800 - in head: . textproc textproc/aspell textproc/aspell-without-dicten textproc/en-aspell Message-ID: <201209242123.q8OLNp8Q002624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Sep 24 21:23:51 2012 New Revision: 304800 URL: http://svn.freebsd.org/changeset/ports/304800 Log: No longer install the english dictionary (please use textproc/en-aspell if you want the english dictionary) Optionify Remove the now useless textproc/aspell-with-dicten port textproc/en-aspell now depends on textproc/aspell clean up the Makefile Deleted: head/textproc/aspell-without-dicten/ Modified: head/MOVED head/UPDATING head/textproc/Makefile head/textproc/aspell/Makefile head/textproc/aspell/Makefile.inc head/textproc/aspell/distinfo head/textproc/en-aspell/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Sep 24 21:21:37 2012 (r304799) +++ head/MOVED Mon Sep 24 21:23:51 2012 (r304800) @@ -3713,3 +3713,4 @@ print/pips930||2012-09-22|Removed print/pips770||2012-09-22|Removed www/linuxpluginwrapper||2012-09-22|Has expired: doesn't support ELF symbol versioning, yet. net/fping+ipv6|net/fping|2012-09-24|IPv6 support has been merged +textproc/aspell-without-dicten|textproc/aspell|2012-09-24|The dictionary is no longer installed with aspell Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Sep 24 21:21:37 2012 (r304799) +++ head/UPDATING Mon Sep 24 21:23:51 2012 (r304800) @@ -5,6 +5,13 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20120924: + AFFECTS: users of textproc/aspell + AUTHOR: bapt@FreeBSD.org + + textproc/aspell no longer installs the english dictionary. If you need it + please install textproc/en-aspell. + 20120919: AFFECTS: users of net-mgmt/better-cacti-templates AUTHOR: Bryan Drewery <bdrewery@FreeBSD.org> Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Mon Sep 24 21:21:37 2012 (r304799) +++ head/textproc/Makefile Mon Sep 24 21:23:51 2012 (r304800) @@ -27,7 +27,6 @@ SUBDIR += asciidoc SUBDIR += asm-xml SUBDIR += aspell - SUBDIR += aspell-without-dicten SUBDIR += ast-aspell SUBDIR += atom SUBDIR += ats-contrib-parcomb Modified: head/textproc/aspell/Makefile ============================================================================== --- head/textproc/aspell/Makefile Mon Sep 24 21:21:37 2012 (r304799) +++ head/textproc/aspell/Makefile Mon Sep 24 21:23:51 2012 (r304800) @@ -1,80 +1,61 @@ -# New ports collection makefile for: aspell -# Date created: 7 December 1998 -# Whom: Josh Gilliam <josh@quick.net> -# +# Created by: Josh Gilliam <josh@quick.net> # $FreeBSD$ -# PORTNAME= aspell PORTVERSION= 0.60.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= aspell -.if defined(WITHOUT_DICTEN) -PKGNAMESUFFIX= -without-dicten -.endif -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= office@FreeBSD.org COMMENT= Spelling checker with better suggestion logic than ispell LICENSE= LGPL21 +OPTIONS_DEFINE= NLS DOCS ISPELL + +ISPELL_DESC= Install the ispell wrapper + GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-dict-dir=${DATADIR} \ --enable-docdir=${DOCSDIR} \ + --enable-curses=ncursesw \ --enable-static -PTHREAD_CFLAGS= # Disable threading -PTHREAD_LIBS= # libaspell may be used by unthreaded apps. -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + +CONFLICTS+= ispell* ??-ispell* +SCRIPTS= ispell spell + USE_GMAKE= yes USE_ICONV= yes USE_PERL5_BUILD= yes USE_LDCONFIG= yes -SLAVEDIRS= textproc/aspell-without-dicten - MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS} VERINST= ${PORTVERSION:R:R} SUB_FILES= aspell.ver PLIST_SUB= VER=${VERINST} SUB_LIST= VERINST=${VERINST} -.if defined(WITHOUT_DICTEN) -CONFLICTS= aspell-0.* -DICT_TARGET= -.else -VERDICT_EN= 6-en-7.1-0 -DICT_SUFFIX= .tar.bz2 -MASTER_SITES+= ${MASTER_SITE_GNU:S|$|:dicten|} -MASTER_SITE_SUBDIR+= aspell/dict/en/:dicten -DISTFILES+= aspell${VERDICT_EN}${DICT_SUFFIX}:dicten -CONFLICTS= aspell-without-dicten-0.* -DICT_TARGET= inst-dicten -CONF_DICT_ENV= ASPELL="${PREFIX}/bin/aspell" \ - WORD_LIST_COMPRESS="${PREFIX}/bin/word-list-compress" -.endif - -.if defined(WITH_ISPELL) -CONFLICTS+= ispell* ??-ispell* -SCRIPTS= ispell spell -PLIST_SUB+= SCRIPTS="" +.include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .else -PLIST_SUB+= SCRIPTS="@comment " -.endif - -.if defined(WITHOUT_NLS) +USE_GETTEXT= yes CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " +.endif + +.if ${PORT_OPTIONS:MISPELL} +CONFLICTS+= ispell* ??-ispell* +SCRIPTS= ispell spell +PLIST_SUB+= SCRIPTS="" .else -USE_GETTEXT= yes -PLIST_SUB+= NLS="" +PLIST_SUB+= SCRIPTS="@comment " .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} MAN1= aspell-import.1 aspell.1 pspell-config.1 \ run-with-aspell.1 word-list-compress.1 prezip-bin.1 INFO= aspell-dev aspell @@ -85,51 +66,12 @@ INFO= aspell-dev aspell CFLAGS+= -O .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 602107 -CONFIGURE_ARGS+= --disable-wide-curses -.else -CONFIGURE_ARGS+= --enable-curses=ncursesw -.endif - -pre-everything:: - @${ECHO_MSG} "" -.if !defined(WITH_ISPELL) - @${ECHO_MSG} "Define WITH_ISPELL to install Ispell's wrapper." - @${ECHO_MSG} "" -.endif -.if !defined(WITHOUT_DICTEN) - @${ECHO_MSG} "Define WITHOUT_DICTEN to not install english dictionary." - @${ECHO_MSG} "" -.endif - -post-extract: -.if !defined(WITHOUT_DICTEN) - cd ${WRKDIR} && \ - ${TAR} -xjf ${DISTDIR}/aspell${VERDICT_EN}${DICT_SUFFIX} -.endif - -pre-configure: - @cd ${WRKSRC} && ${ACLOCAL} - post-install: ${DICT_TARGET} - ${INSTALL_DATA} ${WRKDIR}/aspell.ver ${PREFIX}/etc -.if defined(WITH_ISPELL) - ${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin + @${INSTALL_DATA} ${WRKDIR}/aspell.ver ${PREFIX}/etc +.if ${PORT_OPTIONS:MISPELL} + @${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/scripts/|} ${PREFIX}/bin .endif @${ECHO_CMD} "@dirrm share/aspell" >> ${TMPPLIST} @${ECHO_CMD} "@dirrm lib/aspell-${VERINST}" >> ${TMPPLIST} -inst-dicten: -# Install en-aspell by default -.if !exists(${LOCALBASE}/lib/aspell-${VERINST}/en.dat) && !defined(WITHOUT_DICTEN) - @${ECHO_MSG} "===> Installing for en dictionaries" - cd ${WRKDIR}/aspell${VERDICT_EN} && \ - ${CONF_DICT_ENV} ./${CONFIGURE_SCRIPT} && \ - ${GMAKE} ${INSTALL_TARGET} - ${SED} -e "s|%%VER%%|${VERINST}|" ${MASTERDIR}/pkg-plist.en \ - >> ${TMPPLIST} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/textproc/aspell/Makefile.inc ============================================================================== --- head/textproc/aspell/Makefile.inc Mon Sep 24 21:21:37 2012 (r304799) +++ head/textproc/aspell/Makefile.inc Mon Sep 24 21:23:51 2012 (r304800) @@ -6,11 +6,7 @@ MASTER_SITE_SUBDIR?= aspell/dict/${DICT} DISTNAME?= aspell${DISTVERSION} PORTVERSION?= ${DISTVERSION:L:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g} -.if ${PORTNAME} == "en-aspell" || defined(WITHOUT_DICTEN) -LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell-without-dicten -.else LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell -.endif USE_BZIP2= yes USE_GMAKE= yes Modified: head/textproc/aspell/distinfo ============================================================================== --- head/textproc/aspell/distinfo Mon Sep 24 21:21:37 2012 (r304799) +++ head/textproc/aspell/distinfo Mon Sep 24 21:23:51 2012 (r304800) @@ -1,4 +1,2 @@ SHA256 (aspell-0.60.6.1.tar.gz) = f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SIZE (aspell-0.60.6.1.tar.gz) = 1878163 -SHA256 (aspell6-en-7.1-0.tar.bz2) = ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a -SIZE (aspell6-en-7.1-0.tar.bz2) = 175360 Modified: head/textproc/en-aspell/Makefile ============================================================================== --- head/textproc/en-aspell/Makefile Mon Sep 24 21:21:37 2012 (r304799) +++ head/textproc/en-aspell/Makefile Mon Sep 24 21:23:51 2012 (r304800) @@ -1,12 +1,9 @@ -# New ports collection makefile for: en-aspell -# Date created: Fri Sep 17 2004 -# Whom: Serge Gagnon <ser_gagnon@sympatico.ca> -# +# Created by: Serge Gagnon <ser_gagnon@sympatico.ca> # $FreeBSD$ -# PORTNAME= ${DICT}-aspell DISTVERSION= 6-en-7.1-0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= office@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209242123.q8OLNp8Q002624>