Date: Wed, 24 May 2000 22:10:15 +0900 From: Yoichi ASAI <yatt@msc.biglobe.ne.jp> To: mharo@FreeBSD.org Cc: freebsd-ports@FreeBSD.org Subject: Re: ports/17241: Update: japanese/tkdesk Message-ID: <20000524221015O.yatt@msc.biglobe.ne.jp> In-Reply-To: <200004012018.MAA60766@freefall.freebsd.org> References: <200004012018.MAA60766@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Latest version of TkDesk Japanization patch is now 1.2-jp5.
Please use this patch below.
Yoichi ASAI <yatt@msc.biglobe.ne.jp>
diff -urN tkdesk.orig/Makefile tkdesk/Makefile
--- tkdesk.orig/Makefile Thu Apr 13 07:12:37 2000
+++ tkdesk/Makefile Mon May 8 21:55:42 2000
@@ -12,7 +12,7 @@
DISTNAME= ${PORTNAME}-${VERSION}
PATCH_SITES= http://www.linet.gr.jp/~mituiwa/
-PATCHFILES= tkdesk-${VERSION}-jmenu-${VERSION_PL}.diff
+PATCHFILES= tkdesk-${VERSION}-${VERSION_PL}.diff
PATCH_DIST_STRIP= -p1
MAINTAINER= yatt@msc.biglobe.ne.jp
@@ -21,8 +21,8 @@
RUN_DEPENDS= imali:${PORTSDIR}/mail/im \
easypr:${PORTSDIR}/japanese/easypr
-VERSION= 1.1
-VERSION_PL= p58
+VERSION= 1.2
+VERSION_PL= jp5
USE_XLIB= yes
USE_GMAKE= yes
@@ -32,13 +32,9 @@
MAN1= tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1
-pre-patch:
- @cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/pre-patch
-
post-patch:
@/usr/bin/find ${WRKSRC}/tcldesk '(' -name '*.orig' -o -name '*~' ')' \
-exec ${RM} -f {} \;
- @${RM} ${WRKSRC}/config.h ${WRKSRC}/config.cache
post-install:
@/usr/bin/strip ${PREFIX}/bin/tkdesksh
diff -urN tkdesk.orig/files/md5 tkdesk/files/md5
--- tkdesk.orig/files/md5 Fri Dec 10 20:15:00 1999
+++ tkdesk/files/md5 Mon May 8 21:54:01 2000
@@ -1,2 +1,2 @@
-MD5 (tkdesk-1.1.tar.gz) = 4ac95c572a662709f7f575ad3544afc3
-MD5 (tkdesk-1.1-jmenu-p58.diff) = 6c494228ef55ccb922fdc353ded3b7ac
+MD5 (tkdesk-1.2.tar.gz) = 33aa10a3d3b51017cdd495886848a2a6
+MD5 (tkdesk-1.2-jp5.diff) = 7477e7c298ac8b4caf8af20652ec4a66
diff -urN tkdesk.orig/files/pre-patch tkdesk/files/pre-patch
--- tkdesk.orig/files/pre-patch Thu Oct 28 01:37:00 1999
+++ tkdesk/files/pre-patch Thu Jan 1 09:00:00 1970
@@ -1,12 +0,0 @@
---- tkdesk.main.orig Tue Sep 21 15:10:58 1999
-+++ tkdesk.main Tue Sep 21 15:11:12 1999
-@@ -45,7 +45,7 @@
- #
-
- set tkdesk(version) "1.1"
--set tkdesk(date) "20.09.98"
-+set tkdesk(date) "02.09.98"
-
- if [info exists env(TKDESK_LIBRARY)] {
- set tkdesk(library) $env(TKDESK_LIBRARY)
-EOF
diff -urN tkdesk.orig/patches/patch-aa tkdesk/patches/patch-aa
--- tkdesk.orig/patches/patch-aa Fri Oct 22 18:14:00 1999
+++ tkdesk/patches/patch-aa Mon May 8 21:42:42 2000
@@ -1,6 +1,6 @@
---- configure.orig Tue Sep 21 15:27:50 1999
-+++ configure Tue Sep 21 15:27:50 1999
-@@ -646,8 +646,8 @@
+--- configure.orig Wed Dec 22 11:29:53 1999
++++ configure Wed Dec 22 11:30:17 1999
+@@ -745,8 +745,8 @@
# ITCL_LIB_SPEC already set in itclConfig.sh
ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
else
diff -urN tkdesk.orig/patches/patch-ab tkdesk/patches/patch-ab
--- tkdesk.orig/patches/patch-ab Fri Oct 22 18:14:00 1999
+++ tkdesk/patches/patch-ab Mon May 8 21:42:42 2000
@@ -1,24 +1,19 @@
---- Makefile.in.orig Wed Oct 20 22:27:33 1999
-+++ Makefile.in Wed Oct 20 22:36:27 1999
-@@ -127,7 +127,7 @@
- FVERSION = 11
+--- Makefile.in.orig Thu Dec 23 05:55:44 1999
++++ Makefile.in Thu Dec 23 05:58:56 1999
+@@ -131,11 +131,7 @@
+ FVERSION = 12
PKGDIR = $(PKGNAME)-$(VERSION)
-all: shell client tkdesk_script man2text jisdecode catheader text2bin easypr
+- @echo "========= Build complete."
+- @echo " "
+- @echo "You can try out TkDesk before installing it by executing:"
+- @echo "./testdrive"
+all: shell client tkdesk_script man2text jisdecode catheader text2bin
- @echo "========= Build complete."
- @echo " "
- @echo "You can try out TkDesk before installing it by commenting"
-@@ -139,7 +139,7 @@
- tkAppInit.o libdesk/libdesk.a netscape-remote/libnetscape.a \
- blt/libBLT.a $(LIBS)
--static: makelibs tkAppInit-static.o client tkdesk_script man2text jisdecode catheader text2bin easypr
-+static: makelibs tkAppInit-static.o client tkdesk_script man2text jisdecode catheader text2bin
- $(CC) $(LDFLAGS) @TCL_LD_SEARCH_FLAGS@ -static -o tkdesksh \
- tkAppInit-static.o libdesk/libdesk.a netscape-remote/libnetscape.a \
- blt/libBLT.a itcl/libitcl.a $(LIBS_STATIC)
-@@ -211,7 +211,7 @@
+ shell: makelibs tkAppInit.o
+ $(CC) $(LDFLAGS) @TCL_LD_SEARCH_FLAGS@ -o tkdesksh \
+@@ -218,7 +214,7 @@
find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \;
find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
@echo "=== Creating index..."
@@ -27,20 +22,20 @@
@echo "=== Installing the manual pages..."
@for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \
echo "installing $$f" ;\
-@@ -222,9 +222,6 @@
+@@ -229,9 +225,6 @@
cp text2bin $(BIN_INSTALL_DIR)
cp jisdecode $(BIN_INSTALL_DIR)
cp catheader $(BIN_INSTALL_DIR)
- cp easypr $(BIN_INSTALL_DIR)
- cp lpr2 $(BIN_INSTALL_DIR)
- chmod 755 $(BIN_INSTALL_DIR)/lpr2
-
@echo "=== Installation complete."
-@@ -253,7 +250,7 @@
- cd libdesk ; $(MAKE) clean
+ uninstall:
+@@ -260,7 +253,7 @@
cd tkdeskclient ; $(MAKE) clean
cd tcldesk ; rm -f #*#
+ rm -f *.o tkdesksh
- rm -f *.o tkdesksh man2text jisdecode catheader text2bin easypr
+ rm -f *.o tkdesksh man2text jisdecode catheader text2bin
diff -urN tkdesk.orig/pkg/PLIST tkdesk/pkg/PLIST
--- tkdesk.orig/pkg/PLIST Fri Oct 22 18:14:00 1999
+++ tkdesk/pkg/PLIST Mon May 8 21:42:42 2000
@@ -17,10 +17,12 @@
lib/TkDesk/Editor.tcl
lib/TkDesk/FileInfo.tcl
lib/TkDesk/FileListbox.tcl
+lib/TkDesk/Frame.tcl
lib/TkDesk/HistEntry.tcl
lib/TkDesk/List.tcl
lib/TkDesk/Mail.tcl
lib/TkDesk/Periodic.tcl
+lib/TkDesk/Toplevel.tcl
lib/TkDesk/Viewer.tcl
lib/TkDesk/action.tcl
lib/TkDesk/annotations.tcl
@@ -30,6 +32,8 @@
lib/TkDesk/appbar-mail.tcl
lib/TkDesk/appbar-trash.tcl
lib/TkDesk/appbar.tcl
+lib/TkDesk/bltDnd.tcl
+lib/TkDesk/bltDragdrop.tcl
lib/TkDesk/bookmarks.tcl
lib/TkDesk/cb_tools/bindings.tcl
lib/TkDesk/cb_tools/bitmaps/combo.xbm
@@ -74,8 +78,6 @@
@exec chmod 755 %B/.trash
lib/TkDesk/copy.tcl
lib/TkDesk/cpanels.tcl
-lib/TkDesk/dd-file.tcl
-lib/TkDesk/dd-text.tcl
lib/TkDesk/delete.tcl
lib/TkDesk/diary.tcl
lib/TkDesk/doc/CHANGES
@@ -84,6 +86,8 @@
lib/TkDesk/doc/MailUsage
lib/TkDesk/doc/QuickStart
lib/TkDesk/doc/guide-1.html
+lib/TkDesk/doc/guide-10.html
+lib/TkDesk/doc/guide-11.html
lib/TkDesk/doc/guide-2.html
lib/TkDesk/doc/guide-3.html
lib/TkDesk/doc/guide-4.html
@@ -92,10 +96,9 @@
lib/TkDesk/doc/guide-7.html
lib/TkDesk/doc/guide-8.html
lib/TkDesk/doc/guide-9.html
-lib/TkDesk/doc/guide-10.html
-lib/TkDesk/doc/guide-11.html
lib/TkDesk/doc/guide.html
lib/TkDesk/dsk_Listbox.tcl
+lib/TkDesk/envedit.tcl
lib/TkDesk/file_ops.tcl
lib/TkDesk/find.tcl
lib/TkDesk/help.tcl
@@ -198,10 +201,12 @@
lib/TkDesk/images/ficons16/gif2.xpm
lib/TkDesk/images/ficons16/h.xpm
lib/TkDesk/images/ficons16/html.xpm
+lib/TkDesk/images/ficons16/html2.xpm
lib/TkDesk/images/ficons16/image.xpm
lib/TkDesk/images/ficons16/mini-comet.xpm
lib/TkDesk/images/ficons16/music.xpm
lib/TkDesk/images/ficons16/parcel.xpm
+lib/TkDesk/images/ficons16/pdf.xpm
lib/TkDesk/images/ficons16/prism.xpm
lib/TkDesk/images/ficons16/rpm.xpm
lib/TkDesk/images/ficons16/script.xpm
@@ -321,6 +326,7 @@
lib/TkDesk/images/next/Write.xpm
lib/TkDesk/images/next/WriteMail.xpm
lib/TkDesk/images/next/adder.xpm
+lib/TkDesk/images/next/applix.xpm
lib/TkDesk/images/next/bag.xpm
lib/TkDesk/images/next/bag_full.xpm
lib/TkDesk/images/next/bargraph.xpm
@@ -533,39 +539,41 @@
lib/TkDesk/sounds/newmail.au
lib/TkDesk/sounds/robot_dead.au
lib/TkDesk/sounds/start.au
+lib/TkDesk/static/itcl3.0/itcl.tcl
+lib/TkDesk/static/itcl3.0/pkgIndex.tcl
+lib/TkDesk/static/tcl8.0/history.tcl
+lib/TkDesk/static/tcl8.0/init.tcl
+lib/TkDesk/static/tcl8.0/ldAix
+lib/TkDesk/static/tcl8.0/ldAout.tcl
+lib/TkDesk/static/tcl8.0/parray.tcl
+lib/TkDesk/static/tcl8.0/safe.tcl
+lib/TkDesk/static/tcl8.0/tclIndex
+lib/TkDesk/static/tcl8.0/word.tcl
+lib/TkDesk/static/tk8.0/bgerror.tcl
+lib/TkDesk/static/tk8.0/button.tcl
+lib/TkDesk/static/tk8.0/clrpick.tcl
+lib/TkDesk/static/tk8.0/comdlg.tcl
+lib/TkDesk/static/tk8.0/console.tcl
+lib/TkDesk/static/tk8.0/dialog.tcl
+lib/TkDesk/static/tk8.0/entry.tcl
+lib/TkDesk/static/tk8.0/focus.tcl
+lib/TkDesk/static/tk8.0/listbox.tcl
+lib/TkDesk/static/tk8.0/menu.tcl
+lib/TkDesk/static/tk8.0/msgbox.tcl
+lib/TkDesk/static/tk8.0/obsolete.tcl
+lib/TkDesk/static/tk8.0/optMenu.tcl
+lib/TkDesk/static/tk8.0/palette.tcl
+lib/TkDesk/static/tk8.0/prolog.ps
+lib/TkDesk/static/tk8.0/safetk.tcl
+lib/TkDesk/static/tk8.0/scale.tcl
+lib/TkDesk/static/tk8.0/scrlbar.tcl
+lib/TkDesk/static/tk8.0/tclIndex
+lib/TkDesk/static/tk8.0/tearoff.tcl
+lib/TkDesk/static/tk8.0/text.tcl
+lib/TkDesk/static/tk8.0/tk.tcl
+lib/TkDesk/static/tk8.0/tkfbox.tcl
+lib/TkDesk/static/tk8.0/xmfbox.tcl
lib/TkDesk/tclIndex
-lib/TkDesk/tcl_lib/Version
-lib/TkDesk/tcl_lib/init.tcl
-lib/TkDesk/tcl_lib/ldAout.tcl
-lib/TkDesk/tcl_lib/parray.tcl
-lib/TkDesk/tcl_lib/tclIndex
-lib/TkDesk/tk_lib/bgerror.tcl
-lib/TkDesk/tk_lib/button.tcl
-lib/TkDesk/tk_lib/clrpick.tcl
-lib/TkDesk/tk_lib/comdlg.tcl
-lib/TkDesk/tk_lib/console.tcl
-lib/TkDesk/tk_lib/dialog.tcl
-lib/TkDesk/tk_lib/entry.tcl
-lib/TkDesk/tk_lib/focus.tcl
-lib/TkDesk/tk_lib/folder.gif
-lib/TkDesk/tk_lib/listbox.tcl
-lib/TkDesk/tk_lib/menu.tcl
-lib/TkDesk/tk_lib/msgbox.tcl
-lib/TkDesk/tk_lib/obsolete.tcl
-lib/TkDesk/tk_lib/optMenu.tcl
-lib/TkDesk/tk_lib/palette.tcl
-lib/TkDesk/tk_lib/prolog.ps
-lib/TkDesk/tk_lib/scale.tcl
-lib/TkDesk/tk_lib/scrlbar.tcl
-lib/TkDesk/tk_lib/tclIndex
-lib/TkDesk/tk_lib/tearoff.tcl
-lib/TkDesk/tk_lib/text.tcl
-lib/TkDesk/tk_lib/textfile.gif
-lib/TkDesk/tk_lib/tk.tcl
-lib/TkDesk/tk_lib/tkAppInit.c
-lib/TkDesk/tk_lib/tkfbox.tcl
-lib/TkDesk/tk_lib/updir.xbm
-lib/TkDesk/tk_lib/xmfbox.tcl
lib/TkDesk/tkpatches.tcl
lib/TkDesk/update.tcl
lib/TkDesk/util.tcl
@@ -581,6 +589,8 @@
@dirrm lib/TkDesk/images/xbm
@dirrm lib/TkDesk/images
@dirrm lib/TkDesk/sounds
-@dirrm lib/TkDesk/tcl_lib
-@dirrm lib/TkDesk/tk_lib
+@dirrm lib/TkDesk/static/itcl3.0
+@dirrm lib/TkDesk/static/tcl8.0
+@dirrm lib/TkDesk/static/tk8.0
+@dirrm lib/TkDesk/static
@dirrm lib/TkDesk
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?20000524221015O.yatt>