Date: Mon, 18 Nov 2002 15:31:27 +0100 From: Willem van Engen <wvengen@stack.nl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/45406: port update misc/sword to 1.5.5, this fixes -current. Message-ID: <20021118153127.186a07cb.wvengen@stack.nl>
next in thread | raw e-mail | index | archive | help
>Number: 45406 >Category: ports >Synopsis: port update misc/sword to 1.5.5, this fixes -current. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Nov 18 06:40:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Willem van Engen >Release: FreeBSD 4.6.1-RELEASE-p10 i386 >Organization: >Environment: >Description: Update misc/sword to version 1.5.5. This also makes the port build and run on -current. >How-To-Repeat: >Fix: --- sword-1.5.5.diff begins here --- diff -ruN misc/sword.old/Makefile misc/sword/Makefile --- misc/sword.old/Makefile Fri Jun 28 05:34:54 2002 +++ misc/sword/Makefile Mon Nov 18 14:30:16 2002 @@ -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,16 +18,35 @@ 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 -ruN misc/sword.old/distinfo misc/sword/distinfo --- misc/sword.old/distinfo Fri Jun 28 05:34:54 2002 +++ misc/sword/distinfo Sun Oct 27 00:39:55 2002 @@ -1 +1 @@ -MD5 (sword-1.5.3.tar.gz) = f3dfedb3c58561bb9b07a616c8e08381 +MD5 (sword-1.5.5.tar.gz) = d5889fa47ed52c83cfd6466fabc0241b diff -ruN misc/sword.old/files/patch-examples::cmdline::search.cpp misc/sword/files/patch-examples::cmdline::search.cpp --- misc/sword.old/files/patch-examples::cmdline::search.cpp Fri Jun 28 05:34:56 2002 +++ misc/sword/files/patch-examples::cmdline::search.cpp Thu Jan 1 01:00:00 1970 @@ -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 -ruN misc/sword.old/files/patch-examples::cmdline::threaded_search.cpp misc/sword/files/patch-examples::cmdline::threaded_search.cpp --- misc/sword.old/files/patch-examples::cmdline::threaded_search.cpp Fri Jun 28 05:34:56 2002 +++ misc/sword/files/patch-examples::cmdline::threaded_search.cpp Thu Jan 1 01:00:00 1970 @@ -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 -ruN misc/sword.old/files/patch-tests::treeidxtest.cpp misc/sword/files/patch-tests::treeidxtest.cpp --- misc/sword.old/files/patch-tests::treeidxtest.cpp Fri Jun 28 05:34:56 2002 +++ misc/sword/files/patch-tests::treeidxtest.cpp Thu Jan 1 01:00:00 1970 @@ -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 -ruN misc/sword.old/pkg-plist misc/sword/pkg-plist --- misc/sword.old/pkg-plist Fri Jun 28 05:34:54 2002 +++ misc/sword/pkg-plist Mon Nov 18 14:23:59 2002 @@ -97,16 +97,11 @@ 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/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 --- sword-1.5.5.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021118153127.186a07cb.wvengen>