diff options
| -rw-r--r-- | MOVED | 2 | ||||
| -rw-r--r-- | misc/Makefile | 2 | ||||
| -rw-r--r-- | misc/bibletime/Makefile (renamed from misc/bibletime-kde4/Makefile) | 11 | ||||
| -rw-r--r-- | misc/bibletime/distinfo (renamed from misc/bibletime-kde4/distinfo) | 0 | ||||
| -rw-r--r-- | misc/bibletime/pkg-descr (renamed from misc/bibletime-kde4/pkg-descr) | 0 | ||||
| -rw-r--r-- | misc/bibletime/pkg-plist (renamed from misc/bibletime-kde4/pkg-plist) | 2 |
6 files changed, 8 insertions, 9 deletions
@@ -3814,7 +3814,6 @@ deskutils/zbgset|deskutils/p5-ZConf-BGSet|2009-02-15|Integrated into deskutils/p deskutils/zbgset-admin|deskutils/p5-ZConf-BGSet|2009-02-15|Integrated into deskutils/p5-ZConf-BGSet. net/samba32-devel|net/samba32|2009-02-16|Samba 3.2 became stable enough to be used in production. editors/sam||2009-02-19|Has expired: distfile and homepage disappeared -misc/bibletime|misc/bibletime-kde3|2009-02-26|Use misc/bibletime-kde3 math/slsc||2009-02-28|Has expired: No longer maintained by author finance/eqonomize|finance/eqonomize-kde3|2009-03-02|Use finance/eqonomize-kde3 x11/libxfce4mcs||2009-03-02|got obsolete by xfce 4.6 update @@ -4193,3 +4192,4 @@ databases/ruby-dbd_msql||2009-10-29|Has expired: no longer under development databases/ruby-dbd_proxy||2009-10-29|Has expired: no longer under development databases/ruby-dbd_interbase||2009-10-29|Has expired: no longer under development textproc/p5-XML-LibXML-Common|textproc/p5-XML-LibXML|2009-10-30|merged +misc/bibletime-kde4|misc/bibletime|2009-10-30|Renamed now that KDE dependencies are removed diff --git a/misc/Makefile b/misc/Makefile index b51a86a2b163..7974122c8b74 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -21,8 +21,8 @@ SUBDIR += bbjd SUBDIR += bdelta SUBDIR += bestfit + SUBDIR += bibletime SUBDIR += bibletime-kde3 - SUBDIR += bibletime-kde4 SUBDIR += biblical-curse SUBDIR += bidwatcher SUBDIR += bigboard diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime/Makefile index 3e653ef1d9ef..be4efff32869 100644 --- a/misc/bibletime-kde4/Makefile +++ b/misc/bibletime/Makefile @@ -9,7 +9,6 @@ PORTNAME= bibletime PORTVERSION= 2.3.3 CATEGORIES= misc kde MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code -PKGNAMESUFFIX= -kde4 MAINTAINER= tabthorpe@FreeBSD.org COMMENT= An opensource Bible study tool @@ -20,20 +19,18 @@ LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ clucene.0:${PORTSDIR}/textproc/clucene USE_OPENSSL= yes -KDE4_BUILDENV= yes -USE_KDE4= kdeprefix runtime workspace oxygen automoc4 USE_CMAKE= yes USE_QT_VER= 4 -QT_COMPONENTS= corelib dbus gui xml webkit qmake_build moc_build uic_build rcc_build - -CMAKE_SOURCE_PATH= ${WRKSRC}/.. +QT_COMPONENTS= corelib dbus gui qtestlib script webkit xml qmake_build moc_build uic_build rcc_build CONFLICTS= bibletime-devel-2* .include <bsd.port.pre.mk> .if ${OSVERSION} < 700042 -BROKEN= does on build on 6.x, use misc/bibletime-kde3 +CMAKE_USE_PTHREAD= yes .endif +CMAKE_BUILD_TYPE= Release + .include <bsd.port.post.mk> diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime/distinfo index 4289ce3707e3..4289ce3707e3 100644 --- a/misc/bibletime-kde4/distinfo +++ b/misc/bibletime/distinfo diff --git a/misc/bibletime-kde4/pkg-descr b/misc/bibletime/pkg-descr index afb4781dbf49..afb4781dbf49 100644 --- a/misc/bibletime-kde4/pkg-descr +++ b/misc/bibletime/pkg-descr diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime/pkg-plist index 610f7118603b..4b8a6bc27742 100644 --- a/misc/bibletime-kde4/pkg-plist +++ b/misc/bibletime/pkg-plist @@ -738,6 +738,7 @@ share/applications/bibletime.desktop %%DATADIR%%/locale/bibletime_ui_zh_TW.qm %%DATADIR%%/pics/startuplogo.png share/icons/bibletime.svg +@dirrm share/icons @dirrm %%DATADIR%%/pics @dirrm %%DATADIR%%/locale @dirrm %%DATADIR%%/license @@ -770,3 +771,4 @@ share/icons/bibletime.svg @dirrm %%DATADIR%%/docs @dirrm %%DATADIR%%/display-templates @dirrm %%DATADIR%% +@dirrm share/applications |