The attached diff updates trojita to 0.3.96. They jumped right from 0.3.93. They switched to cmake and now require gcc4 so I figured I'd send the diff to ports@ to get a second set of eyes on the update.
Tested on amd64. -- James Turner
Index: Makefile =================================================================== RCS file: /cvs/ports/mail/trojita/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile 8 May 2013 02:03:11 -0000 1.2 +++ Makefile 3 Oct 2013 19:22:17 -0000 @@ -2,9 +2,11 @@ COMMENT = fast Qt IMAP e-mail client -DISTNAME = trojita-0.3.93 +DISTNAME = trojita-0.3.96 CATEGORIES = mail x11 +SHARED_LIBS = trojita_plugins 0.0 # 0.0 + MAINTAINER = James Turner <[email protected]> HOMEPAGE = http://trojita.flaska.net/ @@ -14,21 +16,27 @@ EXTRACT_SUFX = .tar.bz2 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB += ICE lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSql -WANTLIB += lib/qt4/QtWebKit SM X11 Xext Xi Xinerama Xrender -WANTLIB += c fontconfig freetype m pthread stdc++ +WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSql +WANTLIB += lib/qt4/QtWebKit c m pthread z + +MODULES = devel/cmake gcc4 x11/qt4 -MODULES = x11/qt4 +MODGCC4_ARCHS = * +MODGCC4_LANGS = c++ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+2,-guic -FAKE_FLAGS = INSTALL_ROOT=${WRKINST} +CONFIGURE_ENV += QTDIR="${MODQT_LIBDIR}" +CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \ + -DWITH_HARMATTAN=OFF \ + -DWITH_RAGEL=OFF \ + -DWITH_QT5=OFF \ + -DGIT_EXECUTABLE="" -TEST_FLAGS = DISPLAY=:0 TEST_IS_INTERACTIVE = X11 -do-configure: - cd ${WRKDIST} && qmake4 trojita.pro +do-test: + cd ${WRKBUILD} && ${LOCALBASE}/bin/ctest --output-on-failure .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/mail/trojita/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo 8 May 2013 02:03:11 -0000 1.2 +++ distinfo 3 Oct 2013 19:22:17 -0000 @@ -1,2 +1,2 @@ -SHA256 (trojita-0.3.93.tar.bz2) = Ylv3/e0/AKRfb06v5QT6PiDiN2MgcvfkeUnQoTOSdOQ= -SIZE (trojita-0.3.93.tar.bz2) = 966396 +SHA256 (trojita-0.3.96.tar.bz2) = 8IXboqM+7WEoK93gWwFRE4+8ggp7/kZVdY4dY/Ma9/E= +SIZE (trojita-0.3.96.tar.bz2) = 1068542 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/trojita/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 8 May 2013 02:03:11 -0000 1.2 +++ pkg/PLIST 3 Oct 2013 19:22:17 -0000 @@ -1,5 +1,7 @@ @comment $OpenBSD: PLIST,v 1.2 2013/05/08 02:03:11 jturner Exp $ +@bin bin/be.contacts @bin bin/trojita +@lib lib/libtrojita_plugins.so.${LIBtrojita_plugins_VERSION} share/applications/trojita.desktop share/icons/hicolor/32x32/apps/trojita.png share/icons/hicolor/scalable/apps/trojita.svg @@ -23,11 +25,13 @@ share/trojita/locale/trojita_common_nl.q share/trojita/locale/trojita_common_pl.qm share/trojita/locale/trojita_common_pt.qm share/trojita/locale/trojita_common_pt_BR.qm +share/trojita/locale/trojita_common_ro.qm share/trojita/locale/trojita_common_sk.qm share/trojita/locale/trojita_common_sv.qm share/trojita/locale/trojita_common_tr.qm +share/trojita/locale/trojita_common_ug.qm share/trojita/locale/trojita_common_uk.qm -share/trojita/locale/trojita_common_x-test.qm +share/trojita/locale/trojita_common_x_test.qm share/trojita/locale/trojita_common_zh_CN.qm share/trojita/locale/trojita_common_zh_TW.qm @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
