Attachment 1242 Details for Bug 4569 – file.diff

[patch] file.diff

file.diff (text/plain), 7.18 KB, created by vanilla on 1997-09-18 16:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vanilla

Created: 1997-09-18 16:20:00 UTC

Size: 7.18 KB

patch

obsolete

>diff -bcrNp filerunner.orig/Makefile filerunner/Makefile
>*** filerunner.orig/Makefile	Sun May 25 01:08:36 1997
>--- filerunner/Makefile	Thu Sep 18 22:54:22 1997
>***************
>*** 1,26 ****
>  # New ports collection makefile for:	filerunner
>! # Version required:	2.1
>  # Date created:		3 August 1996
>  # Whom:			lukin
>  #
>  # $Id: Makefile,v 1.7 1997/05/24 17:08:36 obrien Exp $
>  #
>  
>! DISTNAME=	FileRunner_2.3
>! PKGNAME=	filerunner-2.3
>! CATEGORIES=	x11 tk41
>  MASTER_SITES=	${MASTER_SITE_SUNSITE}
>  MASTER_SITE_SUBDIR=	X11/desktop
>  EXTRACT_SUFX=	.tgz
>  
>  MAINTAINER=	lukin@okbmei.msk.su
>  
>! LIB_DEPENDS=	tk42\\.1:${PORTSDIR}/x11/tk42
>  
>  MAKEFILE=	Makefile.freebsd
>  MAKE_ENV+=	X11BASE=${X11BASE}
>  
>  pre-build:
>  	@ ${RM} ${WRKSRC}/ext.so
>  	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
>  
>--- 1,28 ----
>  # New ports collection makefile for:	filerunner
>! # Version required:	2.4
>  # Date created:		3 August 1996
>  # Whom:			lukin
>  #
>  # $Id: Makefile,v 1.7 1997/05/24 17:08:36 obrien Exp $
>  #
>  
>! DISTNAME=	FileRunner-2.4
>! PKGNAME=	filerunner-2.4
>! CATEGORIES=	x11 tk80
>  MASTER_SITES=	${MASTER_SITE_SUNSITE}
>  MASTER_SITE_SUBDIR=	X11/desktop
>  EXTRACT_SUFX=	.tgz
>  
>  MAINTAINER=	lukin@okbmei.msk.su
>  
>! LIB_DEPENDS=	tk80\\.1:${PORTSDIR}/x11/tk80
>  
>+ WRKSRC=		${WRKDIR}/FileRunner_2.4
>  MAKEFILE=	Makefile.freebsd
>  MAKE_ENV+=	X11BASE=${X11BASE}
>  
>  pre-build:
>+ 	@ ${RM} ${WRKSRC}/ext.o
>  	@ ${RM} ${WRKSRC}/ext.so
>  	@ ${CP} ${WRKSRC}/Makefiles/Makefile.freebsd ${WRKSRC}
>  
>*************** do-install:
>*** 28,37 ****
>  	@ ${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
>  	@ ${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
>  	@ ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
>! .for file in FAQ QuickStart.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl frcolor frftp ftp.tcl palette.tcl tclIndex HISTORY
>  		@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner
>  .endfor
>! .for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit up.bit update.bit xterm.bit
>  		@ ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
>  .endfor
>  
>--- 30,39 ----
>  	@ ${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps
>  	@ ${INSTALL_SCRIPT} ${WRKSRC}/fr ${PREFIX}/lib/FileRunner
>  	@ ln -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin
>! .for file in FAQ HISTORY QuickStart.txt Tips Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog_about.tcl ext.so font.tcl frcolor frftp ftp.tcl http.tcl palette.tcl tclIndex
>  		@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner
>  .endfor
>! .for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit tree.bit up.bit update.bit xterm.bit
>  		@ ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${PREFIX}/lib/FileRunner/bitmaps
>  .endfor
>  
>Binary files filerunner.orig/files/FileRunner-2.4.tgz and filerunner/files/FileRunner-2.4.tgz differ
>diff -bcrNp filerunner.orig/files/md5 filerunner/files/md5
>*** filerunner.orig/files/md5	Tue May 20 15:03:26 1997
>--- filerunner/files/md5	Thu Sep 18 17:22:41 1997
>***************
>*** 1 ****
>! MD5 (FileRunner_2.3.tgz) = 4afe940178c82b7d9cd73d972352f37f
>--- 1 ----
>! MD5 (FileRunner-2.4.tgz) = e58a5455eb35bf2d1491e5821384b0bf
>diff -bcrNp filerunner.orig/patches/patch-aa filerunner/patches/patch-aa
>*** filerunner.orig/patches/patch-aa	Tue May 20 15:03:27 1997
>--- filerunner/patches/patch-aa	Thu Sep 18 17:26:26 1997
>***************
>*** 1,18 ****
>! --- ./Makefiles/Makefile.freebsd.org	Mon May 19 23:59:20 1997
>! +++ ./Makefiles/Makefile.freebsd	Tue May 20 00:01:05 1997
>! @@ -2,11 +2,11 @@
>   # It has been tested under FreeBSD 2.1.5.
>   
>   # Change this if you have this stuff somewhere else.
>! -TCLINC = /usr/local/lib/tcl7.6
>! -TKINC  = /usr/local/lib/tk4.2
>! -X11INC = /usr/X11/include
>! +TCLINC = /usr/local/include/tcl7.6
>! +TKINC  = /usr/local/include/tk4.2
>! +X11INC = /usr/X11R6/include
>   
>! -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
>! +CFLAGS += -Wall -fpic -DPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
>   
>   CC = gcc
>   
>--- 1,27 ----
>! *** Makefiles/Makefile.freebsd.orig	Sat Aug  9 03:56:08 1997
>! --- Makefiles/Makefile.freebsd	Thu Sep 18 17:25:58 1997
>! ***************
>! *** 2,12 ****
>    # It has been tested under FreeBSD 2.1.5.
>    
>    # Change this if you have this stuff somewhere else.
>! ! TCLINC = /usr/local/lib/tcl8.0
>! ! TKINC  = /usr/local/lib/tk8.0
>! ! X11INC = /usr/X11/include
>    
>! ! CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
>!   
>!   CC = gcc
>!   
>! --- 2,12 ----
>!   # It has been tested under FreeBSD 2.1.5.
>!   
>!   # Change this if you have this stuff somewhere else.
>! ! TCLINC = /usr/local/include/tcl8.0
>! ! TKINC  = /usr/local/include/tk8.0
>! ! X11INC = /usr/X11R6/include
>!   
>! ! CFLAGS += -Wall -fpic -DPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
>    
>    CC = gcc
>    
>diff -bcrNp filerunner.orig/patches/patch-ab filerunner/patches/patch-ab
>*** filerunner.orig/patches/patch-ab	Thu Jan  1 08:00:00 1970
>--- filerunner/patches/patch-ab	Thu Sep 18 22:57:17 1997
>***************
>*** 0 ****
>--- 1,28 ----
>+ *** fr.orig	Thu Sep 18 22:55:04 1997
>+ --- fr	Thu Sep 18 22:57:08 1997
>+ *************** CheckCmdLineArgs
>+ *** 3125,3135 ****
>+   
>+   FindLibfr
>+   
>+   # Load patches for 8.0...
>+ ! if {$tk_patchLevel == "8.0"} {
>+ !   #puts "Buggy 8.0 menu.tcl file, applying patch"
>+ !   source $glob(lib_fr)/menu_80_patch.tcl
>+ ! }
>+   
>+   set auto_path [linsert $auto_path 0 $glob(lib_fr) ]
>+   
>+ --- 3125,3136 ----
>+   
>+   FindLibfr
>+   
>+ + # FreeBSD fix the bug already..
>+   # Load patches for 8.0...
>+ ! #if {$tk_patchLevel == "8.0"} {
>+ ! #  #puts "Buggy 8.0 menu.tcl file, applying patch"
>+ ! #  source $glob(lib_fr)/menu_80_patch.tcl
>+ ! #}
>+   
>+   set auto_path [linsert $auto_path 0 $glob(lib_fr) ]
>+   
>diff -bcrNp filerunner.orig/pkg/PLIST filerunner/pkg/PLIST
>*** filerunner.orig/pkg/PLIST	Sun May 25 01:08:37 1997
>--- filerunner/pkg/PLIST	Thu Sep 18 22:58:11 1997
>***************
>*** 1,11 ****
>  lib/FileRunner/FAQ
>  lib/FileRunner/HISTORY
>  lib/FileRunner/QuickStart.txt
>  lib/FileRunner/Users_Guide.txt
>  lib/FileRunner/chmod.tcl
>  lib/FileRunner/cmd.tcl
>  lib/FileRunner/config.tcl
>- lib/FileRunner/bitmaps/cross.bit
>  lib/FileRunner/dialog_about.tcl
>  lib/FileRunner/ext.so
>  lib/FileRunner/font.tcl
>--- 1,11 ----
>  lib/FileRunner/FAQ
>  lib/FileRunner/HISTORY
>  lib/FileRunner/QuickStart.txt
>+ lib/FileRunner/Tips
>  lib/FileRunner/Users_Guide.txt
>  lib/FileRunner/chmod.tcl
>  lib/FileRunner/cmd.tcl
>  lib/FileRunner/config.tcl
>  lib/FileRunner/dialog_about.tcl
>  lib/FileRunner/ext.so
>  lib/FileRunner/font.tcl
>*************** lib/FileRunner/fr
>*** 13,20 ****
>--- 13,22 ----
>  lib/FileRunner/frcolor
>  lib/FileRunner/frftp
>  lib/FileRunner/ftp.tcl
>+ lib/FileRunner/http.tcl
>  lib/FileRunner/palette.tcl
>  lib/FileRunner/tclIndex
>+ lib/FileRunner/bitmaps/cross.bit
>  lib/FileRunner/bitmaps/frterm.bit
>  lib/FileRunner/bitmaps/larger.bit
>  lib/FileRunner/bitmaps/left.bit
>*************** lib/FileRunner/bitmaps/pgdown.bit
>*** 23,28 ****
>--- 25,31 ----
>  lib/FileRunner/bitmaps/pgup.bit
>  lib/FileRunner/bitmaps/right.bit
>  lib/FileRunner/bitmaps/smaller.bit
>+ lib/FileRunner/bitmaps/tree.bit
>  lib/FileRunner/bitmaps/toggle.bit
>  lib/FileRunner/bitmaps/up.bit
>  lib/FileRunner/bitmaps/update.bit

Actions: View | Diff

Attachments on bug 4569: 1242