Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Apr 2000 03:51:24 -0500 (EST)
From:      Don Croyle <croyle@gelemna.ft-wayne.in.us>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/18309: Update www/amaya to 3.1
Message-ID:  <200004300851.DAA17300@gelemna.ft-wayne.in.us>

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

>Number:         18309
>Category:       ports
>Synopsis:       Update www/amaya to 3.1
>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 Apr 30 02:00:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Don Croyle
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
>Environment:

	

>Description:
These diffs update the www/amaya port to use the current release
distfile.

I missed version 3.0 while trying to implement SUSv2's wchar.h
recommendation, before it dawned on me that the contents of the header
weren't actually being used.  I am going to keep working on that
project.
	

>How-To-Repeat:

	

>Fix:
Apply this patch.  Note that a new file, patches/patch-ab needs to be
added.
	
diff -ruN amaya.old/Makefile amaya/Makefile
--- amaya.old/Makefile	Sun Apr  9 19:04:12 2000
+++ amaya/Makefile	Sat Apr 29 07:25:50 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amaya
-PORTVERSION= 	2.4
+PORTVERSION=	3.1
 CATEGORIES= 	www
 MASTER_SITES=	http://www.w3.org/Amaya/Distribution/ \
 		ftp://ftp.w3.org/pub/amaya/ \
diff -ruN amaya.old/files/md5 amaya/files/md5
--- amaya.old/files/md5	Sun Dec 26 09:23:24 1999
+++ amaya/files/md5	Sat Apr 29 05:54:17 2000
@@ -1,4 +1,4 @@
-MD5 (amaya/amaya-src-2.4.tgz) = 0116711b648aa15898fa017c7e761cff
+MD5 (amaya/amaya-src-3.1.tgz) = ee9cf1219c471eff5ac8403bc575312c
 MD5 (amaya/Dutch.tgz) = 3edb9cce5ce160d7270b23808c1d5981
 MD5 (amaya/English.tgz) = 0e95d11b4817094b8cd9aa4010363806
 MD5 (amaya/French.tgz) = 791bc87281b27f10a987815aa7d10108
diff -ruN amaya.old/patches/patch-aa amaya/patches/patch-aa
--- amaya.old/patches/patch-aa	Sat Nov 13 21:10:11 1999
+++ amaya/patches/patch-aa	Sun Apr 16 04:39:32 2000
@@ -1,11 +1,11 @@
---- ../amaya/Makefile.in.orig	Wed Oct 20 04:35:53 1999
-+++ ../amaya/Makefile.in	Tue Oct 26 18:05:51 1999
+--- ../amaya/Makefile.in.orig	Tue Mar  7 11:45:48 2000
++++ ../amaya/Makefile.in	Sun Apr 16 04:39:12 2000
 @@ -10,7 +10,7 @@
  include ../Options
  
  INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(X_FLAGS)
 -XMLIB   = -lXm
 +XMLIB   = ${MOTIFLIB} 
- LIBS	=  $(AMAYA_LIBWWW_LIBS) $(AMAYA_JAVA_LIBS) $(AMAYA_PLUGIN_LIBS) \
+ LIBS	=  $(AMAYA_LIBWWW_LIBS) $(AMAYA_PLUGIN_LIBS) \
  	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ANNOT_LIBS) \
            -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
diff -ruN amaya.old/patches/patch-ab amaya/patches/patch-ab
--- amaya.old/patches/patch-ab	Wed Dec 31 19:00:00 1969
+++ amaya/patches/patch-ab	Sat Apr 29 07:25:21 2000
@@ -0,0 +1,12 @@
+--- ../thotlib/include/ustring.h.orig	Sat Apr 29 07:22:29 2000
++++ ../thotlib/include/ustring.h	Sat Apr 29 07:24:07 2000
+@@ -7,7 +7,9 @@
+ #include <windows.h>
+ #endif /* _WINDOWS */
+ 
++#ifdef _I18N_
+ #include <wchar.h>
++#endif /* _I18N_ */
+ 
+ #ifdef _WINDOWS
+ #define strncasecmp _strnicmp
diff -ruN amaya.old/pkg/PLIST amaya/pkg/PLIST
--- amaya.old/pkg/PLIST	Sun Dec 26 09:23:25 1999
+++ amaya/pkg/PLIST	Sat Apr 29 08:00:07 2000
@@ -49,6 +49,10 @@
 Amaya/config/fr-amayamsg
 Amaya/config/fr-corrdialogue
 Amaya/config/fr-libdialogue
+Amaya/config/it-amayadialogue
+Amaya/config/it-amayamsg
+Amaya/config/it-corrdialogue
+Amaya/config/it-libdialogue
 Amaya/config/tr-amayadialogue
 Amaya/config/tr-amayamsg
 Amaya/config/tr-corrdialogue
@@ -142,7 +146,6 @@
 Amaya/doc/amaya/Numbering.html
 Amaya/doc/amaya/Printing.html
 Amaya/doc/amaya/Publishing.html
-Amaya/doc/amaya/Put.html
 Amaya/doc/amaya/Registry.html
 Amaya/doc/amaya/Searching.html
 Amaya/doc/amaya/Selecting.html


>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?200004300851.DAA17300>