o Update holiday file to year 2004 edition(for ja_JP.eucJP only).

o Fix X resources to enable vertical scrollbar on help window.
  whenNeeded had been assumed as Never from XFree86 4.0.
o Fix X resources to use roman font insted of italic or oblique
  (for ja_JP.eucJP only).

PR:		ports/59560
Submitted by:	Yoshihiko Sarumaru <mistral@imasy.or.jp> (maintainer)

4 files changed, 40 insertions, 17 deletions

diff --git a/deskutils/xcalendar/Makefile b/deskutils/xcalendar/Makefile
index 9bee6f58fffa..f5027093a4a0 100644
--- a/deskutils/xcalendar/Makefile
+++ b/deskutils/xcalendar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcalendar
-PORTVERSION=	4.0.2003
+PORTVERSION=	4.0.2004
 CATEGORIES=	deskutils
 MASTER_SITES=	ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 DISTNAME=	${PORTNAME}-4.0+i18n
diff --git a/deskutils/xcalendar/files/patch-ac b/deskutils/xcalendar/files/patch-ac
index a25f018d7bbf..171dda032003 100644
--- a/deskutils/xcalendar/files/patch-ac
+++ b/deskutils/xcalendar/files/patch-ac
@@ -1,5 +1,5 @@
 --- XCal-uj.sed.orig	Sun Oct  1 14:31:06 1995
-+++ XCal-uj.sed	Sun Mar 11 12:52:22 2001
++++ XCal-uj.sed	Sat Nov 22 00:58:44 2003
 @@ -3,7 +3,9 @@
  *showGrip:		False
  *calendar*internalBorderWidth: 0
@@ -68,12 +68,13 @@
  *succ*vertDistance: 0
  
 -*controls*date*fontSet:		8x13bold
-+*controls*date*fontSet:		8x13bold, -*--14-*
- *daynames*fontSet:			-*--14-*
+-*daynames*fontSet:			-*--14-*
 -*dayEditor*editorTitle*fontSet:	8x13bold
 -*helpWindow*editorTitle*fontSet:	8x13bold
-+*dayEditor*editorTitle*fontSet:	8x13bold, -*--14-*
-+*helpWindow*editorTitle*fontSet:	8x13bold, -*--14-*
++*controls*date*fontSet:		8x13bold, -*-r-*--14-*
++*daynames*fontSet:			-*-r-*--14-*
++*dayEditor*editorTitle*fontSet:	8x13bold, -*-r-*--14-*
++*helpWindow*editorTitle*fontSet:	8x13bold, -*-r-*--14-*
  
  *helpButton*vertDistance: 5
  *quitButton*vertDistance: 5
@@ -105,7 +106,12 @@
 -*prevday*highlightThickness: 0
 -*succday*highlightThickness: 0
 -*daybuttons*borderWidth: 0
--
++*dayEditor*fontSet:			-*-r-*--14-*
++*controls*fontSet:			-*-r-*--14-*
++*bcontrols*fontSet:			-*-r-*--14-*
++*editorControls*fontSet:		-*-r-*--14-*
++*fontSet: 				-*-r-*--14-*
+ 
 -*Scrollbar.borderWidth: 1
 -*editor.scrollVertical: whenNeeded
 -! *scrollHorizontal: False
@@ -116,12 +122,11 @@
 -*helpWindow*displayCaret: False
 -
 -
- *dayEditor*fontSet:			-*--14-*
- *controls*fontSet:			-*--14-*
- *bcontrols*fontSet:			-*--14-*
- *editorControls*fontSet:		-*--14-*
- *fontSet: 				-*--14-*
-+
+-*dayEditor*fontSet:			-*--14-*
+-*controls*fontSet:			-*--14-*
+-*bcontrols*fontSet:			-*--14-*
+-*editorControls*fontSet:		-*--14-*
+-*fontSet: 				-*--14-*
  !*preeditType: Root
  !*preeditType: OffTheSpot
  *preeditType: OverTheSpot
@@ -144,9 +149,10 @@
 +*daybuttons*borderWidth: 0
  
  *Scrollbar.borderWidth: 1
- *Text*scrollVertical: whenNeeded
+-*Text*scrollVertical: whenNeeded
 -*scrollHorizontal: False
 -*helpWindow*scrollHorizontal: True
++*Text*scrollVertical: always
 +*scrollHorizontal: Never
 +*helpWindow*scrollHorizontal: Always
  *holiday*cursorPositionVisible: False
diff --git a/deskutils/xcalendar/files/patch-af b/deskutils/xcalendar/files/patch-af
index 7ad3be5bc60c..3d0eea1db991 100644
--- a/deskutils/xcalendar/files/patch-af
+++ b/deskutils/xcalendar/files/patch-af
@@ -1,5 +1,5 @@
 --- XCalendar.sed.orig	Tue Jul  4 06:59:01 1995
-+++ XCalendar.sed	Sun Mar 11 11:39:52 2001
++++ XCalendar.sed	Sat Nov 22 03:05:34 2003
 @@ -2,7 +2,9 @@
  *showGrip:		False
  *calendar*internalBorderWidth: 0
@@ -11,12 +11,14 @@
  *resizable: True
  *title: XCalendar v.4.0
  *dayEditor.title: Day Editor
-@@ -120,8 +122,8 @@
+@@ -119,9 +121,9 @@
+ *daybuttons*borderWidth: 0
  
  *Scrollbar.borderWidth: 1
- *Text*scrollVertical: whenNeeded
+-*Text*scrollVertical: whenNeeded
 -*scrollHorizontal: False
 -*helpWindow*scrollHorizontal: True
++*Text*scrollVertical: Always
 +*scrollHorizontal: Never
 +*helpWindow*scrollHorizontal: Always
  *holiday*cursorPositionVisible: False
diff --git a/deskutils/xcalendar/files/xcalendar-uj.hol b/deskutils/xcalendar/files/xcalendar-uj.hol
index 07ec7abc9f5d..dd084ba3db93 100644
--- a/deskutils/xcalendar/files/xcalendar-uj.hol
+++ b/deskutils/xcalendar/files/xcalendar-uj.hol
@@ -51,3 +51,18 @@
 11/23/2003	勤労感謝の日
 11/24/2003	振替休日
 12/23/2003	天皇誕生日
+01/01/2004	元日
+01/12/2004	成人の日
+02/11/2004	建国記念の日
+03/20/2004	春分の日
+04/29/2004	みどりの日
+05/03/2004	憲法記念日
+05/04/2004	国民の休日
+05/05/2004	こどもの日
+07/19/2004	海の日
+09/20/2004	敬老の日
+09/23/2004	秋分の日
+10/11/2004	体育の日
+11/03/2004	文化の日
+11/23/2004	勤労感謝の日
+12/23/2004	天皇誕生日