Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Dec 1999 21:38:53 -0500 (EST)
From:      Don Croyle <croyle@gelemna.ft-wayne.in.us>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/15576: Update www/amaya to 2.4
Message-ID:  <199912200238.VAA58151@gelemna.ft-wayne.in.us>

next in thread | raw e-mail | index | archive | help

>Number:         15576
>Category:       ports
>Synopsis:       Update www/amaya to 2.4
>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:   Sun Dec 19 18:40:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Don Croyle
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
>Environment:

	

>Description:
These diffs update the www/amaya port to build the new version 2.4
(2.3 was an unannounced pre-release).

They've made several more spell-checking dictionaries available, which
vastly increased the amount of tapdancing needed allow for selectively
installing them.  It would be easier just to install them all, but
does anyone actually use the things?

Oh, well.  At least the way I have it set up now, adding more will be
simple.
	

>How-To-Repeat:

	

>Fix:
Apply this patch:	
	
diff -ruN amaya.old/Makefile amaya/Makefile
--- amaya.old/Makefile	Sat Nov 13 21:09:58 1999
+++ amaya/Makefile	Sun Dec 19 20:51:00 1999
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	amaya
-# Version required:	2.2
+# Version required:	2.4
 # Date created:		26 Dec 1998
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD: ports/www/amaya/Makefile,v 1.7 1999/11/14 02:09:58 steve Exp $
 #
 
-DISTNAME=	amaya-src-2.2
-PKGNAME=	amaya-2.2
+DISTNAME=	amaya-src-2.4
+PKGNAME=	amaya-2.4
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
@@ -22,11 +22,21 @@
 
 DIST_SUBDIR=	amaya
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-.ifdef ENGLISH_DICT
-DISTFILES+=	English.tar.gz
+
+DICT?=		none
+
+.if ${DICT} != "none"
+.if ${DICT} == "all"
+DISTFILES+=	Dutch.tgz
+DISTFILES+=	English.tgz
+DISTFILES+=	French.tgz
+DISTFILES+=	German.tgz
+DISTFILES+=	Italian.tgz
+DISTFILES+=	Spanish.tgz
+DISTFILES+=	Swedish.tgz
+.else
+DISTFILES+= 	${DICT:S/$/.tgz/g}
 .endif
-.ifdef FRENCH_DICT
-DISTFILES+=	French.tar.gz
 .endif
 
 WRKSRC=		${WRKDIR}/Amaya/obj
@@ -36,9 +46,9 @@
 CONFIGURE_ARGS=	--with-amaya
 
 pre-fetch:
-.if !defined(ENGLISH_DICT) && !defined(FRENCH_DICT)
-	@${ECHO_MSG} To enable spell checking, define either
-	@${ECHO_MSG} ENGLISH_DICT or FRENCH_DICT
+.if ${DICT} == "none"
+	@${ECHO_MSG} Several spellchecking dictionaries are available.  To use
+	@${ECHO_MSG} one of them, define DICT to be the appropriate language.
 .endif
 
 post-extract:
@@ -51,18 +61,13 @@
 .for file in amaya print
 	strip ${PREFIX}/Amaya/applis/bin/${file}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html ${PREFIX}/Amaya/amaya/
