Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Dec 2001 02:40:01 -0800 (PST)
From:      Willem van Engen <wvengen@stack.nl>
To:        freebsd-ports@FreeBSD.org
Subject:   Re: ports/32750: Update port: misc/sword-modules
Message-ID:  <200112131040.fBDAe1i21420@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/32750; it has been noted by GNATS.

From: Willem van Engen <wvengen@stack.nl>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/32750: Update port: misc/sword-modules
Date: Thu, 13 Dec 2001 11:31:35 +0100

 I already sent this message, but it didn't seem to have arrived. It must have
 been a typo in the subject.
 
 diff -ruN /usr/ports/misc/sword-modules/Makefile misc/sword-modules/Makefile
 --- /usr/ports/misc/sword-modules/Makefile	Tue Dec 11 10:37:43 2001
 +++ misc/sword-modules/Makefile	Wed Dec 12 11:53:32 2001
 @@ -2,11 +2,11 @@
  # Date created:   28 may 2001
  # Whom:           Willem van Engen <wvengen@stack.nl>
  #
 -# $FreeBSD: ports/misc/sword-modules/Makefile,v 1.1 2001/12/11 09:37:43 ijliao Exp $
 +# $FreeBSD$
  #
  
  PORTNAME=	sword-modules
 -PORTVERSION=	1.0
 +PORTVERSION=	1.1
  CATEGORIES=	misc
  MASTER_SITES=	ftp://ftp.crosswire.org/pub/sword/modules/raw/ \
  		http://www.crosswire.org/sword/download/ftpmirror/pub/sword/modules/raw/
 @@ -25,9 +25,9 @@
  # it's best not to use checksum. Besides, there is no version number on modules.
  NO_CHECKSUM=	yes
  
 +MODULE_FILES=
  SETDIR=	${WRKDIRPREFIX}${.CURDIR}
 -MODFILE=	${SETDIR}/selected.mods
 -MODFILE_WITHDIR=${SETDIR}/selected.mods.withdir
 +MODFILE=	${SETDIR}/Makefile.sel
  SCRIPTS_ENV=	SETDIR="${SETDIR}" \
  	TOUCH="${TOUCH}" \
  	MKDIR="${MKDIR}" \
 @@ -40,27 +40,27 @@
  	BUILD="${PACKAGE_BUILDING}" \
  	DIST_SUBDIR="${DIST_SUBDIR}" \
  	MODFILE="${MODFILE}" \
 -	MODFILE_WITHDIR="${MODFILE_WITHDIR}" \
  	BATCH="${BATCH}"
 -MODULE_FILES=	`${CAT} ${MODFILE}`
 -# XXX The regex for _CKSUMFILES in bsd.port.mk can't handle the backquotes
 -#     in MODULE_FILES. It substitutes the command instead of it's result.
 -_CKSUMFILES=	`${CAT} ${MODFILE_WITHDIR}`
  
  DIRNAME?=	${BASENAME:S/basename/dirname/}
  SORT?=		sort
  
  .if !exists(${MODFILE})
  pre-fetch:	select
 +.else
 +.include <${MODFILE}>
 +pre-fetch:
  .endif
 +	@${MAKE} do-fetch		# XXX Not sure if this is needed
  
  select:
  	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.swmods
  
  post-clean:
 -	@${RM} -f ${MODFILE} ${MODFILE_WITHDIR}
 +	@${RM} -f ${MODFILE}
  
  do-install:
 +	@${MKDIR} -p ${PREFIX}/share/sword
  	@for i in ${MODULE_FILES}; do \
  		${EXTRACT_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/$${i} -d ${PREFIX}/share/sword; \
  	 done
 diff -ruN /usr/ports/misc/sword-modules/scripts/bibles.list misc/sword-modules/scripts/bibles.list
 --- /usr/ports/misc/sword-modules/scripts/bibles.list	Tue Dec 11 10:37:43 2001
 +++ misc/sword-modules/scripts/bibles.list	Wed Dec 12 01:05:45 2001
 @@ -1,83 +1,94 @@
 -ASV	"1901 American Standard Version"
 -KJV	"King James Version of 1611 w/ Strongs Numbers"
 -BBE	"1965 Bible in Basic English"
 -Websters	"The Webster Bible"
 -RWebster	"Revised 1833 Webster Version (RWEBSTER)"
 -Weymouth	"1912 Weymouth NT"
 -ORTHJBC	"The Orthodox Jewish Brit Chadasha"
 -Rotherham	"The Emphasized Bible by J. B. Rotherham"
 -YLT	"1898 Young's Literal Translation"
 -ISV	"International Standard Version"
 -Darby	"1889 Darby Bible"
 -AKJV	"American King James Version"
 -RNKJV	"Restored Name King James Version"
 -WEB	"The World English Bible"
 -HNV	"The Hebrew Names Version of the World English Bible"
 -DRA	"The Douay-Rheims 1899 American Edition"
 -LO	"The Living Oracles NT"
 -DR	"Douay-Rheims Bible"
 -Murdock	"James Murdock's Translation of the Syriac Peshitta"
 -JPS	"Jewish Publication Society Old Testament"
 -Twenty	"The Twentieth Century New Testament"
 -Montgomery	"Montgomery New Testament"
 -Byz	"1991 Byzantine/Majority Text"
 -ByzX	"1991 Byzantine/Majority Text - Roman Transliterated"
 -LXX	"Septuagint (LXX)"
 -LXXX	"Septuagint (LXX) - Roman Transliterated"
 -IGNT	"Interlinear Greek New Testament"
 -Tisch	"Tischendorf's Eighth Edition GNT"
 -UMGreek	"Unaccented Modern Greek Text"
 -Stephanus	"1550 Stephanus Textus Receptus"
 -StephanusX	"1550 Stephanus Textus Receptus - Roman Transliterated"
 -WH	"1881 Westcott-Hort Greek Text"
 -WHNU	"Westcott-Hort with NA27U4 variants"
 -Scrivner	"1894 Scrivener Textus Receptus"
 -ScrivnerX	"1894 Scrivener Textus Receptus - Roman Transliterated"
 -Vulgate	"Latin Vulgate"
 -Vulgate_HebPs	"Latin Vulgate Psalms from Hebrew"
 -GerSch	"German 1951 Schlachter Bibel"
 -GerLut	"German 1912 Luther"
 -GerBen	"German Bengel NT"
 -GerLut1545	"German 1545 Luther"
 -Dan	"Danske Bibel (Danish Bible)"
 -Icelandic	"Icelandic Bible"
 -FinPR	"Finnish 1938 Phy Raamattu"
 -SweSVE	"Swedish Bible 1917 New Testament"
 -Norsk	"Norsk (Norwegian) Bible"
 -ManxGaelic	"Gaelic Scripture Portions"
 -ScotsGaelic	"Gaelic Gospel of Mark"
 -Turkish	"Turkish NT"
 -RomCor	"Romanian Cornilescu Version"
 -CzeNKB	"Nova kralicka Bible"
 -CzeKMS	"Preklad KMS Nova smlouva"
 -CzeBKR	"Czech Bible Kralicka"
 -CzeCEP	"Czech Ekumenicky Cesky preklad"
 -HunKar	"Hungarian Karoli"
 -Swahili	"Swahili New Testament"
 -ChiGU-B5	"Chinese Glory Union Bible (Big5)"
 -ChiGU-UTF8	"Chinese Glory Union Bible (UTF8)"
 -ChiGU-GB	"Chinese Glory Union Bible (GB2312)"
 -Viet	"1934 Vietnamese Bible"
 -Korean	"Korean Bible"
 -Maori	"Maori Bible"
 -IndTB	"Indonesian Terjemahan Baru"
 -IndBIS	"Indonesian Bahasa Indonesia Sehari-hari"
 -IndTL	"Indonesian Terjemahan Baru"
 -ArabicLtoR	"Arabic Bible - Left to Right"
 -Arabic	"Arabic Bible"
 -ItaLND	"Italian 1991 La Nuova Diodati"
 -ItaNRV	"Italian 1994 La Sacra Bibbia Nuova Riveduta"
 -SpaSEV	"Spanish 1569 Sagradas Escrituras Version Antigua"
 -SpaRV	"Spanish Reina-Valera"
 -SpaVNT	"Spanish Valera 1858 Spanish New Testament Text"
 -Esperanto	"Esperanto Bible"
 -FreLSG	"French 1910 Louis Segond"
 -FreCrl	"French Haitian Creole Version"
 -Uma	"Uma New Testament"
 -Mel	"Melanesian Pidgin Bible"
 -Latvian	"Latvian New Testament"
 -Xhosa	"Xhosa Bible"
 -Tagalog	"Tagalog (John & James)"
 -Ketchi	"Ketchi Bible"
 -GothicA	"Gothic Codex Ambr. A & Mss."
 -GothicB	"Gothic Codex Ambr. B & Car."
 +AraSVD	"Smith & Van Dyke Arabic Bible" 
 +Bulgarian	"Bulgarian Bible" 
 +CzeBKR	"Czech Bible Kralicka" 
 +CzeCEP	"Czech Ekumenicky Cesky preklad" 
 +CzeKMS	"Czech Preklad KMS Nova smlouva" 
 +CzeNKB	"Czech Nova kralicka Bible" 
 +Dan	"Danske Bibel" 
 +GerBen	"German Bengel NT" 
 +GerLut	"German 1912 Luther" 
 +GerLut1545	"German 1545 Luther" 
 +GerSch	"German 1951 Schlachter Bibel" 
 +UMGreek	"Unaccented Modern Greek Text" 
 +AKJV	"American King James Version" 
 +ASV	"1901 American Standard Version" 
 +BBE	"1965 Bible in Basic English" 
 +Common	"The Common Edition: New Testament" 
 +DR	"Douay-Rheims Bible" 
 +DRA	"Douay-Rheims 1899 American Edition" 
 +Darby	"1889 Darby Bible" 
 +HNV	"Hebrew Names Version of the World English Bible" 
 +IGNT	"Interlinear Greek New Testament" 
 +ISV	"International Standard Version" 
 +JPS	"Jewish Publication Society Old Testament" 
 +KJV	"King James Version of 1611 w/ Strongs Numbers" 
 +LO	"The Living Oracles NT" 
 +Montgomery	"Montgomery New Testament" 
 +Murdock	"James Murdock's Translation of the Syriac Peshitta" 
 +ORTHJBC	"The Orthodox Jewish Brit Chadasha" 
 +RNKJV	"Restored Name King James Version" 
 +RSV	"Revised Standard Version" 
 +RWebster	"Revised 1833 Webster Version" 
 +Rotherham	"The Emphasized Bible by J. B. Rotherham" 
 +Twenty	"Twentieth Century New Testament" 
 +WEB	"World English Bible" 
 +Websters	"Webster Bible" 
 +WesleyNT	"John Wesley NT" 
 +Weymouth	"1912 Weymouth NT" 
 +YLT	"1898 Young's Literal Translation" 
 +Esperanto	"Esperanto Bible" 
 +SpaRV	"Spanish Reina-Valera" 
 +SpaSEV	"Spanish 1569 Sagradas Escrituras Version Antigua" 
 +SpaVNT	"Spanish 1858 Valera New Testament" 
 +Est	"Estonian Bible" 
 +FinPR	"Finnish 1938 PhyZ Raamattu" 
 +FreLSG	"French 1910 Louis Segond" 
 +GothicA	"Gothic Codex Ambr. A & Mss." 
 +GothicB	"Gothic Codex Ambr. B & Car." 
 +Byz	"1991 Byzantine/Majority Text" 
 +LXX	"Septuagint" 
 +LXXM	"Septuagint, Morphologically Tagged Rahlfs'" 
 +Scrivner	"1894 Scrivener Textus Receptus" 
 +Stephanus	"1550 Stephanus Textus Receptus" 
 +Tisch	"Tischendorf's Eighth Edition GNT" 
 +WH	"1881 Westcott-Hort Greek Text" 
 +WHNU	"Westcott-Hort with NA27U4 variants" 
 +ManxGaelic	"Manx Gaelic Scripture Portions" 
 +FreCrl	"French Haitian Creole Version" 
 +Aleppo	"Aleppo Codex" 
 +BHS	"Biblia Hebraica Stuttgartensia" 
 +HebModern	"Modern Hebrew Bible" 
 +HunKar	"Hungarian Karoli" 
 +IndBIS	"Indonesian Bahasa Indonesia Sehari-hari" 
 +IndTB	"Indonesian Terjemahan Baru" 
 +IndTL	"Indonesian Terjemahan Baru" 
 +Icelandic	"Icelandic Bible" 
 +ItaLND	"Italian 1991 La Nuova Diodati" 
 +ItaNRV	"Italian 1994 La Sacra Bibbia Nuova Riveduta" 
 +JapKUG	"Japanese JKUG Translation" 
 +JapSNKI	"Japanese JSNKI Translation" 
 +Ketchi	"Ketchi Bible" 
 +Korean	"Korean Bible" 
 +Vulgate	"Latin Vulgate" 
 +Vulgate_HebPs	"Latin Vulgate Psalms from Hebrew" 
 +Latvian	"Latvian New Testament" 
 +Maori	"Maori Bible" 
 +DutSVV	"Dutch Statenvertaling" 
 +Norsk	"Norsk Bibelen" 
 +Mel	"Melanesian Pidgin Bible" 
 +Uma	"Uma New Testament" 
 +PorAA	"Portuguese Joao Ferreira de Almeida Atualizada" 
 +RomCor	"Romanian Cornilescu Version" 
 +RST	"Russian Synodal Translation" 
 +RusMakarij	"The Pentateuch of Moses in Russian" 
 +ScotsGaelic	"Scots Gaelic Gospel of Mark" 
 +ALB	"Albanian Bible" 
 +SweSVE	"Swedish Bible 1917 New Testament" 
 +Swahili	"Swahili New Testament" 
 +ThaiKJV	"Thai KJV" 
 +Tagalog	"Tagalog (John & James)" 
 +Turkish	"Turkish NT" 
 +Ukrainian	"Ukrainian Bible" 
 +Viet	"1934 Vietnamese Bible" 
 +Xhosa	"Xhosa Bible" 
 +ChiGU	"Chinese Glory Union Bible" 
 diff -ruN /usr/ports/misc/sword-modules/scripts/comments.list misc/sword-modules/scripts/comments.list
 --- /usr/ports/misc/sword-modules/scripts/comments.list	Tue Dec 11 10:37:43 2001
 +++ misc/sword-modules/scripts/comments.list	Wed Dec 12 01:05:45 2001
 @@ -1,12 +1,19 @@
 -Personal	"Personal Commentary" 
 -Family	"Family Bible Notes" 
 +MAK	"Matthias Ansorgs Kommentar" 
 +Rieger	"Carl Heinrich Riegers Kommentar" 
 +Barnes	"Barnes' New Testament Notes" 
 +Clarke	"Adam Clarke's Commentary on the Bible" 
  DTN	"Darby Translation Notes" 
 +Family	"Family Bible Notes" 
  Geneva	"Geneva Bible Translation Notes" 
 -MAK	"Matthias Ansorgs Kommentar" 
 +JFB	"Jamieson Fausset Brown Bible Commentary" 
 +MHC	"Matthew Henry's Complete Commentary on the Whole Bible" 
  MHCC	"Matthew Henry's Concise Commentary on the Whole Bible" 
  PNT	"The People's New Testament" 
 +Personal	"Personal Commentary" 
  RWP	"Robertson's Word Pictures" 
 -Rieger	"Carl Heinrich Riegers Kommentar" 
 +Scofield	"Scofield Reference Notes, 1917 Edition" 
 +TDavid	"C. H. Spurgeon's Treasury of David" 
  TFG	"The Fourfold Gospel and Commentary on Acts of Apostles" 
  TSK	"Treasury of Scriptural Knowledge" 
  Wesley	"John Wesley's Notes on the Bible" 
 +DutKant	"Kanttekeningen Statenvertaling" 
 diff -ruN /usr/ports/misc/sword-modules/scripts/configure.swmods misc/sword-modules/scripts/configure.swmods
 --- /usr/ports/misc/sword-modules/scripts/configure.swmods	Tue Dec 11 10:37:43 2001
 +++ misc/sword-modules/scripts/configure.swmods	Wed Dec 12 10:34:19 2001
 @@ -1,5 +1,5 @@
  #!/bin/sh
 -# $FreeBSD: ports/misc/sword-modules/scripts/configure.swmods,v 1.1 2001/12/11 09:37:43 ijliao Exp $
 +# $FreeBSD$
  
  SED=${SED:-/usr/bin/sed}
  MKTEMP=${MKTEMP:-/usr/bin/mktemp}
 @@ -15,10 +15,11 @@
  	while [ $choosedone != 1 ]; do
  		/usr/bin/dialog --title "SWORD Modules" --clear \
  			--menu "\n\
 -Please select desired modules in each section:" -1 -1 5 \
 +Please select desired modules in each section:" -1 -1 6 \
  Bibles		"Select biblical texts" \
  Lexicons	"Select lexicons / dictionaries" \
  Comments	"Select commentaries" \
 +Devotionals	"Select daily devotionals" \
  Cults		"Select cults / unorthodox / questionnable modules" \
  Done		"Done" \
  2> $tmpfile
 @@ -42,6 +43,10 @@
  				dialog_select ${SCRIPTDIR}/comments.list selcomments "$selcomments"
  				;;
  
 +			"Devotionals")
 +				dialog_select ${SCRIPTDIR}/devotionals.list seldevotionals "$seldevotionals"
 +				;;
 +
  			"Cults")
  				dialog_select ${SCRIPTDIR}/cults.list selcults "$selcults"
  				;;
 @@ -117,6 +122,7 @@
  	selbibles="ASV KJV WEB"
  	sellexicons="StrongsGreek StrongsHebrew"
  	selcomments="Personal TSK"
 +	seldevotionals=""
  	selcults=""
  fi
  
 @@ -128,9 +134,8 @@
  	mkdir ${SETDIR}
  fi
  
 -rm -f ${MODFILE} ${MODFILE_WITHDIR}
 -for module in $selbibles $sellexicons $selcomments $selcults; do
 -	echo -n "${module}.zip " >>${MODFILE}
 -	echo -n "${DIST_SUBDIR}/${module}.zip " >>${MODFILE_WITHDIR}
 +echo "# Automatically generated file - manual changes may be lost" >${MODFILE}
 +for module in $selbibles $sellexicons $selcomments $selcults $seldevotionals; do
 +	echo "MODULE_FILES += ${module}.zip " >>${MODFILE}
  done
  
 diff -ruN /usr/ports/misc/sword-modules/scripts/devotionals.list misc/sword-modules/scripts/devotionals.list
 --- /usr/ports/misc/sword-modules/scripts/devotionals.list	Thu Jan  1 01:00:00 1970
 +++ misc/sword-modules/scripts/devotionals.list	Wed Dec 12 01:05:45 2001
 @@ -0,0 +1,20 @@
 +losung_de_89	"1989 Losung auf deutsch" 
 +losung_de_90	"1990 Losung auf deutsch" 
 +losung_de_91	"1991 Losung auf deutsch" 
 +losung_de_92	"1992 Losung auf deutsch" 
 +losung_de_93	"1993 Losung auf deutsch" 
 +losung_de_94	"1994 Losung auf deutsch" 
 +losung_de_95	"1995 Losung auf deutsch" 
 +losung_de_96	"1996 Losung auf deutsch" 
 +losung_de_97	"1997 Losung auf deutsch" 
 +losung_de_98	"1998 Losung auf deutsch" 
 +losung_de_99	"1999 Losung auf deutsch" 
 +DBD	"Day By Day By Grace - Bob Hoekstra" 
 +Daily	"Jonathan Bagster's Daily Light on the Daily Path" 
 +SME	"C. H. Spurgeon's Morning and Evening: Daily Readins" 
 +losung_en_96	"1996 Watchwords (Losung) in English" 
 +losung_en_97	"1997 Watchwords (Losung) in English" 
 +losung_en_98	"1998 Watchwords (Losung) in English" 
 +losung_en_99	"1999 Watchwords (Losung) in English" 
 +losung_es_99	"1999 Watchwords (Losung) en Castellano" 
 +losung_nl_99	"1999 Watchwords (Losung) in Dutch" 
 diff -ruN /usr/ports/misc/sword-modules/scripts/lexicons.list misc/sword-modules/scripts/lexicons.list
 --- /usr/ports/misc/sword-modules/scripts/lexicons.list	Tue Dec 11 10:37:43 2001
 +++ misc/sword-modules/scripts/lexicons.list	Wed Dec 12 01:07:01 2001
 @@ -1,27 +1,15 @@
 +AmTract	"American Tract Society Bible Dictionary" 
  BDB	"Brown-Driver-Briggs Hebrew Lexicon" 
  Eastons	"Easton's Bible Dictionary" 
  Hitchcocks	"Hitchcock's Bible Names" 
  ISBE	"International Standard Bible Encyclopedia" 
  Naves	"Nave's Topical Bible" 
 +Packard	"Packard's Morphological Analysis Codes" 
  Smiths	"Smith's Bible Dictionary" 
  StrongsGreek	"Strong's Greek Bible Dictionary" 
  StrongsHebrew	"Strong's Hebrew Bible Dictionary" 
  Thayer	"Thayer's Greek Lexicon" 
  Torrey	"R. A. Torrey's New Topical Textbook" 
 -losung_de_89	"1989 Losung auf deutsch" 
 -losung_de_90	"1990 Losung auf deutsch" 
 -losung_de_91	"1991 Losung auf deutsch" 
 -losung_de_92	"1992 Losung auf deutsch" 
 -losung_de_93	"1993 Losung auf deutsch" 
 -losung_de_94	"1994 Losung auf deutsch" 
 -losung_de_95	"1995 Losung auf deutsch" 
 -losung_de_96	"1996 Losung auf deutsch" 
 -losung_de_97	"1997 Losung auf deutsch" 
 -losung_de_98	"1998 Losung auf deutsch" 
 -losung_de_99	"1999 Losung auf deutsch" 
 -losung_en_96	"1996 Watchwords (Losung) in English" 
 -losung_en_97	"1997 Watchwords (Losung) in English" 
 -losung_en_98	"1998 Watchwords (Losung) in English" 
 -losung_en_99	"1999 Watchwords (Losung) in English" 
 -losung_es_99	"1999 Watchwords (Losung) en Castellano" 
 -losung_nl_99	"1999 Watchwords (Losung) in Dutch" 
 +WebstersDict	"Webster's Revised Unabridged English Dictionary 1913" 
 +GreekHebrew	"Greek to Hebrew Dictionary of Septuagint Words" 
 +HebrewGreek	"Hebrew to Greek Dictionary of Septuagint Words" 

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?200112131040.fBDAe1i21420>