Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Aug 1997 16:32:53 +0900 (JST)
From:      mita@jp.FreeBSD.org
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Subject:   ports/4210: japanese/tgif port is updated.
Message-ID:  <199708010732.QAA08424@hanpen.fujita3.iis.u-tokyo.ac.jp>
Resent-Message-ID: <199708020950.CAA15345@hub.freebsd.org>

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

>Number:         4210
>Category:       ports
>Synopsis:       japanese/tgif port is updated.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Class:          support
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug  2 02:50:00 PDT 1997
>Last-Modified:
>Originator:     MITA Yoshio
>Organization:
IIS, the University of Tokyo, JAPAN.
>Release:        FreeBSD 2.2.1-RELEASE i386
>Environment:

2.2.1-RELEASE + current bsd.port*

>Description:

japanese/tgif port is updated from version 2.16p12 to 3.0p13.

>How-To-Repeat:


>Fix:
	
Apply this patch and remove patches/patch-ab patches/patch-ac, please.

diff -rcN --exclude=CVS japanese/tgif.current/Makefile japanese/tgif/Makefile
*** japanese/tgif.current/Makefile	Mon Nov 18 09:54:08 1996
--- japanese/tgif/Makefile	Fri Aug  1 09:39:58 1997
***************
*** 1,21 ****
  # New ports collection makefile for:	tgif-j
! # Version required:	2.16.12
  # Date created:		8 Dec 1995
  # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
  #
  # $Id: Makefile,v 1.5 1996/11/18 09:54:08 asami Exp $
  #
  
! DISTNAME=	tgif-2.16-p12
! PKGNAME=	jp-tgif-216-p12
  CATEGORIES=	japanese
  MASTER_SITES=	${MASTER_SITE_XCONTRIB}
  MASTER_SITE_SUBDIR=	applications/tgif
  
! PATCH_SITES=	ftp://ftp.eos.hokudai.ac.jp/pub/X/contrib/misc/tgif/
! PATCHFILES=	tgif-2.16-p12.jp.gz \
! 		tgif-2.16-p12.jp.kinput2over-the-spotpatch
! PATCH_DIST_STRIP=	-p1
  
  MAINTAINER=	mita@jp.FreeBSD.org
  
--- 1,19 ----
  # New ports collection makefile for:	tgif-j
! # Version required:	3.0.13
  # Date created:		8 Dec 1995
  # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
  #
  # $Id: Makefile,v 1.5 1996/11/18 09:54:08 asami Exp $
  #
  
! DISTNAME=	tgif-3.0-p13
! PKGNAME=	jp-tgif-30-p13
  CATEGORIES=	japanese
  MASTER_SITES=	${MASTER_SITE_XCONTRIB}
  MASTER_SITE_SUBDIR=	applications/tgif
  
! PATCH_SITES=	ftp://ftp.mei.co.jp/free/X11/X/applications/drawing/tgif/
! PATCHFILES=	tgif-3.0J0.12-p13-patch.gz
  
  MAINTAINER=	mita@jp.FreeBSD.org
  
***************
*** 27,31 ****
--- 25,30 ----
  		xpmtoppm:${PORTSDIR}/graphics/netpbm
  
  USE_IMAKE=	yes
+ PATCH_DIST_STRIP=	-p1
  
  .include <bsd.port.mk>
