summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/sword/Makefile25
-rw-r--r--misc/sword/distinfo2
-rw-r--r--misc/sword/files/patch-examples::cmdline::search.cpp8
-rw-r--r--misc/sword/files/patch-examples::cmdline::threaded_search.cpp8
-rw-r--r--misc/sword/files/patch-tests::treeidxtest.cpp12
-rw-r--r--misc/sword/pkg-plist21
-rw-r--r--misc/sword15/Makefile25
-rw-r--r--misc/sword15/distinfo2
-rw-r--r--misc/sword15/files/patch-examples::cmdline::search.cpp8
-rw-r--r--misc/sword15/files/patch-examples::cmdline::threaded_search.cpp8
-rw-r--r--misc/sword15/files/patch-tests::treeidxtest.cpp12
-rw-r--r--misc/sword15/pkg-plist21
12 files changed, 78 insertions, 74 deletions
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 4003bc62e07c..bb1a4d76639c 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= sword
-PORTVERSION= 1.5.3
+PORTVERSION= 1.5.5
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/ \
@@ -18,17 +18,36 @@ MAINTAINER= wvengen@stack.nl
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_ARGS+= --program-transform-name="" --without-conf
+
+.if defined(WITH_INSTALLMGR)
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+= --enable-installmgr
+PLIST_SUB+= INSTALLMGR=""
+.else
+CONFIGURE_ARGS+= --disable-installmgr
+PLIST_SUB+= INSTALLMGR="@comment "
+
+pre-everything:
+ @${ECHO_CMD} "Define WITH_INSTALLMGR to include the installmanager (curl)"
+.endif
post-install: register
.if !exists(${PREFIX}/etc/sword.conf)
@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
- @${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
+ @${ECHO_CMD} "DataPath=${DATADIR}/" >>${PREFIX}/etc/sword.conf
@${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
+.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}
diff --git a/misc/sword/distinfo b/misc/sword/distinfo
index 3011a9a43b0b..8e7d59add556 100644
--- a/misc/sword/distinfo
+++ b/misc/sword/distinfo
@@ -1 +1 @@
-MD5 (sword-1.5.3.tar.gz) = f3dfedb3c58561bb9b07a616c8e08381
+MD5 (sword-1.5.5.tar.gz) = d5889fa47ed52c83cfd6466fabc0241b
diff --git a/misc/sword/files/patch-examples::cmdline::search.cpp b/misc/sword/files/patch-examples::cmdline::search.cpp
deleted file mode 100644
index 729eee07f8b6..000000000000
--- a/misc/sword/files/patch-examples::cmdline::search.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-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/sword/files/patch-examples::cmdline::threaded_search.cpp b/misc/sword/files/patch-examples::cmdline::threaded_search.cpp
deleted file mode 100644
index 753076ab9c66..000000000000
--- a/misc/sword/files/patch-examples::cmdline::threaded_search.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-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/sword/files/patch-tests::treeidxtest.cpp b/misc/sword/files/patch-tests::treeidxtest.cpp
deleted file mode 100644
index 59f038b0e285..000000000000
--- a/misc/sword/files/patch-tests::treeidxtest.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-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/sword/pkg-plist b/misc/sword/pkg-plist
index a15daf3ee07b..55271d1c4dbb 100644
--- a/misc/sword/pkg-plist
+++ b/misc/sword/pkg-plist
@@ -97,16 +97,11 @@ include/sword/treekeyidx.h
include/sword/unicodertf.h
include/sword/unixstr.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
@@ -117,21 +112,37 @@ include/sword/zconf.h
include/sword/zipcomprs.h
include/sword/zld.h
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
share/sword/locales.d/abbr.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/es.conf
share/sword/locales.d/fr.conf
+share/sword/locales.d/fr_FR.ISO-8859-1.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/sk.conf
+share/sword/locales.d/ru.conf
+share/sword/locales.d/et.conf
+share/sword/locales.d/et_abbr.conf
@dirrm share/sword/locales.d
share/sword/mods.d/globals.conf
@dirrm share/sword/mods.d
diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile
index 4003bc62e07c..bb1a4d76639c 100644
--- a/misc/sword15/Makefile
+++ b/misc/sword15/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= sword
-PORTVERSION= 1.5.3
+PORTVERSION= 1.5.5
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/ \
@@ -18,17 +18,36 @@ MAINTAINER= wvengen@stack.nl
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --program-transform-name=""
+CONFIGURE_ARGS+= --program-transform-name="" --without-conf
+
+.if defined(WITH_INSTALLMGR)
+LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+= --enable-installmgr
+PLIST_SUB+= INSTALLMGR=""
+.else
+CONFIGURE_ARGS+= --disable-installmgr
+PLIST_SUB+= INSTALLMGR="@comment "
+
+pre-everything:
+ @${ECHO_CMD} "Define WITH_INSTALLMGR to include the installmanager (curl)"
+.endif
post-install: register
.if !exists(${PREFIX}/etc/sword.conf)
@${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf
- @${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
+ @${ECHO_CMD} "DataPath=${DATADIR}/" >>${PREFIX}/etc/sword.conf
@${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
+.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}
diff --git a/misc/sword15/distinfo b/misc/sword15/distinfo
index 3011a9a43b0b..8e7d59add556 100644
--- a/misc/sword15/distinfo
+++ b/misc/sword15/distinfo
@@ -1 +1 @@
-MD5 (sword-1.5.3.tar.gz) = f3dfedb3c58561bb9b07a616c8e08381
+MD5 (sword-1.5.5.tar.gz) = d5889fa47ed52c83cfd6466fabc0241b
diff --git a/misc/sword15/files/patch-examples::cmdline::search.cpp b/misc/sword15/files/patch-examples::cmdline::search.cpp
deleted file mode 100644
index 729eee07f8b6..000000000000
--- a/misc/sword15/files/patch-examples::cmdline::search.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 753076ab9c66..000000000000
--- a/misc/sword15/files/patch-examples::cmdline::threaded_search.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-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-tests::treeidxtest.cpp b/misc/sword15/files/patch-tests::treeidxtest.cpp
deleted file mode 100644
index 59f038b0e285..000000000000
--- a/misc/sword15/files/patch-tests::treeidxtest.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-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 a15daf3ee07b..55271d1c4dbb 100644
--- a/misc/sword15/pkg-plist
+++ b/misc/sword15/pkg-plist
@@ -97,16 +97,11 @@ include/sword/treekeyidx.h
include/sword/unicodertf.h
include/sword/unixstr.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
@@ -117,21 +112,37 @@ include/sword/zconf.h
include/sword/zipcomprs.h
include/sword/zld.h
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
share/sword/locales.d/abbr.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/es.conf
share/sword/locales.d/fr.conf
+share/sword/locales.d/fr_FR.ISO-8859-1.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/sk.conf
+share/sword/locales.d/ru.conf
+share/sword/locales.d/et.conf
+share/sword/locales.d/et_abbr.conf
@dirrm share/sword/locales.d
share/sword/mods.d/globals.conf
@dirrm share/sword/mods.d
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 00:17:48 +0000