From e11dc40e120e0fd9970db28cd078825b33c37443 Mon Sep 17 00:00:00 2001 From: Thomas Abthorpe Date: Mon, 12 May 2008 18:51:07 +0000 Subject: - Update to 1.6.5.1 - Changelog at --- misc/bibletime-devel/Makefile | 11 ++- misc/bibletime-devel/distinfo | 6 +- .../patch-bibletime::frontend::btinstallmgr.cpp | 24 ----- misc/bibletime-devel/pkg-plist | 102 ++++++++++----------- misc/bibletime-kde3/Makefile | 11 ++- misc/bibletime-kde3/distinfo | 6 +- .../patch-bibletime::frontend::btinstallmgr.cpp | 24 ----- misc/bibletime-kde3/pkg-plist | 102 ++++++++++----------- misc/bibletime-kde4/Makefile | 11 ++- misc/bibletime-kde4/distinfo | 6 +- .../patch-bibletime::frontend::btinstallmgr.cpp | 24 ----- misc/bibletime-kde4/pkg-plist | 102 ++++++++++----------- misc/bibletime/Makefile | 11 ++- misc/bibletime/distinfo | 6 +- .../patch-bibletime::frontend::btinstallmgr.cpp | 24 ----- misc/bibletime/pkg-plist | 102 ++++++++++----------- 16 files changed, 244 insertions(+), 328 deletions(-) delete mode 100644 misc/bibletime-devel/files/patch-bibletime::frontend::btinstallmgr.cpp delete mode 100644 misc/bibletime-kde3/files/patch-bibletime::frontend::btinstallmgr.cpp delete mode 100644 misc/bibletime-kde4/files/patch-bibletime::frontend::btinstallmgr.cpp delete mode 100644 misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile index 5196a42fbe6c..512c1f669d29 100644 --- a/misc/bibletime-devel/Makefile +++ b/misc/bibletime-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.5.1 CATEGORIES= misc MASTER_SITES= SF @@ -23,13 +23,16 @@ USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --enable-static-clucene INSTALLS_ICONS= yes -DOCSDIR= share/doc/HTML/en/bibletime +.include + +.if ${OSVERSION} < 700000 +CONFIGURE_ARGS+= --enable-static-clucene +.endif post-patch: @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/bibletime/Makefile.in -.include +.include diff --git a/misc/bibletime-devel/distinfo b/misc/bibletime-devel/distinfo index 0915c6ac290e..6e1d4f992eb0 100644 --- a/misc/bibletime-devel/distinfo +++ b/misc/bibletime-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (bibletime-1.6.5.tar.bz2) = c6815d2076e454150c3b9fb88c1dd1e8 -SHA256 (bibletime-1.6.5.tar.bz2) = c68c8c44157ef7c5f7aaf3201869f9b714930ce66c39057a66481282ecae07bf -SIZE (bibletime-1.6.5.tar.bz2) = 1230062 +MD5 (bibletime-1.6.5.1.tar.bz2) = c54f2d298d7568ca41b0815097abff37 +SHA256 (bibletime-1.6.5.1.tar.bz2) = dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9 +SIZE (bibletime-1.6.5.1.tar.bz2) = 1231060 diff --git a/misc/bibletime-devel/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime-devel/files/patch-bibletime::frontend::btinstallmgr.cpp deleted file mode 100644 index d20435f830f3..000000000000 --- a/misc/bibletime-devel/files/patch-bibletime::frontend::btinstallmgr.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- bibletime/frontend/btinstallmgr.cpp.orig Sat Oct 1 08:18:03 2005 -+++ bibletime/frontend/btinstallmgr.cpp Tue Jul 11 11:07:41 2006 -@@ -97,7 +97,7 @@ - continue; - } - else { -- conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) ); -+ conf["Install"].insert( std::make_pair((const char*)(!setDataPath ? "DataPath" : "AugmentPath"), t.local8Bit()) ); - - setDataPath = true; - } -@@ -167,10 +167,10 @@ - is->directory--; //make one char shorter - } - -- config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"FTPSource", is->getConfEnt()) ); - } - else if (!strcmp(is->type, "DIR")) { -- config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) ); - } - config.Save(); - } diff --git a/misc/bibletime-devel/pkg-plist b/misc/bibletime-devel/pkg-plist index f425edb12e0f..612ca905a971 100644 --- a/misc/bibletime-devel/pkg-plist +++ b/misc/bibletime-devel/pkg-plist @@ -4,54 +4,54 @@ share/applications/bibletime.desktop share/apps/bibletime/bibletimeui.rc share/apps/bibletime/pics/startuplogo.png share/apps/bibletime/tips -%%DOCSDIR%%/handbook/hdbk-config.docbook -%%DOCSDIR%%/handbook/hdbk-intro.docbook -%%DOCSDIR%%/handbook/hdbk-operation.docbook -%%DOCSDIR%%/handbook/hdbk-reference.docbook -%%DOCSDIR%%/handbook/hdbk-start.docbook -%%DOCSDIR%%/handbook/i_bible.png -%%DOCSDIR%%/handbook/i_bible_add.png -%%DOCSDIR%%/handbook/i_bibletime.png -%%DOCSDIR%%/handbook/i_book.png -%%DOCSDIR%%/handbook/i_book_add.png -%%DOCSDIR%%/handbook/i_cascade.png -%%DOCSDIR%%/handbook/i_cascade_auto.png -%%DOCSDIR%%/handbook/i_commentary.png -%%DOCSDIR%%/handbook/i_commentary_add.png -%%DOCSDIR%%/handbook/i_configure.png -%%DOCSDIR%%/handbook/i_configureaccels.png -%%DOCSDIR%%/handbook/i_configuredisplay.png -%%DOCSDIR%%/handbook/i_configurefonts.png -%%DOCSDIR%%/handbook/i_configurestart.png -%%DOCSDIR%%/handbook/i_configuresword.png -%%DOCSDIR%%/handbook/i_configuretoolbars.png -%%DOCSDIR%%/handbook/i_contents.png -%%DOCSDIR%%/handbook/i_delete.png -%%DOCSDIR%%/handbook/i_editdelete.png -%%DOCSDIR%%/handbook/i_exit.png -%%DOCSDIR%%/handbook/i_fileclose.png -%%DOCSDIR%%/handbook/i_fileprint.png -%%DOCSDIR%%/handbook/i_find.png -%%DOCSDIR%%/handbook/i_fullscreen.png -%%DOCSDIR%%/handbook/i_go.png -%%DOCSDIR%%/handbook/i_ktip.png -%%DOCSDIR%%/handbook/i_lexicon.png -%%DOCSDIR%%/handbook/i_lexicon_add.png -%%DOCSDIR%%/handbook/i_pencil.png -%%DOCSDIR%%/handbook/i_sidetree.png -%%DOCSDIR%%/handbook/i_sync.png -%%DOCSDIR%%/handbook/i_tile.png -%%DOCSDIR%%/handbook/i_tile_auto.png -%%DOCSDIR%%/handbook/index.docbook -%%DOCSDIR%%/handbook/ss_configfonts.png -%%DOCSDIR%%/handbook/ss_configtoolbar.png -%%DOCSDIR%%/handbook/ss_mainterms.png -%%DOCSDIR%%/handbook/ss_searchanal.png -%%DOCSDIR%%/handbook/ss_searchopts.png -%%DOCSDIR%%/howto/how2-basics.docbook -%%DOCSDIR%%/howto/how2-importance.docbook -%%DOCSDIR%%/howto/how2-interpretation.docbook -%%DOCSDIR%%/howto/index.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook +share/doc/HTML/en/bibletime/handbook/i_bible.png +share/doc/HTML/en/bibletime/handbook/i_bible_add.png +share/doc/HTML/en/bibletime/handbook/i_bibletime.png +share/doc/HTML/en/bibletime/handbook/i_book.png +share/doc/HTML/en/bibletime/handbook/i_book_add.png +share/doc/HTML/en/bibletime/handbook/i_cascade.png +share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png +share/doc/HTML/en/bibletime/handbook/i_commentary.png +share/doc/HTML/en/bibletime/handbook/i_commentary_add.png +share/doc/HTML/en/bibletime/handbook/i_configure.png +share/doc/HTML/en/bibletime/handbook/i_configureaccels.png +share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png +share/doc/HTML/en/bibletime/handbook/i_configurefonts.png +share/doc/HTML/en/bibletime/handbook/i_configurestart.png +share/doc/HTML/en/bibletime/handbook/i_configuresword.png +share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png +share/doc/HTML/en/bibletime/handbook/i_contents.png +share/doc/HTML/en/bibletime/handbook/i_delete.png +share/doc/HTML/en/bibletime/handbook/i_editdelete.png +share/doc/HTML/en/bibletime/handbook/i_exit.png +share/doc/HTML/en/bibletime/handbook/i_fileclose.png +share/doc/HTML/en/bibletime/handbook/i_fileprint.png +share/doc/HTML/en/bibletime/handbook/i_find.png +share/doc/HTML/en/bibletime/handbook/i_fullscreen.png +share/doc/HTML/en/bibletime/handbook/i_go.png +share/doc/HTML/en/bibletime/handbook/i_ktip.png +share/doc/HTML/en/bibletime/handbook/i_lexicon.png +share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png +share/doc/HTML/en/bibletime/handbook/i_pencil.png +share/doc/HTML/en/bibletime/handbook/i_sidetree.png +share/doc/HTML/en/bibletime/handbook/i_sync.png +share/doc/HTML/en/bibletime/handbook/i_tile.png +share/doc/HTML/en/bibletime/handbook/i_tile_auto.png +share/doc/HTML/en/bibletime/handbook/index.docbook +share/doc/HTML/en/bibletime/handbook/ss_configfonts.png +share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png +share/doc/HTML/en/bibletime/handbook/ss_mainterms.png +share/doc/HTML/en/bibletime/handbook/ss_searchanal.png +share/doc/HTML/en/bibletime/handbook/ss_searchopts.png +share/doc/HTML/en/bibletime/howto/how2-basics.docbook +share/doc/HTML/en/bibletime/howto/how2-importance.docbook +share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook +share/doc/HTML/en/bibletime/howto/index.docbook share/icons/hicolor/16x16/actions/bt_bible.png share/icons/hicolor/16x16/actions/bt_bible_add.png share/icons/hicolor/16x16/actions/bt_bible_locked.png @@ -145,9 +145,9 @@ share/icons/hicolor/48x48/actions/bt_tile.png share/icons/hicolor/48x48/actions/bt_tile_auto.png share/icons/hicolor/48x48/apps/bibletime.png share/icons/hicolor/64x64/apps/bibletime.png -@dirrm %%DOCSDIR%%/howto -@dirrm %%DOCSDIR%%/handbook -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/HTML/en/bibletime/howto +@dirrm share/doc/HTML/en/bibletime/handbook +@dirrm share/doc/HTML/en/bibletime @dirrmtry share/doc/HTML/en @dirrmtry share/doc/HTML @dirrmtry share/config diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile index 5196a42fbe6c..512c1f669d29 100644 --- a/misc/bibletime-kde3/Makefile +++ b/misc/bibletime-kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.5.1 CATEGORIES= misc MASTER_SITES= SF @@ -23,13 +23,16 @@ USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --enable-static-clucene INSTALLS_ICONS= yes -DOCSDIR= share/doc/HTML/en/bibletime +.include + +.if ${OSVERSION} < 700000 +CONFIGURE_ARGS+= --enable-static-clucene +.endif post-patch: @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/bibletime/Makefile.in -.include +.include diff --git a/misc/bibletime-kde3/distinfo b/misc/bibletime-kde3/distinfo index 0915c6ac290e..6e1d4f992eb0 100644 --- a/misc/bibletime-kde3/distinfo +++ b/misc/bibletime-kde3/distinfo @@ -1,3 +1,3 @@ -MD5 (bibletime-1.6.5.tar.bz2) = c6815d2076e454150c3b9fb88c1dd1e8 -SHA256 (bibletime-1.6.5.tar.bz2) = c68c8c44157ef7c5f7aaf3201869f9b714930ce66c39057a66481282ecae07bf -SIZE (bibletime-1.6.5.tar.bz2) = 1230062 +MD5 (bibletime-1.6.5.1.tar.bz2) = c54f2d298d7568ca41b0815097abff37 +SHA256 (bibletime-1.6.5.1.tar.bz2) = dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9 +SIZE (bibletime-1.6.5.1.tar.bz2) = 1231060 diff --git a/misc/bibletime-kde3/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime-kde3/files/patch-bibletime::frontend::btinstallmgr.cpp deleted file mode 100644 index d20435f830f3..000000000000 --- a/misc/bibletime-kde3/files/patch-bibletime::frontend::btinstallmgr.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- bibletime/frontend/btinstallmgr.cpp.orig Sat Oct 1 08:18:03 2005 -+++ bibletime/frontend/btinstallmgr.cpp Tue Jul 11 11:07:41 2006 -@@ -97,7 +97,7 @@ - continue; - } - else { -- conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) ); -+ conf["Install"].insert( std::make_pair((const char*)(!setDataPath ? "DataPath" : "AugmentPath"), t.local8Bit()) ); - - setDataPath = true; - } -@@ -167,10 +167,10 @@ - is->directory--; //make one char shorter - } - -- config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"FTPSource", is->getConfEnt()) ); - } - else if (!strcmp(is->type, "DIR")) { -- config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) ); - } - config.Save(); - } diff --git a/misc/bibletime-kde3/pkg-plist b/misc/bibletime-kde3/pkg-plist index f425edb12e0f..612ca905a971 100644 --- a/misc/bibletime-kde3/pkg-plist +++ b/misc/bibletime-kde3/pkg-plist @@ -4,54 +4,54 @@ share/applications/bibletime.desktop share/apps/bibletime/bibletimeui.rc share/apps/bibletime/pics/startuplogo.png share/apps/bibletime/tips -%%DOCSDIR%%/handbook/hdbk-config.docbook -%%DOCSDIR%%/handbook/hdbk-intro.docbook -%%DOCSDIR%%/handbook/hdbk-operation.docbook -%%DOCSDIR%%/handbook/hdbk-reference.docbook -%%DOCSDIR%%/handbook/hdbk-start.docbook -%%DOCSDIR%%/handbook/i_bible.png -%%DOCSDIR%%/handbook/i_bible_add.png -%%DOCSDIR%%/handbook/i_bibletime.png -%%DOCSDIR%%/handbook/i_book.png -%%DOCSDIR%%/handbook/i_book_add.png -%%DOCSDIR%%/handbook/i_cascade.png -%%DOCSDIR%%/handbook/i_cascade_auto.png -%%DOCSDIR%%/handbook/i_commentary.png -%%DOCSDIR%%/handbook/i_commentary_add.png -%%DOCSDIR%%/handbook/i_configure.png -%%DOCSDIR%%/handbook/i_configureaccels.png -%%DOCSDIR%%/handbook/i_configuredisplay.png -%%DOCSDIR%%/handbook/i_configurefonts.png -%%DOCSDIR%%/handbook/i_configurestart.png -%%DOCSDIR%%/handbook/i_configuresword.png -%%DOCSDIR%%/handbook/i_configuretoolbars.png -%%DOCSDIR%%/handbook/i_contents.png -%%DOCSDIR%%/handbook/i_delete.png -%%DOCSDIR%%/handbook/i_editdelete.png -%%DOCSDIR%%/handbook/i_exit.png -%%DOCSDIR%%/handbook/i_fileclose.png -%%DOCSDIR%%/handbook/i_fileprint.png -%%DOCSDIR%%/handbook/i_find.png -%%DOCSDIR%%/handbook/i_fullscreen.png -%%DOCSDIR%%/handbook/i_go.png -%%DOCSDIR%%/handbook/i_ktip.png -%%DOCSDIR%%/handbook/i_lexicon.png -%%DOCSDIR%%/handbook/i_lexicon_add.png -%%DOCSDIR%%/handbook/i_pencil.png -%%DOCSDIR%%/handbook/i_sidetree.png -%%DOCSDIR%%/handbook/i_sync.png -%%DOCSDIR%%/handbook/i_tile.png -%%DOCSDIR%%/handbook/i_tile_auto.png -%%DOCSDIR%%/handbook/index.docbook -%%DOCSDIR%%/handbook/ss_configfonts.png -%%DOCSDIR%%/handbook/ss_configtoolbar.png -%%DOCSDIR%%/handbook/ss_mainterms.png -%%DOCSDIR%%/handbook/ss_searchanal.png -%%DOCSDIR%%/handbook/ss_searchopts.png -%%DOCSDIR%%/howto/how2-basics.docbook -%%DOCSDIR%%/howto/how2-importance.docbook -%%DOCSDIR%%/howto/how2-interpretation.docbook -%%DOCSDIR%%/howto/index.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook +share/doc/HTML/en/bibletime/handbook/i_bible.png +share/doc/HTML/en/bibletime/handbook/i_bible_add.png +share/doc/HTML/en/bibletime/handbook/i_bibletime.png +share/doc/HTML/en/bibletime/handbook/i_book.png +share/doc/HTML/en/bibletime/handbook/i_book_add.png +share/doc/HTML/en/bibletime/handbook/i_cascade.png +share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png +share/doc/HTML/en/bibletime/handbook/i_commentary.png +share/doc/HTML/en/bibletime/handbook/i_commentary_add.png +share/doc/HTML/en/bibletime/handbook/i_configure.png +share/doc/HTML/en/bibletime/handbook/i_configureaccels.png +share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png +share/doc/HTML/en/bibletime/handbook/i_configurefonts.png +share/doc/HTML/en/bibletime/handbook/i_configurestart.png +share/doc/HTML/en/bibletime/handbook/i_configuresword.png +share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png +share/doc/HTML/en/bibletime/handbook/i_contents.png +share/doc/HTML/en/bibletime/handbook/i_delete.png +share/doc/HTML/en/bibletime/handbook/i_editdelete.png +share/doc/HTML/en/bibletime/handbook/i_exit.png +share/doc/HTML/en/bibletime/handbook/i_fileclose.png +share/doc/HTML/en/bibletime/handbook/i_fileprint.png +share/doc/HTML/en/bibletime/handbook/i_find.png +share/doc/HTML/en/bibletime/handbook/i_fullscreen.png +share/doc/HTML/en/bibletime/handbook/i_go.png +share/doc/HTML/en/bibletime/handbook/i_ktip.png +share/doc/HTML/en/bibletime/handbook/i_lexicon.png +share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png +share/doc/HTML/en/bibletime/handbook/i_pencil.png +share/doc/HTML/en/bibletime/handbook/i_sidetree.png +share/doc/HTML/en/bibletime/handbook/i_sync.png +share/doc/HTML/en/bibletime/handbook/i_tile.png +share/doc/HTML/en/bibletime/handbook/i_tile_auto.png +share/doc/HTML/en/bibletime/handbook/index.docbook +share/doc/HTML/en/bibletime/handbook/ss_configfonts.png +share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png +share/doc/HTML/en/bibletime/handbook/ss_mainterms.png +share/doc/HTML/en/bibletime/handbook/ss_searchanal.png +share/doc/HTML/en/bibletime/handbook/ss_searchopts.png +share/doc/HTML/en/bibletime/howto/how2-basics.docbook +share/doc/HTML/en/bibletime/howto/how2-importance.docbook +share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook +share/doc/HTML/en/bibletime/howto/index.docbook share/icons/hicolor/16x16/actions/bt_bible.png share/icons/hicolor/16x16/actions/bt_bible_add.png share/icons/hicolor/16x16/actions/bt_bible_locked.png @@ -145,9 +145,9 @@ share/icons/hicolor/48x48/actions/bt_tile.png share/icons/hicolor/48x48/actions/bt_tile_auto.png share/icons/hicolor/48x48/apps/bibletime.png share/icons/hicolor/64x64/apps/bibletime.png -@dirrm %%DOCSDIR%%/howto -@dirrm %%DOCSDIR%%/handbook -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/HTML/en/bibletime/howto +@dirrm share/doc/HTML/en/bibletime/handbook +@dirrm share/doc/HTML/en/bibletime @dirrmtry share/doc/HTML/en @dirrmtry share/doc/HTML @dirrmtry share/config diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile index 5196a42fbe6c..512c1f669d29 100644 --- a/misc/bibletime-kde4/Makefile +++ b/misc/bibletime-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.5.1 CATEGORIES= misc MASTER_SITES= SF @@ -23,13 +23,16 @@ USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --enable-static-clucene INSTALLS_ICONS= yes -DOCSDIR= share/doc/HTML/en/bibletime +.include + +.if ${OSVERSION} < 700000 +CONFIGURE_ARGS+= --enable-static-clucene +.endif post-patch: @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/bibletime/Makefile.in -.include +.include diff --git a/misc/bibletime-kde4/distinfo b/misc/bibletime-kde4/distinfo index 0915c6ac290e..6e1d4f992eb0 100644 --- a/misc/bibletime-kde4/distinfo +++ b/misc/bibletime-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (bibletime-1.6.5.tar.bz2) = c6815d2076e454150c3b9fb88c1dd1e8 -SHA256 (bibletime-1.6.5.tar.bz2) = c68c8c44157ef7c5f7aaf3201869f9b714930ce66c39057a66481282ecae07bf -SIZE (bibletime-1.6.5.tar.bz2) = 1230062 +MD5 (bibletime-1.6.5.1.tar.bz2) = c54f2d298d7568ca41b0815097abff37 +SHA256 (bibletime-1.6.5.1.tar.bz2) = dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9 +SIZE (bibletime-1.6.5.1.tar.bz2) = 1231060 diff --git a/misc/bibletime-kde4/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime-kde4/files/patch-bibletime::frontend::btinstallmgr.cpp deleted file mode 100644 index d20435f830f3..000000000000 --- a/misc/bibletime-kde4/files/patch-bibletime::frontend::btinstallmgr.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- bibletime/frontend/btinstallmgr.cpp.orig Sat Oct 1 08:18:03 2005 -+++ bibletime/frontend/btinstallmgr.cpp Tue Jul 11 11:07:41 2006 -@@ -97,7 +97,7 @@ - continue; - } - else { -- conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) ); -+ conf["Install"].insert( std::make_pair((const char*)(!setDataPath ? "DataPath" : "AugmentPath"), t.local8Bit()) ); - - setDataPath = true; - } -@@ -167,10 +167,10 @@ - is->directory--; //make one char shorter - } - -- config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"FTPSource", is->getConfEnt()) ); - } - else if (!strcmp(is->type, "DIR")) { -- config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) ); - } - config.Save(); - } diff --git a/misc/bibletime-kde4/pkg-plist b/misc/bibletime-kde4/pkg-plist index f425edb12e0f..612ca905a971 100644 --- a/misc/bibletime-kde4/pkg-plist +++ b/misc/bibletime-kde4/pkg-plist @@ -4,54 +4,54 @@ share/applications/bibletime.desktop share/apps/bibletime/bibletimeui.rc share/apps/bibletime/pics/startuplogo.png share/apps/bibletime/tips -%%DOCSDIR%%/handbook/hdbk-config.docbook -%%DOCSDIR%%/handbook/hdbk-intro.docbook -%%DOCSDIR%%/handbook/hdbk-operation.docbook -%%DOCSDIR%%/handbook/hdbk-reference.docbook -%%DOCSDIR%%/handbook/hdbk-start.docbook -%%DOCSDIR%%/handbook/i_bible.png -%%DOCSDIR%%/handbook/i_bible_add.png -%%DOCSDIR%%/handbook/i_bibletime.png -%%DOCSDIR%%/handbook/i_book.png -%%DOCSDIR%%/handbook/i_book_add.png -%%DOCSDIR%%/handbook/i_cascade.png -%%DOCSDIR%%/handbook/i_cascade_auto.png -%%DOCSDIR%%/handbook/i_commentary.png -%%DOCSDIR%%/handbook/i_commentary_add.png -%%DOCSDIR%%/handbook/i_configure.png -%%DOCSDIR%%/handbook/i_configureaccels.png -%%DOCSDIR%%/handbook/i_configuredisplay.png -%%DOCSDIR%%/handbook/i_configurefonts.png -%%DOCSDIR%%/handbook/i_configurestart.png -%%DOCSDIR%%/handbook/i_configuresword.png -%%DOCSDIR%%/handbook/i_configuretoolbars.png -%%DOCSDIR%%/handbook/i_contents.png -%%DOCSDIR%%/handbook/i_delete.png -%%DOCSDIR%%/handbook/i_editdelete.png -%%DOCSDIR%%/handbook/i_exit.png -%%DOCSDIR%%/handbook/i_fileclose.png -%%DOCSDIR%%/handbook/i_fileprint.png -%%DOCSDIR%%/handbook/i_find.png -%%DOCSDIR%%/handbook/i_fullscreen.png -%%DOCSDIR%%/handbook/i_go.png -%%DOCSDIR%%/handbook/i_ktip.png -%%DOCSDIR%%/handbook/i_lexicon.png -%%DOCSDIR%%/handbook/i_lexicon_add.png -%%DOCSDIR%%/handbook/i_pencil.png -%%DOCSDIR%%/handbook/i_sidetree.png -%%DOCSDIR%%/handbook/i_sync.png -%%DOCSDIR%%/handbook/i_tile.png -%%DOCSDIR%%/handbook/i_tile_auto.png -%%DOCSDIR%%/handbook/index.docbook -%%DOCSDIR%%/handbook/ss_configfonts.png -%%DOCSDIR%%/handbook/ss_configtoolbar.png -%%DOCSDIR%%/handbook/ss_mainterms.png -%%DOCSDIR%%/handbook/ss_searchanal.png -%%DOCSDIR%%/handbook/ss_searchopts.png -%%DOCSDIR%%/howto/how2-basics.docbook -%%DOCSDIR%%/howto/how2-importance.docbook -%%DOCSDIR%%/howto/how2-interpretation.docbook -%%DOCSDIR%%/howto/index.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook +share/doc/HTML/en/bibletime/handbook/i_bible.png +share/doc/HTML/en/bibletime/handbook/i_bible_add.png +share/doc/HTML/en/bibletime/handbook/i_bibletime.png +share/doc/HTML/en/bibletime/handbook/i_book.png +share/doc/HTML/en/bibletime/handbook/i_book_add.png +share/doc/HTML/en/bibletime/handbook/i_cascade.png +share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png +share/doc/HTML/en/bibletime/handbook/i_commentary.png +share/doc/HTML/en/bibletime/handbook/i_commentary_add.png +share/doc/HTML/en/bibletime/handbook/i_configure.png +share/doc/HTML/en/bibletime/handbook/i_configureaccels.png +share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png +share/doc/HTML/en/bibletime/handbook/i_configurefonts.png +share/doc/HTML/en/bibletime/handbook/i_configurestart.png +share/doc/HTML/en/bibletime/handbook/i_configuresword.png +share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png +share/doc/HTML/en/bibletime/handbook/i_contents.png +share/doc/HTML/en/bibletime/handbook/i_delete.png +share/doc/HTML/en/bibletime/handbook/i_editdelete.png +share/doc/HTML/en/bibletime/handbook/i_exit.png +share/doc/HTML/en/bibletime/handbook/i_fileclose.png +share/doc/HTML/en/bibletime/handbook/i_fileprint.png +share/doc/HTML/en/bibletime/handbook/i_find.png +share/doc/HTML/en/bibletime/handbook/i_fullscreen.png +share/doc/HTML/en/bibletime/handbook/i_go.png +share/doc/HTML/en/bibletime/handbook/i_ktip.png +share/doc/HTML/en/bibletime/handbook/i_lexicon.png +share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png +share/doc/HTML/en/bibletime/handbook/i_pencil.png +share/doc/HTML/en/bibletime/handbook/i_sidetree.png +share/doc/HTML/en/bibletime/handbook/i_sync.png +share/doc/HTML/en/bibletime/handbook/i_tile.png +share/doc/HTML/en/bibletime/handbook/i_tile_auto.png +share/doc/HTML/en/bibletime/handbook/index.docbook +share/doc/HTML/en/bibletime/handbook/ss_configfonts.png +share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png +share/doc/HTML/en/bibletime/handbook/ss_mainterms.png +share/doc/HTML/en/bibletime/handbook/ss_searchanal.png +share/doc/HTML/en/bibletime/handbook/ss_searchopts.png +share/doc/HTML/en/bibletime/howto/how2-basics.docbook +share/doc/HTML/en/bibletime/howto/how2-importance.docbook +share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook +share/doc/HTML/en/bibletime/howto/index.docbook share/icons/hicolor/16x16/actions/bt_bible.png share/icons/hicolor/16x16/actions/bt_bible_add.png share/icons/hicolor/16x16/actions/bt_bible_locked.png @@ -145,9 +145,9 @@ share/icons/hicolor/48x48/actions/bt_tile.png share/icons/hicolor/48x48/actions/bt_tile_auto.png share/icons/hicolor/48x48/apps/bibletime.png share/icons/hicolor/64x64/apps/bibletime.png -@dirrm %%DOCSDIR%%/howto -@dirrm %%DOCSDIR%%/handbook -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/HTML/en/bibletime/howto +@dirrm share/doc/HTML/en/bibletime/handbook +@dirrm share/doc/HTML/en/bibletime @dirrmtry share/doc/HTML/en @dirrmtry share/doc/HTML @dirrmtry share/config diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile index 5196a42fbe6c..512c1f669d29 100644 --- a/misc/bibletime/Makefile +++ b/misc/bibletime/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.6.5 +PORTVERSION= 1.6.5.1 CATEGORIES= misc MASTER_SITES= SF @@ -23,13 +23,16 @@ USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS+= --enable-static-clucene INSTALLS_ICONS= yes -DOCSDIR= share/doc/HTML/en/bibletime +.include + +.if ${OSVERSION} < 700000 +CONFIGURE_ARGS+= --enable-static-clucene +.endif post-patch: @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure @${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/bibletime/Makefile.in -.include +.include diff --git a/misc/bibletime/distinfo b/misc/bibletime/distinfo index 0915c6ac290e..6e1d4f992eb0 100644 --- a/misc/bibletime/distinfo +++ b/misc/bibletime/distinfo @@ -1,3 +1,3 @@ -MD5 (bibletime-1.6.5.tar.bz2) = c6815d2076e454150c3b9fb88c1dd1e8 -SHA256 (bibletime-1.6.5.tar.bz2) = c68c8c44157ef7c5f7aaf3201869f9b714930ce66c39057a66481282ecae07bf -SIZE (bibletime-1.6.5.tar.bz2) = 1230062 +MD5 (bibletime-1.6.5.1.tar.bz2) = c54f2d298d7568ca41b0815097abff37 +SHA256 (bibletime-1.6.5.1.tar.bz2) = dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9 +SIZE (bibletime-1.6.5.1.tar.bz2) = 1231060 diff --git a/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp b/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp deleted file mode 100644 index d20435f830f3..000000000000 --- a/misc/bibletime/files/patch-bibletime::frontend::btinstallmgr.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- bibletime/frontend/btinstallmgr.cpp.orig Sat Oct 1 08:18:03 2005 -+++ bibletime/frontend/btinstallmgr.cpp Tue Jul 11 11:07:41 2006 -@@ -97,7 +97,7 @@ - continue; - } - else { -- conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) ); -+ conf["Install"].insert( std::make_pair((const char*)(!setDataPath ? "DataPath" : "AugmentPath"), t.local8Bit()) ); - - setDataPath = true; - } -@@ -167,10 +167,10 @@ - is->directory--; //make one char shorter - } - -- config["Sources"].insert( std::make_pair(SWBuf("FTPSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"FTPSource", is->getConfEnt()) ); - } - else if (!strcmp(is->type, "DIR")) { -- config["Sources"].insert( std::make_pair(SWBuf("DIRSource"), is->getConfEnt()) ); -+ config["Sources"].insert( std::make_pair((const char*)"DIRSource", is->getConfEnt()) ); - } - config.Save(); - } diff --git a/misc/bibletime/pkg-plist b/misc/bibletime/pkg-plist index f425edb12e0f..612ca905a971 100644 --- a/misc/bibletime/pkg-plist +++ b/misc/bibletime/pkg-plist @@ -4,54 +4,54 @@ share/applications/bibletime.desktop share/apps/bibletime/bibletimeui.rc share/apps/bibletime/pics/startuplogo.png share/apps/bibletime/tips -%%DOCSDIR%%/handbook/hdbk-config.docbook -%%DOCSDIR%%/handbook/hdbk-intro.docbook -%%DOCSDIR%%/handbook/hdbk-operation.docbook -%%DOCSDIR%%/handbook/hdbk-reference.docbook -%%DOCSDIR%%/handbook/hdbk-start.docbook -%%DOCSDIR%%/handbook/i_bible.png -%%DOCSDIR%%/handbook/i_bible_add.png -%%DOCSDIR%%/handbook/i_bibletime.png -%%DOCSDIR%%/handbook/i_book.png -%%DOCSDIR%%/handbook/i_book_add.png -%%DOCSDIR%%/handbook/i_cascade.png -%%DOCSDIR%%/handbook/i_cascade_auto.png -%%DOCSDIR%%/handbook/i_commentary.png -%%DOCSDIR%%/handbook/i_commentary_add.png -%%DOCSDIR%%/handbook/i_configure.png -%%DOCSDIR%%/handbook/i_configureaccels.png -%%DOCSDIR%%/handbook/i_configuredisplay.png -%%DOCSDIR%%/handbook/i_configurefonts.png -%%DOCSDIR%%/handbook/i_configurestart.png -%%DOCSDIR%%/handbook/i_configuresword.png -%%DOCSDIR%%/handbook/i_configuretoolbars.png -%%DOCSDIR%%/handbook/i_contents.png -%%DOCSDIR%%/handbook/i_delete.png -%%DOCSDIR%%/handbook/i_editdelete.png -%%DOCSDIR%%/handbook/i_exit.png -%%DOCSDIR%%/handbook/i_fileclose.png -%%DOCSDIR%%/handbook/i_fileprint.png -%%DOCSDIR%%/handbook/i_find.png -%%DOCSDIR%%/handbook/i_fullscreen.png -%%DOCSDIR%%/handbook/i_go.png -%%DOCSDIR%%/handbook/i_ktip.png -%%DOCSDIR%%/handbook/i_lexicon.png -%%DOCSDIR%%/handbook/i_lexicon_add.png -%%DOCSDIR%%/handbook/i_pencil.png -%%DOCSDIR%%/handbook/i_sidetree.png -%%DOCSDIR%%/handbook/i_sync.png -%%DOCSDIR%%/handbook/i_tile.png -%%DOCSDIR%%/handbook/i_tile_auto.png -%%DOCSDIR%%/handbook/index.docbook -%%DOCSDIR%%/handbook/ss_configfonts.png -%%DOCSDIR%%/handbook/ss_configtoolbar.png -%%DOCSDIR%%/handbook/ss_mainterms.png -%%DOCSDIR%%/handbook/ss_searchanal.png -%%DOCSDIR%%/handbook/ss_searchopts.png -%%DOCSDIR%%/howto/how2-basics.docbook -%%DOCSDIR%%/howto/how2-importance.docbook -%%DOCSDIR%%/howto/how2-interpretation.docbook -%%DOCSDIR%%/howto/index.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-reference.docbook +share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook +share/doc/HTML/en/bibletime/handbook/i_bible.png +share/doc/HTML/en/bibletime/handbook/i_bible_add.png +share/doc/HTML/en/bibletime/handbook/i_bibletime.png +share/doc/HTML/en/bibletime/handbook/i_book.png +share/doc/HTML/en/bibletime/handbook/i_book_add.png +share/doc/HTML/en/bibletime/handbook/i_cascade.png +share/doc/HTML/en/bibletime/handbook/i_cascade_auto.png +share/doc/HTML/en/bibletime/handbook/i_commentary.png +share/doc/HTML/en/bibletime/handbook/i_commentary_add.png +share/doc/HTML/en/bibletime/handbook/i_configure.png +share/doc/HTML/en/bibletime/handbook/i_configureaccels.png +share/doc/HTML/en/bibletime/handbook/i_configuredisplay.png +share/doc/HTML/en/bibletime/handbook/i_configurefonts.png +share/doc/HTML/en/bibletime/handbook/i_configurestart.png +share/doc/HTML/en/bibletime/handbook/i_configuresword.png +share/doc/HTML/en/bibletime/handbook/i_configuretoolbars.png +share/doc/HTML/en/bibletime/handbook/i_contents.png +share/doc/HTML/en/bibletime/handbook/i_delete.png +share/doc/HTML/en/bibletime/handbook/i_editdelete.png +share/doc/HTML/en/bibletime/handbook/i_exit.png +share/doc/HTML/en/bibletime/handbook/i_fileclose.png +share/doc/HTML/en/bibletime/handbook/i_fileprint.png +share/doc/HTML/en/bibletime/handbook/i_find.png +share/doc/HTML/en/bibletime/handbook/i_fullscreen.png +share/doc/HTML/en/bibletime/handbook/i_go.png +share/doc/HTML/en/bibletime/handbook/i_ktip.png +share/doc/HTML/en/bibletime/handbook/i_lexicon.png +share/doc/HTML/en/bibletime/handbook/i_lexicon_add.png +share/doc/HTML/en/bibletime/handbook/i_pencil.png +share/doc/HTML/en/bibletime/handbook/i_sidetree.png +share/doc/HTML/en/bibletime/handbook/i_sync.png +share/doc/HTML/en/bibletime/handbook/i_tile.png +share/doc/HTML/en/bibletime/handbook/i_tile_auto.png +share/doc/HTML/en/bibletime/handbook/index.docbook +share/doc/HTML/en/bibletime/handbook/ss_configfonts.png +share/doc/HTML/en/bibletime/handbook/ss_configtoolbar.png +share/doc/HTML/en/bibletime/handbook/ss_mainterms.png +share/doc/HTML/en/bibletime/handbook/ss_searchanal.png +share/doc/HTML/en/bibletime/handbook/ss_searchopts.png +share/doc/HTML/en/bibletime/howto/how2-basics.docbook +share/doc/HTML/en/bibletime/howto/how2-importance.docbook +share/doc/HTML/en/bibletime/howto/how2-interpretation.docbook +share/doc/HTML/en/bibletime/howto/index.docbook share/icons/hicolor/16x16/actions/bt_bible.png share/icons/hicolor/16x16/actions/bt_bible_add.png share/icons/hicolor/16x16/actions/bt_bible_locked.png @@ -145,9 +145,9 @@ share/icons/hicolor/48x48/actions/bt_tile.png share/icons/hicolor/48x48/actions/bt_tile_auto.png share/icons/hicolor/48x48/apps/bibletime.png share/icons/hicolor/64x64/apps/bibletime.png -@dirrm %%DOCSDIR%%/howto -@dirrm %%DOCSDIR%%/handbook -%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm share/doc/HTML/en/bibletime/howto +@dirrm share/doc/HTML/en/bibletime/handbook +@dirrm share/doc/HTML/en/bibletime @dirrmtry share/doc/HTML/en @dirrmtry share/doc/HTML @dirrmtry share/config -- cgit v1.2.3