ports/52027: Update port: misc/bibletime from 1.2.1 to 1.2.2

Andreas Mollestad Nilsen amoll at tiscali.no
Sat May 10 10:20:19 UTC 2003 

>Number:         52027
>Category:       ports
>Synopsis:       Update port: misc/bibletime from 1.2.1 to 1.2.2
>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:   Sat May 10 03:20:17 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Mollestad Nilsen
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD free.andreasmn.tsps1.freenet6.net 4.8-STABLE FreeBSD 4.8-STABLE #8: Wed May 7 02:33:18 CEST 2003 root at free.andreasmn.tsps1.freenet6.net:/usr/obj/usr/src/sys/FREE_NOMOD i386


	
>Description:
	The bibletime port does not compile in version 1.2.1.
	
>How-To-Repeat:
	
>Fix:
	I updated the port to use 1.2.2, which compiled and worked
	at my computer.
	I deleted the files: 
	files/patch-Makefile.am
	files/patch-Makefile.in
	files/patch-bibletime::backend::cswordbookmoduleinfo.cpp
	files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp
	files/patch-bibletime::printing::cprintdialogpages.cpp
	becouse they where included in the new version.
	Here follows the outputt of 
	#diff -ruN bibletime.bak bibletime
	where bibletime.bak is the old version and bibletime is my
	patched version.

diff -ruN bibletime.bak/Makefile bibletime/Makefile
--- bibletime.bak/Makefile	Tue May  6 08:54:27 2003
+++ bibletime/Makefile	Fri May  9 01:00:55 2003
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	bibletime
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	wvengen at stack.nl
 COMMENT=	A powerful Bible study application for KDE3
-
-BROKEN=		"Does not compile"
 
 LIB_DEPENDS=	sword.1:${PORTSDIR}/misc/sword
 .if !defined(NOPORTDOCS)
