Date: Wed, 12 Dec 2001 04:38:40 -0800 (PST) From: Willem van Engen <wvengen@stack.nl> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/32751: Update port: misc/sword new version 1.5.2 Message-ID: <200112121238.fBCCcev73291@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 32751
>Category: ports
>Synopsis: Update port: misc/sword new version 1.5.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 12 04:40:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Willem van Engen
>Release: 4.4-STABLE i386
>Organization:
>Environment:
>Description:
The crosswire bible society has released version 1.5.2 of the sword bible framework.
And some small changes:
- Install removes symbolic links before installing. Avoids error when they exist.
[if you feel the error should occur, feel free to undo this change]
- PREFIX/etc is used instead of /usr/local/etc for the configfile location in swmgr.c
>How-To-Repeat:
>Fix:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# misc/sword/
# misc/sword/files
# misc/sword/files/patch-Makefile.cfg
# misc/sword/files/patch-src::mgr::swmgr.cpp
# misc/sword/pkg-comment
# misc/sword/pkg-descr
# misc/sword/pkg-message
# misc/sword/pkg-plist
# misc/sword/Makefile
# misc/sword/distinfo
#
echo c - misc/sword/
mkdir -p misc/sword/ > /dev/null 2>&1
echo c - misc/sword/files
mkdir -p misc/sword/files > /dev/null 2>&1
echo x - misc/sword/files/patch-Makefile.cfg
sed 's/^X//' >misc/sword/files/patch-Makefile.cfg << 'END-of-misc/sword/files/patch-Makefile.cfg'
X--- Makefile.cfg.orig Wed Dec 12 00:56:50 2001
X Makefile.cfg Wed Dec 12 00:57:18 2001
X@@ -1,4 1,5 @@
X # General defines
X include ${root}/localport.cfg
X
X version := 1.5.2
X
X@@ -6,7 7,7 @@
X # ownership (used by 'make install')
X
X user := root
X-group := root
X group := wheel
X
X
X # this WILL NOT WORK for you. only inhouse patched version of
X@@ -27,7 28,7 @@
X
X # shared library- set to yes if you would like to build
X
X-buildshare := no
X buildshare := yes
X
X
X # VCL library- set to yes if you would like to build
X@@ -60,8 61,6 @@
X
X # paths
X
X-instdir := /usr
X-
X bindir := ${instdir}/bin
X libdir := ${instdir}/lib
X hdir := ${instdir}/include/sword
X@@ -80,16 79,16 @@
X WARNINGS = -Wall -Wno-format -pedantic
X #WARNINGS = -Werror
X WARNINGS = -pedantic
X-CFLAGS = -pipe $(WARNINGS) $(DEBUG)
X CFLAGS = -pipe $(WARNINGS) $(DEBUG)
X
X-CPPFLAGS = -I${root}/include/ $(DEFINES)
X CPPFLAGS = -I${root}/include/ $(DEFINES)
X ifeq ($(system),macosx)
X CPPFLAGS = -I/System/Library/Frameworks/System.framework/Headers/
X endif
X CPPFLAGS = $(DEFINES)
X
X LFLAGS = $(OPTIMIZE) $(DEBUG) -L${root}/lib/
X-LIBS = -lsword -lstdc
X LIBS = -lsword -lstdc
X
X ifeq ($(zlib),no)
X CFLAGS = -DEXCLUDEZLIB
X@@ -97,9 96,9 @@
X LIBS = -lz
X endif
X
X-LDFLAGS = $(LFLAGS) $(LIBS)
X LDFLAGS = $(LFLAGS) $(LIBS)
X
X-DEFINES = -D_GNU_SOURCE
X DEFINES = -D_GNU_SOURCE -D_INSTDIR_="\"${instdir}\""
X
X ifeq ($(profile),yes)
X CFLAGS = -pg
X@@ -256,9 255,9 @@
X ifneq (${confdir},)
X @if [ ! -d ${confdir}/mods.d ]; then install -o ${user} -g ${group} -m a rx,u rxw -d ${confdir}/mods.d/ ; fi
X @if [ ! -d ${confdir}/locales.d ]; then install -o ${user} -g ${group} -m a rx,u rxw -d ${confdir}/locales.d/ ; fi
X- @echo "[Install]" > /etc/sword.conf
X- @echo "DataPath=${confdir}" >> /etc/sword.conf
X-# install -o ${user} -g ${group} -m a r,u rw samples/recommended/sword.conf /etc/
X @echo "[Install]" > ${instdir}/etc/sword.conf
X @echo "DataPath=${confdir}" >> ${instdir}/etc/sword.conf
X # install -o ${user} -g ${group} -m a r,u rw samples/recommended/sword.conf ${instdir}/etc/
X install -o ${user} -g ${group} -m a r,u rw ${modsconf} ${confdir}/mods.d/
X install -o ${user} -g ${group} -m a r,u rw ${localesconf} ${confdir}/locales.d/
X endif
END-of-misc/sword/files/patch-Makefile.cfg
echo x - misc/sword/files/patch-src::mgr::swmgr.cpp
sed 's/^X//' >misc/sword/files/patch-src::mgr::swmgr.cpp << 'END-of-misc/sword/files/patch-src::mgr::swmgr.cpp'
X--- src/mgr/swmgr.cpp.org Wed Dec 12 00:43:04 2001
X src/mgr/swmgr.cpp Wed Dec 12 00:44:39 2001
X@@ -268,21 268,21 @@
X }
X
X
X- // check for systemwide /etc/sword.conf
X // check for systemwide _INSTDIR_/etc/sword.conf
X
X #ifndef __VISUALC__
X if (debug)
X- cerr << "\nChecking for /etc/sword.conf...";
X cerr << "\nChecking for "_INSTDIR_"/etc/sword.conf...";
X #endif
X
X- if (!::access("/etc/sword.conf", 04)) {
X if (!::access(_INSTDIR_"/etc/sword.conf", 04)) {
X
X #ifndef __VISUALC__
X if (debug)
X cerr << "found\n";
X #endif
X
X- SWConfig etcconf("/etc/sword.conf");
X SWConfig etcconf(_INSTDIR_"/etc/sword.conf");
X if ((entry = etcconf.Sections["Install"].find("DataPath")) != etcconf.Sections["Install"].end()) {
X path = (*entry).second;
X if (((*entry).second.c_str()[strlen((*entry).second.c_str())-1] != '\\') && ((*entry).second.c_str()[strlen((*entry).second.c_str())-1] != '/'))
X@@ -290,7 290,7 @@
X
X #ifndef __VISUALC__
X if (debug)
X- cerr << "DataPath in /etc/sword.conf is set to: " << path;
X cerr << "DataPath in "_INSTDIR_"/etc/sword.conf is set to: " << path;
X #endif
X
X #ifndef __VISUALC__
END-of-misc/sword/files/patch-src::mgr::swmgr.cpp
echo x - misc/sword/pkg-comment
sed 's/^X//' >misc/sword/pkg-comment << 'END-of-misc/sword/pkg-comment'
XA project framework for manipulating Bible texts
END-of-misc/sword/pkg-comment
echo x - misc/sword/pkg-descr
sed 's/^X//' >misc/sword/pkg-descr << 'END-of-misc/sword/pkg-descr'
XThe SWORD Project is an effort to create an ever expanding software package
Xfor research and study of God and His Word. The SWORD Bible Framework allows
Xeasy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.
XMany frontends are build using this framework. An installed module set may be
Xshared between any frontend using the framework.
X
XWWW: http://www.crosswire.org/
X
X- Willem van Engen <wvengen@stack.nl>
END-of-misc/sword/pkg-descr
echo x - misc/sword/pkg-message
sed 's/^X//' >misc/sword/pkg-message << 'END-of-misc/sword/pkg-message'
XTo use sword, you need to have bible, commentary and/or lexicon modules. Those
Xare available in the sword-modules package/port. And you probabely want to
Xinstall a bible-application that uses sword, like cheatah (or irenaeus,
Xbibletime or gnomesword when they become available as package/port).
END-of-misc/sword/pkg-message
echo x - misc/sword/pkg-plist
sed 's/^X//' >misc/sword/pkg-plist << 'END-of-misc/sword/pkg-plist'
Xetc/sword.conf
Xinclude/sword/Greek2Greek.h
Xinclude/sword/GreekChars.h
Xinclude/sword/canon.h
Xinclude/sword/cipherfil.h
Xinclude/sword/defs.h
Xinclude/sword/echomod.h
Xinclude/sword/entriesblk.h
Xinclude/sword/femain.h
Xinclude/sword/filemgr.h
Xinclude/sword/gbffootnotes.h
Xinclude/sword/gbfheadings.h
Xinclude/sword/gbfhtml.h
Xinclude/sword/gbfmorph.h
Xinclude/sword/gbfplain.h
Xinclude/sword/gbfrtf.h
Xinclude/sword/gbfstrongs.h
Xinclude/sword/gbfthml.h
Xinclude/sword/hrefcom.h
Xinclude/sword/listkey.h
Xinclude/sword/localemgr.h
Xinclude/sword/lzsscomprs.h
Xinclude/sword/plainfootnotes.h
Xinclude/sword/plainhtml.h
Xinclude/sword/rawcom.h
Xinclude/sword/rawfiles.h
Xinclude/sword/rawgbf.h
Xinclude/sword/rawld.h
Xinclude/sword/rawld4.h
Xinclude/sword/rawstr.h
Xinclude/sword/rawstr4.h
Xinclude/sword/rawtext.h
Xinclude/sword/rawverse.h
Xinclude/sword/regex.h
Xinclude/sword/roman.h
Xinclude/sword/rtfhtml.h
Xinclude/sword/rwphtml.h
Xinclude/sword/rwprtf.h
Xinclude/sword/sapphire.h
Xinclude/sword/strkey.h
Xinclude/sword/swcipher.h
Xinclude/sword/swcom.h
Xinclude/sword/swcomprs.h
Xinclude/sword/swconfig.h
Xinclude/sword/swdisp.h
Xinclude/sword/swdisprtf.h
Xinclude/sword/swdisprtfchap.h
Xinclude/sword/swfilter.h
Xinclude/sword/swkey.h
Xinclude/sword/swld.h
Xinclude/sword/swlocale.h
Xinclude/sword/swlog.h
Xinclude/sword/swmacs.h
Xinclude/sword/swmgr.h
Xinclude/sword/swmodule.h
Xinclude/sword/swobject.h
Xinclude/sword/swtext.h
Xinclude/sword/swunicod.h
Xinclude/sword/swwinlog.h
Xinclude/sword/tbdisp.h
Xinclude/sword/thmlgbf.h
Xinclude/sword/thmlhtml.h
Xinclude/sword/thmlolb.h
Xinclude/sword/thmlplain.h
Xinclude/sword/thmlrtf.h
Xinclude/sword/unicodertf.h
Xinclude/sword/unixstr.h
Xinclude/sword/untgz.h
Xinclude/sword/utilconf.h
Xinclude/sword/utilfuns.h
Xinclude/sword/utilstr.h
Xinclude/sword/versekey.h
Xinclude/sword/zcom.h
Xinclude/sword/zconf.h
Xinclude/sword/zipcomprs.h
Xinclude/sword/zlib.h
Xinclude/sword/ztext.h
Xinclude/sword/zverse.h
Xlib/libsword.a.1
Xlib/libsword.a
Xlib/libsword.so.1
Xlib/libsword.so
X@dirrm include/sword
X@dirrm share/sword
END-of-misc/sword/pkg-plist
echo x - misc/sword/Makefile
sed 's/^X//' >misc/sword/Makefile << 'END-of-misc/sword/Makefile'
X# New ports collection makefile for: sword
X# Date created: 22 may 2001
X# Whom: Willem van Engen <wvengen@stack.nl>
X#
X# $FreeBSD$
X#
X
XPORTNAME= sword
XPORTVERSION= 1.5.2
XCATEGORIES= misc
XMASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v1.5/ \
X http://www.crosswire.org/sword/download/ftpmirror/pub/sword/source/v1.5/ \
X http://ftp.sourceforge.net/pub/sourceforge/sword/
X
XMAINTAINER= wvengen@stack.nl
X
XUSE_GMAKE= yes
XINSTALLS_SHLIB= yes
X
XINCLUDES= Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \
X echomod.h entriesblk.h femain.h filemgr.h gbffootnotes.h \
X gbfheadings.h gbfhtml.h gbfmorph.h gbfplain.h gbfrtf.h \
X gbfstrongs.h gbfthml.h hrefcom.h listkey.h localemgr.h \
X lzsscomprs.h plainfootnotes.h plainhtml.h rawcom.h rawfiles.h \
X rawgbf.h rawld.h rawld4.h rawstr.h rawstr4.h rawtext.h \
X rawverse.h regex.h roman.h rtfhtml.h rwphtml.h rwprtf.h \
X sapphire.h strkey.h swcipher.h swcom.h swcomprs.h swconfig.h \
X swdisp.h swdisprtf.h swdisprtfchap.h swfilter.h swkey.h swld.h \
X swlocale.h swlog.h swmacs.h swmgr.h swmodule.h swobject.h \
X swtext.h swunicod.h swwinlog.h tbdisp.h thmlgbf.h thmlhtml.h \
X thmlolb.h thmlplain.h thmlrtf.h unicodertf.h unixstr.h untgz.h \
X utilconf.h utilfuns.h utilstr.h versekey.h zcom.h zconf.h \
X zipcomprs.h zlib.h ztext.h zverse.h
X
Xpre-build:
X @${ECHO} "instdir:= ${PREFIX}" >${WRKSRC}/localport.cfg
X
Xdo-install:
X ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib/libsword.a.1
X ${RM} -f ${PREFIX}/lib/libsword.a
X ${LN} -s ${PREFIX}/lib/libsword.a.1 ${PREFIX}/lib/libsword.a
X ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1
X ${RM} -f ${PREFIX}/lib/libsword.so
X ${LN} -s ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so
X @${ECHO} "[Install]" >${PREFIX}/etc/sword.conf
X @${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf
X ${MKDIR} ${DATADIR}
X ${MKDIR} ${PREFIX}/include/sword
X.for file in ${INCLUDES}
X ${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include/sword
X.endfor
X
Xpost-install: register
X @${ECHO} ""
X @${CAT} ${PKGMESSAGE}
X
Xregister:
X.if !defined(BATCH)
X @${ECHO} "Do you want to help the authors of SWORD to keep track of how many"
X @${ECHO} -n "people use this program and register now ? [y/n] "
X @read answer; \
X if [ x$$answer = xy -o x$$answer = xY ]; then \
X (cd ${WRKSRC}; ${GMAKE} register;); \
X fi
X.endif
X
X.include <bsd.port.mk>
END-of-misc/sword/Makefile
echo x - misc/sword/distinfo
sed 's/^X//' >misc/sword/distinfo << 'END-of-misc/sword/distinfo'
XMD5 (sword-1.5.2.tar.gz) = 6be465212e300672b5ab6502caf39baa
END-of-misc/sword/distinfo
exit
>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?200112121238.fBCCcev73291>