Date: Fri, 20 Aug 2004 16:27:22 +0200 (CEST) From: Willem van Engen <wvengen@stack.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/70714: [port update] misc/bibletime: update to 1.4.1 Message-ID: <20040820142722.668021CC82@turtle.stack.nl> Resent-Message-ID: <200408201430.i7KEUPnr017234@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 70714
>Category: ports
>Synopsis: [port update] misc/bibletime: update to 1.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 20 14:30:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Willem van Engen
>Release: FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Port update to 1.4.1. misc/sword must be updated to 1.5.7 before
this can happen however, see ports/70702.
--- bibletime-1.4.1.diff begins here ---
diff -ruN /usr/ports/misc/bibletime/Makefile misc/bibletime/Makefile
--- /usr/ports/misc/bibletime/Makefile Tue Apr 6 04:02:04 2004
+++ misc/bibletime/Makefile Fri Aug 20 16:22:36 2004
@@ -6,8 +6,7 @@
#
PORTNAME= bibletime
-PORTVERSION= 1.2.2
-PORTREVISION= 2
+PORTVERSION= 1.4.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,18 +14,13 @@
MAINTAINER= wvengen@stack.nl
COMMENT= A powerful Bible study application for KDE3
-LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword
-.if !defined(NOPORTDOCS)
-RUN_DEPENDS= ${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc
-.endif
+LIB_DEPENDS= sword.4:${PORTSDIR}/misc/sword
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
USE_REINPLACE= yes
-CONFIGURE_ARGS+=--program-transform-name="" \
- --with-sworddir=${PREFIX}
post-patch:
@${REINPLACE_CMD} -e "s^-lpthread^${PTHREAD_LIBS}^g" ${WRKSRC}/configure
diff -ruN /usr/ports/misc/bibletime/distinfo misc/bibletime/distinfo
--- /usr/ports/misc/bibletime/distinfo Wed Mar 31 13:35:21 2004
+++ misc/bibletime/distinfo Fri Aug 20 13:51:16 2004
@@ -1,2 +1,2 @@
-MD5 (bibletime-1.2.2.tar.bz2) = 681aceaa8415fd05b46100d896a99b9e
-SIZE (bibletime-1.2.2.tar.bz2) = 814427
+MD5 (bibletime-1.4.1.tar.bz2) = df6ab259b188b8555f9423c629d0b239
+SIZE (bibletime-1.4.1.tar.bz2) = 1647715
diff -ruN /usr/ports/misc/bibletime/files/patch-Makefile.am misc/bibletime/files/patch-Makefile.am
--- /usr/ports/misc/bibletime/files/patch-Makefile.am Thu Jan 1 01:00:00 1970
+++ misc/bibletime/files/patch-Makefile.am Fri Aug 20 13:51:16 2004
@@ -0,0 +1,11 @@
+--- Makefile.am.orig Thu Aug 19 21:50:04 2004
++++ Makefile.am Thu Aug 19 21:50:17 2004
+@@ -56,7 +56,7 @@
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+
+ install-data-local:
+- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
++ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime
+ $(mkinstalldirs) $(kde_appsdir)/Applications
+ $(INSTALL_DATA) $(srcdir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
+
diff -ruN /usr/ports/misc/bibletime/files/patch-Makefile.in misc/bibletime/files/patch-Makefile.in
--- /usr/ports/misc/bibletime/files/patch-Makefile.in Thu Jan 1 01:00:00 1970
+++ misc/bibletime/files/patch-Makefile.in Fri Aug 20 13:51:16 2004
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Thu Aug 19 21:50:07 2004
++++ Makefile.in Thu Aug 19 21:50:29 2004
+@@ -762,7 +762,7 @@
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
+
+ install-data-local:
+- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
++ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime
+ #>- $(mkinstalldirs) $(kde_appsdir)/Applications
+ #>+ 1
+ $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
diff -ruN /usr/ports/misc/bibletime/files/patch-admin::ltmain.sh misc/bibletime/files/patch-admin::ltmain.sh
--- /usr/ports/misc/bibletime/files/patch-admin::ltmain.sh Sat Nov 23 04:33:20 2002
+++ misc/bibletime/files/patch-admin::ltmain.sh Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-diff -ruN admin/ltmain.sh admin/ltmain.sh
---- admin/ltmain.sh Fri Apr 12 13:40:12 2002
-+++ admin/ltmain.sh Thu Jun 20 09:51:32 2002
-@@ -1239,7 +1239,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd[0-4]*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
diff -ruN /usr/ports/misc/bibletime/pkg-plist misc/bibletime/pkg-plist
--- /usr/ports/misc/bibletime/pkg-plist Sat Nov 23 04:33:20 2002
+++ misc/bibletime/pkg-plist Fri Aug 20 16:21:59 2004
@@ -1,11 +1,76 @@
-share/apps/bibletime/printing/bw_muchtext.xml
-share/apps/bibletime/printing/standard.xml
-@unexec rmdir %D/share/apps/bibletime/printing 2>/dev/null || true
+bin/bibletime
+share/applnk/Applications/bibletime.desktop
share/apps/bibletime/bibletimeui.rc
share/apps/bibletime/pics/startuplogo.png
-@unexec rmdir %D/share/apps/bibletime/pics 2>/dev/null || true
-@unexec rmdir %D/share/apps/bibletime 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+share/apps/bibletime/tips
+share/doc/HTML/en/bibletime/handbook/common
+share/doc/HTML/en/bibletime/handbook/configure.png
+share/doc/HTML/en/bibletime/handbook/contents.png
+share/doc/HTML/en/bibletime/handbook/editdelete.png
+share/doc/HTML/en/bibletime/handbook/exit.png
+share/doc/HTML/en/bibletime/handbook/fileclose.png
+share/doc/HTML/en/bibletime/handbook/fileprint.png
+share/doc/HTML/en/bibletime/handbook/find.png
+share/doc/HTML/en/bibletime/handbook/go.png
+share/doc/HTML/en/bibletime/handbook/hdbk-bars-toolbar-Configtoolbar.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-color.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-fonts.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-start.png
+share/doc/HTML/en/bibletime/handbook/hdbk-conf-optdialog-sword.png
+share/doc/HTML/en/bibletime/handbook/hdbk-config-toolbar.png
+share/doc/HTML/en/bibletime/handbook/hdbk-config.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-inst-sources-installmgr.png
+share/doc/HTML/en/bibletime/handbook/hdbk-intro.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-op-change-range.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-crch-dia-choose.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-delete-verse.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-select-1.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-select-2.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-tree-1.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-pencil.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-modsel.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-options.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-range.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchanal.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchresult.png
+share/doc/HTML/en/bibletime/handbook/hdbk-op-search-dialog-searchtext.png
+share/doc/HTML/en/bibletime/handbook/hdbk-operation.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-start-screen-terms.png
+share/doc/HTML/en/bibletime/handbook/hdbk-start-sequence-tips.png
+share/doc/HTML/en/bibletime/handbook/hdbk-start.docbook
+share/doc/HTML/en/bibletime/handbook/hdbk-toolbars.docbook
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_bible.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_bible_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_book.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_book_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_cascade.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_cascade_auto.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_commentary.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_commentary_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_displayconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_lexicon.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_lexicon_add.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_startconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_swordconfig.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_sync.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_tile.png
+share/doc/HTML/en/bibletime/handbook/hi32-action-bt_tile_auto.png
+share/doc/HTML/en/bibletime/handbook/hi32-app-bibletime.png
+share/doc/HTML/en/bibletime/handbook/index.docbook
+share/doc/HTML/en/bibletime/handbook/kcmfontinst.png
+share/doc/HTML/en/bibletime/handbook/key_bindings.png
+share/doc/HTML/en/bibletime/handbook/ktip.png
+share/doc/HTML/en/bibletime/handbook/pencil.png
+share/doc/HTML/en/bibletime/handbook/queue.png
+share/doc/HTML/en/bibletime/handbook/start.png
+share/doc/HTML/en/bibletime/handbook/view_sidetree.png
+share/doc/HTML/en/bibletime/handbook/window_fullscreen.png
+share/doc/HTML/en/bibletime/howto/common
+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
@@ -18,6 +83,7 @@
share/icons/hicolor/16x16/actions/bt_commentary_add.png
share/icons/hicolor/16x16/actions/bt_commentary_locked.png
share/icons/hicolor/16x16/actions/bt_displayconfig.png
+share/icons/hicolor/16x16/actions/bt_displaytranslit.png
share/icons/hicolor/16x16/actions/bt_lexicon.png
share/icons/hicolor/16x16/actions/bt_lexicon_add.png
share/icons/hicolor/16x16/actions/bt_lexicon_locked.png
@@ -26,10 +92,7 @@
share/icons/hicolor/16x16/actions/bt_sync.png
share/icons/hicolor/16x16/actions/bt_tile.png
share/icons/hicolor/16x16/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true
share/icons/hicolor/16x16/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
share/icons/hicolor/22x22/actions/bt_bible.png
share/icons/hicolor/22x22/actions/bt_bible_add.png
share/icons/hicolor/22x22/actions/bt_bible_locked.png
@@ -42,64 +105,84 @@
share/icons/hicolor/22x22/actions/bt_commentary_add.png
share/icons/hicolor/22x22/actions/bt_commentary_locked.png
share/icons/hicolor/22x22/actions/bt_displayconfig.png
+share/icons/hicolor/22x22/actions/bt_displaytranslit.png
share/icons/hicolor/22x22/actions/bt_lexicon.png
share/icons/hicolor/22x22/actions/bt_lexicon_add.png
share/icons/hicolor/22x22/actions/bt_lexicon_locked.png
share/icons/hicolor/22x22/actions/bt_parallel.png
share/icons/hicolor/22x22/actions/bt_startconfig.png
-share/icons/hicolor/22x22/actions/bt_sync.png
share/icons/hicolor/22x22/actions/bt_swordconfig.png
+share/icons/hicolor/22x22/actions/bt_sync.png
share/icons/hicolor/22x22/actions/bt_tile.png
share/icons/hicolor/22x22/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true
share/icons/hicolor/22x22/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
share/icons/hicolor/32x32/actions/bt_bible.png
share/icons/hicolor/32x32/actions/bt_bible_add.png
+share/icons/hicolor/32x32/actions/bt_bible_locked.png
share/icons/hicolor/32x32/actions/bt_book.png
share/icons/hicolor/32x32/actions/bt_book_add.png
+share/icons/hicolor/32x32/actions/bt_book_locked.png
share/icons/hicolor/32x32/actions/bt_cascade.png
share/icons/hicolor/32x32/actions/bt_cascade_auto.png
share/icons/hicolor/32x32/actions/bt_commentary.png
share/icons/hicolor/32x32/actions/bt_commentary_add.png
+share/icons/hicolor/32x32/actions/bt_commentary_locked.png
share/icons/hicolor/32x32/actions/bt_displayconfig.png
+share/icons/hicolor/32x32/actions/bt_displaytranslit.png
share/icons/hicolor/32x32/actions/bt_lexicon.png
share/icons/hicolor/32x32/actions/bt_lexicon_add.png
+share/icons/hicolor/32x32/actions/bt_lexicon_locked.png
share/icons/hicolor/32x32/actions/bt_startconfig.png
share/icons/hicolor/32x32/actions/bt_swordconfig.png
share/icons/hicolor/32x32/actions/bt_sync.png
share/icons/hicolor/32x32/actions/bt_tile.png
share/icons/hicolor/32x32/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true
share/icons/hicolor/32x32/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
share/icons/hicolor/48x48/actions/bt_bible.png
share/icons/hicolor/48x48/actions/bt_bible_add.png
+share/icons/hicolor/48x48/actions/bt_bible_locked.png
share/icons/hicolor/48x48/actions/bt_book.png
share/icons/hicolor/48x48/actions/bt_book_add.png
+share/icons/hicolor/48x48/actions/bt_book_locked.png
share/icons/hicolor/48x48/actions/bt_cascade.png
share/icons/hicolor/48x48/actions/bt_cascade_auto.png
share/icons/hicolor/48x48/actions/bt_commentary.png
share/icons/hicolor/48x48/actions/bt_commentary_add.png
+share/icons/hicolor/48x48/actions/bt_commentary_locked.png
share/icons/hicolor/48x48/actions/bt_displayconfig.png
+share/icons/hicolor/48x48/actions/bt_displaytranslit.png
share/icons/hicolor/48x48/actions/bt_lexicon.png
share/icons/hicolor/48x48/actions/bt_lexicon_add.png
+share/icons/hicolor/48x48/actions/bt_lexicon_locked.png
share/icons/hicolor/48x48/actions/bt_startconfig.png
share/icons/hicolor/48x48/actions/bt_swordconfig.png
share/icons/hicolor/48x48/actions/bt_sync.png
share/icons/hicolor/48x48/actions/bt_tile.png
share/icons/hicolor/48x48/actions/bt_tile_auto.png
-@unexec rmdir %D/share/icons/hicolor/48x48/actions 2>/dev/null || true
share/icons/hicolor/48x48/apps/bibletime.png
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
-share/config/bt-printing
-@unexec rmdir %D/share/config 2>/dev/null || true
-share/applnk/Applications/bibletime.desktop
-@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
-bin/bibletime
+share/icons/hicolor/64x64/apps/bibletime.png
+@dirrm share/icons/hicolor/64x64/apps
+@dirrm share/icons/hicolor/64x64
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/48x48/actions
+@dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/22x22/apps
+@dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/doc/HTML/en/bibletime/howto
+@dirrm share/doc/HTML/en/bibletime/handbook
+@dirrm share/doc/HTML/en/bibletime
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/config
+@dirrm share/apps/bibletime/pics
+@dirrm share/apps/bibletime
+@dirrm share/applnk/Applications
+@dirrm share/applnk
--- bibletime2-1.4.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040820142722.668021CC82>