Date: 1 Jun 1999 23:44:06 +0900 From: one@netlab.is.tsukuba.ac.jp To: FreeBSD-gnats-submit@freebsd.org, one@netlab.is.tsukuba.ac.jp Subject: ports/11976: graphics/tgif-nls to 4.1.15 Message-ID: <19990601144406.63585.qmail@sprite.netlab.is.tsukuba.ac.jp>
next in thread | raw e-mail | index | archive | help
>Number: 11976 >Category: ports >Synopsis: graphics/tgif-nls to 4.1.15 >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: Tue Jun 1 07:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Hajime Tanno >Release: FreeBSD 3.1-RELEASE i386 >Organization: Computer Networks Lab., Univ. of Tsukuba >Environment: FreeBSD 3.1-RELEASE i386 >Description: based Tgif's version from 4.1.14 to 4.1.15. old version patch-ad contains $Header:*$ line. so when I make new patch-ad, add "-1" option to diff command. >How-To-Repeat: >Fix: Here's a patch to the port. diff -urN tgif-nls/Makefile tgif-nls.new/Makefile --- tgif-nls/Makefile Tue Jun 1 23:07:21 1999 +++ tgif-nls.new/Makefile Tue Jun 1 23:09:03 1999 @@ -6,8 +6,8 @@ # $Id: Makefile,v 1.3 1999/05/29 04:39:26 steve Exp $ # -DISTNAME= tgif-4.1.14 -PKGNAME= tgif-nls-4.1.14 +DISTNAME= tgif-4.1.15 +PKGNAME= tgif-nls-4.1.15 CATEGORIES= graphics MASTER_SITES= ftp://bourbon.cs.umd.edu/pub/tgif/ \ ftp://ftp.cs.ucla.edu/pub/tgif/ @@ -18,19 +18,13 @@ RUN_DEPENDS= giftopnm:${PORTSDIR}/graphics/netpbm USE_IMAKE= yes +XMKMF= LOCALBASE=${LOCALBASE} xmkmf -a + MAN1= tgif.1 -post-extract: +pre-patch: @cd ${WRKSRC}; ${RM} -f Tgif.tmpl; \ - ${SED} -e "s#/usr/share/locale#${PREFIX}/share/locale#" \ - Tgif.tmpl-freebsd > Tgif.tmpl; \ - ${ECHO} "EXTRA_INCLUDES += -I${LOCALBASE}/include" \ - >> Tgif.tmpl; \ - ${ECHO} "EXTRA_LIBRARIES += -L${LOCALBASE}/lib -lintl" \ - >> Tgif.tmpl; \ - ${MV} po/Po.tmpl po/Po.tmpl.orig; \ - ${SED} -e "s#/usr/share/locale#${PREFIX}/share/locale#" \ - po/Po.tmpl.orig > po/Po.tmpl; \ + ${CP} Tgif.tmpl-freebsd Tgif.tmpl post-patch: @cd ${WRKSRC}; \ diff -urN tgif-nls/files/md5 tgif-nls.new/files/md5 --- tgif-nls/files/md5 Tue Jun 1 23:07:21 1999 +++ tgif-nls.new/files/md5 Sun May 30 05:41:28 1999 @@ -1 +1 @@ -MD5 (tgif-4.1.14.tar.gz) = aff6c3dbb7d854bd69409ffc403c6b15 +MD5 (tgif-4.1.15.tar.gz) = 3656598fe1f7963ba581fd9c821da6e5 diff -urN tgif-nls/patches/patch-aa tgif-nls.new/patches/patch-aa --- tgif-nls/patches/patch-aa Tue Jun 1 23:07:21 1999 +++ tgif-nls.new/patches/patch-aa Sun May 30 05:42:30 1999 @@ -1,11 +1,11 @@ ---- tgif.man.orig Wed May 26 01:19:41 1999 -+++ tgif.man Wed May 26 01:20:08 1999 +--- tgif.man.orig Sun May 30 05:28:59 1999 ++++ tgif.man Sun May 30 05:29:12 1999 @@ -8,7 +8,7 @@ .\" .\" .\" --.TH tgif n "Version 4.1 Patchlevel 10 and Above" "Tgif" -+.TH tgif 1L "Version 4.1 Patchlevel 10 and Above" "Tgif" +-.TH tgif n "Version 4.1 Patchlevel 15 and Above" "Tgif" ++.TH tgif 1L "Version 4.1 Patchlevel 15 and Above" "Tgif" .\" .SH NAME .\" diff -urN tgif-nls/patches/patch-ab tgif-nls.new/patches/patch-ab --- tgif-nls/patches/patch-ab Tue Jun 1 23:07:21 1999 +++ tgif-nls.new/patches/patch-ab Sun May 30 05:42:32 1999 @@ -1,5 +1,5 @@ ---- Tgif.tmpl.orig Wed May 26 01:34:43 1999 -+++ Tgif.tmpl Wed May 26 01:39:52 1999 +--- Tgif.tmpl.orig Sun May 30 05:32:54 1999 ++++ Tgif.tmpl Sun May 30 05:33:12 1999 @@ -41,6 +41,15 @@ XIMPDEFINES = #endif @@ -16,7 +16,16 @@ PROGRAMS = tgif XCOMM prtgif frontend11.o testdrive XCOMM CDEBUGFLAGS= -g -Wall XCOMM INSTPGMFLAGS= -s -@@ -58,16 +67,16 @@ +@@ -48,7 +57,7 @@ + XCOMM MANPATH = /u/halfmoon/man + XCOMM TGIFDIR = /u/halfmoon/lib/X11/tgif + TGIFDIR = $(LIBDIR)/tgif +-LOCALEDIR = /usr/share/locale ++LOCALEDIR = $(PREFIX)/share/locale + DIRDEFINES = -DTGIF_PATH=\"$(TGIFDIR)\" -DPSFILE_MOD=0664 \@@\ + -DLOCALEDIR=\"$(LOCALEDIR)\" \@@\ + -DTELEPORT_ATTR=\"warp_to=\" -DTMP_DIR=\"/tmp/\" \@@\ +@@ -58,14 +67,16 @@ -DOBJ_FILE_EXT=\"obj\" -DSYM_FILE_EXT=\"sym\" \@@\ -DTEXT_FILE_EXT=\"txt\" -DPIN_FILE_EXT=\"pin\" MISCDEFINES = -D_BACKGROUND_DONT_FORK -D_USE_XDRAWPOINT_TO_PUT_A_POINT @@ -35,5 +44,15 @@ XCOMM SYS_LIBRARIES = -ldl -lm -SYS_LIBRARIES = -lm +SYS_LIBRARIES = -lm -lcompat - EXTRA_INCLUDES += -I/usr/local/include - EXTRA_LIBRARIES += -L/usr/local/lib -lintl ++EXTRA_INCLUDES += -I$(LOCALBASE)/include ++EXTRA_LIBRARIES += -L$(LOCALBASE)/lib -lintl + +--- po/Po.tmpl.orig Sun Apr 4 03:27:53 1999 ++++ po/Po.tmpl Sun May 30 05:33:12 1999 +@@ -8,5 +8,5 @@ + MKINSTALLDIRS = install -d + + DESTDIR = +-SYSNLSDIR = /usr/share/locale ++SYSNLSDIR = $(PREFIX)/share/locale + NLSDIR = $(DESTDIR)$(SYSNLSDIR) diff -urN tgif-nls/patches/patch-ad tgif-nls.new/patches/patch-ad --- tgif-nls/patches/patch-ad Tue Jun 1 23:07:21 1999 +++ tgif-nls.new/patches/patch-ad Tue Jun 1 05:19:44 1999 @@ -1,8 +1,6 @@ ---- tgif.Xdefaults.orig Wed May 26 01:25:03 1999 -+++ tgif.Xdefaults Wed May 26 01:27:33 1999 -@@ -8,12 +8,12 @@ - ! - ! @(#)$Header: /home/ncvs/ports/graphics/tgif-nls/patches/patch-ad,v 1.2 1999/05/29 04:39:37 steve Exp $ +--- tgif.Xdefaults.orig Sat May 29 02:57:56 1999 ++++ tgif.Xdefaults Sun May 30 05:37:26 1999 +@@ -11,8 +11,8 @@ ! -Tgif.Geometry: 640x512-40+20 -Tgif.IconGeometry: -224+82 @@ -17,65 +15,37 @@ +!Tgif.BorderColor: Aquamarine +!Tgif.ReverseVideo: on ! - Tgif.InitialFont: Times - !Tgif.InitialFont: Courier -@@ -27,7 +27,7 @@ - !Tgif.InitialFontStyle: BoldItalic - ! +@@ -30,3 +30,3 @@ !Tgif.InitialFontJust: Left -Tgif.InitialFontJust: Center +!Tgif.InitialFontJust: Center !Tgif.InitialFontJust: Right - ! - ! The next 3 are obsoleted -@@ -40,7 +40,7 @@ - Tgif.RulerFontSize: 10 - Tgif.DefaultFontSize: 14 +@@ -43,3 +43,3 @@ ! -Tgif.FontSizes: 8 10 11 12 14 17 18 20 24 25 34 +Tgif.FontSizes: 8 9 10 11 12 13 14 15 16 17 18 20 24 32 34 36 40 44 60 70 100 200 250 300 Tgif.AdditionalFonts: \n\ - lucidabright-medium-r-normal,iso8859-1,ZapfChancery-MediumItalic\n\ - lucidabright-demibold-r-normal,iso8859-1,ZapfChancery-MediumItalic\n\ -@@ -83,7 +83,7 @@ - Tgif.DrawCursor: arrow - Tgif.DragCursor: hand2 +@@ -86,3 +86,3 @@ Tgif.VertexCursor: dotbox -Tgif.RubberBandColor: Aquamarine +!Tgif.RubberBandColor: Aquamarine ! - Tgif.MaxColors: 11 - Tgif.Color0: magenta -@@ -97,7 +97,7 @@ - Tgif.Color8: white - Tgif.Color9: black +@@ -100,3 +100,3 @@ Tgif.Color10: DarkSlateGray -Tgif.DefaultColorIndex: 0 +Tgif.DefaultColorIndex: 9 ! - Tgif.ShortCuts: !<Key>A:SelectAll() \n\ - !<Key>U:Undo() \n\ -@@ -329,7 +329,7 @@ - Tgif.XpmDeckToGifAnim: gifsicle -lforever --delay 10 - !Tgif.XpmDeckToGifAnim: whirlgif -loop -time 10 +@@ -332,3 +332,3 @@ Tgif.GifAnimExplode: gifsicle -eU -Tgif.Btn3PopupModeMenu: false +Tgif.Btn3PopupModeMenu: true Tgif.ScriptFraction: 0.6 - Tgif.DeleteNextCharWithDelKey: true - ! -@@ -370,7 +370,7 @@ - Tgif.GBShowFontChar: \271\372 - Tgif.RyuminShowFontChar: \244\242 +@@ -373,3 +373,3 @@ Tgif.GothicBBBShowFontChar: \244\316 -Tgif.DoubleByteInputMethod: xcin +!Tgif.DoubleByteInputMethod: xcin !Tgif.DoubleByteInputMethod: chinput - !Tgif.DoubleByteInputMethod: kinput2 - !Tgif.DoubleByteInputMethod: xim -@@ -381,11 +381,11 @@ - ! Please note that the environment variables LANG and XMODIFIERS override the - ! Tgif.Lang and Tgif.Modifiers X defaults. +@@ -384,7 +384,7 @@ ! -Tgif.UseNKF: true -Tgif.CopyAndPasteJIS: true @@ -87,5 +57,3 @@ -Tgif.Lang: ja_JP.EUC +!Tgif.Lang: ja_JP.EUC !Tgif.Lang: ja_JP.ujis - !Tgif.Modifiers: false - !Tgif.ConvSelection: _JAPANESE_CONVERSION >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?19990601144406.63585.qmail>