Date: Wed, 12 Dec 2001 13:50:02 -0800 (PST) From: Willem van Engen <wvengen@stack.nl> To: freebsd-ports@FreeBSD.org Subject: Re: ports/32751: Update port: misc/sword new version 1.5.2 Message-ID: <200112122150.fBCLo2E84469@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/32751; it has been noted by GNATS. From: Willem van Engen <wvengen@stack.nl> To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/32751: Update port: misc/sword new version 1.5.2 Date: Wed, 12 Dec 2001 22:43:15 +0100 Sorry that I didn't send a diff right away, but here it is: diff -ruN /usr/ports/misc/sword/Makefile misc/sword/Makefile --- /usr/ports/misc/sword/Makefile Tue Dec 11 10:36:32 2001 +++ misc/sword/Makefile Wed Dec 12 22:19:44 2001 @@ -2,11 +2,11 @@ # Date created: 22 may 2001 # Whom: Willem van Engen <wvengen@stack.nl> # -# $FreeBSD: ports/misc/sword/Makefile,v 1.1 2001/12/11 09:36:32 ijliao Exp $ +# $FreeBSD$ # 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,27 +19,32 @@ 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 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib/libsword.a.1 + ${RM} -f ${PREFIX}/lib/libsword.a + ${LN} -s ${PREFIX}/lib/libsword.a.1 ${PREFIX}/lib/libsword.a ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1 + ${RM} -f ${PREFIX}/lib/libsword.so ${LN} -s ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so - ${INSTALL_DATA} ${FILESDIR}/sword.conf ${PREFIX}/etc + @${ECHO} "[Install]" >${PREFIX}/etc/sword.conf + @${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf ${MKDIR} ${DATADIR} ${MKDIR} ${PREFIX}/include/sword .for file in ${INCLUDES} diff -ruN /usr/ports/misc/sword/distinfo misc/sword/distinfo --- /usr/ports/misc/sword/distinfo Tue Dec 11 10:36:32 2001 +++ misc/sword/distinfo Wed Dec 12 01:36:46 2001 @@ -1 +1 @@ -MD5 (sword-1.5.1a.tar.gz) = c46dc38018183600a472620fd97c9287 +MD5 (sword-1.5.2.tar.gz) = 6be465212e300672b5ab6502caf39baa diff -ruN /usr/ports/misc/sword/files/patch-Makefile.cfg misc/sword/files/patch-Makefile.cfg --- /usr/ports/misc/sword/files/patch-Makefile.cfg Tue Dec 11 10:36:33 2001 +++ misc/sword/files/patch-Makefile.cfg Wed Dec 12 02:00:36 2001 @@ -1,12 +1,21 @@ ---- Makefile.cfg.orig Mon Nov 6 14:17:22 2000 -+++ Makefile.cfg Wed Jun 27 14:46:28 2001 +--- Makefile.cfg.orig Wed Dec 12 00:56:50 2001 ++++ Makefile.cfg Wed Dec 12 00:57:18 2001 @@ -1,4 +1,5 @@ # General defines +include ${root}/localport.cfg - version := 1.5.1a + version := 1.5.2 + +@@ -6,7 +7,7 @@ + # ownership (used by 'make install') + + user := root +-group := root ++group := wheel -@@ -19,18 +20,18 @@ + + # this WILL NOT WORK for you. only inhouse patched version of +@@ -27,7 +28,7 @@ # shared library- set to yes if you would like to build @@ -15,39 +24,19 @@ # 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 @@ - - # ownership (used by 'make install') - --user := root -+user := sword - group := sword - +@@ -60,8 +61,6 @@ # paths --instdir := /usr/local/sword/ - +-instdir := /usr +- bindir := ${instdir}/bin libdir := ${instdir}/lib -@@ -74,9 +74,9 @@ - - WARNINGS = -Wall -Wno-format + hdir := ${instdir}/include/sword +@@ -80,16 +79,16 @@ + WARNINGS = -Wall -Wno-format -pedantic #WARNINGS += -Werror + WARNINGS += -pedantic -CFLAGS = -pipe $(WARNINGS) $(DEBUG) +CFLAGS += -pipe $(WARNINGS) $(DEBUG) @@ -56,25 +45,36 @@ ifeq ($(system),macosx) CPPFLAGS += -I/System/Library/Frameworks/System.framework/Headers/ endif -@@ -89,7 +89,7 @@ + CPPFLAGS += $(DEFINES) + + LFLAGS = $(OPTIMIZE) $(DEBUG) -L${root}/lib/ +-LIBS = -lsword -lstdc++ ++LIBS += -lsword -lstdc++ + + ifeq ($(zlib),no) + CFLAGS += -DEXCLUDEZLIB +@@ -97,9 +96,9 @@ LIBS += -lz endif 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?200112122150.fBCLo2E84469>