diff -rcN --exclude=CVS japanese/tgif.current/files/md5 japanese/tgif/files/md5
*** japanese/tgif.current/files/md5	Thu Feb  1 06:47:42 1996
--- japanese/tgif/files/md5	Fri Aug  1 15:56:59 1997
***************
*** 1,3 ****
! MD5 (tgif-2.16-p12.tar.gz) = f6eae5e52fd1a9772d2e33bbd6425308
! MD5 (tgif-2.16-p12.jp.gz) = 919d48ee21f43a374959c2633ede4851
! MD5 (tgif-2.16-p12.jp.kinput2over-the-spotpatch) = f64ce166984fd8a38a032758bd319b68
--- 1,2 ----
! MD5 (tgif-3.0-p13.tar.gz) = d862c6bdf9c4e0f3852fdfe8646e50fc
! MD5 (tgif-3.0J0.12-p13-patch.gz) = 399e09ddb139a4840fa83de9307aee20
diff -rcN --exclude=CVS japanese/tgif.current/patches/patch-aa japanese/tgif/patches/patch-aa
*** japanese/tgif.current/patches/patch-aa	Thu Feb  1 06:47:41 1996
--- japanese/tgif/patches/patch-aa	Mon Jul 21 22:53:40 1997
***************
*** 1,12 ****
! diff -u copypaste.c.orig copypaste.c
! --- copypaste.c.orig    Mon Nov  6 23:03:10 1995
! +++ copypaste.c Mon Nov  6 23:09:02 1995
! @@ -158,7 +158,7 @@
!     }
! 
!     if (cutBuffer != NULL) cfree (cutBuffer);
! -   cutBuffer = (char *) calloc (stat.st_size+1, sizeof(char));
! +   cutBuffer = (char *) calloc ((size_t) stat.st_size+1, sizeof(char));
! 
!     rewind(fp);
!     if (read (fileno(fp), cutBuffer, stat.st_size) < stat.st_size)
--- 1,19 ----
! *** Imakefile.orig	Mon Jul 21 22:52:14 1997
! --- Imakefile	Mon Jul 21 22:52:25 1997
! ***************
! *** 87,93 ****
!   LOCAL_LIBRARIES	= $(XLIB)
!   XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
!   DEPLIBS		= $(DEPXLIB)
! ! SYS_LIBRARIES	= -lm
!   
!   XCOMM -D_NO_GETTIMEOFDAY
!   XCOMM    Include the above line if you do not have the gettimeofday()
! --- 87,93 ----
!   LOCAL_LIBRARIES	= $(XLIB)
!   XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
!   DEPLIBS		= $(DEPXLIB)
! ! SYS_LIBRARIES	= -lm -lcompat
!   
!   XCOMM -D_NO_GETTIMEOFDAY
!   XCOMM    Include the above line if you do not have the gettimeofday()
diff -rcN --exclude=CVS japanese/tgif.current/patches/patch-ab japanese/tgif/patches/patch-ab
*** japanese/tgif.current/patches/patch-ab	Thu Feb  1 06:47:41 1996
--- japanese/tgif/patches/patch-ab	Thu Jan  1 09:00:00 1970
***************
*** 1,31 ****
- --- Imakefile.orig	Fri Dec  8 18:53:30 1995
- +++ Imakefile	Mon Dec 11 16:29:05 1995
- @@ -48,7 +48,7 @@
-  #endif
-  #endif
-  
- -TGIFVERSION	= 2.16-p12
- +TGIFVERSION	= 2.16J-p12
-  PROGRAMS	= tgif prtgif XCOMM frontend11.o testdrive
-  XCOMM CDEBUGFLAGS= -g
-  XCOMM INSTPGMFLAGS= -s
- @@ -63,8 +63,8 @@
-                    -DTEXT_FILE_EXT=\"txt\" \@@\
-                    -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\
-                    -DLAUNCH_ATTR=\"launch=\" -DEXEC_ATTR=\"exec=\" \@@\
- -                  -DA4PAPER -DUSE_FLUSH_COLORMAP -DUSE_QUICKWARP $(XIMDEFINES)
- -
- +                  -DA4PAPER -DUSE_FLUSH_COLORMAP -DUSE_QUICKWARP $(XIMDEFINES)\
- +		  -D_USE_XDRAWPOINT_TO_PUT_A_POINT
-  XCOMM Things to try to add to the DEFINES line above:
-  XCOMM
-  XCOMM    RS6000:  -D_BSD
- @@ -80,7 +80,7 @@
-  LOCAL_LIBRARIES	= $(XLIB)
-  XCOMM LOCAL_LIBRARIES	= $(XMULIB) $(XTOOLLIB) $(XLIB)
-  DEPLIBS		= $(DEPXLIB)
- -SYS_LIBRARIES	= -lm
- +SYS_LIBRARIES	= -lm -lcompat
-  
-  XCOMM -D_NO_GETTIMEOFDAY
-  XCOMM    Include the above line if you do not have the gettimeofday()
--- 0 ----
diff -rcN --exclude=CVS japanese/tgif.current/patches/patch-ac japanese/tgif/patches/patch-ac
*** japanese/tgif.current/patches/patch-ac	Sat Oct 19 03:25:12 1996
--- japanese/tgif/patches/patch-ac	Thu Jan  1 09:00:00 1970
***************
*** 1,128 ****
- *** ps.c.orig	Fri Oct 18 13:16:52 1996
- --- ps.c	Fri Oct 18 13:18:39 1996
- ***************
- *** 246,259 ****
-   };
-   
-   static char *psKanjiFontMacro[] =
- ! { "%",
-     "%%Title: eucfont.ps",
-     "%%Creator: shikida@cs.titech.ac.jp, ueno@cs.titech.ac.jp",
-     "%%CreationDate: 1991-2-27",
-     "%%EndComments",
- !   "",
- !   "% <font> copyfont <font>",
- !   "/copyfont {",
-     "    dup maxlength 1 add dict begin",
-     "    {",
-     "	1 index /FID ne 2 index /UniqueID ne and",
- --- 246,289 ----
-   };
-   
-   static char *psKanjiFontMacro[] =
- ! {
-     "%%Title: eucfont.ps",
- +   "% old eucfont.ps(OCFeucfont) and new eucfont.ps(CIDeucfont) were combined.",
- +   "%  1996-09, kawamata@sra.co.jp",
- +   "% Sample Usage:",
- +   "%   Operands are only font names permitted. Don't put fontdict itself.",
- +   "% /Courier-Ryumin /Courier /Ryumin-Light-EUC-V eucfont",
- +   "",
- +   "%%Title: CIDeucfont.ps",
- +   "%%Creator: yohtaki@cis.ibaraki.ac.jp",
- +   "%%CreationDate: 1996-9-29",
- +   "%%EndComments",
- +   "%",
- +   "% <newfont> <asciifont> <kanjifont> CIDeucfont",
- +   "/CIDeucfont {",
- +   "dup findfont /WMode get 1 eq 4 1 roll % push direction info.",
- +   "12 dict begin",
- +   "  /CIDInit /ProcSet findresource begin",
- +   "  exch [ 3 1 roll ] beginrearrangedfont",
- +   "      3 -1 roll {   % pop direction info",
- +   "         /WMode 1 def	% vertical font",
- +   "         0 beginusematrix [ 0 1 -1 0 0 0.3 ] endusematrix",
- +   "      } if",
- +   "      1 usefont",
- +   "      1 beginbfrange",
- +   "         <00> <7F> <00>",
- +   "       endbfrange",
- +   "     endrearrangedfont",
- +   "  end",
- +   "end",
- +   "} def",
- +   "",
- +   "%%Title: OCFeucfont.ps",
-     "%%Creator: shikida@cs.titech.ac.jp, ueno@cs.titech.ac.jp",
-     "%%CreationDate: 1991-2-27",
-     "%%EndComments",
- !   "% <font> OCFcopyfont <font>",
- !   "/OCFcopyfont {",
-     "    dup maxlength 1 add dict begin",
-     "    {",
-     "	1 index /FID ne 2 index /UniqueID ne and",
- ***************
- *** 262,271 ****
-     "    currentdict",
-     "    end",
-     "} bind def",
- !   "",
- !   "% <newfont> <asciifont> <kanjifont> eucfont",
- !   "/eucfont {",
- !   "    12 dict begin",
-     "	dup type /nametype eq { findfont } if",
-     "	dup /WMode known {",
-     "	    dup /WMode get /WMode exch def",
- --- 292,300 ----
-     "    currentdict",
-     "    end",
-     "} bind def",
- !   "% <newfont> <asciifont> <kanjifont> OCFeucfont",
- !   "/OCFeucfont {",
- !   "      12 dict begin",
-     "	dup type /nametype eq { findfont } if",
-     "	dup /WMode known {",
-     "	    dup /WMode get /WMode exch def",
- ***************
- *** 273,279 ****
-     "		[0.0 1.0 -1.0 0.0 0.0 0.30] makefont",
-     "	    } if",
-     "	} if",
- !   "	copyfont dup begin",
-     "	    /Encoding Encoding",
-     "	    FMapType dup 2 eq {",
-     "		pop 128 128",
- --- 302,308 ----
-     "		[0.0 1.0 -1.0 0.0 0.0 0.30] makefont",
-     "	    } if",
-     "	} if",
- !   "	OCFcopyfont dup begin",
-     "	    /Encoding Encoding",
-     "	    FMapType dup 2 eq {",
-     "		pop 128 128",
- ***************
- *** 303,308 ****
- --- 332,344 ----
-     "    definefont pop",
-     "} def",
-     "",
- +   "% <newfont> <asciifont> <kanjifont> eucfont",
- +   "/eucfont {",
- +   "	dup findfont",
- +   "	/FMapType get 9 eq",
- +   "		{ CIDeucfont}",
- +   "		{ OCFeucfont} ifelse",
- +   "} def",
-     NULL
-   };
-   
- ***************
- *** 319,325 ****
-     " {",
-     "%    dup 0.01 lt { pop 0.01 } if",
-     " } bind def",
- -   "",
-     NULL
-   };
-   
- --- 355,360 ----
--- 0 ----
diff -rcN --exclude=CVS japanese/tgif.current/pkg/DESCR japanese/tgif/pkg/DESCR
*** japanese/tgif.current/pkg/DESCR	Thu Feb  1 06:47:42 1996
--- japanese/tgif/pkg/DESCR	Fri Aug  1 16:01:36 1997
***************
*** 1,6 ****
  tgif-j is  Xlib based interactive 2-D drawing facility under X11.
  It can put out ps, eps, gif, xbm files.
