11 files changed, 159 insertions, 88 deletions

diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index ab79ef08a410..476b9cc18855 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -5,63 +5,55 @@
 # $FreeBSD$
 #
 
-PORTNAME=	${SWORD_PORTNAME}
-PORTVERSION=	${SWORD_PORTVERSION}
-PORTREVISION=	1
+PORTNAME=	sword
+PORTVERSION=	1.5.7
 CATEGORIES=	misc
-MASTER_SITES=	${SWORD_MASTER_SITES}
-MASTER_SITE_SUBDIR=	${SWORD_MASTER_SITE_SUBDIR}
-DISTNAME=	${SWORD_DISTNAME}
+MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
+	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+# 1.5.7a version fixes some build problems. Since there was no FreeBSD
+# version of 1.5.7 it's really no problem to put the a here. WRKSRC is also
+# just work/sword-1.5.7
+DISTFILES=	${DISTNAME}a${EXTRACT_SUFX}
 
 MAINTAINER=	wvengen@stack.nl
 COMMENT=	A project framework for manipulating Bible texts
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS+=	--without-conf
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--program-transform-name="" --without-conf
 
-.if defined(WITH_INSTALLMGR)
+.if defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--without-curl
+PLIST_SUB+=	INSTALLMGR="@comment "
+.else
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--enable-installmgr
+CONFIGURE_ARGS+=	--with-curl
 PLIST_SUB+=	INSTALLMGR=""
-.else
-CONFIGURE_ARGS+=	--disable-installmgr
-PLIST_SUB+=	INSTALLMGR="@comment "
-
-.include "${.CURDIR}/Makefile.common"
 
 pre-everything::
-	@${ECHO_CMD} "Define WITH_INSTALLMGR to include the installmanager (curl)"
+	@${ECHO_CMD} "Define WITHOUT_CURL to disable remote fetch (curl) support in the installmanager"
 .endif
 
-post-install: register
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.in
+
+post-install:
+	@${MKDIR} -p ${PREFIX}/share/sword/mods.d
 .if !exists(${PREFIX}/etc/sword.conf)
-	@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
-	@${ECHO_CMD} "DataPath=${DATADIR}/" >>${PREFIX}/etc/sword.conf
-	@${ECHO_CMD} "Config file installed in ${PREFIX}/etc/sword.conf"
+	@(cd ${WRKSRC} && make install_config)
 .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
-.if !exists(${PREFIX}/share/sword/mods.d/globals.conf)
-	@${MKDIR} ${PREFIX}/share/sword/mods.d
-	@${ECHO_CMD} "[Globals]" >${PREFIX}/share/sword/mods.d/globals.conf
-	@${ECHO_CMD} "" >>${PREFIX}/share/sword/mods.d/globals.conf
-	@${ECHO_CMD} "Global sword runtime settings installed in"
-	@${ECHO_CMD} "       ${PREFIX}/share/sword/mods.d/globals.conf
-.endif
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
 
 register:
-.if !defined(BATCH)
-	@${ECHO} "Do you want to help the authors of SWORD to keep track of how many"
-	@${ECHO} -n "people use this program and register now ? [y/n] "
-	@read answer; \
-	 if [ x$$answer = xy -o x$$answer = xY ]; then \
-		(cd ${WRKSRC}; ${GMAKE} register;); \
-	 fi
-.endif
+	@(cd ${WRKSRC} && make register)
 
 .include <bsd.port.mk>
diff --git a/misc/sword15/Makefile.common b/misc/sword15/Makefile.common
index a2731b181964..e69de29bb2d1 100644
--- a/misc/sword15/Makefile.common
+++ b/misc/sword15/Makefile.common
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SWORD_PORTNAME=	sword
-SWORD_PORTVERSION=	1.5.5
-SWORD_MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
-	${MASTER_SITE_SOURCEFORGE}
-SWORD_MASTER_SITE_SUBDIR=	${PORTNAME}
-SWORD_DISTNAME=	${SWORD_PORTNAME}-${SWORD_PORTVERSION}
-
-MD5_FILE?=	${PORTSDIR}/misc/sword/distinfo
-
diff --git a/misc/sword15/distinfo b/misc/sword15/distinfo
index 481b49991fd7..d1c91c5f93db 100644
--- a/misc/sword15/distinfo
+++ b/misc/sword15/distinfo
@@ -1,2 +1,2 @@
-MD5 (sword-1.5.5.tar.gz) = d5889fa47ed52c83cfd6466fabc0241b
-SIZE (sword-1.5.5.tar.gz) = 3984442
+MD5 (sword-1.5.7a.tar.gz) = e77801ac7abb7a940eb8a75d725e346f
+SIZE (sword-1.5.7a.tar.gz) = 1535217
diff --git a/misc/sword15/files/patch-configure b/misc/sword15/files/patch-configure
new file mode 100644
index 000000000000..aa6514ab106b
--- /dev/null
+++ b/misc/sword15/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Tue Aug 17 13:48:32 2004
++++ configure	Tue Aug 17 13:49:13 2004
+@@ -20183,8 +20183,8 @@
+ 	echo "curl found - remote install options available"
+ 	CURL_CFLAGS=`$CURL_CONFIG --cflags`
+ 	CURL_LIBS=`$CURL_CONFIG --libs`
+-	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE"
+-	CFLAGS="$CFLAGS -DCURLAVAILABLE"
++	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE $CURL_CFLAGS"
++	CFLAGS="$CFLAGS -DCURLAVAILABLE $CURL_CFLAGS"
+     fi
+ fi
+ 
diff --git a/misc/sword15/files/patch-configure.ac b/misc/sword15/files/patch-configure.ac
new file mode 100644
index 000000000000..64a367923b83
--- /dev/null
+++ b/misc/sword15/files/patch-configure.ac
@@ -0,0 +1,13 @@
+--- configure.ac.orig	Tue Aug 17 13:48:26 2004
++++ configure.ac	Tue Aug 17 13:48:53 2004
+@@ -151,8 +151,8 @@
+ 	echo "curl found - remote install options available"
+ 	CURL_CFLAGS=`$CURL_CONFIG --cflags`
+ 	CURL_LIBS=`$CURL_CONFIG --libs`
+-	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE"
+-	CFLAGS="$CFLAGS -DCURLAVAILABLE"
++	CXXFLAGS="$CXXFLAGS -DCURLAVAILABLE $CURL_CFLAGS"
++	CFLAGS="$CFLAGS -DCURLAVAILABLE $CURL_CFLAGS"
+     fi
+ fi
+ 
diff --git a/misc/sword15/files/patch-examples::cmdline::Makefile.am b/misc/sword15/files/patch-examples::cmdline::Makefile.am
deleted file mode 100644
index 50535881e5a8..000000000000
--- a/misc/sword15/files/patch-examples::cmdline::Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index 78c75dd1fddb..000000000000
--- a/misc/sword15/files/patch-examples::cmdline::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-include::ftpparse.h b/misc/sword15/files/patch-include::ftpparse.h
new file mode 100644
index 000000000000..e135d22a25e8
--- /dev/null
+++ b/misc/sword15/files/patch-include::ftpparse.h
@@ -0,0 +1,19 @@
+--- include/ftpparse.h.orig	Tue Aug 17 10:49:11 2004
++++ include/ftpparse.h	Tue Aug 17 10:49:24 2004
+@@ -1,7 +1,6 @@
+ #ifndef FTPPARSE_H
+ #define FTPPARSE_H
+ 
+-#include <time.h>
+ 
+ /*
+ ftpparse(&fp,buf,len) tries to parse one line of LIST output.
+@@ -25,7 +24,7 @@
+   int sizetype;
+   long size; /* number of octets */
+   int mtimetype;
+-  time_t mtime; /* modification time */
++  long mtime; /* modification time */
+   int idtype;
+   char *id; /* not necessarily 0-terminated */
+   int idlen;
diff --git a/misc/sword15/files/patch-src::utilfuns::ftpparse.c b/misc/sword15/files/patch-src::utilfuns::ftpparse.c
new file mode 100644
index 000000000000..ab8a3eab8e85
--- /dev/null
+++ b/misc/sword15/files/patch-src::utilfuns::ftpparse.c
@@ -0,0 +1,10 @@
+--- src/utilfuns/ftpparse.c.orig	Thu Feb 19 23:22:11 2004
++++ src/utilfuns/ftpparse.c	Thu Feb 19 23:22:19 2004
+@@ -21,6 +21,7 @@
+ NCSA Telnet FTP server. Has LIST = NLST (and bad NLST for directories).
+ */
+ 
++#include <time.h>
+ #include <ftpparse.h>
+ 
+ static long totai(long year,long month,long mday)
diff --git a/misc/sword15/pkg-message b/misc/sword15/pkg-message
index 5ee11c58658e..541b0da7b4d2 100644
--- a/misc/sword15/pkg-message
+++ b/misc/sword15/pkg-message
@@ -1,4 +1,15 @@
-To use sword, you need to have bible, commentary and/or lexicon modules. Those
-are available in the sword-modules package/port. And you probabely want to
-install a bible-application that uses sword, like cheatah (or irenaeus,
-bibletime or gnomesword when they become available as package/port).
+To use sword, you need to have bible, commentary and/or lexicon modules. You
+can install those from the crosswire website in two ways. If you live in a
+persecuted country however and do not wish to risk detection, you should *not*
+try this.
+  1. Use installmgr (doesn't work when port is built WITHOUT_CURL). E.g.:
+     # installmgr -init
+     # installmgr -r crosswire
+     # installmgr -ri crosswire ASV
+     See `installmgr --help` for details.
+  2. Download raw zip-archives from
+       http://www.crosswire.org/sword/modules/
+     and unpack them in PREFIX/share/sword.
+
+You probabely want to install a bible-application that uses sword, like
+cheatah, bibletime or gnomesword.
diff --git a/misc/sword15/pkg-plist b/misc/sword15/pkg-plist
index 55271d1c4dbb..e4c2e3ec0261 100644
--- a/misc/sword15/pkg-plist
+++ b/misc/sword15/pkg-plist
@@ -1,5 +1,16 @@
-bin/diatheke
 etc/sword.conf
+bin/addld
+bin/diatheke
+bin/imp2ld
+bin/imp2vs
+bin/installmgr
+bin/mod2imp
+bin/mod2osis
+bin/mod2vpl
+bin/mod2zmod
+bin/osis2mod
+bin/vpl2mod
+bin/vs2osisref
 include/sword/Greek2Greek.h
 include/sword/GreekChars.h
 include/sword/canon.h
@@ -11,18 +22,23 @@ include/sword/entriesblk.h
 include/sword/femain.h
 include/sword/filemgr.h
 include/sword/flatapi.h
+include/sword/ftpparse.h
 include/sword/gbffootnotes.h
 include/sword/gbfheadings.h
 include/sword/gbfhtml.h
 include/sword/gbfhtmlhref.h
 include/sword/gbfmorph.h
+include/sword/gbfosis.h
 include/sword/gbfplain.h
+include/sword/gbfredletterwords.h
 include/sword/gbfrtf.h
 include/sword/gbfstrongs.h
 include/sword/gbfthml.h
+include/sword/gbfwebif.h
 include/sword/greeklexattribs.h
 include/sword/hebrewmcim.h
 include/sword/hrefcom.h
+include/sword/installmgr.h
 include/sword/latin1utf16.h
 include/sword/latin1utf8.h
 include/sword/listkey.h
@@ -31,6 +47,17 @@ include/sword/lzsscomprs.h
 include/sword/markupfiltmgr.h
 include/sword/multimapwdef.h
 include/sword/nullim.h
+include/sword/osisfootnotes.h
+include/sword/osisheadings.h
+include/sword/osishtmlhref.h
+include/sword/osislemma.h
+include/sword/osismorph.h
+include/sword/osisplain.h
+include/sword/osisredletterwords.h
+include/sword/osisrtf.h
+include/sword/osisscripref.h
+include/sword/osisstrongs.h
+include/sword/osiswebif.h
 include/sword/plainfootnotes.h
 include/sword/plainhtml.h
 include/sword/rawcom.h
@@ -46,12 +73,11 @@ include/sword/rawverse.h
 include/sword/regex.h
 include/sword/roman.h
 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/swbuf.h
 include/sword/swcacher.h
 include/sword/swcipher.h
 include/sword/swcom.h
@@ -64,6 +90,7 @@ include/sword/swfilter.h
 include/sword/swfiltermgr.h
 include/sword/swgenbook.h
 include/sword/swinputmeth.h
+%%INSTALLMGR%%include/sword/swinstallmgr.h
 include/sword/swkey.h
 include/sword/swld.h
 include/sword/swlocale.h
@@ -71,8 +98,10 @@ 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/swoptfilter.h
+%%INSTALLMGR%%include/sword/swremotemgr.h
+include/sword/swsearchable.h
 include/sword/swtext.h
 include/sword/swunicod.h
 include/sword/swversion.h
@@ -86,26 +115,35 @@ include/sword/thmlhtml.h
 include/sword/thmlhtmlhref.h
 include/sword/thmllemma.h
 include/sword/thmlmorph.h
-include/sword/thmlolb.h
+include/sword/thmlosis.h
 include/sword/thmlplain.h
 include/sword/thmlrtf.h
 include/sword/thmlscripref.h
 include/sword/thmlstrongs.h
 include/sword/thmlvariants.h
+include/sword/thmlwebif.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
+include/sword/utilweb.h
+include/sword/utilxml.h
 include/sword/versekey.h
 include/sword/zcom.h
 include/sword/zconf.h
@@ -115,35 +153,40 @@ include/sword/zlib.h
 include/sword/zstr.h
 include/sword/ztext.h
 include/sword/zverse.h
-%%INSTALLMGR%%include/sword/swremotemgr.h
-%%INSTALLMGR%%include/sword/swinstallmgr.h
-@dirrm include/sword
-lib/libsword.so.1
-lib/libsword.so
-lib/libsword.la
 lib/libsword.a
-@dirrm lib/sword
+lib/libsword.la
+lib/libsword.so
+lib/libsword.so.4
+libdata/pkgconfig/sword.pc
 share/sword/locales.d/abbr.conf
+share/sword/locales.d/bg_BG-cp1251.conf
 share/sword/locales.d/cs.conf
 share/sword/locales.d/da.conf
 share/sword/locales.d/de.conf
 share/sword/locales.d/de_abbrev.conf
+share/sword/locales.d/en_GB.conf
 share/sword/locales.d/es.conf
+share/sword/locales.d/et.conf
+share/sword/locales.d/et_abbr.conf
+share/sword/locales.d/fi.conf
 share/sword/locales.d/fr.conf
-share/sword/locales.d/fr_FR.ISO-8859-1.conf
+share/sword/locales.d/id.conf
 share/sword/locales.d/it.conf
 share/sword/locales.d/la.conf
 share/sword/locales.d/nl.conf
 share/sword/locales.d/no.conf
 share/sword/locales.d/pl.conf
 share/sword/locales.d/pt.conf
-share/sword/locales.d/id.conf
 share/sword/locales.d/pt_BR.conf
+share/sword/locales.d/ro.conf
+share/sword/locales.d/ru_RU-cp1251.conf
+share/sword/locales.d/ru_RU-koi8-r.conf
 share/sword/locales.d/sk.conf
-share/sword/locales.d/ru.conf
-share/sword/locales.d/et.conf
-share/sword/locales.d/et_abbr.conf
+share/sword/locales.d/uk_UA-cp1251.conf
+share/sword/locales.d/uk_UA-koi8-u.conf
 @dirrm share/sword/locales.d
-share/sword/mods.d/globals.conf
 @dirrm share/sword/mods.d
 @dirrm share/sword
+@dirrm lib/sword
+@dirrm libdata/pkgconfig
+@dirrm include/sword