From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 21 07:20:02 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D513216A4CE for ; Mon, 21 Mar 2005 07:20:02 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88FBA43D48 for ; Mon, 21 Mar 2005 07:20:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2L7K2rZ072447 for ; Mon, 21 Mar 2005 07:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2L7K2vP072446; Mon, 21 Mar 2005 07:20:02 GMT (envelope-from gnats) Resent-Date: Mon, 21 Mar 2005 07:20:02 GMT Resent-Message-Id: <200503210720.j2L7K2vP072446@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yoshihiko Sarumaru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDEDD16A4CF for ; Mon, 21 Mar 2005 07:19:10 +0000 (GMT) Received: from shimako.yamayuri.org (yumi.yamayuri.org [218.45.22.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id B117543D5A for ; Mon, 21 Mar 2005 07:19:09 +0000 (GMT) (envelope-from mistral@imasy.or.jp) Received: from shimako.yamayuri.org (localhost [IPv6:3ffe:505:2020:0:203:47ff:fe14:7175])j2L7J5D1014196 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 21 Mar 2005 16:19:06 +0900 (JST) (envelope-from mistral@imasy.or.jp) Received: (from sarumaru@localhost) by shimako.yamayuri.org (8.13.1/8.13.1/Submit) id j2L7J4h7014195; Mon, 21 Mar 2005 16:19:04 +0900 (JST) (envelope-from sarumaru) Message-Id: <200503210719.j2L7J4h7014195@shimako.yamayuri.org> Date: Mon, 21 Mar 2005 16:19:04 +0900 (JST) From: Yoshihiko Sarumaru To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/79075: Update port: deskutils/xcalendar X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Yoshihiko Sarumaru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2005 07:20:02 -0000 >Number: 79075 >Category: ports >Synopsis: Update port: deskutils/xcalendar >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 21 07:20:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Yoshihiko Sarumaru >Release: FreeBSD 4.11-STABLE i386 >Organization: >Environment: System: FreeBSD shimako.yamayuri.org 4.11-STABLE FreeBSD 4.11-STABLE #2: Wed Feb 16 00:33:30 JST 2005 sarumaru@sendpr.yamayuri.org:/usr/obj/usr/src/sys/Z505VRK i386 >Description: This PR throws away old locale ja_JP.EUC that was obsoleted by ja_JP.eucJP in few years ago. As a transition, both locales had been supported by this port, but I beleive no one is still using ja_JP.EUC. Also this PR introduces holiday database in Japan for year 2005 and 2006. >How-To-Repeat: >Fix: As I mentioned in Description section, there are two part in this PR. Patches for part 1 are attached in this section (see below). A patch for part 2 is located at http://www.imasy.or.jp/~mistral/tmp/xcalendar.hol.diff because it contains ja_JP.eucJP characters. diff -urN xcalendar.bak/Makefile xcalendar/Makefile --- xcalendar.bak/Makefile Sun Mar 13 19:58:48 2005 +++ xcalendar/Makefile Mon Mar 21 15:02:25 2005 @@ -6,8 +6,7 @@ # PORTNAME= xcalendar -PORTVERSION= 4.0.2004 -PORTREVISION= 1 +PORTVERSION= 4.0.2005 CATEGORIES= deskutils MASTER_SITES= ftp://daemon.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ DISTNAME= ${PORTNAME}-4.0+i18n diff -urN xcalendar.bak/files/patch-ad xcalendar/files/patch-ad --- xcalendar.bak/files/patch-ad Thu May 16 19:27:53 2002 +++ xcalendar/files/patch-ad Mon Mar 21 14:34:25 2005 @@ -1,15 +1,13 @@ ---- /usr/ports/deskutils/xcalendar.orig/work/xcalendar/Imakefile Sun Oct 1 12:19:17 1995 -+++ Imakefile Mon May 13 00:55:07 2002 -@@ -1,4 +1,8 @@ +--- Imakefile.orig Sun Oct 1 12:19:17 1995 ++++ Imakefile Mon Mar 21 14:30:06 2005 +@@ -1,4 +1,6 @@ XCALENDAR_LIBDIR = $(LIBDIR)/xcalendar +XCALENDAR_JP_LIBDIR_EUCJP = $(LIBDIR)/ja_JP.eucJP/xcalendar -+XCALENDAR_JP_LIBDIR_EUC = $(LIBDIR)/ja_JP.EUC/xcalendar +XCALENDAR_JP_APPDEFAULTS_EUCJP = $(LIBDIR)/ja_JP.eucJP/app-defaults -+XCALENDAR_JP_APPDEFAULTS_EUC = $(LIBDIR)/ja_JP.EUC/app-defaults LIBFILES = larrow.xbm qmark.xbm quit.xbm rarrow.xbm xcalendar.hlp # Comment out the following two lines for the Motif version LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -@@ -12,7 +16,7 @@ +@@ -12,7 +14,7 @@ # # for Internationalization # @@ -18,7 +16,7 @@ ##if !SharedLibXwchar # _UseCat($(USRLIBDIR),$(CONTRIBSRC)/lib/Xwchar,/libXwchar.a) # XWCHARLIB = LoaderLibPrefix _Use(-lXwchar,$(DEPXWCHARLIB)) -@@ -40,12 +44,36 @@ +@@ -40,12 +42,31 @@ # for Internationalization # XCal-uj.ad: XCal-uj.sed @@ -41,17 +39,12 @@ + MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUCJP)) + $(INSTALL) -c $(INSTAPPFLAGS) XCal-uj.ad \ + $(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar -+ MakeDir($(XCALENDAR_JP_APPDEFAULTS_EUC)) -+ $(LN) $(XCALENDAR_JP_APPDEFAULTS_EUCJP)/XCalendar \ -+ $(XCALENDAR_JP_APPDEFAULTS_EUC)/ + + MakeDir($(XCALENDAR_JP_LIBDIR_EUCJP)) + $(INSTALL) -c $(INSTAPPFLAGS) $(FILESDIR)/xcalendar-uj.hol \ + $(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hol + $(INSTALL) -c $(INSTAPPFLAGS) xcalendar-uj.hlp \ + $(XCALENDAR_JP_LIBDIR_EUCJP)/xcalendar.hlp -+ $(LN) $(XCALENDAR_JP_LIBDIR_EUCJP) \ -+ $(XCALENDAR_JP_LIBDIR_EUC) + + $(INSTALL) -c $(INSTMANFLAGS) xcalendar-uj.man \ + $(MANPATH)/ja/man1/xcalendar.1 >Release-Note: >Audit-Trail: >Unformatted: