From 52ca4711f99d0200b77d85f8fb7bf85856bcf1e3 Mon Sep 17 00:00:00 2001 From: landry Date: Wed, 12 Apr 2017 18:12:33 +0000 Subject: [PATCH] Fix WANTLIB and bump REVISION for all ports depending on hunspell. While here enforce dependency on hunspell 1.6 in mozilla.port.mk, as it's a requirement for 53. --- devel/codeblocks/Makefile | 6 +++--- devel/kf5/sonnet/Makefile | 5 +++-- devel/xulrunner/24/Makefile | 6 +++--- editors/focuswriter/Makefile | 6 +++--- editors/ghostwriter/Makefile | 5 +++-- editors/libreoffice/Makefile | 6 +++--- editors/texmaker/Makefile | 5 +++-- editors/texworks/Makefile | 6 +++--- mail/mozilla-thunderbird/Makefile | 3 ++- textproc/link-grammar/Makefile | 5 +++-- www/firefox-esr/Makefile | 3 ++- www/mozilla-firefox/Makefile | 3 ++- www/mozilla/mozilla.port.mk | 6 +++--- www/otter-browser/Makefile | 5 +++-- www/seamonkey/Makefile | 4 ++-- www/tor-browser/browser/Makefile | 3 ++- x11/kde4/lokalize/Makefile | 6 +++--- 17 files changed, 46 insertions(+), 37 deletions(-) diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index c8feadbfa60..4e45670a5da 100755 --- a/devel/codeblocks/Makefile +++ b/devel/codeblocks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2017/04/10 11:45:25 sthen Exp $ +# $OpenBSD: Makefile,v 1.37 2017/04/12 18:12:33 landry Exp $ BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation fault BROKEN-arm= wxwidgets va_list c++ mangling requires gcc < 4.4 @@ -7,7 +7,7 @@ COMMENT= Code::Blocks C/C++ IDE V= 16.01 DISTNAME= codeblocks_${V} PKGNAME= codeblocks-${V} -REVISION= 0 +REVISION= 1 WRKDIST= ${WRKDIR}/codeblocks-${V}.release @@ -36,7 +36,7 @@ WANTLIB += ICE SDL SM X11 Xcomposite Xcursor Xdamage Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 bz2 c cairo WANTLIB += expat ffi fontconfig freetype gamin-1 gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hunspell-1.3 iodbc +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hunspell-1.6 iodbc WANTLIB += jpeg m mspack pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread pthread-stubs sndio ${LIBCXX} WANTLIB += tiff usbhid wx_base wx_base_net wx_base_odbc wx_base_xml diff --git a/devel/kf5/sonnet/Makefile b/devel/kf5/sonnet/Makefile index 271d9976288..f6a35c24386 100644 --- a/devel/kf5/sonnet/Makefile +++ b/devel/kf5/sonnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2016/12/25 14:54:49 zhuk Exp $ +# $OpenBSD: Makefile,v 1.3 2017/04/12 18:12:33 landry Exp $ COMMENT-main = multi-language spell checker for KDE COMMENT-aspell = ASpell plugin for Sonnet @@ -7,6 +7,7 @@ DISTNAME = sonnet-${VERSION} PKGNAME-main = ${DISTNAME} PKGNAME-aspell = sonnet-aspell-${VERSION} PKGNAME-hunspell = sonnet-hunspell-${VERSION} +REVISION-hunspell = 0 SHARED_LIBS = KF5SonnetCore 0.0 SHARED_LIBS += KF5SonnetUi 0.0 @@ -15,7 +16,7 @@ MULTI_PACKAGES = -main -aspell -hunspell WANTLIB-main = ${WANTLIB} Qt5Core Qt5Gui Qt5Widgets m c WANTLIB-aspell = ${WANTLIB} KF5SonnetCore Qt5Core aspell m -WANTLIB-hunspell = ${WANTLIB} KF5SonnetCore Qt5Core hunspell-1.3 m +WANTLIB-hunspell = ${WANTLIB} KF5SonnetCore Qt5Core hunspell-1.6 m LIB_DEPENDS-aspell = ${LIB_DEPENDS} \ ${BASE_PKGPATH},-main \ diff --git a/devel/xulrunner/24/Makefile b/devel/xulrunner/24/Makefile index 69ec5545ccb..fced81ffdf6 100644 --- a/devel/xulrunner/24/Makefile +++ b/devel/xulrunner/24/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2017/03/07 15:26:41 landry Exp $ +# $OpenBSD: Makefile,v 1.39 2017/04/12 18:12:33 landry Exp $ ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64 alpha USE_WXNEEDED = Yes @@ -10,8 +10,8 @@ MOZILLA_PROJECT = xulrunner MOZILLA_DIST = firefox PKGSPEC-devel = xulrunner-devel->=24.0,<31.0 PKGSPEC-main = xulrunner->=24.0,<31.0 -REVISION-main = 17 -REVISION-devel = 12 +REVISION-main = 18 +REVISION-devel = 13 SO_VERSION = 0.0 MOZILLA_LIBS = mozgnome mozalloc xul diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index 6fe46d68527..de5931aca52 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2017/04/10 11:45:27 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2017/04/12 18:12:33 landry Exp $ COMMENT = simple, distraction-free writing environment @@ -7,7 +7,7 @@ PKGNAME = ${DISTNAME:S/-src//} CATEGORIES = editors EXTRACT_SUFX = .tar.bz2 WRKDIST = ${WRKDIR}/${DISTNAME:S/-src//} - +REVISION = 0 HOMEPAGE = http://gottcode.org/focuswriter/ MASTER_SITES = ${HOMEPAGE} @@ -22,7 +22,7 @@ RUN_DEPENDS += devel/desktop-file-utils \ x11/gtk+3,-guic LIB_DEPENDS += textproc/hunspell WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype -WANTLIB += QtNetwork z QtGui c m pthread ${LIBCXX} hunspell-1.3 +WANTLIB += QtNetwork z QtGui c m pthread ${LIBCXX} hunspell-1.6 NO_TEST = Yes diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile index 6a6db594b78..292772986c1 100644 --- a/editors/ghostwriter/Makefile +++ b/editors/ghostwriter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2017/01/17 12:58:26 awolk Exp $ +# $OpenBSD: Makefile,v 1.2 2017/04/12 18:12:33 landry Exp $ # qt5 webkit USE_WXNEEDED = Yes @@ -8,6 +8,7 @@ COMMENT = distraction-free Markdown editor GH_ACCOUNT = wereturtle GH_PROJECT = ghostwriter GH_TAGNAME = v1.4.2 +REVISION = 0 CATEGORIES = editors @@ -19,7 +20,7 @@ MAINTAINER = Adam Wolk PERMIT_PACKAGE_CDROM = Yes WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c hunspell-1.3 +WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets c hunspell-1.6 WANTLIB += m pthread MODULES = devel/qmake \ diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d222ac9eec0..ba00fd2671b 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.155 2017/01/03 19:30:57 landry Exp $ +# $OpenBSD: Makefile,v 1.156 2017/04/12 18:12:33 landry Exp $ USE_WXNEEDED= Yes @@ -19,7 +19,7 @@ PKGNAME-kde= libreoffice-kde-${VERSION} PKGNAME-java= libreoffice-java-${VERSION} CATEGORIES= editors productivity DPB_PROPERTIES= parallel tag:kde4 -REVISION= 0 +REVISION= 1 EPOCH= 0 @@ -204,7 +204,7 @@ WANTLIB-main+= ICE SM X11 Xcomposite Xcursor Xdamage \ jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pthread ssl xml2 z gdk_pixbuf-2.0 \ util ${MODGETTEXT_WANTLIB} -WANTLIB-main+= hunspell-1.3 +WANTLIB-main+= hunspell-1.6 WANTLIB-main+= ${MODPY_WANTLIB} WANTLIB-main+= clucene-contribs-lib clucene-core clucene-shared WANTLIB-main+= cups exslt gcrypt gpg-error lcms2 diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index e2396299b8b..f809f58a5e9 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.33 2017/04/10 11:45:27 sthen Exp $ +# $OpenBSD: Makefile,v 1.34 2017/04/12 18:12:33 landry Exp $ COMMENT= LaTeX development environment DISTNAME= texmaker-4.5 CATEGORIES= editors +REVISION= 0 HOMEPAGE= http://www.xm1math.net/texmaker/ @@ -15,7 +16,7 @@ MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.bz2 WANTLIB += ICE QtGui QtNetwork QtScript QtWebKit QtXml SM X11 -WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.3 +WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.6 WANTLIB += m poppler-qt4 pthread ${LIBCXX} z MODULES= devel/qmake x11/qt4 diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 0d944ee4243..d7256964827 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2017/04/10 11:45:27 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2017/04/12 18:12:33 landry Exp $ COMMENT-main = easy to use LaTeX and ConTeXt editor COMMENT-python = Python scripting for TeXworks @@ -12,7 +12,7 @@ PKGNAME-main = texworks-${V} PKGNAME-lua = texworks-lua-${V} PKGNAME-python = texworks-python-${V} -REVISION-main = 1 +REVISION-main = 2 REVISION-lua = 1 REVISION-python = 0 @@ -35,7 +35,7 @@ MODQMAKE_PROJECTS = plugins-src/TWLuaPlugin/TWLuaPlugin.pro \ TeXworks.pro WANTLIB += ICE QtDBus QtGui QtScript QtScriptTools QtXml SM X11 -WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.3 +WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.6 WANTLIB += m poppler-qt4 pthread ${LIBCXX} z WANTLIB-lua = ${MODLUA_WANTLIB} diff --git a/mail/mozilla-thunderbird/Makefile b/mail/mozilla-thunderbird/Makefile index e83967ebda9..738d4658722 100644 --- a/mail/mozilla-thunderbird/Makefile +++ b/mail/mozilla-thunderbird/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.240 2017/04/05 09:46:18 landry Exp $ +# $OpenBSD: Makefile,v 1.241 2017/04/12 18:12:33 landry Exp $ COMMENT-main = Mozilla e-mail, rss and usenet client COMMENT-lightning = Mozilla Thunderbird calendar extension @@ -10,6 +10,7 @@ MOZILLA_BRANCH = release MOZILLA_PROJECT = thunderbird MOZILLA_CODENAME = mail EXTRACT_SUFX = .tar.xz +REVISION-main = 0 MULTI_PACKAGES = -main -lightning PKGNAME-main = ${PKGNAME} diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile index 2a67170f808..f02f1c34f92 100644 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2017/02/18 11:27:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2017/04/12 18:12:33 landry Exp $ ONLY_FOR_ARCHS-java = i386 amd64 @@ -12,6 +12,7 @@ DISTNAME = link-grammar-${VERSION} PKGNAME-main = ${DISTNAME} PKGNAME-java = link-grammar-java-${VERSION} PKGNAME-python = py-link-grammar-${VERSION} +REVISION = 0 SHARED_LIBS += link-grammar 4.0 # 8.7 SHARED_LIBS += link-grammar-java 4.0 # 8.7 @@ -23,7 +24,7 @@ HOMEPAGE = http://www.abisource.com/projects/link-grammar/ # LGPLv2.1 PERMIT_PACKAGE_CDROM = Yes -WANTLIB += hunspell-1.3 m sqlite3 +WANTLIB += hunspell-1.6 m sqlite3 WANTLIB-main += ${WANTLIB} c pthread diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index c1bba0abf1c..134351212a1 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2017/03/28 20:06:41 landry Exp $ +# $OpenBSD: Makefile,v 1.51 2017/04/12 18:12:33 landry Exp $ COMMENT = Firefox web browser, Extended Support Release @@ -8,6 +8,7 @@ MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser BROKEN-sparc64 = xpcshell SIGBUS during fake EXTRACT_SUFX = .tar.xz +REVISION = 0 PKGNAME = ${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//} SO_VERSION = 4.0 diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index c0719962c75..20cedc510d6 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.313 2017/03/28 20:07:27 landry Exp $ +# $OpenBSD: Makefile,v 1.314 2017/04/12 18:12:33 landry Exp $ COMMENT = Mozilla web browser @@ -10,6 +10,7 @@ MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser BROKEN-sparc64 = xpcshell SIGBUS during fake EXTRACT_SUFX = .tar.xz +REVISION = 0 SO_VERSION = 70.0 # NOTE: Must bump minor version if any shlib's are removed from the diff --git a/www/mozilla/mozilla.port.mk b/www/mozilla/mozilla.port.mk index c293912583a..4e9002a56cf 100644 --- a/www/mozilla/mozilla.port.mk +++ b/www/mozilla/mozilla.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: mozilla.port.mk,v 1.103 2017/04/10 11:46:35 sthen Exp $ +# $OpenBSD: mozilla.port.mk,v 1.104 2017/04/12 18:12:33 landry Exp $ ONLY_FOR_ARCHS ?= amd64 i386 # ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation @@ -68,8 +68,8 @@ CONFIGURE_ARGS += --with-system-icu .endif .if !defined(MOZILLA_USE_BUNDLED_HUNSPELL) -MODMOZ_LIB_DEPENDS += textproc/hunspell -MODMOZ_WANTLIB += hunspell-1.3 +MODMOZ_LIB_DEPENDS += textproc/hunspell>=1.6 +MODMOZ_WANTLIB += hunspell-1.6 CONFIGURE_ARGS += --with-system-hunspell .endif diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile index d492a99b14a..1eeaa313ec8 100644 --- a/www/otter-browser/Makefile +++ b/www/otter-browser/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2017/01/08 12:13:49 awolk Exp $ +# $OpenBSD: Makefile,v 1.23 2017/04/12 18:12:33 landry Exp $ COMMENT = browser aiming to recreate classic Opera (12.x) UI using Qt5 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=otter-browser/} DISTNAME = otter-browser-0.9.12 +REVISION = 0 EXTRACT_SUFX = .tar.bz2 @@ -19,7 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += c m pthread Qt5Core Qt5DBus Qt5Gui Qt5Multimedia WANTLIB += Qt5Network Qt5PrintSupport Qt5Qml Qt5WebKit WANTLIB += Qt5WebKitWidgets Qt5Widgets Qt5XmlPatterns -WANTLIB += hunspell-1.3 X11 +WANTLIB += hunspell-1.6 X11 RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 42af5c988c9..a32a9970549 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.199 2017/04/10 11:46:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.200 2017/04/12 18:12:33 landry Exp $ COMMENT-main = Mozilla application suite COMMENT-lightning = Mozilla Seamonkey calendar extension @@ -9,7 +9,7 @@ MOZILLA_BRANCH = release MOZILLA_PROJECT = seamonkey MOZILLA_CODENAME = suite EXTRACT_SUFX = .tar.xz -REVISION-main = 4 +REVISION-main = 5 MULTI_PACKAGES = -main -lightning PKGNAME-main = ${PKGNAME} diff --git a/www/tor-browser/browser/Makefile b/www/tor-browser/browser/Makefile index 010a5cb3408..7fab3d89746 100644 --- a/www/tor-browser/browser/Makefile +++ b/www/tor-browser/browser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2017/02/18 16:22:54 landry Exp $ +# $OpenBSD: Makefile,v 1.7 2017/04/12 18:12:33 landry Exp $ # Some of this comes from www/firefox-esr as apropos, since Tor # browser is a fork of ESR. It is a good idea to look at that # Makefile when editing this one (ESR versions not always the same). @@ -19,6 +19,7 @@ GH_TAGNAME = v${TB_VERSION}-esr45.7.0 PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION} DISTNAME = ${GH_TAGNAME} +REVISION = 0 SO_VERSION = 1.0 MOZILLA_LIBS = browsercomps xul lgpllibs diff --git a/x11/kde4/lokalize/Makefile b/x11/kde4/lokalize/Makefile index f9f9455091d..56f84dc6508 100644 --- a/x11/kde4/lokalize/Makefile +++ b/x11/kde4/lokalize/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2015/05/28 10:17:30 pascal Exp $ +# $OpenBSD: Makefile,v 1.5 2017/04/12 18:12:33 landry Exp $ COMMENT = KDE app localization tools DISTNAME = lokalize-${MODKDE4_VERSION} -REVISION = 1 +REVISION = 2 CATEGORIES = devel HOMEPAGE = http://projects.kde.org/projects/kde/kdesdk/lokalize @@ -14,7 +14,7 @@ WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/kio WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/krosscore ${KDE4LIB}/krossui WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils WANTLIB += ${KDE4LIB}/threadweaver -WANTLIB += hunspell-1.3 soprano +WANTLIB += hunspell-1.6 soprano MODULES = lang/python MODPY_ADJ_FILES = scripts/xliffmerge.py