From 4a2c864ae5da9dbe41a501e0bf263d3646d4acf9 Mon Sep 17 00:00:00 2001 From: tabthorpe Date: Thu, 7 Jan 2010 17:47:25 +0000 Subject: - Chase sword libbump - Remove CONFLICTS and un-needed patch --- misc/bibletime/Makefile | 5 ++--- misc/bibletime/files/patch-src__bibletime.cpp | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 misc/bibletime/files/patch-src__bibletime.cpp (limited to 'misc/bibletime') diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile index 6d122ff144fb..4db24ac3d360 100644 --- a/misc/bibletime/Makefile +++ b/misc/bibletime/Makefile @@ -7,13 +7,14 @@ PORTNAME= bibletime PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= misc kde MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code MAINTAINER= tabthorpe@FreeBSD.org COMMENT= An opensource Bible study tool -RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.0.so:${PORTSDIR}/misc/sword +RUN_DEPENDS= ${LOCALBASE}/lib/libsword-1.6.1.so:${PORTSDIR}/misc/sword BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ clucene.0:${PORTSDIR}/textproc/clucene @@ -25,8 +26,6 @@ QT_COMPONENTS= corelib dbus gui iconengines network phonon qtestlib script \ svg webkit xml linguist_build moc_build qmake_build \ rcc_build uic_build -CONFLICTS= bibletime-kde3-1* - .include .if ${OSVERSION} < 700042 diff --git a/misc/bibletime/files/patch-src__bibletime.cpp b/misc/bibletime/files/patch-src__bibletime.cpp deleted file mode 100644 index 29b6a6ae4296..000000000000 --- a/misc/bibletime/files/patch-src__bibletime.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/bibletime.cpp.orig 2009-12-15 13:23:36.000000000 -0500 -+++ ./src/bibletime.cpp 2009-12-15 13:24:19.000000000 -0500 -@@ -61,7 +61,7 @@ - const int month = date.month(); - QString splashImage(DU::getPicsDir().canonicalPath().append("/")); - -- if ((month >= 12 && day >= 24) || (month <= 1 && day < 6)) { -+ if ((month >= 12) || (month <= 1 && day < 6)) { - splashImage.append("startuplogo_christmas.png"); - } else { - splashImage.append("startuplogo.png"); -- cgit