- Update to 2.10.r1

3 files changed, 41 insertions, 48 deletions

diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile
index c098d0c8ee27..3ab9a7ffbc1e 100644
--- a/misc/bibletime-devel/Makefile
+++ b/misc/bibletime-devel/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	bibletime
-PORTVERSION=	2.10.b1
+PORTVERSION=	2.10.r1
 CATEGORIES=	misc kde
 MASTER_SITES=	SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/_beta/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/_rc/}
 
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Open source Bible study tool
@@ -18,12 +18,11 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 CONFLICTS=	bibletime-2.9.*
 PKGNAMESUFFIX=	-devel
 
-USES=		cmake
+USES=		cmake:outsource
 USE_XZ=		yes
 USE_OPENSSL=	yes
 USE_QT4=	corelib dbus gui iconengines network phonon qtestlib script \
 		svg webkit xml linguist_build moc_build qmake_build \
 		rcc_build uic_build
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo
index 33d02fb854d5..1242151fb9c4 100644
--- a/misc/bibletime-devel/distinfo
+++ b/misc/bibletime-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bibletime-2.10_beta1.tar.xz) = 497514f57fd93a743891cbe2c8c8fb4edec371059857ae9b9a76fb64b2ec8f82
-SIZE (bibletime-2.10_beta1.tar.xz) = 3311032
+SHA256 (bibletime-2.10_rc1.tar.xz) = 8a715e45cb543e9c33cb4afd28192a2e4e2a01e90f913390058b2e82194e9a1b
+SIZE (bibletime-2.10_rc1.tar.xz) = 3238308
diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist
index 2db8dd44b775..fe34634e9bdd 100644
--- a/misc/bibletime-devel/pkg-plist
+++ b/misc/bibletime-devel/pkg-plist
@@ -951,57 +951,51 @@ share/applications/bibletime.desktop
 %%DATADIR%%/locale/bibletime_ui_es.qm
 %%DATADIR%%/locale/bibletime_ui_et.qm
 %%DATADIR%%/locale/bibletime_ui_fi.qm
-%%DATADIR%%/locale/bibletime_ui_fr.qm
 %%DATADIR%%/locale/bibletime_ui_hu.qm
 %%DATADIR%%/locale/bibletime_ui_it.qm
-%%DATADIR%%/locale/bibletime_ui_nl.qm
-%%DATADIR%%/locale/bibletime_ui_nn_NO.qm
-%%DATADIR%%/locale/bibletime_ui_pl.qm
 %%DATADIR%%/locale/bibletime_ui_pt.qm
 %%DATADIR%%/locale/bibletime_ui_pt_BR.qm
-%%DATADIR%%/locale/bibletime_ui_ro.qm
 %%DATADIR%%/locale/bibletime_ui_ru.qm
 %%DATADIR%%/locale/bibletime_ui_sk.qm
-%%DATADIR%%/locale/bibletime_ui_zh_CN.qm
 %%DATADIR%%/locale/bibletime_ui_zh_TW.qm
 %%DATADIR%%/pics/startuplogo.png
 %%DATADIR%%/pics/startuplogo_christmas.png
 %%DATADIR%%/pics/startuplogo_easter.jpg
 share/icons/bibletime.svg
 @dirrmtry share/icons
-@dirrm %%DATADIR%%/pics
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/license
-@dirrm %%DATADIR%%/javascript
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/docs/howto/ru
-@dirrm %%DATADIR%%/docs/howto/pt_BR
-@dirrm %%DATADIR%%/docs/howto/nl
-@dirrm %%DATADIR%%/docs/howto/ko
-@dirrm %%DATADIR%%/docs/howto/it
-@dirrm %%DATADIR%%/docs/howto/hu
-@dirrm %%DATADIR%%/docs/howto/fr
-@dirrm %%DATADIR%%/docs/howto/fi
-@dirrm %%DATADIR%%/docs/howto/es
-@dirrm %%DATADIR%%/docs/howto/en
-@dirrm %%DATADIR%%/docs/howto/de
-@dirrm %%DATADIR%%/docs/howto/da
-@dirrm %%DATADIR%%/docs/howto/cs
-@dirrm %%DATADIR%%/docs/howto/bg
-@dirrm %%DATADIR%%/docs/howto/ar
-@dirrm %%DATADIR%%/docs/howto
-@dirrm %%DATADIR%%/docs/handbook/pt_BR
-@dirrm %%DATADIR%%/docs/handbook/nl
-@dirrm %%DATADIR%%/docs/handbook/it
-@dirrm %%DATADIR%%/docs/handbook/hu
-@dirrm %%DATADIR%%/docs/handbook/fr
-@dirrm %%DATADIR%%/docs/handbook/fi
-@dirrm %%DATADIR%%/docs/handbook/es
-@dirrm %%DATADIR%%/docs/handbook/en
-@dirrm %%DATADIR%%/docs/handbook/de
-@dirrm %%DATADIR%%/docs/handbook/cs
-@dirrm %%DATADIR%%/docs/handbook/ar
-@dirrm %%DATADIR%%/docs/handbook
-@dirrm %%DATADIR%%/docs
-@dirrm %%DATADIR%%/display-templates
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%/pics
+@dirrmtry %%DATADIR%%/locale
+@dirrmtry %%DATADIR%%/license
+@dirrmtry %%DATADIR%%/javascript
+@dirrmtry %%DATADIR%%/icons
+@dirrmtry %%DATADIR%%/docs/howto/ru
+@dirrmtry %%DATADIR%%/docs/howto/pt_BR
+@dirrmtry %%DATADIR%%/docs/howto/nl
+@dirrmtry %%DATADIR%%/docs/howto/ko
+@dirrmtry %%DATADIR%%/docs/howto/it
+@dirrmtry %%DATADIR%%/docs/howto/hu
+@dirrmtry %%DATADIR%%/docs/howto/fr
+@dirrmtry %%DATADIR%%/docs/howto/fi
+@dirrmtry %%DATADIR%%/docs/howto/es
+@dirrmtry %%DATADIR%%/docs/howto/en
+@dirrmtry %%DATADIR%%/docs/howto/de
+@dirrmtry %%DATADIR%%/docs/howto/da
+@dirrmtry %%DATADIR%%/docs/howto/cs
+@dirrmtry %%DATADIR%%/docs/howto/bg
+@dirrmtry %%DATADIR%%/docs/howto/ar
+@dirrmtry %%DATADIR%%/docs/howto
+@dirrmtry %%DATADIR%%/docs/handbook/pt_BR
+@dirrmtry %%DATADIR%%/docs/handbook/nl
+@dirrmtry %%DATADIR%%/docs/handbook/it
+@dirrmtry %%DATADIR%%/docs/handbook/hu
+@dirrmtry %%DATADIR%%/docs/handbook/fr
+@dirrmtry %%DATADIR%%/docs/handbook/fi
+@dirrmtry %%DATADIR%%/docs/handbook/es
+@dirrmtry %%DATADIR%%/docs/handbook/en
+@dirrmtry %%DATADIR%%/docs/handbook/de
+@dirrmtry %%DATADIR%%/docs/handbook/cs
+@dirrmtry %%DATADIR%%/docs/handbook/ar
+@dirrmtry %%DATADIR%%/docs/handbook
+@dirrmtry %%DATADIR%%/docs
+@dirrmtry %%DATADIR%%/display-templates
+@dirrmtry %%DATADIR%%