Attachment 34754 Details for Bug 56370 – file.diff

[patch] file.diff

file.diff (text/plain), 13.18 KB, created by Brian Clapper on 2003-09-03 14:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Clapper

Created: 2003-09-03 14:40:14 UTC

Size: 13.18 KB

patch

obsolete

>diff -uNr gnuls/Makefile gnuls.new/Makefile
>--- gnuls/Makefile	Wed Aug 20 05:59:28 2003
>+++ gnuls.new/Makefile	Sun Aug 31 14:14:55 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	gnuls
>-PORTVERSION=	4.0
>+PORTVERSION=	4.1
> PORTREVISION=	1
> CATEGORIES=	misc
> MASTER_SITES=	${MASTER_SITE_GNU}
>diff -uNr gnuls/distinfo gnuls.new/distinfo
>--- gnuls/distinfo	Sat Aug 25 20:47:28 2001
>+++ gnuls.new/distinfo	Sun Aug 31 14:15:27 2003
>@@ -1,2 +1,2 @@
>-MD5 (fileutils-4.0.tar.gz) = 082ab37b7f37c00e768b04e37bc736be
>+MD5 (fileutils-4.1.tar.gz) = 2fa04ceee87e962ddf72f32a2d6b906d
> MD5 (gnuls-acl-20010825.patch) = d020a41cf42b44e57d4ebd4d4938dd9a
>diff -uNr gnuls/files/patch-aa gnuls.new/files/patch-aa
>--- gnuls/files/patch-aa	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-aa	Sun Aug 31 14:14:09 2003
>@@ -1,20 +1,19 @@
>-*** Makefile.in.orig	Fri Feb 19 19:24:40 1999
>---- Makefile.in	Fri Feb 19 19:27:05 1999
>+*** Makefile.in.orig	Sun Aug 31 14:13:23 2003
>+--- Makefile.in	Sun Aug 31 14:13:37 2003
> ***************
>-*** 92,98 ****
>+*** 121,127 ****
>   
>   AUTOMAKE_OPTIONS = gnits 1.2h
>   
> ! SUBDIRS = lib intl src doc man m4 po tests
>+  EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog-1997 \
>+    .kludge-stamp .prev-version
>   
>-  # Remove this file here (it is created via configure), not from within intl.
>-  DISTCLEANFILES = intl/libintl.h
>---- 92,99 ----
>+--- 121,127 ----
>   
>   AUTOMAKE_OPTIONS = gnits 1.2h
>   
>-! #SUBDIRS = lib intl src doc man m4 po tests
>-! SUBDIRS = lib intl src man 
>+! SUBDIRS = lib intl src man
>+  EXTRA_DIST = Makefile.maint GNUmakefile ChangeLog-1997 \
>+    .kludge-stamp .prev-version
>   
>-  # Remove this file here (it is created via configure), not from within intl.
>-  DISTCLEANFILES = intl/libintl.h
>diff -uNr gnuls/files/patch-ac gnuls.new/files/patch-ac
>--- gnuls/files/patch-ac	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-ac	Wed Sep  3 09:22:44 2003
>@@ -1,54 +1,94 @@
>-*** src/Makefile.in.orig	Thu Feb 18 08:40:27 1999
>---- src/Makefile.in	Thu Feb 18 08:44:15 1999
>+*** src/Makefile.in.orig	Sun Apr 29 07:40:37 2001
>+--- src/Makefile.in	Wed Sep  3 09:22:13 2003
> ***************
>-*** 95,103 ****
>-  EXTRAdir = $(bindir)
>-  EXTRA_PROGRAMS = df mvdir
>+*** 121,129 ****
>+  
>+  EXTRA_PROGRAMS = df
>   
> ! bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \
> ! ginstall ln dir vdir ls mkdir \
>-! mkfifo mknod mv rm rmdir sync touch @DF_PROG@
>+! mkfifo mknod mv rm rmdir shred sync touch @DF_PROG@
>+  
>   
>-  libexec_PROGRAMS = @MVDIR_PROG@
>   datadir = $(prefix)/@DATADIRNAME@
>---- 95,101 ----
>-  EXTRAdir = $(bindir)
>-  EXTRA_PROGRAMS = df mvdir
>+--- 121,127 ----
>+  
>+  EXTRA_PROGRAMS = df
>   
> ! bin_PROGRAMS = gnuls dir vdir dircolors
>   
>-  libexec_PROGRAMS = @MVDIR_PROG@
>+  
>   datadir = $(prefix)/@DATADIRNAME@
> ***************
>-*** 203,209 ****
>-  ls_OBJECTS =  ls$U.o ls-ls$U.o
>-  ls_LDADD = $(LDADD)
>-  ls_DEPENDENCIES =  ../lib/libfu.a
>+*** 173,183 ****
>+  CONFIG_HEADER = $(top_builddir)/config.h
>+  CONFIG_CLEAN_FILES =
>+  EXTRA_PROGRAMS = df$(EXEEXT)
>+! bin_PROGRAMS = chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) cp$(EXEEXT) \
>+! dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) ginstall$(EXEEXT) \
>+! ln$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) ls$(EXEEXT) mkdir$(EXEEXT) \
>+! mkfifo$(EXEEXT) mknod$(EXEEXT) mv$(EXEEXT) rm$(EXEEXT) rmdir$(EXEEXT) \
>+! shred$(EXEEXT) sync$(EXEEXT) touch$(EXEEXT) @DF_PROG@
>+  PROGRAMS = $(bin_PROGRAMS)
>+  
>+  CPPFLAGS = @CPPFLAGS@
>+--- 171,177 ----
>+  CONFIG_HEADER = $(top_builddir)/config.h
>+  CONFIG_CLEAN_FILES =
>+  EXTRA_PROGRAMS = df$(EXEEXT)
>+! bin_PROGRAMS = dircolors$(EXEEXT) dir$(EXEEXT) vdir$(EXEEXT) gnuls$(EXEEXT)
>+  PROGRAMS = $(bin_PROGRAMS)
>+  
>+  CPPFLAGS = @CPPFLAGS@
>+***************
>+*** 242,248 ****
>+  am_ls_OBJECTS = ls$U.$(OBJEXT) ls-ls$U.$(OBJEXT)
>+  ls_OBJECTS = $(am_ls_OBJECTS)
>+  ls_DEPENDENCIES = ../lib/libfetish.a
> ! ls_LDFLAGS = 
>   mkdir_SOURCES = mkdir.c
>-  mkdir_OBJECTS =  mkdir$U.o
>+  mkdir_OBJECTS = mkdir$U.$(OBJEXT)
>   mkdir_LDADD = $(LDADD)
>---- 201,207 ----
>-  ls_OBJECTS =  ls$U.o ls-ls$U.o
>-  ls_LDADD = $(LDADD)
>-  ls_DEPENDENCIES =  ../lib/libfu.a
>+--- 236,242 ----
>+  am_ls_OBJECTS = ls$U.$(OBJEXT) ls-ls$U.$(OBJEXT)
>+  ls_OBJECTS = $(am_ls_OBJECTS)
>+  ls_DEPENDENCIES = ../lib/libfetish.a
> ! ls_LDFLAGS = -o gnuls
>   mkdir_SOURCES = mkdir.c
>-  mkdir_OBJECTS =  mkdir$U.o
>+  mkdir_OBJECTS = mkdir$U.$(OBJEXT)
>   mkdir_LDADD = $(LDADD)
> ***************
>-*** 412,419 ****
>-  	@rm -f vdir
>-  	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
>+*** 316,323 ****
>+  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in ansi2knr.1 \
>+  ansi2knr.c
>+  
>+! SOURCES = $(chgrp_SOURCES) chmod.c $(chown_SOURCES) $(cp_SOURCES) dd.c df.c $(dir_SOURCES) dircolors.c du.c $(ginstall_SOURCES) ln.c $(ls_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) $(rm_SOURCES) rmdir.c shred.c sync.c touch.c $(vdir_SOURCES)
>+! OBJECTS = $(am_chgrp_OBJECTS) chmod$U.$(OBJEXT) $(am_chown_OBJECTS) $(am_cp_OBJECTS) dd$U.$(OBJEXT) df$U.$(OBJEXT) $(am_dir_OBJECTS) dircolors$U.$(OBJEXT) du$U.$(OBJEXT) $(am_ginstall_OBJECTS) ln$U.$(OBJEXT) $(am_ls_OBJECTS) mkdir$U.$(OBJEXT) mkfifo$U.$(OBJEXT) mknod$U.$(OBJEXT) $(am_mv_OBJECTS) $(am_rm_OBJECTS) rmdir$U.$(OBJEXT) shred$U.$(OBJEXT) sync$U.$(OBJEXT) touch$U.$(OBJEXT) $(am_vdir_OBJECTS)
>+  
>+  all: $(BUILT_SOURCES)
>+  	$(MAKE) $(AM_MAKEFLAGS) all-am
>+--- 310,317 ----
>+  DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in ansi2knr.1 \
>+  ansi2knr.c
>+  
>+! SOURCES = $(dir_SOURCES) dircolors.c $(ls_SOURCES) $(vdir_SOURCES)
>+! OBJECTS = $(am_dir_OBJECTS) dircolors$U.$(OBJEXT) $(am_ls_OBJECTS) $(am_vdir_OBJECTS)
>+  
>+  all: $(BUILT_SOURCES)
>+  	$(MAKE) $(AM_MAKEFLAGS) all-am
>+***************
>+*** 415,422 ****
>+  	@rm -f ln
>+  	$(LINK) $(ln_LDFLAGS) $(ln_OBJECTS) $(ln_LDADD) $(LIBS)
>   
> ! ls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
> ! 	@rm -f ls
>   	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
>   
>   mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
>---- 410,417 ----
>-  	@rm -f vdir
>-  	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
>+--- 409,416 ----
>+  	@rm -f ln
>+  	$(LINK) $(ln_LDFLAGS) $(ln_OBJECTS) $(ln_LDADD) $(LIBS)
>   
> ! gnuls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
> ! 	@rm -f gnuls
>diff -uNr gnuls/files/patch-ad gnuls.new/files/patch-ad
>--- gnuls/files/patch-ad	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-ad	Sun Aug 31 14:12:06 2003
>@@ -1,52 +1,42 @@
>-*** man/Makefile.in.orig	Sat Nov 14 10:46:12 1998
>---- man/Makefile.in	Sat Feb 20 09:20:26 1999
>+*** man/Makefile.in.orig	Sun Aug 31 13:59:34 2003
>+--- man/Makefile.in	Sun Aug 31 14:00:15 2003
> ***************
>-*** 88,96 ****
>-  YACC = @YACC@
>+*** 118,126 ****
>   l = @l@
>   
>+  
> ! man_MANS = chgrp.1 chmod.1 chown.1 cp.1 dir.1 dd.1 df.1 dircolors.1 \
> !   du.1 ginstall.1 ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 \
>-!   sync.1 touch.1 vdir.1
>+!   shred.1 sync.1 touch.1 vdir.1
>+  
>   man_aux = $(man_MANS:.1=.x)
>   
>-  EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
>---- 88,94 ----
>-  YACC = @YACC@
>+--- 118,124 ----
>   l = @l@
>   
>+  
> ! man_MANS = dir.1 dircolors.1 gnuls.1 vdir.1
>+  
>   man_aux = $(man_MANS:.1=.x)
>   
>-  EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
> ***************
>-*** 117,123 ****
>+*** 148,154 ****
>+  NROFF = nroff
>+  DIST_COMMON = Makefile.am Makefile.in
>   
>-  TAR = tar
>-  GZIP = --best
>-! all: Makefile $(MANS)
>+! all: all-am
>   
>   .SUFFIXES:
>-  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
>---- 115,125 ----
>   
>-  TAR = tar
>-  GZIP = --best
>-! all: freebsd_setup Makefile $(MANS)
>+--- 146,156 ----
>+  NROFF = nroff
>+  DIST_COMMON = Makefile.am Makefile.in
>+  
>+! all: freebsd-setup all-am
> ! 
>-! freebsd_setup:
>+! freebsd-setup:
> ! 	@cp ls.1 gnuls.1
> ! 	@cp ls.x gnuls.x
>   
>   .SUFFIXES:
>-  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
>-***************
>-*** 228,234 ****
>-  uninstall all installdirs mostlyclean-generic distclean-generic \
>-  clean-generic maintainer-clean-generic clean mostlyclean distclean \
>-  maintainer-clean
>-- 
>-  
>-  # For additional rules usually of interest only to the maintainer,
>-  # see GNUmakefile and Makefile.maint.
>---- 230,235 ----
>+  
>diff -uNr gnuls/files/patch-ae gnuls.new/files/patch-ae
>--- gnuls/files/patch-ae	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-ae	Sun Aug 31 14:12:10 2003
>@@ -1,29 +1,46 @@
>-*** man/ls.1.orig	Sat Feb 20 08:55:59 1999
>---- man/ls.1	Sat Feb 20 09:02:36 1999
>+*** man/ls.1.orig	Sun Aug 31 14:01:47 2003
>+--- man/ls.1	Sun Aug 31 14:04:59 2003
> ***************
> *** 1,9 ****
>-  ." DO NOT MODIFY THIS FILE!  It was generated by help2man 1.5.1.2.
>-! .TH LS 1 "November 1998" "GNU fileutils 4.0" "FSF"
>+  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
>+! .TH LS "1" "April 2001" "ls (fileutils) 4.1" FSF
>   .SH NAME
> ! ls \- list directory contents
>   .SH SYNOPSIS
> ! .B ls
>   [\fIOPTION\fR]... [\fIFILE\fR]...
>   .SH DESCRIPTION
>-  .PP
>+  .\" Add any additional description here
> --- 1,9 ----
>-  ." DO NOT MODIFY THIS FILE!  It was generated by help2man 1.5.1.2.
>-! .TH GNULS 1 "November 1998" "GNU fileutils 4.0" "FSF"
>+  .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
>+! .TH GNULS "1" "April 2001" "ls (fileutils) 4.1" FSF
>   .SH NAME
> ! gnuls \- list directory contents
>   .SH SYNOPSIS
> ! .B gnuls
>   [\fIOPTION\fR]... [\fIFILE\fR]...
>   .SH DESCRIPTION
>-  .PP
>+  .\" Add any additional description here
>+***************
>+*** 113,119 ****
>+  .TP
>+  \fB\-\-show\-control\-chars\fR
>+  show non graphic characters as-is (default
>+! unless program is `ls' and output is a terminal)
>+  .TP
>+  \fB\-Q\fR, \fB\-\-quote\-name\fR
>+  enclose entry names in double quotes
>+--- 113,119 ----
>+  .TP
>+  \fB\-\-show\-control\-chars\fR
>+  show non graphic characters as-is (default
>+! unless program is `gnuls' and output is a terminal)
>+  .TP
>+  \fB\-Q\fR, \fB\-\-quote\-name\fR
>+  enclose entry names in double quotes
> ***************
>-*** 171,182 ****
>-  Report bugs to <bug-fileutils@gnu.org>.
>+*** 196,207 ****
>+  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>   .SH "SEE ALSO"
>   The full documentation for
> ! .B ls
>@@ -35,15 +52,15 @@
>   .IP
>   .B info ls
>   .PP
>---- 171,181 ----
>-  Report bugs to <bug-fileutils@gnu.org>.
>+--- 196,206 ----
>+  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>   .SH "SEE ALSO"
>   The full documentation for
> ! .B gnuls
>   is maintained as a Texinfo manual.  If the
>   .B info
>-! program and the full suite of GNU fileutils
>-! are properly installed at your site, the command
>+! program and the full suite of GNU fileutils are properly installed
>+! at your site, the command
>   .IP
>   .B info ls
>   .PP
>diff -uNr gnuls/files/patch-af gnuls.new/files/patch-af
>--- gnuls/files/patch-af	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-af	Sun Aug 31 14:12:14 2003
>@@ -1,7 +1,7 @@
>-*** man/dircolors.1.orig	Sat Feb 20 09:28:05 1999
>---- man/dircolors.1	Sat Feb 20 09:29:10 1999
>+*** man/dircolors.1.orig	Sun Aug 31 14:05:39 2003
>+--- man/dircolors.1	Sun Aug 31 14:06:07 2003
> ***************
>-*** 37,45 ****
>+*** 43,51 ****
>   .B dircolors
>   is maintained as a Texinfo manual.  If the
>   .B info
>@@ -11,7 +11,7 @@
>   .IP
>   .B info dircolors
>   .PP
>---- 37,44 ----
>+--- 43,50 ----
>   .B dircolors
>   is maintained as a Texinfo manual.  If the
>   .B info
>diff -uNr gnuls/files/patch-ag gnuls.new/files/patch-ag
>--- gnuls/files/patch-ag	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-ag	Sun Aug 31 14:12:18 2003
>@@ -1,7 +1,7 @@
>-*** man/dir.1.orig	Sat Feb 20 09:29:26 1999
>---- man/dir.1	Sat Feb 20 09:29:45 1999
>+*** man/dir.1.orig	Sun Aug 31 14:06:52 2003
>+--- man/dir.1	Sun Aug 31 14:07:07 2003
> ***************
>-*** 174,182 ****
>+*** 199,207 ****
>   .B dir
>   is maintained as a Texinfo manual.  If the
>   .B info
>@@ -11,7 +11,7 @@
>   .IP
>   .B info dir
>   .PP
>---- 174,181 ----
>+--- 199,206 ----
>   .B dir
>   is maintained as a Texinfo manual.  If the
>   .B info
>diff -uNr gnuls/files/patch-ah gnuls.new/files/patch-ah
>--- gnuls/files/patch-ah	Sun Mar 14 21:20:21 1999
>+++ gnuls.new/files/patch-ah	Sun Aug 31 14:12:21 2003
>@@ -1,7 +1,7 @@
>-*** man/vdir.1.orig	Sat Feb 20 09:29:29 1999
>---- man/vdir.1	Sat Feb 20 09:30:04 1999
>+*** man/vdir.1.orig	Sun Aug 31 14:07:48 2003
>+--- man/vdir.1	Sun Aug 31 14:08:01 2003
> ***************
>-*** 174,182 ****
>+*** 199,207 ****
>   .B vdir
>   is maintained as a Texinfo manual.  If the
>   .B info
>@@ -11,7 +11,7 @@
>   .IP
>   .B info vdir
>   .PP
>---- 174,181 ----
>+--- 199,206 ----
>   .B vdir
>   is maintained as a Texinfo manual.  If the
>   .B info
>diff -uNr gnuls/files/patch-ai gnuls.new/files/patch-ai
>--- gnuls/files/patch-ai	Thu Feb  7 15:54:59 2002
>+++ gnuls.new/files/patch-ai	Wed Dec 31 19:00:00 1969
>@@ -1,12 +0,0 @@
>---- lib/error.c.orig	Fri Mar 27 12:22:34 1998
>-+++ lib/error.c	Thu Jan 31 08:49:18 2002
>-@@ -152,7 +152,8 @@
>-     {
>- #if defined HAVE_STRERROR_R || defined _LIBC
>-       char errbuf[1024];
>--      fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf));
>-+      __strerror_r (errnum, errbuf, sizeof errbuf);
>-+      fprintf (stderr, ": %s", errbuf);
>- #else
>-       fprintf (stderr, ": %s", strerror (errnum));
>- #endif
>diff -uNr gnuls/pkg-descr gnuls.new/pkg-descr
>--- gnuls/pkg-descr	Sun Mar 14 21:20:22 1999
>+++ gnuls.new/pkg-descr	Wed Sep  3 09:27:41 2003
>@@ -19,5 +19,3 @@
> 3. This colorized `ls' program is not the same as the `colorls' program 
>    available from the ports collection.
> 
>-Brian Clapper <bmc@WillsCreek.COM>
>-20 February, 1999

Actions: View | Diff

Attachments on bug 56370: 34754