upgrade to 1.5.2

PR:		32751
Submitted by:	maintainer

3 files changed, 42 insertions, 82 deletions

diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index fc233b593c9a..d8b0d13efcf6 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sword
-PORTVERSION=	1.5.1a
+PORTVERSION=	1.5.2
 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/ \
@@ -19,18 +19,19 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 INCLUDES=	Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \
-		echomod.h femain.h filemgr.h gbffootnotes.h gbfhtml.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 rawstr.h \
-		rawtext.h rawverse.h regex.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 swtext.h swwinlog.h tbdisp.h thmlgbf.h \
-		thmlhtml.h thmlplain.h thmlrtf.h unixstr.h utilconf.h \
-		utilfuns.h utilstr.h versekey.h zcom.h zipcomprs.h ztext.h \
-		zverse.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} "instdir:=	${PREFIX}" >${WRKSRC}/localport.cfg
@@ -38,8 +39,9 @@ pre-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1
-	${LN} -s ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
-	${INSTALL_DATA} ${FILESDIR}/sword.conf ${PREFIX}/etc
+	${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
+	@${ECHO} "[Install]" >${PREFIX}/etc/sword.conf
+	@${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${PREFIX}/include/sword
 .for file in ${INCLUDES}
diff --git a/misc/sword/distinfo b/misc/sword/distinfo
index e6058b2380c8..8388436bf995 100644
--- a/misc/sword/distinfo
+++ b/misc/sword/distinfo
@@ -1 +1 @@
-MD5 (sword-1.5.1a.tar.gz) = c46dc38018183600a472620fd97c9287
+MD5 (sword-1.5.2.tar.gz) = 6be465212e300672b5ab6502caf39baa
diff --git a/misc/sword/files/patch-Makefile.cfg b/misc/sword/files/patch-Makefile.cfg
index 7ad98e0abea1..ecbc3dbfe099 100644
--- a/misc/sword/files/patch-Makefile.cfg
+++ b/misc/sword/files/patch-Makefile.cfg
@@ -1,80 +1,38 @@
---- Makefile.cfg.orig	Mon Nov  6 14:17:22 2000
-+++ Makefile.cfg	Wed Jun 27 14:46:28 2001
-@@ -1,4 +1,5 @@
- # General defines
-+include ${root}/localport.cfg
- 
- version := 1.5.1a
- 
-@@ -19,18 +20,18 @@
- 
- # 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
- 
--buildvcl := yes
-+buildvcl := no
- 
- 
- # Debugging options etc...
- 
--debug   := yes
--profile := yes
-+debug   := no
-+profile := no
- 
- 
- # endian, etc. support for other hardware
-@@ -50,13 +51,12 @@
- 
+--- Makefile.cfg.orig	Thu Dec 13 10:44:49 2001
++++ Makefile.cfg	Thu Dec 13 10:47:07 2001
+@@ -6,7 +6,7 @@
  # ownership (used by 'make install')
  
--user      := root
-+user      := sword
- group     := sword
+ user      := root
+-group     := root
++group     := wheel
  
  
- # paths
+ # this WILL NOT WORK for you. only inhouse patched version of
+@@ -60,8 +60,6 @@
  
--instdir   := /usr/local/sword/
+ # paths
  
+-instdir   := /usr
+-
  bindir    := ${instdir}/bin
  libdir    := ${instdir}/lib
-@@ -74,9 +74,9 @@
- 
- WARNINGS  = -Wall -Wno-format
+ hdir      := ${instdir}/include/sword
+@@ -80,7 +78,7 @@
+ WARNINGS  = -Wall -Wno-format -pedantic
  #WARNINGS += -Werror
+ WARNINGS += -pedantic
 -CFLAGS    = -pipe $(WARNINGS) $(DEBUG)
-+CFLAGS    += -pipe $(WARNINGS) $(DEBUG)
++CFLAGS   += -pipe $(WARNINGS) $(DEBUG)
  
--CPPFLAGS  = -I${root}/include/ $(DEFINES)
-+CPPFLAGS  += -I${root}/include/ $(DEFINES)
+ CPPFLAGS  = -I${root}/include/ $(DEFINES)
  ifeq ($(system),macosx)
- CPPFLAGS  += -I/System/Library/Frameworks/System.framework/Headers/
- endif
-@@ -89,7 +89,7 @@
- LIBS += -lz
- endif
- 
--LDFLAGS	= $(LFLAGS) $(LIBS)
-+LDFLAGS	+= $(LFLAGS) $(LIBS)
- 
- DEFINES   = -D_GNU_SOURCE
- 
-@@ -123,9 +123,9 @@
- endif
- 
+@@ -89,7 +87,7 @@
+ CPPFLAGS  += $(DEFINES)
  
--ifeq ($(system),intel)
--CFLAGS   += -m486
--endif
-+#ifeq ($(system),intel)
-+#CFLAGS   += -m486
-+#endif
+ LFLAGS    = $(OPTIMIZE) $(DEBUG) -L${root}/lib/ 
+-LIBS      = -lsword -lstdc++
++LIBS     += -lsword -lstdc++
  
- ifeq ($(buildvcl),yes)
- ifeq ($(root),.)
+ ifeq ($(zlib),no)
+ CFLAGS += -DEXCLUDEZLIB