! Japanese input is also available by means of kinput2.
! Japanese over the spot conversion patch is also applied so that
! inline kana-kanji conversion is available.
! see /usr/X11R6/lib/X11/tgif/2.16J-p12/JAPANESE for more information.
--- 1,7 ----
  tgif-j is  Xlib based interactive 2-D drawing facility under X11.
  It can put out ps, eps, gif, xbm files.
! Japanese input is also available by means of kinput or kinput2.
! Over-the-spot kana-kanji conversion is available by setting X resource:
! Tgif*PreeditType:               OverTheSpot
! 
! see /usr/X11R6/lib/X11/tgif/3.0J0.12-p13/ for more information.
diff -rcN --exclude=CVS japanese/tgif.current/pkg/PLIST japanese/tgif/pkg/PLIST
*** japanese/tgif.current/pkg/PLIST	Thu Feb  1 06:47:42 1996
--- japanese/tgif/pkg/PLIST	Fri Aug  1 16:21:49 1997
***************
*** 1,19 ****
  bin/tgif
  bin/prtgif
  man/man1/tgif.1.gz
! lib/X11/tgif/2.16J-p12/HISTORY.jp
! lib/X11/tgif/2.16J-p12/JAPANESE
! lib/X11/tgif/2.16J-p12/JAPANESE.ms
! lib/X11/tgif/2.16J-p12/README.jp
! lib/X11/tgif/2.16J-p12/SCALABLE
! lib/X11/tgif/2.16J-p12/SCALABLE.ms
! lib/X11/tgif/2.16J-p12/TO_USERS
! lib/X11/tgif/2.16J-p12/TO_USERS.ms
! lib/X11/tgif/2.16J-p12/keys.obj
! lib/X11/tgif/2.16J-p12/keys_jpn.obj
! lib/X11/tgif/2.16J-p12/tangram.sym
! lib/X11/tgif/2.16J-p12/tgif.Xdefaults
! lib/X11/tgif/2.16J-p12/tgificon.eps
! lib/X11/tgif/2.16J-p12/tgificon.obj
! lib/X11/tgif/2.16J-p12/tgificon.xbm
! lib/X11/tgif/2.16J-p12/tgificon.xpm
--- 1,24 ----
  bin/tgif
  bin/prtgif
