Date: Mon, 10 Jul 2006 22:15:37 -0400 (EDT) From: Thomas Abthorpe <tabthorpe@goodking.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100052: [PATCH] misc/sword: update to 1.5.8 Message-ID: <200607110215.k6B2FbIj089083@goodking.goodking.ca> Resent-Message-ID: <200607110220.k6B2KIrE019513@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 100052 >Category: ports >Synopsis: [PATCH] misc/sword: update to 1.5.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 02:20:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas Abthorpe >Release: FreeBSD 6.1-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD goodking.goodking.ca 6.1-RELEASE-p2 FreeBSD 6.1-RELEASE-p2 #19: Wed Jun 14 18:47:23 EDT 2006 >Description: - Update to 1.5.8 - Assume maintainership Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- sword-1.5.8.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/misc/sword/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 10 May 2006 22:37:23 -0000 1.17 +++ Makefile 11 Jul 2006 02:14:21 -0000 @@ -6,17 +6,14 @@ # PORTNAME= sword -PORTVERSION= 1.5.7 +PORTVERSION= 1.5.8 CATEGORIES= misc MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \ - ${MASTER_SITE_SOURCEFORGE} + http://www.goodking.ca/pub/files/ 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} +DISTNAME= ${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= thomas@goodking.ca COMMENT= A project framework for manipulating Bible texts USE_GNOME= pkgconfig @@ -41,11 +38,11 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ + @${REINPLACE_CMD} -e 's|##(libdir)/pkgconfig|#{PREFIX}/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in post-install: - @${MKDIR} -p ${PREFIX}/share/sword/mods.d + @${MKDIR} ${PREFIX}/share/sword/mods.d .if !exists(${PREFIX}/etc/sword.conf) @(cd ${WRKSRC} && make install_config) .else Index: distinfo =================================================================== RCS file: /home/ncvs/ports/misc/sword/distinfo,v retrieving revision 1.7 diff -u -r1.7 distinfo --- distinfo 25 Nov 2005 16:09:27 -0000 1.7 +++ distinfo 11 Jul 2006 02:14:21 -0000 @@ -1,3 +1,3 @@ -MD5 (sword-1.5.7a.tar.gz) = e77801ac7abb7a940eb8a75d725e346f -SHA256 (sword-1.5.7a.tar.gz) = 37f9e3e231f7ce65f9d0e6d8e9fee5467e632b1834c62327db5420fc14e50246 -SIZE (sword-1.5.7a.tar.gz) = 1535217 +MD5 (sword-1.5.8.tar.gz) = c36398c84bfb044c0c66ef3ffcf29400 +SHA256 (sword-1.5.8.tar.gz) = aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9 +SIZE (sword-1.5.8.tar.gz) = 1714799 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/misc/sword/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 11 Dec 2001 09:36:32 -0000 1.1 +++ pkg-descr 11 Jul 2006 02:14:21 -0000 @@ -1,9 +1,8 @@ -The SWORD Project is an effort to create an ever expanding software package -for research and study of God and His Word. The SWORD Bible Framework allows -easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc. -Many frontends are build using this framework. An installed module set may be -shared between any frontend using the framework. +The SWORD Project is an effort to create an ever expanding software +package for research and study of God and His Word. The SWORD Bible +Framework allows easy manipulation of Bible texts, commentaries, +lexicons, dictionaries, etc. Many frontends are build using this +framework. An installed module set may be shared between any frontend +using the framework. -WWW: http://www.crosswire.org/ - -- Willem van Engen <wvengen@stack.nl> +WWW: http://www.crosswire.org/sword Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/misc/sword/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- pkg-plist 27 Aug 2004 10:28:26 -0000 1.6 +++ pkg-plist 11 Jul 2006 02:14:21 -0000 @@ -1,9 +1,9 @@ -etc/sword.conf bin/addld bin/diatheke bin/imp2ld bin/imp2vs bin/installmgr +bin/mkfastmod bin/mod2imp bin/mod2osis bin/mod2vpl @@ -11,10 +11,12 @@ bin/osis2mod bin/vpl2mod bin/vs2osisref +etc/sword.conf include/sword/Greek2Greek.h include/sword/GreekChars.h include/sword/canon.h include/sword/cipherfil.h +include/sword/curlftpt.h include/sword/defs.h include/sword/echomod.h include/sword/encfiltmgr.h @@ -22,7 +24,10 @@ include/sword/femain.h include/sword/filemgr.h include/sword/flatapi.h +include/sword/ftplib.h +include/sword/ftplibftpt.h include/sword/ftpparse.h +include/sword/ftptrans.h include/sword/gbffootnotes.h include/sword/gbfheadings.h include/sword/gbfhtml.h @@ -52,17 +57,18 @@ include/sword/osishtmlhref.h include/sword/osislemma.h include/sword/osismorph.h +include/sword/osisosis.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/osiswordjs.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 @@ -75,6 +81,7 @@ include/sword/rtfhtml.h include/sword/sapphire.h include/sword/scsuutf8.h +include/sword/stringmgr.h include/sword/strkey.h include/sword/swbasicfilter.h include/sword/swbuf.h @@ -84,13 +91,10 @@ include/sword/swcomprs.h include/sword/swconfig.h 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 -%%INSTALLMGR%%include/sword/swinstallmgr.h include/sword/swkey.h include/sword/swld.h include/sword/swlocale.h @@ -100,14 +104,11 @@ include/sword/swmodule.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 -include/sword/swwinlog.h include/sword/sysdata.h -include/sword/tbdisp.h include/sword/thmlfootnotes.h include/sword/thmlgbf.h include/sword/thmlheadings.h @@ -122,11 +123,12 @@ include/sword/thmlstrongs.h include/sword/thmlvariants.h include/sword/thmlwebif.h +include/sword/thmlwordjs.h include/sword/treekey.h include/sword/treekeyidx.h include/sword/unicodertf.h -include/sword/unixstr.h include/sword/untgz.h +include/sword/url.h include/sword/utf16utf8.h include/sword/utf8arshaping.h include/sword/utf8bidireorder.h @@ -139,10 +141,7 @@ 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 @@ -153,39 +152,71 @@ include/sword/zstr.h include/sword/ztext.h include/sword/zverse.h +lib/libsword-1.5.8.so lib/libsword.a 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/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/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/uk_UA-cp1251.conf -share/sword/locales.d/uk_UA-koi8-u.conf -@dirrm share/sword/locales.d -@dirrm share/sword/mods.d -@dirrm share/sword +%%DATADIR%%/locales.d/abbr.conf +%%DATADIR%%/locales.d/af-utf8.conf +%%DATADIR%%/locales.d/af.conf +%%DATADIR%%/locales.d/bg_BG-cp1251.conf +%%DATADIR%%/locales.d/bg_BG-utf8.conf +%%DATADIR%%/locales.d/cs-utf8.conf +%%DATADIR%%/locales.d/cs.conf +%%DATADIR%%/locales.d/da-utf8.conf +%%DATADIR%%/locales.d/da.conf +%%DATADIR%%/locales.d/de-utf8.conf +%%DATADIR%%/locales.d/de.conf +%%DATADIR%%/locales.d/de_abbrev-utf8.conf +%%DATADIR%%/locales.d/de_abbrev.conf +%%DATADIR%%/locales.d/en_GB.conf +%%DATADIR%%/locales.d/es-utf8.conf +%%DATADIR%%/locales.d/es.conf +%%DATADIR%%/locales.d/et-utf8.conf +%%DATADIR%%/locales.d/et.conf +%%DATADIR%%/locales.d/et_abbr-utf8.conf +%%DATADIR%%/locales.d/et_abbr.conf +%%DATADIR%%/locales.d/fi-utf8.conf +%%DATADIR%%/locales.d/fi.conf +%%DATADIR%%/locales.d/fr-utf8.conf +%%DATADIR%%/locales.d/fr.conf +%%DATADIR%%/locales.d/hu-utf8.conf +%%DATADIR%%/locales.d/hu.conf +%%DATADIR%%/locales.d/id.conf +%%DATADIR%%/locales.d/it-utf8.conf +%%DATADIR%%/locales.d/it.conf +%%DATADIR%%/locales.d/ko-utf8.conf +%%DATADIR%%/locales.d/ko.conf +%%DATADIR%%/locales.d/ko_abbrev-utf8.conf +%%DATADIR%%/locales.d/ko_abbrev.conf +%%DATADIR%%/locales.d/la.conf +%%DATADIR%%/locales.d/lt-utf8.conf +%%DATADIR%%/locales.d/nl.conf +%%DATADIR%%/locales.d/no-utf8.conf +%%DATADIR%%/locales.d/no.conf +%%DATADIR%%/locales.d/pl-utf8.conf +%%DATADIR%%/locales.d/pl.conf +%%DATADIR%%/locales.d/pt-utf8.conf +%%DATADIR%%/locales.d/pt.conf +%%DATADIR%%/locales.d/pt_BR-utf8.conf +%%DATADIR%%/locales.d/pt_BR.conf +%%DATADIR%%/locales.d/ro.conf +%%DATADIR%%/locales.d/ru_RU-cp1251.conf +%%DATADIR%%/locales.d/ru_RU-koi8-r.conf +%%DATADIR%%/locales.d/ru_RU-utf8.conf +%%DATADIR%%/locales.d/sk-utf8.conf +%%DATADIR%%/locales.d/sk.conf +%%DATADIR%%/locales.d/sl.conf +%%DATADIR%%/locales.d/sv-utf8.conf +%%DATADIR%%/locales.d/sv.conf +%%DATADIR%%/locales.d/uk_UA-cp1251.conf +%%DATADIR%%/locales.d/uk_UA-koi8-u.conf +%%DATADIR%%/locales.d/uk_UA-utf8.conf +@dirrm %%DATADIR%%/mods.d +@dirrm %%DATADIR%%/locales.d +@dirrm %%DATADIR%% +@dirrm share/nls/en_US.US-ASCII +@dirrm share/nls/POSIX @dirrm lib/sword @dirrm include/sword Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/misc/sword/files/patch-configure,v retrieving revision 1.1 diff -u -r1.1 patch-configure --- files/patch-configure 20 Aug 2004 18:04:07 -0000 1.1 +++ files/patch-configure 11 Jul 2006 02:14:21 -0000 @@ -1,13 +1,13 @@ ---- configure.orig Tue Aug 17 13:48:32 2004 -+++ configure Tue Aug 17 13:49:13 2004 -@@ -20183,8 +20183,8 @@ +--- configure.orig Sun May 29 00:59:43 2005 ++++ configure Mon Jul 10 14:10:06 2006 +@@ -20481,8 +20481,8 @@ echo "curl found - remote install options available" - CURL_CFLAGS=`$CURL_CONFIG --cflags` + CURL_AM_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" +- AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE" +- AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE" ++ AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" ++ AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" fi fi Index: files/patch-configure.ac =================================================================== RCS file: /home/ncvs/ports/misc/sword/files/patch-configure.ac,v retrieving revision 1.1 diff -u -r1.1 patch-configure.ac --- files/patch-configure.ac 20 Aug 2004 18:04:07 -0000 1.1 +++ files/patch-configure.ac 11 Jul 2006 02:14:21 -0000 @@ -1,13 +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 @@ +--- configure.ac.orig Mon Jul 10 18:22:50 2006 ++++ configure.ac Mon Jul 10 18:23:13 2006 +@@ -187,8 +187,8 @@ echo "curl found - remote install options available" - CURL_CFLAGS=`$CURL_CONFIG --cflags` + CURL_AM_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" +- AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE" +- AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE" ++ AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" ++ AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS" fi fi --- sword-1.5.8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607110215.k6B2FbIj089083>