Convert textproc/aspell to "USES=libtool tar:bzip2" and bump dependen…

…t ports Approved by: portmgr (implicit, PORTREVISION bump on unstaged port)
yurkis · Jul 4, 2014 · f936c15 · f936c15
1 parent aad1135
commit f936c15
Show file tree

Hide file tree

Showing 34 changed files with 52 additions and 60 deletions.
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gxneur
 PORTVERSION=	0.15.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dists.xneur.ru/release-${PORTVERSION}/tgz/
 

diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xneur
 PORTVERSION=	0.15.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 		http://mirror.amdmi3.ru/distfiles/

diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	librcc
 PORTVERSION=	0.2.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://dside.dyndns.org/files/rusxmms/ \
 		LOCAL/fluffy

diff --git a/editors/tea/Makefile b/editors/tea/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tea
 PORTVERSION=	37.2.1
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://semiletov.org/tea/dloads/
 

diff --git a/editors/winefish/Makefile b/editors/winefish/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	winefish
 DISTVERSION=	1.3.3
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	editors print
 MASTER_SITES=	http://download.berlios.de/winefish/ \
 		http://nivi.interfree.it/distfiles/winefish/

diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmlcopyeditor
 PORTVERSION=	1.2.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	SF/xml-copy-editor/${PORTNAME}-linux/${PORTVERSION}
 

diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ocre
 PORTVERSION=	0.042
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://lem.eui.upm.es/pub/ocre/
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/}

diff --git a/graphics/yagf/Makefile b/graphics/yagf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yagf
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://symmetrica.net/cuneiform-linux/
 

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	20140213
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/weechat-devel/ \
 		${MASTER_SITE_LOCAL}
@@ -15,7 +16,8 @@ COMMENT=	Lightweight and user friendly ncurses based IRC client
 
 LICENSE=	GPLv3
 
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 CONFLICTS=	weechat-0.3*
 
@@ -24,9 +26,6 @@ USES=		cmake iconv ncurses
 CMAKE_ARGS+=	-DENABLE_GUILE=no
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-
 GITDESC=	v0.4.3-14-gc324610
 GITREV!=	echo "${GITDESC}" | sed -E 's/^.*-g(.{7})$$/\1/'
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GITREV}
@@ -37,7 +36,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${GITREV}
 
 OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL \
 		GNUTLS NLS DOCS ICON MANPAGES
-OPTIONS_DEFAULTS=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL \
+OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL \
 		GNUTLS ICON MANPAGES
 
 BACKTRACE_DESC=	Provide crash backtraces
@@ -68,7 +67,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
-BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	ASPELL=""
 .else
 CMAKE_ARGS+=	-DENABLE_ASPELL=no

diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	weechat
 PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/ \
 		http://perturb.me.uk/distfiles/weechat/:mandocs \
@@ -16,16 +16,16 @@ COMMENT=	Lightweight and user friendly ncurses based IRC client
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+
 CONFLICTS=	weechat-devel-0.*
 
 USE_LDCONFIG=	yes
 USES=		cmake iconv ncurses
 CMAKE_ARGS+=	-DENABLE_GUILE=no
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
-
 OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
 		GNUTLS NLS ICON MANPAGES DOCS
 OPTIONS_DEFAULT=RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE ASPELL \
@@ -58,7 +58,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MASPELL}
-BUILD_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 PLIST_SUB+=	ASPELL=""
 .else
 CMAKE_ARGS+=	-DENABLE_ASPELL=no

diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext
@@ -291,7 +291,7 @@ CONFIGURE_ARGS+=--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
-LIB_DEPENDS+=	libaspell.so.16:${PORTSDIR}/textproc/aspell
+LIB_DEPENDS+=	libaspell.so:${PORTSDIR}/textproc/aspell
 
 CONFIGURE_ARGS+=--with-pspell=${LOCALBASE}
 

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	balsa
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://pawsa.fedorapeople.org/balsa/
 
@@ -13,8 +14,7 @@ COMMENT=	Mail reader for the GNOME desktop
 BUILD_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnome-keyring \
 		itstool:${PORTSDIR}/textproc/itstool \
 		yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools
-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
-		libpcre.so:${PORTSDIR}/devel/pcre \
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libesmtp.so:${PORTSDIR}/mail/libesmtp \
 		libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
 		libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cone
 PORTVERSION=	0.90
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ayttm
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
@@ -16,7 +16,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
 		libjasper.so:${PORTSDIR}/graphics/jasper \
 		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libpspell.so:${PORTSDIR}/textproc/aspell \
 		libenchant.so:${PORTSDIR}/textproc/enchant
 
 OPTIONS_DEFINE=	ESOUND YAHOO

diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mcabber
 PORTVERSION=	0.10.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.lilotux.net/~mikael/mcabber/files/ CENKES
 

diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	psi
 PORTVERSION=	0.15
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	SF/${PORTNAME}/Psi/${PORTVERSION}
 

diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eiskaltdcpp-qt
 PORTVERSION=	2.2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	eiskaltdcpp-${DISTVERSION}

diff --git a/polish/ekg2/Makefile b/polish/ekg2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ekg2
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	polish net-im
 MASTER_SITES=	http://pl.ekg2.org/
@@ -35,6 +35,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib -lintl -pthread
 CFLAGS+=		-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	ASPELL GPG GSM GTK2 NLS PERL PYTHON SQLITE UNICODE XOSD
+OPTIONS_DEFAULT=ASPELL
 OPTIONS_SUB=	yes
 
 ASPELL_DESC=	Enable spell checking support
@@ -47,8 +48,6 @@ SQLITE_DESC=	Enable sqlite plugin
 UNICODE_DESC=	Enable unicode (experimental)
 XOSD_DESC=	Enable xosd plugin
 
-OPTIONS_DEFAULT=ASPELL
-
 ASPELL_CONFIGURE_ON=	--with-aspell
 ASPELL_CONFIGURE_OFF=	--without-aspell
 ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell

diff --git a/print/lyx/Makefile b/print/lyx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print editors
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \

diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scribus
 PORTVERSION=	1.5.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	print editors
 MASTER_SITES=	http://download.tuxfamily.org/bartcoding/FreeBSD/ \
 				${MASTER_SITE_LOCAL}

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell
 
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-curses=ncursesw \
 		--enable-static
 
-USES=		gmake iconv perl5 shebangfix
+USES=		gmake iconv libtool perl5 shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 

diff --git a/textproc/aspell/Makefile.inc b/textproc/aspell/Makefile.inc
@@ -8,8 +8,7 @@ PORTVERSION?=	${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9
 
 LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 
-USES+=		gmake
-USE_BZIP2=	yes
+USES+=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
 
 PLIST_SUB=	VER=${VER}

diff --git a/textproc/aspell/files/patch-configure b/textproc/aspell/files/patch-configure
@@ -9,18 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -8101,6 +8101,10 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ltmain"
-+save_CC="$CC"
-+CC="$CXX"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-+CC="$save_CC"
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18179,7 +18183,7 @@
+@@ -18179,7 +18179,7 @@
    CURSES_LIB=-lncurses
 
  cat >>confdefs.h <<\_ACEOF
@@ -29,7 +18,7 @@
  _ACEOF
 
  else
-@@ -18366,8 +18370,8 @@
+@@ -18366,8 +18366,8 @@
       if test "$enable_wide_curses" != "no"
       then
 

diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
@@ -68,13 +68,13 @@ lib/aspell-%%VER%%/spell
 lib/aspell-%%VER%%/split.kbd
 lib/aspell-%%VER%%/standard.kbd
 lib/libaspell.a
-lib/libaspell.la
 lib/libaspell.so
-lib/libaspell.so.16
+lib/libaspell.so.15
+lib/libaspell.so.15.1.5
 lib/libpspell.a
-lib/libpspell.la
 lib/libpspell.so
-lib/libpspell.so.16
+lib/libpspell.so.15
+lib/libpspell.so.15.1.5
 man/man1/aspell-import.1.gz
 man/man1/aspell.1.gz
 man/man1/prezip-bin.1.gz

diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	gnome2

diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-spell
 PORTVERSION=	1.0.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome

diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=		gnome-translate
 PORTVERSION=		0.99
-PORTREVISION=	15
+PORTREVISION=		16
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	libtranslate
 
 MAINTAINER=		[email protected]
-COMMENT=		A natural language translator
+COMMENT=		Natural language translator
 
 LIB_DEPENDS=		libtranslate.so:${PORTSDIR}/textproc/libtranslate