-.ifdef ENGLISH_DICT
-	${INSTALL_DATA} ${WRKDIR}/dicopar/Eprinc.dic ${PREFIX}/Amaya/dicopar/
-	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${ECHO} Amaya/dicopar/Eprinc.dic > ${TMPPLIST}
-	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
-	${RM} ${TMPPLIST}.new
-.endif
-.ifdef FRENCH_DICT
-	${INSTALL_DATA} ${WRKDIR}/dicopar/Fprinc.dic ${PREFIX}/Amaya/dicopar/
+	${INSTALL_DATA} ${WRKSRC}/../amaya/COPYRIGHT.html\
+	${PREFIX}/Amaya/amaya/
+.if ${DICT} != "none"
+	${INSTALL_DATA} ${WRKDIR}/*.dic ${PREFIX}/Amaya/dicopar/
 	${MV} ${TMPPLIST} ${TMPPLIST}.new
-	${ECHO} Amaya/dicopar/Fprinc.dic > ${TMPPLIST}
+	cd ${WRKDIR} && ls -1 *.dic | perl -pi -e 's|^|Amaya/dicopar/|'\
+	> ${TMPPLIST}
 	${CAT} ${TMPPLIST}.new >> ${TMPPLIST}
 	${RM} ${TMPPLIST}.new
 .endif
diff -ruN amaya.old/files/md5 amaya/files/md5
--- amaya.old/files/md5	Sat Nov 13 21:10:08 1999
+++ amaya/files/md5	Sun Dec 19 16:35:07 1999
@@ -1,3 +1,8 @@
-MD5 (amaya/amaya-src-2.2.tgz) = 0ba0f33f02e4e6ae5083feaf153c9ace
-MD5 (amaya/English.tar.gz) = db59f59244fbc6698934aeefd6f5e53e
-MD5 (amaya/French.tar.gz) = c18bd862588d187b86c5c0c4d0cfd306
+MD5 (amaya/amaya-src-2.4.tgz) = 0116711b648aa15898fa017c7e761cff
+MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
+MD5 (amaya/English.tgz) = 0e95d11b4817094b8cd9aa4010363806
+MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
+MD5 (amaya/German.tgz) = 400eeeae974a64d23de4fcdd609c30bc
+MD5 (amaya/Italian.tgz) = 05e2d25ee8af11faaaa25a33da89d504
+MD5 (amaya/Spanish.tgz) = b504a75cd0f789a3046bf2041067b18b
+MD5 (amaya/Swedish.tgz) = 6536ab2e31e3f58618ba79d9fddc7f76
diff -ruN amaya.old/pkg/PLIST amaya/pkg/PLIST
--- amaya.old/pkg/PLIST	Sat Nov 13 21:10:12 1999
+++ amaya/pkg/PLIST	Sun Dec 19 17:39:43 1999
@@ -39,22 +39,20 @@
 Amaya/config/amaya.keyboard
 Amaya/config/de-amayadialogue
 Amaya/config/de-amayamsg
+Amaya/config/de-corrdialogue
 Amaya/config/de-libdialogue
 Amaya/config/en-amayadialogue
 Amaya/config/en-amayamsg
 Amaya/config/en-corrdialogue
 Amaya/config/en-libdialogue
-Amaya/config/en-transdialogue
 Amaya/config/fr-amayadialogue
 Amaya/config/fr-amayamsg
 Amaya/config/fr-corrdialogue
 Amaya/config/fr-libdialogue
-Amaya/config/fr-transdialogue
 Amaya/config/tr-amayadialogue
 Amaya/config/tr-amayamsg
 Amaya/config/tr-corrdialogue
 Amaya/config/tr-libdialogue
-Amaya/config/tr-transdialogue
 Amaya/config/unix-thot.rc
 Amaya/dicopar/alphabet
 Amaya/dicopar/american.ptn
@@ -91,6 +89,7 @@
 Amaya/doc/Icons/ProfilesMenu.gif
 Amaya/doc/Icons/ProxyMenu.gif
 Amaya/doc/Icons/PublishMenu.gif
+Amaya/doc/Icons/Reload.png
 Amaya/doc/Icons/SaveAs.gif
 Amaya/doc/Icons/SourceJava.gif
 Amaya/doc/Icons/Sources.gif
@@ -119,23 +118,28 @@
 Amaya/doc/Icons/up.gif
 Amaya/doc/Icons/warning.gif
 Amaya/doc/Icons/w3c-amaya.gif
+Amaya/doc/amaya/Access.html
 Amaya/doc/amaya/Attributes.html
-Amaya/doc/amaya/Autoconf.html
-Amaya/doc/amaya/BinDist.html
 Amaya/doc/amaya/Browsing.html
 Amaya/doc/amaya/CSS.html
 Amaya/doc/amaya/Changing.html
 Amaya/doc/amaya/Configure.html
 Amaya/doc/amaya/Creating.html
+Amaya/doc/amaya/HTML-elements/40styling.html
+Amaya/doc/amaya/HTML-elements/address.html
+Amaya/doc/amaya/HTML-elements/headings.html
+Amaya/doc/amaya/HTML-elements/infoTypes.html
+Amaya/doc/amaya/HTML-elements/inline.html
+Amaya/doc/amaya/HTML-elements/lists.html
+Amaya/doc/amaya/HTML-elements/structure.html
+Amaya/doc/amaya/HTML.html
 Amaya/doc/amaya/ImageMaps.html
 Amaya/doc/amaya/Keyboard.html
 Amaya/doc/amaya/Links.html
 Amaya/doc/amaya/MakeBook.html
 Amaya/doc/amaya/Manual.html
 Amaya/doc/amaya/Math.html
-Amaya/doc/amaya/New.html
 Amaya/doc/amaya/Numbering.html
-Amaya/doc/amaya/Plugins.html
 Amaya/doc/amaya/Printing.html
 Amaya/doc/amaya/Publishing.html
 Amaya/doc/amaya/Put.html
@@ -159,6 +163,7 @@
 @dirrm Amaya/config
 @dirrm Amaya/dicopar
 @dirrm Amaya/doc/Icons
+@dirrm Amaya/doc/amaya/HTML-elements
 @dirrm Amaya/doc/amaya
 @dirrm Amaya/doc
 @dirrm Amaya/fonts


>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?199912200238.VAA58151>