+ lib/X11/tgif/3.0J0.12-p13/tgif.Xdefaults
+ lib/X11/tgif/3.0J0.12-p13/tgificon.eps
+ lib/X11/tgif/3.0J0.12-p13/tgificon.obj
+ lib/X11/tgif/3.0J0.12-p13/tgificon.xbm
+ lib/X11/tgif/3.0J0.12-p13/tgificon.xpm
+ lib/X11/tgif/3.0J0.12-p13/tangram.sym
+ lib/X11/tgif/3.0J0.12-p13/keys.obj
+ lib/X11/tgif/3.0J0.12-p13/keys_jpn.obj
+ lib/X11/tgif/3.0J0.12-p13/SCALABLE.ms
+ lib/X11/tgif/3.0J0.12-p13/SCALABLE
+ lib/X11/tgif/3.0J0.12-p13/JAPANESE.ms
+ lib/X11/tgif/3.0J0.12-p13/JAPANESE
+ lib/X11/tgif/3.0J0.12-p13/TO_USERS.ms
+ lib/X11/tgif/3.0J0.12-p13/TO_USERS
+ lib/X11/tgif/3.0J0.12-p13/HISTORY.jp
+ lib/X11/tgif/3.0J0.12-p13/HISTORY-3.0.jp
+ lib/X11/tgif/3.0J0.12-p13/README.jp
+ lib/X11/tgif/3.0J0.12-p13/README-3.0.jp
  man/man1/tgif.1.gz
! man/man1/prtgif.1.gz
! @dirrm lib/X11/tgif/3.0J0.12-p13
! @dirrm lib/X11/tgif

---
MITA Yoshio
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199708010732.QAA08424>