diff -ruN bibletime.bak/distinfo bibletime/distinfo
--- bibletime.bak/distinfo	Sat Nov 23 04:33:20 2002
+++ bibletime/distinfo	Tue May  6 21:37:15 2003
@@ -1 +1 @@
-MD5 (bibletime-1.2.1.tar.bz2) = 48d7d38c216d5fbcb531eb0746dc4875
+MD5 (bibletime-1.2.2.tar.bz2) = 681aceaa8415fd05b46100d896a99b9e
diff -ruN bibletime.bak/files/patch-Makefile.am bibletime/files/patch-Makefile.am
--- bibletime.bak/files/patch-Makefile.am	Sat Nov 23 04:33:20 2002
+++ bibletime/files/patch-Makefile.am	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Fri May  3 11:30:38 2002
-+++ Makefile.am	Fri May  3 11:32:30 2002
-@@ -32,7 +32,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
- 
- MAINTAINERCLEANFILES = configure.files subdirs 
- 
diff -ruN bibletime.bak/files/patch-Makefile.in bibletime/files/patch-Makefile.in
--- bibletime.bak/files/patch-Makefile.in	Sat Nov 23 04:33:20 2002
+++ bibletime/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri May  3 11:30:38 2002
-+++ Makefile.in	Fri May  3 11:32:25 2002
-@@ -597,7 +597,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
- 
- dist-hook:	
- 	cd $(distdir) && make -f Makefile.cvs
diff -ruN bibletime.bak/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp bibletime/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp
--- bibletime.bak/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp	Sat Nov 23 04:33:20 2002
+++ bibletime/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-diff -ruN bibletime/backend/cswordbookmoduleinfo.cpp bibletime/backend/cswordbookmoduleinfo.cpp
---- bibletime/backend/cswordbookmoduleinfo.cpp	Sun Apr  7 01:12:21 2002
-+++ bibletime/backend/cswordbookmoduleinfo.cpp	Wed Jun 19 17:31:40 2002
-@@ -18,6 +18,9 @@
- //BibleTime includes
- #include "cswordbookmoduleinfo.h"
- 
-+//Other includes
-+#include <iostream.h>
-+
- //Sword includes
- #include <treekeyidx.h>
- #include <treekey.h>
diff -ruN bibletime.bak/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp bibletime/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp
--- bibletime.bak/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp	Sat Nov 23 04:33:20 2002
+++ bibletime/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-diff -ruN bibletime/frontend/searchdialog/csearchdialog.cpp bibletime/frontend/searchdialog/csearchdialog.cpp
---- bibletime/frontend/searchdialog/csearchdialog.cpp	Sat Apr 20 02:25:39 2002
-+++ bibletime/frontend/searchdialog/csearchdialog.cpp	Thu Jun 20 09:24:54 2002
-@@ -114,7 +114,7 @@
- }
- 
- void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) {
--	if (m_moduleList != list)
-+	if (! (m_moduleList == list) )
- 		m_moduleList = list; //copy the items of "list"
- 	
- 	m_moduleChooser->blockSignals(true);
diff -ruN bibletime.bak/files/patch-bibletime::printing::cprintdialogpages.cpp bibletime/files/patch-bibletime::printing::cprintdialogpages.cpp
--- bibletime.bak/files/patch-bibletime::printing::cprintdialogpages.cpp	Sat Nov 23 04:33:20 2002
+++ bibletime/files/patch-bibletime::printing::cprintdialogpages.cpp	Thu Jan  1 01:00:00 1970
@@ -1,20 +0,0 @@
-diff -ruN bibletime/printing/cprintdialogpages.cpp bibletime/printing/cprintdialogpages.cpp
---- bibletime/printing/cprintdialogpages.cpp	Fri Apr 12 13:41:32 2002
-+++ bibletime/printing/cprintdialogpages.cpp	Thu Jun 20 00:24:38 2002
-@@ -54,14 +54,14 @@
-   QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 );
-   gbox->addRowSpacing( 0, group->fontMetrics().height()-5 );
- 
--  const QString name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") };
-+  const QString nname[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") };
-   for( int i=0; i<4; i++ ) {
-     m_marginSpin[i] = new QSpinBox( group );
-     m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-     m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 );
-     m_marginSpin[i]->setSuffix(" mm");
- 
--    QLabel *label = new QLabel( m_marginSpin[i], name[i], group );
-+    QLabel *label = new QLabel( m_marginSpin[i], nname[i], group );
-     label->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-     label->setFixedWidth( label->sizeHint().width() );
- 
diff -ruN bibletime.bak/pkg-plist bibletime/pkg-plist
--- bibletime.bak/pkg-plist	Sat Nov 23 04:33:20 2002
+++ bibletime/pkg-plist	Fri May  9 10:26:23 2003
@@ -6,11 +6,26 @@
 @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/icons/hicolor/16x16/actions/sqrt.png
+share/icons/hicolor/16x16/actions/abs.png 
+share/icons/hicolor/16x16/actions/lsub.png
+share/icons/hicolor/16x16/actions/brace.png
+share/icons/hicolor/16x16/actions/frac.png
+share/icons/hicolor/16x16/actions/lsup.png   
+share/icons/hicolor/16x16/actions/prod.png
+share/icons/hicolor/16x16/actions/int.png
+share/icons/hicolor/16x16/actions/paren.png
+share/icons/hicolor/16x16/actions/brackets.png
+share/icons/hicolor/16x16/actions/rsub.png
+share/icons/hicolor/16x16/actions/rsup.png
+share/icons/hicolor/16x16/actions/sum.png
+share/icons/hicolor/16x16/actions/onetwomatrix.png
+share/icons/hicolor/16x16/actions/matrix.png
 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
 share/icons/hicolor/16x16/actions/bt_book.png
-share/icons/hicolor/16x16/actions/bt_book_add.png
+share/icons/hicolor/16x16/actions/bt_book_add.png   
 share/icons/hicolor/16x16/actions/bt_book_locked.png
 share/icons/hicolor/16x16/actions/bt_cascade.png
 share/icons/hicolor/16x16/actions/bt_cascade_auto.png
@@ -27,9 +42,40 @@
 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/karbon.png
+share/icons/hicolor/16x16/apps/kchart.png
+share/icons/hicolor/16x16/apps/kformula.png
+share/icons/hicolor/16x16/apps/kivio.png
+share/icons/hicolor/16x16/apps/kontour.png
+share/icons/hicolor/16x16/apps/kpresenter.png
+share/icons/hicolor/16x16/apps/kspread.png
+share/icons/hicolor/16x16/apps/kudesigner.png
+share/icons/hicolor/16x16/apps/kugar.png
+share/icons/hicolor/16x16/apps/kword.png
 share/icons/hicolor/16x16/apps/bibletime.png
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+share/icons/hicolor/16x16/mimetypes/kugardata.png
+ at unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+share/icons/hicolor/22x22/actions/brackets.png
+share/icons/hicolor/22x22/actions/insrow.png
+share/icons/hicolor/22x22/actions/sum.png
+share/icons/hicolor/22x22/actions/sqrt.png
+share/icons/hicolor/22x22/actions/matrix.png
+share/icons/hicolor/22x22/actions/paren.png  
+share/icons/hicolor/22x22/actions/lsub.png      
+share/icons/hicolor/22x22/actions/frac.png
+share/icons/hicolor/22x22/actions/lsup.png
+share/icons/hicolor/22x22/actions/abs.png  
+share/icons/hicolor/22x22/actions/remcol.png
+share/icons/hicolor/22x22/actions/prod.png  
+share/icons/hicolor/22x22/actions/remrow.png
+share/icons/hicolor/22x22/actions/int.png
+share/icons/hicolor/22x22/actions/onetwomatrix.png
+share/icons/hicolor/22x22/actions/inscol.png
+share/icons/hicolor/22x22/actions/brace.png
+share/icons/hicolor/22x22/actions/rsub.png
+share/icons/hicolor/22x22/actions/rsup.png
 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
@@ -47,13 +93,18 @@
 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_tile.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/kivio.png   
+share/icons/hicolor/22x22/apps/kugar.png
+share/icons/hicolor/22x22/apps/kvoctrain.xpm
 share/icons/hicolor/22x22/apps/bibletime.png
 @unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+share/icons/hicolor/22x22/mimetypes/kugardata.png 
+ at unexec rmdir %D/share/icons/hicolor/22x22/mimetypes 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

	


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list