10 files changed, 117 insertions, 152 deletions

diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index a025c3492fc8..4003bc62e07c 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.3
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
 		http://www.crosswire.org/sword/download/ftpmirror/pub/sword/source/v1.5/ \
@@ -16,40 +16,20 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	wvengen@stack.nl
 
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--program-transform-name=""
 
-INCLUDES=	Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \
-		echomod.h entriesblk.h femain.h filemgr.h gbffootnotes.h \
-		gbfheadings.h gbfhtml.h gbfmorph.h gbfplain.h gbfrtf.h \
-		gbfstrongs.h gbfthml.h hrefcom.h listkey.h localemgr.h \
-		lzsscomprs.h plainfootnotes.h plainhtml.h rawcom.h rawfiles.h \
-		rawgbf.h rawld.h rawld4.h rawstr.h rawstr4.h rawtext.h \
-		rawverse.h regex.h roman.h rtfhtml.h rwphtml.h rwprtf.h \
-		sapphire.h strkey.h swcipher.h swcom.h swcomprs.h swconfig.h \
-		swdisp.h swdisprtf.h swdisprtfchap.h swfilter.h swkey.h swld.h \
-		swlocale.h swlog.h swmacs.h swmgr.h swmodule.h swobject.h \
-		swtext.h swunicod.h swwinlog.h tbdisp.h thmlgbf.h thmlhtml.h \
-		thmlolb.h thmlplain.h thmlrtf.h unicodertf.h unixstr.h untgz.h \
-		utilconf.h utilfuns.h utilstr.h versekey.h zcom.h zconf.h \
-		zipcomprs.h zlib.h ztext.h zverse.h
-
-pre-build:
-	@${ECHO_CMD} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1
-	${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
+post-install: register
+.if !exists(${PREFIX}/etc/sword.conf)
 	@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
 	@${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
-	${MKDIR} ${DATADIR}
-	${MKDIR} ${PREFIX}/include/sword
-.for file in ${INCLUDES}
-	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/sword
-.endfor
-
-post-install: register
-	@${ECHO} ""
+	@${ECHO_CMD} "Config file installed in ${PREFIX}/etc/sword.conf"
+.else
+	@${ECHO_CMD} "Config file not installed since ${PREFIX}/etc/sword.conf already exists."
+	@${ECHO_CMD} "Please check that DataPath points to your modules (default ${DATADIR}).";
+.endif
+	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 
 register:
diff --git a/misc/sword15/distinfo b/misc/sword15/distinfo
index 8388436bf995..3011a9a43b0b 100644
--- a/misc/sword15/distinfo
+++ b/misc/sword15/distinfo
@@ -1 +1 @@
-MD5 (sword-1.5.2.tar.gz) = 6be465212e300672b5ab6502caf39baa
+MD5 (sword-1.5.3.tar.gz) = f3dfedb3c58561bb9b07a616c8e08381
diff --git a/misc/sword15/files/patch-Makefile.cfg b/misc/sword15/files/patch-Makefile.cfg
deleted file mode 100644
index 682e51af6e1c..000000000000
--- a/misc/sword15/files/patch-Makefile.cfg
+++ /dev/null
@@ -1,80 +0,0 @@
---- Makefile.cfg.orig	Wed Dec 12 00:56:50 2001
-+++ Makefile.cfg	Wed Dec 12 00:57:18 2001
-@@ -1,4 +1,5 @@
- # General defines
-+include ${root}/localport.cfg
- 
- version := 1.5.2
- 
-@@ -6,7 +7,7 @@
- # ownership (used by 'make install')
- 
- user      := root
--group     := root
-+group     := wheel
- 
- 
- # this WILL NOT WORK for you. only inhouse patched version of
-@@ -27,7 +28,7 @@
- 
- # shared library- set to yes if you would like to build
- 
--buildshare := no
-+buildshare := yes
- 
- 
- # VCL library- set to yes if you would like to build
-@@ -60,8 +61,6 @@
- 
- # paths
- 
--instdir   := /usr
--
- bindir    := ${instdir}/bin
- libdir    := ${instdir}/lib
- hdir      := ${instdir}/include/sword
-@@ -80,16 +79,16 @@
- WARNINGS  = -Wall -Wno-format -pedantic
- #WARNINGS += -Werror
- WARNINGS += -pedantic
--CFLAGS    = -pipe $(WARNINGS) $(DEBUG)
-+CFLAGS    += -pipe $(WARNINGS) $(DEBUG)
- 
--CPPFLAGS  = -I${root}/include/ $(DEFINES)
-+CPPFLAGS  += -I${root}/include/ $(DEFINES)
- ifeq ($(system),macosx)
- CPPFLAGS  += -I/System/Library/Frameworks/System.framework/Headers/
- endif
- CPPFLAGS  += $(DEFINES)
- 
- LFLAGS    = $(OPTIMIZE) $(DEBUG) -L${root}/lib/ 
--LIBS      = -lsword -lstdc++
-+LIBS      += -lsword -lstdc++
- 
- ifeq ($(zlib),no)
- CFLAGS += -DEXCLUDEZLIB
-@@ -97,9 +96,9 @@
- LIBS += -lz
- endif
- 
--LDFLAGS	= $(LFLAGS) $(LIBS)
-+LDFLAGS	+= $(LFLAGS) $(LIBS)
- 
--DEFINES   = -D_GNU_SOURCE
-+DEFINES   = -D_GNU_SOURCE -D_INSTDIR_="\"${instdir}\""
- 
- ifeq ($(profile),yes)
- CFLAGS   += -pg
-@@ -256,9 +255,9 @@
- ifneq (${confdir},)
- 	@if [ ! -d ${confdir}/mods.d ]; then install -o ${user} -g ${group} -m a+rx,u+rxw -d ${confdir}/mods.d/ ; fi
- 	@if [ ! -d ${confdir}/locales.d ]; then install -o ${user} -g ${group} -m a+rx,u+rxw -d ${confdir}/locales.d/ ; fi
--	@echo "[Install]" > /etc/sword.conf
--	@echo "DataPath=${confdir}" >> /etc/sword.conf
--#	install -o ${user} -g ${group} -m a+r,u+rw samples/recommended/sword.conf /etc/
-+	@echo "[Install]" > ${instdir}/etc/sword.conf
-+	@echo "DataPath=${confdir}" >> ${instdir}/etc/sword.conf
-+#	install -o ${user} -g ${group} -m a+r,u+rw samples/recommended/sword.conf ${instdir}/etc/
- 	install -o ${user} -g ${group} -m a+r,u+rw ${modsconf} ${confdir}/mods.d/
- 	install -o ${user} -g ${group} -m a+r,u+rw ${localesconf} ${confdir}/locales.d/
- endif
diff --git a/misc/sword15/files/patch-examples::cmdline::Makefile.am b/misc/sword15/files/patch-examples::cmdline::Makefile.am
new file mode 100644
index 000000000000..50535881e5a8
--- /dev/null
+++ b/misc/sword15/files/patch-examples::cmdline::Makefile.am
@@ -0,0 +1,8 @@
+--- examples/cmdline/Makefile.am.orig	Thu May  2 11:24:34 2002
++++ examples/cmdline/Makefile.am	Thu May  2 11:24:41 2002
+@@ -7,4 +7,4 @@
+ lookup_SOURCES = lookup.cpp
+ search_SOURCES = search.cpp
+ threaded_search_SOURCES = threaded_search.cpp
+-threaded_search_LDADD = $(LDADD) -lpthread
++threaded_search_LDADD = $(LDADD) -pthread
diff --git a/misc/sword15/files/patch-examples::cmdline::Makefile.in b/misc/sword15/files/patch-examples::cmdline::Makefile.in
new file mode 100644
index 000000000000..78c75dd1fddb
--- /dev/null
+++ b/misc/sword15/files/patch-examples::cmdline::Makefile.in
@@ -0,0 +1,11 @@
+--- examples/cmdline/Makefile.in.orig	Thu May  2 11:24:45 2002
++++ examples/cmdline/Makefile.in	Thu May  2 11:23:52 2002
+@@ -105,7 +105,7 @@
+ lookup_SOURCES = lookup.cpp
+ search_SOURCES = search.cpp
+ threaded_search_SOURCES = threaded_search.cpp
+-threaded_search_LDADD = $(LDADD) -lpthread
++threaded_search_LDADD = $(LDADD) -pthread
+ subdir = examples/cmdline
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/misc/sword15/files/patch-examples::cmdline::search.cpp b/misc/sword15/files/patch-examples::cmdline::search.cpp
new file mode 100644
index 000000000000..729eee07f8b6
--- /dev/null
+++ b/misc/sword15/files/patch-examples::cmdline::search.cpp
@@ -0,0 +1,8 @@
+diff -ruN sword-1.5.3.orig/examples/cmdline/search.cpp sword-1.5.3/examples/cmdline/search.cpp
+--- examples/cmdline/search.cpp	Mon Nov  6 13:18:43 2000
++++ examples/cmdline/search.cpp	Wed Jun 19 14:11:08 2002
+@@ -1,3 +1,4 @@
++#include <iostream.h>
+ #include <stdio.h>
+ #include <rawtext.h>
+ #include <swmgr.h>
diff --git a/misc/sword15/files/patch-examples::cmdline::threaded_search.cpp b/misc/sword15/files/patch-examples::cmdline::threaded_search.cpp
new file mode 100644
index 000000000000..753076ab9c66
--- /dev/null
+++ b/misc/sword15/files/patch-examples::cmdline::threaded_search.cpp
@@ -0,0 +1,8 @@
+diff -ruN sword-1.5.3.orig/examples/cmdline/threaded_search.cpp sword-1.5.3/examples/cmdline/threaded_search.cpp
+--- examples/cmdline/threaded_search.cpp	Thu Mar 15 19:24:39 2001
++++ examples/cmdline/threaded_search.cpp	Wed Jun 19 14:12:14 2002
+@@ -1,3 +1,4 @@
++#include <iostream.h>
+ #include <stdio.h>
+ #include <rawtext.h>
+ #include <swmgr.h>
diff --git a/misc/sword15/files/patch-src::mgr::swmgr.cpp b/misc/sword15/files/patch-src::mgr::swmgr.cpp
deleted file mode 100644
index fe0db28f4cb7..000000000000
--- a/misc/sword15/files/patch-src::mgr::swmgr.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/mgr/swmgr.cpp.org	Wed Dec 12 00:43:04 2001
-+++ src/mgr/swmgr.cpp	Wed Dec 12 00:44:39 2001
-@@ -268,21 +268,21 @@
- 	}
- 
- 
--	// check for systemwide /etc/sword.conf
-+	// check for systemwide _INSTDIR_/etc/sword.conf
- 
- #ifndef __VISUALC__
- if (debug)
--	cerr << "\nChecking for /etc/sword.conf...";
-+	cerr << "\nChecking for "_INSTDIR_"/etc/sword.conf...";
- #endif
- 
--	if (!::access("/etc/sword.conf", 04)) {
-+	if (!::access(_INSTDIR_"/etc/sword.conf", 04)) {
- 
- #ifndef __VISUALC__
- if (debug)
- 	cerr << "found\n";
- #endif
- 
--		SWConfig etcconf("/etc/sword.conf");
-+		SWConfig etcconf(_INSTDIR_"/etc/sword.conf");
- 		if ((entry = etcconf.Sections["Install"].find("DataPath")) != etcconf.Sections["Install"].end()) {
- 			path = (*entry).second;
- 			if (((*entry).second.c_str()[strlen((*entry).second.c_str())-1] != '\\') && ((*entry).second.c_str()[strlen((*entry).second.c_str())-1] != '/'))
-@@ -290,7 +290,7 @@
- 
- #ifndef __VISUALC__
- if (debug)
--	cerr << "DataPath in /etc/sword.conf is set to: " << path;
-+	cerr << "DataPath in "_INSTDIR_"/etc/sword.conf is set to: " << path;
- #endif
- 
- #ifndef __VISUALC__
diff --git a/misc/sword15/files/patch-tests::treeidxtest.cpp b/misc/sword15/files/patch-tests::treeidxtest.cpp
new file mode 100644
index 000000000000..59f038b0e285
--- /dev/null
+++ b/misc/sword15/files/patch-tests::treeidxtest.cpp
@@ -0,0 +1,12 @@
+diff -ruN sword-1.5.3.orig/tests/treeidxtest.cpp sword-1.5.3/tests/treeidxtest.cpp
+--- tests/treeidxtest.cpp	Thu Jan 24 09:55:27 2002
++++ tests/treeidxtest.cpp	Wed Jun 19 14:03:37 2002
+@@ -85,7 +85,7 @@
+ 	}
+ 	TreeKeyIdx root = *treeKey;
+ 
+-	string input;
++	std::string input;
+ 	char line[1024];
+ 
+ 	do {
diff --git a/misc/sword15/pkg-plist b/misc/sword15/pkg-plist
index 2791611de259..a15daf3ee07b 100644
--- a/misc/sword15/pkg-plist
+++ b/misc/sword15/pkg-plist
@@ -1,3 +1,4 @@
+bin/diatheke
 etc/sword.conf
 include/sword/Greek2Greek.h
 include/sword/GreekChars.h
@@ -5,26 +6,37 @@ include/sword/canon.h
 include/sword/cipherfil.h
 include/sword/defs.h
 include/sword/echomod.h
+include/sword/encfiltmgr.h
 include/sword/entriesblk.h
 include/sword/femain.h
 include/sword/filemgr.h
+include/sword/flatapi.h
 include/sword/gbffootnotes.h
 include/sword/gbfheadings.h
 include/sword/gbfhtml.h
+include/sword/gbfhtmlhref.h
 include/sword/gbfmorph.h
 include/sword/gbfplain.h
 include/sword/gbfrtf.h
 include/sword/gbfstrongs.h
 include/sword/gbfthml.h
+include/sword/greeklexattribs.h
+include/sword/hebrewmcim.h
 include/sword/hrefcom.h
+include/sword/latin1utf16.h
+include/sword/latin1utf8.h
 include/sword/listkey.h
 include/sword/localemgr.h
 include/sword/lzsscomprs.h
+include/sword/markupfiltmgr.h
+include/sword/multimapwdef.h
+include/sword/nullim.h
 include/sword/plainfootnotes.h
 include/sword/plainhtml.h
 include/sword/rawcom.h
 include/sword/rawfiles.h
 include/sword/rawgbf.h
+include/sword/rawgenbook.h
 include/sword/rawld.h
 include/sword/rawld4.h
 include/sword/rawstr.h
@@ -37,7 +49,10 @@ include/sword/rtfhtml.h
 include/sword/rwphtml.h
 include/sword/rwprtf.h
 include/sword/sapphire.h
+include/sword/scsuutf8.h
 include/sword/strkey.h
+include/sword/swbasicfilter.h
+include/sword/swcacher.h
 include/sword/swcipher.h
 include/sword/swcom.h
 include/sword/swcomprs.h
@@ -46,6 +61,9 @@ include/sword/swdisp.h
 include/sword/swdisprtf.h
 include/sword/swdisprtfchap.h
 include/sword/swfilter.h
+include/sword/swfiltermgr.h
+include/sword/swgenbook.h
+include/sword/swinputmeth.h
 include/sword/swkey.h
 include/sword/swld.h
 include/sword/swlocale.h
@@ -53,19 +71,43 @@ include/sword/swlog.h
 include/sword/swmacs.h
 include/sword/swmgr.h
 include/sword/swmodule.h
+include/sword/untgz.h
 include/sword/swobject.h
 include/sword/swtext.h
 include/sword/swunicod.h
+include/sword/swversion.h
 include/sword/swwinlog.h
+include/sword/sysdata.h
 include/sword/tbdisp.h
+include/sword/thmlfootnotes.h
 include/sword/thmlgbf.h
+include/sword/thmlheadings.h
 include/sword/thmlhtml.h
+include/sword/thmlhtmlhref.h
+include/sword/thmllemma.h
+include/sword/thmlmorph.h
 include/sword/thmlolb.h
 include/sword/thmlplain.h
 include/sword/thmlrtf.h
+include/sword/thmlscripref.h
+include/sword/thmlstrongs.h
+include/sword/thmlvariants.h
+include/sword/treekey.h
+include/sword/treekeyidx.h
 include/sword/unicodertf.h
 include/sword/unixstr.h
-include/sword/untgz.h
+include/sword/utf16utf8.h
+include/sword/utf8arshaping.h
+include/sword/utf8bidireorder.h
+include/sword/utf8cantillation.h
+include/sword/utf8greekaccents.h
+include/sword/utf8hebrewpoints.h
+include/sword/utf8html.h
+include/sword/utf8latin1.h
+include/sword/utf8nfc.h
+include/sword/utf8nfkd.h
+include/sword/utf8transliterator.h
+include/sword/utf8utf16.h
 include/sword/utilconf.h
 include/sword/utilfuns.h
 include/sword/utilstr.h
@@ -73,11 +115,24 @@ include/sword/versekey.h
 include/sword/zcom.h
 include/sword/zconf.h
 include/sword/zipcomprs.h
+include/sword/zld.h
 include/sword/zlib.h
 include/sword/ztext.h
 include/sword/zverse.h
-lib/libsword.a
+@dirrm include/sword
 lib/libsword.so.1
 lib/libsword.so
-@dirrm include/sword
+lib/libsword.la
+lib/libsword.a
+share/sword/locales.d/abbr.conf
+share/sword/locales.d/da.conf
+share/sword/locales.d/de.conf
+share/sword/locales.d/es.conf
+share/sword/locales.d/fr.conf
+share/sword/locales.d/it.conf
+share/sword/locales.d/no.conf
+share/sword/locales.d/pt.conf
+@dirrm share/sword/locales.d
+share/sword/mods.d/globals.conf
+@dirrm share/sword/mods.d
 @dirrm share/sword