Attachment #3876 for bug #10173

View | Details | Raw Unified | Return to bug 10173
Collapse All | Expand All




# New ports collection makefile for:	GNU colorized `ls'
# Version required:			4.0 (GNU fileutils 4.0)
# Date created:				06 January 1996
# Whom:					bmc@WillsCreek.COM
#
# $Id: Makefile,v 1.7 1997/09/18 17:40:24 fenner Exp $
#

DISTNAME=	fileutils-4.0
PKGNAME=	gnuls-4.0
CATEGORIES=	misc
MASTER_SITES=	${MASTER_SITE_GNU}

MAINTAINER=	bmc@WillsCreek.COM

GNU_CONFIGURE=	yes
MAN1=		gnuls.1 dircolors.1 dir.1 vdir.1

.include <bsd.port.mk>

Line 1 Link Here

(-)gnuls/files/md5 (-1 / +1 lines)
1	MD5 (fileutils-3.16.tar.gz) = b64c38f1f14ec82d55d8b967035ede8f	1	MD5 (fileutils-4.0.tar.gz) = 082ab37b7f37c00e768b04e37bc736be




*** Makefile.in.orig	Fri Feb 19 19:24:40 1999
--- Makefile.in	Fri Feb 19 19:27:05 1999
***************
*** 92,98 ****
  
  AUTOMAKE_OPTIONS = gnits 1.2h
  
! SUBDIRS = lib intl src doc man m4 po tests
  
  # Remove this file here (it is created via configure), not from within intl.
  DISTCLEANFILES = intl/libintl.h
--- 92,99 ----
  
  AUTOMAKE_OPTIONS = gnits 1.2h
  
! #SUBDIRS = lib intl src doc man m4 po tests
! SUBDIRS = lib intl src man 
  
  # Remove this file here (it is created via configure), not from within intl.
  DISTCLEANFILES = intl/libintl.h




*** intl/Makefile.in.orig	Fri Feb 19 19:20:37 1999
--- intl/Makefile.in	Fri Feb 19 19:20:54 1999
***************
*** 109,115 ****
  # where configure found a previously installed GNU gettext library.
  # If you want to use the one which comes with this version of the
  # package, you have to use `configure --with-included-gettext'.

  install-exec: all
  	if test "$(PACKAGE)" = "gettext" \
  	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
--- 109,116 ----
  # where configure found a previously installed GNU gettext library.
  # If you want to use the one which comes with this version of the
  # package, you have to use `configure --with-included-gettext'.
! install: 
! 	@echo Nothing to install in intl
  install-exec: all
  	if test "$(PACKAGE)" = "gettext" \
  	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \




*** src/Makefile.in.orig	Thu Feb 18 08:40:27 1999
--- src/Makefile.in	Thu Feb 18 08:44:15 1999
***************
*** 95,103 ****
  EXTRAdir = $(bindir)
  EXTRA_PROGRAMS = df mvdir
  

  
  libexec_PROGRAMS = @MVDIR_PROG@
  datadir = $(prefix)/@DATADIRNAME@
--- 95,101 ----
  EXTRAdir = $(bindir)
  EXTRA_PROGRAMS = df mvdir
  
! 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
! ls_LDFLAGS = 
  mkdir_SOURCES = mkdir.c
  mkdir_OBJECTS =  mkdir$U.o
  mkdir_LDADD = $(LDADD)
--- 201,207 ----
  ls_OBJECTS =  ls$U.o ls-ls$U.o
  ls_LDADD = $(LDADD)
  ls_DEPENDENCIES =  ../lib/libfu.a
! ls_LDFLAGS = -o gnuls
  mkdir_SOURCES = mkdir.c
  mkdir_OBJECTS =  mkdir$U.o
  mkdir_LDADD = $(LDADD)
***************
*** 412,419 ****
  	@rm -f vdir
  	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
  $(ls_OBJECTS): ../config.h
  
! ls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
! 	@rm -f ls
  	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
  $(mkdir_OBJECTS): ../config.h
  
  mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
--- 410,417 ----
  	@rm -f vdir
  	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
  $(ls_OBJECTS): ../config.h
  
! gnuls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
! 	@rm -f gnuls
  	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
  $(mkdir_OBJECTS): ../config.h
  
*** src/dircolors.c.orig	Sun Jan 26 00:54:17 1997
--- src/dircolors.c	Sat Oct 25 16:00:40 1997
***************
*** 72,84 ****
    "NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
    "SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
    "CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END",
!   "ENDCODE", NULL
  };
  
  static const char *const ls_codes[] =
  {
    "no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
    "so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
  };
  
  static struct option const long_options[] =
--- 72,86 ----
    "NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
    "SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
    "CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END",
!   "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "WRO", "WRITEOTHERS",
!   "WT", "WROT", "WRITEOTHERSSTICKY", NULL
  };
  
  static const char *const ls_codes[] =
  {
    "no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
    "so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
+   "su", "su", "sg", "sg", "wo", "wo", "wo", "wt", "wt", "wt", NULL
  };
  
  static struct option const long_options[] =
*** src/ls.c.orig	Sun Jan 26 00:56:10 1997
--- src/ls.c	Sat Oct 25 16:00:30 1997
***************
*** 359,371 ****
  enum indicator_no
    {
      C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
!     C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC
    };
  
  static const char *const indicator_name[]=
    {
      "lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
!     "bd", "cd", "mi", "or", "ex", NULL
    };
  
  struct col_ext_type
--- 359,371 ----
  enum indicator_no
    {
      C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
!     C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_UID, C_GID, C_WRO, C_WT
    };
  
  static const char *const indicator_name[]=
    {
      "lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
!     "bd", "cd", "mi", "or", "ex", "su", "sg", "wo", "wt", NULL
    };
  
  struct col_ext_type
***************
*** 390,396 ****
      { LEN_STR_PAIR ("01;33") },		/* cd: Char device: bright yellow */
      { 0, NULL },			/* mi: Missing file: undefined */
      { 0, NULL },			/* or: Orphanned symlink: undefined */
!     { LEN_STR_PAIR ("01;32") }		/* ex: Executable: bright green */
    };
  
  /* FIXME: comment  */
--- 390,400 ----
      { LEN_STR_PAIR ("01;33") },		/* cd: Char device: bright yellow */
      { 0, NULL },			/* mi: Missing file: undefined */
      { 0, NULL },			/* or: Orphanned symlink: undefined */
!     { LEN_STR_PAIR ("01;32") },		/* ex: Executable: bright green */
!     { LEN_STR_PAIR ("37;41") },         /* su: setuid: white on red */
!     { LEN_STR_PAIR ("30;43") },         /* sg: setgid: black on yellow */
!     { LEN_STR_PAIR ("37;44") },         /* wo: writeable-other:white on blue */
!     { LEN_STR_PAIR ("37;42") },         /* wt: wo w/ sticky: white on green */
    };
  
  /* FIXME: comment  */
***************
*** 2407,2413 ****
    else
      {
        if (S_ISDIR (mode))
! 	type = C_DIR;
  
  #ifdef S_ISLNK
        else if (S_ISLNK (mode))
--- 2411,2424 ----
    else
      {
        if (S_ISDIR (mode))
!         {
!           if ((mode && MODE_WT) == MODE_WT)
!             type = C_WT;
!           else if ((mode && MODE_WRO) == MODE_WRO)
!             type = C_WRO;
!           else
!             type = C_DIR;
!         }
  
  mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
        else if (S_ISLNK (mode))
***************
*** 2435,2441 ****
  	type = C_CHR;
  #endif
  
!       if (type == C_FILE && (mode & S_IXUGO) != 0)
  	type = C_EXEC;
  
        /* Check the file's suffix only if still classified as C_FILE.  */
--- 2446,2458 ----
  	type = C_CHR;
  #endif
  
!       if ((type == C_FILE) && ((mode & S_ISUID) != 0))
!         type = C_UID;
! 
!       else if ((type == C_FILE) && ((mode & S_ISGID) != 0))
!         type = C_GID;
! 
!       else if (type == C_FILE && (mode & S_IXUGO) != 0)
  	type = C_EXEC;
  
        /* Check the file's suffix only if still classified as C_FILE.  */
*** src/ls.h.orig	Wed Jun 16 11:24:58 1993
--- src/ls.h	Sat Oct 25 16:00:35 1997
***************
*** 7,10 ****
--- 7,13 ----
  /* This is for the `vdir' program.  */
  #define LS_LONG_FORMAT 3
  
+ #define MODE_WT 01002
+ #define MODE_WRO 02
+ 
  extern int ls_mode;




*** man/Makefile.in.orig	Sat Nov 14 10:46:12 1998
--- man/Makefile.in	Sat Feb 20 09:20:26 1999
***************
*** 88,96 ****
  YACC = @YACC@
  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
  man_aux = $(man_MANS:.1=.x)
  
  EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
--- 88,94 ----
  YACC = @YACC@
  l = @l@
--- 47,57 ----
  LN = @LN@
  RM = @RM@
  
! man_MANS = dircolors.1 gnuls.1 
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
  CONFIG_CLEAN_FILES = 
! MANS = dircolors.1 ls.1
  
! 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 ****
  	$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(mandir)/man1
  	sect=1;				\
! 	inst=`echo "ln" | sed '$(transform)'`.1; \
! 	if test -f $(srcdir)/ln.1; then file=$(srcdir)/ln.1; \
! 	else file=ln.1; fi; \
! 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
! 	sect=1;				\
! 	inst=`echo "chgrp" | sed '$(transform)'`.1; \
! 	if test -f $(srcdir)/chgrp.1; then file=$(srcdir)/chgrp.1; \
! 	else file=chgrp.1; fi; \
! 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
! 	sect=1;				\
! 	inst=`echo "ls" | sed '$(transform)'`.1; \
  	if test -f $(srcdir)/ls.1; then file=$(srcdir)/ls.1; \
  	else file=ls.1; fi; \
  	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
  	sect=1;				\
- 	inst=`echo "chmod" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/chmod.1; then file=$(srcdir)/chmod.1; \
- 	else file=chmod.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "mkdir" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/mkdir.1; then file=$(srcdir)/mkdir.1; \
- 	else file=mkdir.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "chown" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/chown.1; then file=$(srcdir)/chown.1; \
- 	else file=chown.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "mkfifo" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/mkfifo.1; then file=$(srcdir)/mkfifo.1; \
- 	else file=mkfifo.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "cp" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/cp.1; then file=$(srcdir)/cp.1; \
- 	else file=cp.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "mknod" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/mknod.1; then file=$(srcdir)/mknod.1; \
- 	else file=mknod.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "dd" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/dd.1; then file=$(srcdir)/dd.1; \
- 	else file=dd.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "mv" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/mv.1; then file=$(srcdir)/mv.1; \
- 	else file=mv.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "df" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/df.1; then file=$(srcdir)/df.1; \
- 	else file=df.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "rm" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/rm.1; then file=$(srcdir)/rm.1; \
- 	else file=rm.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
  	inst=`echo "dircolors" | sed '$(transform)'`.1; \
  	if test -f $(srcdir)/dircolors.1; then file=$(srcdir)/dircolors.1; \
  	else file=dircolors.1; fi; \
  	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "rmdir" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/rmdir.1; then file=$(srcdir)/rmdir.1; \
- 	else file=rmdir.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "du" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/du.1; then file=$(srcdir)/du.1; \
- 	else file=du.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "touch" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/touch.1; then file=$(srcdir)/touch.1; \
- 	else file=touch.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
- 	sect=1;				\
- 	inst=`echo "install" | sed '$(transform)'`.1; \
- 	if test -f $(srcdir)/install.1; then file=$(srcdir)/install.1; \
- 	else file=install.1; fi; \
- 	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
  
  uninstall-man:
- 	inst=`echo "ln" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "chgrp" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
  	inst=`echo "ls" | sed '$(transform)'`.1; \
  	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "chmod" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "mkdir" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "chown" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "mkfifo" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "cp" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "mknod" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "dd" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "mv" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "df" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "rm" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
  	inst=`echo "dircolors" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "rmdir" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "du" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "touch" | sed '$(transform)'`.1; \
- 	rm -f $(mandir)/man1/$$inst
- 	inst=`echo "install" | sed '$(transform)'`.1; \
  	rm -f $(mandir)/man1/$$inst
  
  tags: TAGS
--- 79,98 ----
  	$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(mandir)/man1
  	sect=1;				\
! 	inst=`echo "gnuls" | sed '$(transform)'`.1; \
  	if test -f $(srcdir)/ls.1; then file=$(srcdir)/ls.1; \
  	else file=ls.1; fi; \
  	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
  	sect=1;				\
  	inst=`echo "dircolors" | sed '$(transform)'`.1; \
  	if test -f $(srcdir)/dircolors.1; then file=$(srcdir)/dircolors.1; \
  	else file=dircolors.1; fi; \
  	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
  
  uninstall-man:
  	inst=`echo "ls" | sed '$(transform)'`.1; \
  	rm -f $(mandir)/man1/$$inst
  	inst=`echo "dircolors" | sed '$(transform)'`.1; \
  	rm -f $(mandir)/man1/$$inst
  
  TAR = tar
  GZIP = --best
! all: Makefile $(MANS)
  
  .SUFFIXES:
  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
--- 115,125 ----
  
  TAR = tar
  GZIP = --best
! all: freebsd_setup Makefile $(MANS)
! 
! 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 ----




*** man/ls.1.orig	Sat Feb 20 08:55:59 1999
--- man/ls.1	Sat Feb 20 09:02:36 1999
***************
*** 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"
  .SH NAME
! ls \- list directory contents
  .SH SYNOPSIS
! .B ls
  [\fIOPTION\fR]... [\fIFILE\fR]...
  .SH DESCRIPTION
  .PP
--- 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"
  .SH NAME
! gnuls \- list directory contents
  .SH SYNOPSIS
! .B gnuls
  [\fIOPTION\fR]... [\fIFILE\fR]...
  .SH DESCRIPTION
  [\-\-numeric-uid-gid] [--no-group] [\-\-hide-control-chars] [\-\-reverse]
***************
*** 19,34 ****
  .PP
  This manual page
  documents the GNU version of
! .BR ls .
  .B dir
  and
  .B vdir
  are versions of
! .B ls
  with different default output formats.
  These programs list each given file or directory name.  Directory contents are
  sorted alphabetically.  For
! .BR ls ,
  files are by default listed in columns, sorted
  vertically, if the standard output is a terminal; otherwise they are
  listed one per line.  For
--- 19,34 ----
  .PP
  This manual page
  documents the GNU version of
! .BR gnuls .
  .B dir
  and
  .B vdir
  are versions of
! .B gnuls
  with different default output formats.
  These programs list each given file or directory name.  Directory contents are
  sorted alphabetically.  For
! .BR gnuls ,
  files are by default listed in columns, sorted
  vertically, if the standard output is a terminal; otherwise they are
  listed one per line.  For
***************
*** 171,182 ****
  Report bugs to <bug-fileutils@gnu.org>.
  .SH "SEE ALSO"
  The full documentation for
! .B ls
  is maintained as a Texinfo manual.  If the
  .B info
! and
--- 163,169 ----
  stored on the disk.  This option is not called
  .I \-f
  because the Unix
! .B gnuls
  .I \-f
  option also enables
  .I \-a
***************
*** 229,235 ****
  When using the
  .I "\-\-color"
  option, this version of
! .B ls
! programs are properly installed at your site, the command
  .IP
  .B info ls
  .PP
--- 171,181 ----
  Report bugs to <bug-fileutils@gnu.org>.
  .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
  .IP
  .B info ls
  .PP




*** man/dircolors.1.orig	Sat Feb 20 09:28:05 1999
--- man/dircolors.1	Sat Feb 20 09:29:10 1999
***************
*** 37,45 ****
  .B dircolors
  is maintained as a Texinfo manual.  If the
  .B info
! and
! .B dircolors
! programs are properly installed at your site, the command
  .IP
  .B info dircolors
  .PP
--- 37,44 ----
  .B dircolors
  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
  .IP
  .B info dircolors
  .PP




*** man/dir.1.orig	Sat Feb 20 09:29:26 1999
--- man/dir.1	Sat Feb 20 09:29:45 1999
***************
*** 174,182 ****
  .B dir
  is maintained as a Texinfo manual.  If the
  .B info
! and
! .B dir
! programs are properly installed at your site, the command
  .IP
  .B info dir
  .PP
--- 174,181 ----
  .B dir
  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
  .IP
  .B info dir
  .PP




*** man/vdir.1.orig	Sat Feb 20 09:29:29 1999
--- man/vdir.1	Sat Feb 20 09:30:04 1999
***************
*** 174,182 ****
  .B vdir
  is maintained as a Texinfo manual.  If the
  .B info
! and
! .B vdir
! programs are properly installed at your site, the command
  .IP
  .B info vdir
  .PP
--- 174,181 ----
  .B vdir
  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
  .IP
  .B info vdir
  .PP

Line 1 Link Here

(-)gnuls/pkg/COMMENT (-1 / +1 lines)
1	FreeBSD port of colorized GNU `ls'.	1	GNU colorized `ls'.




`gnuls' is a port of the GNU colorized `ls' program--the one most Linux
users are familiar with.

The port installs four programs in `/usr/local/bin': `gnuls', `dir', `vdir'
and `dircolors'. It also installs man pages for all four programs. See the
individual man pages for details on each program.

The port installs five programs in `/usr/local/bin': `gnuls', `linuxls'
(for backward compatibility), `dir', `vdir' and `dircolors'.  It also
installs man pages for `gnuls' (but *not* `linuxls') and `dircolors'.

NOTES:

1. This port modifies the GNU `fileutils' make procedure so that it
   installs only programs and man pages listed above. In particular, it
   does not install the various GNU info files associated with the
   programs.

2. This port installs GNU's `ls' as `gnuls' so it won't conflict with the
   normal BSD `ls' program or the BSD `colorls' program (the latter
   available from the ports collection).

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

Lines 1-7 Link Here

(-)gnuls/pkg/PLIST (-3 lines)
1	bin/dir	1	bin/dir
2	bin/dircolors	2	bin/dircolors
3	bin/gnuls	3	bin/gnuls
4	bin/linuxls
5	bin/vdir	4	bin/vdir
6	man/man1/dircolors.1.gz
7	man/man1/gnuls.1.gz

Return to bug 10173

Lines 1-19 Link Here

(-)gnuls/Makefile (-5 / +5 lines)
1	# New ports collection makefile for: Linux-style colorized `ls'	1	# New ports collection makefile for: GNU colorized `ls'
2	# Version required: 3.12.0.2 (GNU fileutils 3.12)	2	# Version required: 4.0 (GNU fileutils 4.0)
3	# Date created: 06 January 1996	3	# Date created: 06 January 1996
4	# Whom: bmc@WillsCreek.COM	4	# Whom: bmc@WillsCreek.COM
5	#	5	#
6	# $Id: Makefile,v 1.7 1997/09/18 17:40:24 fenner Exp $	6	# $Id: Makefile,v 1.7 1997/09/18 17:40:24 fenner Exp $
7	#	7	#
8		8
9	DISTNAME= fileutils-3.16	9	DISTNAME= fileutils-4.0
10	PKGNAME= gnuls-3.16	10	PKGNAME= gnuls-4.0
11	CATEGORIES= misc	11	CATEGORIES= misc
12	MASTER_SITES= ${MASTER_SITE_GNU}	12	MASTER_SITES= ${MASTER_SITE_GNU}
13		13
14	MAINTAINER= bmc@WillsCreek.COM	14	MAINTAINER= bmc@WillsCreek.COM
15		15
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	MAN1= gnuls.1 dircolors.1	17	MAN1= gnuls.1 dircolors.1 dir.1 vdir.1
18		18
19	.include <bsd.port.mk>	19	.include <bsd.port.mk>

Lines 1-20 Link Here

(-)gnuls/patches/patch-aa (-12 / +12 lines)
1	*** Makefile.in.orig Sun Aug 10 17:06:15 1997	1	*** Makefile.in.orig Fri Feb 19 19:24:40 1999
2	--- Makefile.in Sun Aug 10 17:07:03 1997	2	--- Makefile.in Fri Feb 19 19:27:05 1999
3	***************	3	***************
4	* 49,55 **	4	* 92,98 **
5		5
6	AUTOMAKE_OPTIONS = gnits 1.1k	6	AUTOMAKE_OPTIONS = gnits 1.2h
7		7
8	! SUBDIRS = lib intl src doc man m4 po	8	! SUBDIRS = lib intl src doc man m4 po tests
9		9
10	acdir = m4	10	# Remove this file here (it is created via configure), not from within intl.
11	ACLOCAL = $(top_srcdir)/aclocal.m4	11	DISTCLEANFILES = intl/libintl.h
12	--- 49,56 ----	12	--- 92,99 ----
13		13
14	AUTOMAKE_OPTIONS = gnits 1.1k	14	AUTOMAKE_OPTIONS = gnits 1.2h
15		15
16	! #SUBDIRS = lib intl src doc man m4 po	16	! #SUBDIRS = lib intl src doc man m4 po tests
17	! SUBDIRS = lib intl src man	17	! SUBDIRS = lib intl src man
18		18
19	acdir = m4	19	# Remove this file here (it is created via configure), not from within intl.
20	ACLOCAL = $(top_srcdir)/aclocal.m4	20	DISTCLEANFILES = intl/libintl.h

Lines 1-7 Link Here

(-)gnuls/patches/patch-ab (-5 / +5 lines)
1	*** intl/Makefile.in.orig Sun Aug 10 18:05:44 1997	1	*** intl/Makefile.in.orig Fri Feb 19 19:20:37 1999
2	--- intl/Makefile.in Sun Aug 10 18:06:26 1997	2	--- intl/Makefile.in Fri Feb 19 19:20:54 1999
3	***************	3	***************
4	* 97,103 **	4	* 109,115 **
5	# where configure found a previously installed GNU gettext library.	5	# where configure found a previously installed GNU gettext library.
6	# If you want to use the one which comes with this version of the	6	# If you want to use the one which comes with this version of the
7	# package, you have to use `configure --with-included-gettext'.	7	# package, you have to use `configure --with-included-gettext'.
Lines 9-20 Link Here
9	install-exec: all	9	install-exec: all
10	if test "$(PACKAGE)" = "gettext" \	10	if test "$(PACKAGE)" = "gettext" \
11	&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \	11	&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \
12	--- 97,104 ----	12	--- 109,116 ----
13	# where configure found a previously installed GNU gettext library.	13	# where configure found a previously installed GNU gettext library.
14	# If you want to use the one which comes with this version of the	14	# If you want to use the one which comes with this version of the
15	# package, you have to use `configure --with-included-gettext'.	15	# package, you have to use `configure --with-included-gettext'.
16	! install:	16	! install:
17	! @echo "Nothing to install in intl"	17	! @echo Nothing to install in intl
18	install-exec: all	18	install-exec: all
19	if test "$(PACKAGE)" = "gettext" \	19	if test "$(PACKAGE)" = "gettext" \
20	&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \	20	&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \

Lines 1-7 Link Here

(-)gnuls/patches/patch-ac (-166 / +29 lines)
1	*** src/Makefile.in.orig Sun Aug 10 17:14:46 1997	1	*** src/Makefile.in.orig Thu Feb 18 08:40:27 1999
2	--- src/Makefile.in Sun Aug 10 19:14:33 1997	2	--- src/Makefile.in Thu Feb 18 08:44:15 1999
3	***************	3	***************
4	* 49,57 **	4	* 95,103 **
5	EXTRAdir = $(bindir)	5	EXTRAdir = $(bindir)
6	EXTRA_PROGRAMS = df mvdir	6	EXTRA_PROGRAMS = df mvdir
7		7
Lines 11-194 Link Here
11		11
12	libexec_PROGRAMS = @MVDIR_PROG@	12	libexec_PROGRAMS = @MVDIR_PROG@
13	datadir = $(prefix)/@DATADIRNAME@	13	datadir = $(prefix)/@DATADIRNAME@
14	--- 49,55 ----	14	--- 95,101 ----
15	EXTRAdir = $(bindir)	15	EXTRAdir = $(bindir)
16	EXTRA_PROGRAMS = df mvdir	16	EXTRA_PROGRAMS = df mvdir
17		17
18	! bin_PROGRAMS = dircolors gnuls	18	! bin_PROGRAMS = gnuls dir vdir dircolors
19		19
20	libexec_PROGRAMS = @MVDIR_PROG@	20	libexec_PROGRAMS = @MVDIR_PROG@
21	datadir = $(prefix)/@DATADIRNAME@	21	datadir = $(prefix)/@DATADIRNAME@
22	***************	22	***************
23	* 247,252 **	23	* 203,209 **
24	--- 245,253 ----	24	ls_OBJECTS = ls$U.o ls-ls$U.o
25	$(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p\|sed '$(transform)'`; \	25	ls_LDADD = $(LDADD)
26	else :; fi; \	26	ls_DEPENDENCIES = ../lib/libfu.a
27	done	27	! ls_LDFLAGS =
28	+ ln -f $(bindir)/gnuls $(bindir)/linuxls	28	mkdir_SOURCES = mkdir.c
29	+ ln -f $(bindir)/gnuls $(bindir)/vdir	29	mkdir_OBJECTS = mkdir$U.o
30	+ ln -f $(bindir)/gnuls $(bindir)/dir	30	mkdir_LDADD = $(LDADD)
31		31	--- 201,207 ----
32	uninstall-binPROGRAMS:	32	ls_OBJECTS = ls$U.o ls-ls$U.o
33	list="$(bin_PROGRAMS)"; for p in $$list; do \	33	ls_LDADD = $(LDADD)
		34	ls_DEPENDENCIES = ../lib/libfu.a
		35	! ls_LDFLAGS = -o gnuls
		36	mkdir_SOURCES = mkdir.c
		37	mkdir_OBJECTS = mkdir$U.o
		38	mkdir_LDADD = $(LDADD)
34	***************	39	***************
35	* 392,398 **	40	* 412,419 **
		41	@rm -f vdir
36	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)	42	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
37	$(ls_OBJECTS): ../config.h
38		43
39	! ls: $(ls_OBJECTS) $(ls_DEPENDENCIES)	44	! ls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
		45	! @rm -f ls
40	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)	46	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
41	$(mkdir_OBJECTS): ../config.h
42		47
43	--- 393,399 ----	48	mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
		49	--- 410,417 ----
		50	@rm -f vdir
44	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)	51	$(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS)
45	$(ls_OBJECTS): ../config.h
46		52
47	! gnuls: $(ls_OBJECTS) $(ls_DEPENDENCIES)	53	! gnuls: $(ls_OBJECTS) $(ls_DEPENDENCIES)
		54	! @rm -f gnuls
48	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)	55	$(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS)
49	$(mkdir_OBJECTS): ../config.h
50
51	*** src/dircolors.c.orig Sun Jan 26 00:54:17 1997
52	--- src/dircolors.c Sat Oct 25 16:00:40 1997
53	***************
54	* 72,84 **
55	"NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
56	"SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
57	"CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END",
58	! "ENDCODE", NULL
59	};
60
61	static const char *const ls_codes[] =
62	{
63	"no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
64	"so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
65	};
66
67	static struct option const long_options[] =
68	--- 72,86 ----
69	"NORMAL", "NORM", "FILE", "DIR", "LNK", "LINK",
70	"SYMLINK", "ORPHAN", "MISSING", "FIFO", "PIPE", "SOCK", "BLK", "BLOCK",
71	"CHR", "CHAR", "EXEC", "LEFT", "LEFTCODE", "RIGHT", "RIGHTCODE", "END",
72	! "ENDCODE", "SUID", "SETUID", "SGID", "SETGID", "WRO", "WRITEOTHERS",
73	! "WT", "WROT", "WRITEOTHERSSTICKY", NULL
74	};
75
76	static const char *const ls_codes[] =
77	{
78	"no", "no", "fi", "di", "ln", "ln", "ln", "or", "mi", "pi", "pi",
79	"so", "bd", "bd", "cd", "cd", "ex", "lc", "lc", "rc", "rc", "ec", "ec"
80	+ "su", "su", "sg", "sg", "wo", "wo", "wo", "wt", "wt", "wt", NULL
81	};
82
83	static struct option const long_options[] =
84	*** src/ls.c.orig Sun Jan 26 00:56:10 1997
85	--- src/ls.c Sat Oct 25 16:00:30 1997
86	***************
87	* 359,371 **
88	enum indicator_no
89	{
90	C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
91	! C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC
92	};
93
94	static const char *const indicator_name[]=
95	{
96	"lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
97	! "bd", "cd", "mi", "or", "ex", NULL
98	};
99
100	struct col_ext_type
101	--- 359,371 ----
102	enum indicator_no
103	{
104	C_LEFT, C_RIGHT, C_END, C_NORM, C_FILE, C_DIR, C_LINK, C_FIFO, C_SOCK,
105	! C_BLK, C_CHR, C_MISSING, C_ORPHAN, C_EXEC, C_UID, C_GID, C_WRO, C_WT
106	};
107
108	static const char *const indicator_name[]=
109	{
110	"lc", "rc", "ec", "no", "fi", "di", "ln", "pi", "so",
111	! "bd", "cd", "mi", "or", "ex", "su", "sg", "wo", "wt", NULL
112	};
113
114	struct col_ext_type
115	***************
116	* 390,396 **
117	{ LEN_STR_PAIR ("01;33") }, /* cd: Char device: bright yellow */
118	{ 0, NULL }, /* mi: Missing file: undefined */
119	{ 0, NULL }, /* or: Orphanned symlink: undefined */
120	! { LEN_STR_PAIR ("01;32") } /* ex: Executable: bright green */
121	};
122
123	/* FIXME: comment */
124	--- 390,400 ----
125	{ LEN_STR_PAIR ("01;33") }, /* cd: Char device: bright yellow */
126	{ 0, NULL }, /* mi: Missing file: undefined */
127	{ 0, NULL }, /* or: Orphanned symlink: undefined */
128	! { LEN_STR_PAIR ("01;32") }, /* ex: Executable: bright green */
129	! { LEN_STR_PAIR ("37;41") }, /* su: setuid: white on red */
130	! { LEN_STR_PAIR ("30;43") }, /* sg: setgid: black on yellow */
131	! { LEN_STR_PAIR ("37;44") }, /* wo: writeable-other:white on blue */
132	! { LEN_STR_PAIR ("37;42") }, /* wt: wo w/ sticky: white on green */
133	};
134
135	/* FIXME: comment */
136	***************
137	* 2407,2413 **
138	else
139	{
140	if (S_ISDIR (mode))
141	! type = C_DIR;
142
143	#ifdef S_ISLNK
144	else if (S_ISLNK (mode))
145	--- 2411,2424 ----
146	else
147	{
148	if (S_ISDIR (mode))
149	! {
150	! if ((mode && MODE_WT) == MODE_WT)
151	! type = C_WT;
152	! else if ((mode && MODE_WRO) == MODE_WRO)
153	! type = C_WRO;
154	! else
155	! type = C_DIR;
156	! }
157		56
158	#ifdef S_ISLNK	57	mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES)
159	else if (S_ISLNK (mode))
160	***************
161	* 2435,2441 **
162	type = C_CHR;
163	#endif
164
165	! if (type == C_FILE && (mode & S_IXUGO) != 0)
166	type = C_EXEC;
167
168	/* Check the file's suffix only if still classified as C_FILE. */
169	--- 2446,2458 ----
170	type = C_CHR;
171	#endif
172
173	! if ((type == C_FILE) && ((mode & S_ISUID) != 0))
174	! type = C_UID;
175	!
176	! else if ((type == C_FILE) && ((mode & S_ISGID) != 0))
177	! type = C_GID;
178	!
179	! else if (type == C_FILE && (mode & S_IXUGO) != 0)
180	type = C_EXEC;
181
182	/* Check the file's suffix only if still classified as C_FILE. */
183	*** src/ls.h.orig Wed Jun 16 11:24:58 1993
184	--- src/ls.h Sat Oct 25 16:00:35 1997
185	***************
186	* 7,10 **
187	--- 7,13 ----
188	/* This is for the `vdir' program. */
189	#define LS_LONG_FORMAT 3
190
191	+ #define MODE_WT 01002
192	+ #define MODE_WRO 02
193	+
194	extern int ls_mode;

Lines 1-183 Link Here

(-)gnuls/patches/patch-ad (-178 / +47 lines)
1	*** man/Makefile.in.orig Sun Jan 26 21:26:52 1997	1	*** man/Makefile.in.orig Sat Nov 14 10:46:12 1998
2	--- man/Makefile.in Sun Aug 10 19:50:02 1997	2	--- man/Makefile.in Sat Feb 20 09:20:26 1999
3	***************	3	***************
4	* 47,58 **	4	* 88,96 **
5	LN = @LN@	5	YACC = @YACC@
6	RM = @RM@	6	l = @l@
7		7
8	! man_MANS = chgrp.1 chmod.1 chown.1 cp.1 dd.1 df.1 dircolors.1 du.1 install.1 \	8	! man_MANS = chgrp.1 chmod.1 chown.1 cp.1 dir.1 dd.1 df.1 dircolors.1 \
9	! ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 touch.1	9	! du.1 ginstall.1 ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 \
10	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	10	! sync.1 touch.1 vdir.1
11	CONFIG_HEADER = ../config.h	11	man_aux = $(man_MANS:.1=.x)
12	CONFIG_CLEAN_FILES =	12
13	! MANS = chgrp.1 chmod.1 chown.1 cp.1 dd.1 df.1 dircolors.1 du.1 install.1 ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 touch.1	13	EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
14		14	--- 88,94 ----
15		15	YACC = @YACC@
16	NROFF = nroff	16	l = @l@
17	--- 47,57 ----
18	LN = @LN@
19	RM = @RM@
20
21	! man_MANS = dircolors.1 gnuls.1
22	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
23	CONFIG_HEADER = ../config.h
24	CONFIG_CLEAN_FILES =
25	! MANS = dircolors.1 ls.1
26		17
		18	! man_MANS = dir.1 dircolors.1 gnuls.1 vdir.1
		19	man_aux = $(man_MANS:.1=.x)
27		20
28	NROFF = nroff	21	EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \
29	***************	22	***************
30	* 80,211 **	23	* 117,123 **
31	$(NORMAL_INSTALL)
32	$(mkinstalldirs) $(mandir)/man1
33	sect=1; \
34	! inst=`echo "ln" \| sed '$(transform)'`.1; \
35	! if test -f $(srcdir)/ln.1; then file=$(srcdir)/ln.1; \
36	! else file=ln.1; fi; \
37	! $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
38	! sect=1; \
39	! inst=`echo "chgrp" \| sed '$(transform)'`.1; \
40	! if test -f $(srcdir)/chgrp.1; then file=$(srcdir)/chgrp.1; \
41	! else file=chgrp.1; fi; \
42	! $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
43	! sect=1; \
44	! inst=`echo "ls" \| sed '$(transform)'`.1; \
45	if test -f $(srcdir)/ls.1; then file=$(srcdir)/ls.1; \
46	else file=ls.1; fi; \
47	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
48	sect=1; \
49	- inst=`echo "chmod" \| sed '$(transform)'`.1; \
50	- if test -f $(srcdir)/chmod.1; then file=$(srcdir)/chmod.1; \
51	- else file=chmod.1; fi; \
52	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
53	- sect=1; \
54	- inst=`echo "mkdir" \| sed '$(transform)'`.1; \
55	- if test -f $(srcdir)/mkdir.1; then file=$(srcdir)/mkdir.1; \
56	- else file=mkdir.1; fi; \
57	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
58	- sect=1; \
59	- inst=`echo "chown" \| sed '$(transform)'`.1; \
60	- if test -f $(srcdir)/chown.1; then file=$(srcdir)/chown.1; \
61	- else file=chown.1; fi; \
62	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
63	- sect=1; \
64	- inst=`echo "mkfifo" \| sed '$(transform)'`.1; \
65	- if test -f $(srcdir)/mkfifo.1; then file=$(srcdir)/mkfifo.1; \
66	- else file=mkfifo.1; fi; \
67	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
68	- sect=1; \
69	- inst=`echo "cp" \| sed '$(transform)'`.1; \
70	- if test -f $(srcdir)/cp.1; then file=$(srcdir)/cp.1; \
71	- else file=cp.1; fi; \
72	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
73	- sect=1; \
74	- inst=`echo "mknod" \| sed '$(transform)'`.1; \
75	- if test -f $(srcdir)/mknod.1; then file=$(srcdir)/mknod.1; \
76	- else file=mknod.1; fi; \
77	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
78	- sect=1; \
79	- inst=`echo "dd" \| sed '$(transform)'`.1; \
80	- if test -f $(srcdir)/dd.1; then file=$(srcdir)/dd.1; \
81	- else file=dd.1; fi; \
82	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
83	- sect=1; \
84	- inst=`echo "mv" \| sed '$(transform)'`.1; \
85	- if test -f $(srcdir)/mv.1; then file=$(srcdir)/mv.1; \
86	- else file=mv.1; fi; \
87	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
88	- sect=1; \
89	- inst=`echo "df" \| sed '$(transform)'`.1; \
90	- if test -f $(srcdir)/df.1; then file=$(srcdir)/df.1; \
91	- else file=df.1; fi; \
92	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
93	- sect=1; \
94	- inst=`echo "rm" \| sed '$(transform)'`.1; \
95	- if test -f $(srcdir)/rm.1; then file=$(srcdir)/rm.1; \
96	- else file=rm.1; fi; \
97	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
98	- sect=1; \
99	inst=`echo "dircolors" \| sed '$(transform)'`.1; \
100	if test -f $(srcdir)/dircolors.1; then file=$(srcdir)/dircolors.1; \
101	else file=dircolors.1; fi; \
102	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
103	- sect=1; \
104	- inst=`echo "rmdir" \| sed '$(transform)'`.1; \
105	- if test -f $(srcdir)/rmdir.1; then file=$(srcdir)/rmdir.1; \
106	- else file=rmdir.1; fi; \
107	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
108	- sect=1; \
109	- inst=`echo "du" \| sed '$(transform)'`.1; \
110	- if test -f $(srcdir)/du.1; then file=$(srcdir)/du.1; \
111	- else file=du.1; fi; \
112	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
113	- sect=1; \
114	- inst=`echo "touch" \| sed '$(transform)'`.1; \
115	- if test -f $(srcdir)/touch.1; then file=$(srcdir)/touch.1; \
116	- else file=touch.1; fi; \
117	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
118	- sect=1; \
119	- inst=`echo "install" \| sed '$(transform)'`.1; \
120	- if test -f $(srcdir)/install.1; then file=$(srcdir)/install.1; \
121	- else file=install.1; fi; \
122	- $(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
123
124	uninstall-man:
125	- inst=`echo "ln" \| sed '$(transform)'`.1; \
126	- rm -f $(mandir)/man1/$$inst
127	- inst=`echo "chgrp" \| sed '$(transform)'`.1; \
128	- rm -f $(mandir)/man1/$$inst
129	inst=`echo "ls" \| sed '$(transform)'`.1; \
130	rm -f $(mandir)/man1/$$inst
131	- inst=`echo "chmod" \| sed '$(transform)'`.1; \
132	- rm -f $(mandir)/man1/$$inst
133	- inst=`echo "mkdir" \| sed '$(transform)'`.1; \
134	- rm -f $(mandir)/man1/$$inst
135	- inst=`echo "chown" \| sed '$(transform)'`.1; \
136	- rm -f $(mandir)/man1/$$inst
137	- inst=`echo "mkfifo" \| sed '$(transform)'`.1; \
138	- rm -f $(mandir)/man1/$$inst
139	- inst=`echo "cp" \| sed '$(transform)'`.1; \
140	- rm -f $(mandir)/man1/$$inst
141	- inst=`echo "mknod" \| sed '$(transform)'`.1; \
142	- rm -f $(mandir)/man1/$$inst
143	- inst=`echo "dd" \| sed '$(transform)'`.1; \
144	- rm -f $(mandir)/man1/$$inst
145	- inst=`echo "mv" \| sed '$(transform)'`.1; \
146	- rm -f $(mandir)/man1/$$inst
147	- inst=`echo "df" \| sed '$(transform)'`.1; \
148	- rm -f $(mandir)/man1/$$inst
149	- inst=`echo "rm" \| sed '$(transform)'`.1; \
150	- rm -f $(mandir)/man1/$$inst
151	inst=`echo "dircolors" \| sed '$(transform)'`.1; \
152	- rm -f $(mandir)/man1/$$inst
153	- inst=`echo "rmdir" \| sed '$(transform)'`.1; \
154	- rm -f $(mandir)/man1/$$inst
155	- inst=`echo "du" \| sed '$(transform)'`.1; \
156	- rm -f $(mandir)/man1/$$inst
157	- inst=`echo "touch" \| sed '$(transform)'`.1; \
158	- rm -f $(mandir)/man1/$$inst
159	- inst=`echo "install" \| sed '$(transform)'`.1; \
160	rm -f $(mandir)/man1/$$inst
161
162	tags: TAGS
163	--- 79,98 ----
164	$(NORMAL_INSTALL)
165	$(mkinstalldirs) $(mandir)/man1
166	sect=1; \
167	! inst=`echo "gnuls" \| sed '$(transform)'`.1; \
168	if test -f $(srcdir)/ls.1; then file=$(srcdir)/ls.1; \
169	else file=ls.1; fi; \
170	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
171	sect=1; \
172	inst=`echo "dircolors" \| sed '$(transform)'`.1; \
173	if test -f $(srcdir)/dircolors.1; then file=$(srcdir)/dircolors.1; \
174	else file=dircolors.1; fi; \
175	$(INSTALL_DATA) $$file $(mandir)/man$$sect/$$inst
176
177	uninstall-man:
178	inst=`echo "ls" \| sed '$(transform)'`.1; \
179	rm -f $(mandir)/man1/$$inst
180	inst=`echo "dircolors" \| sed '$(transform)'`.1; \
181	rm -f $(mandir)/man1/$$inst
182		24
183	tags: TAGS	25	TAR = tar
		26	GZIP = --best
		27	! all: Makefile $(MANS)
		28
		29	.SUFFIXES:
		30	$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
		31	--- 115,125 ----
		32
		33	TAR = tar
		34	GZIP = --best
		35	! all: freebsd_setup Makefile $(MANS)
		36	!
		37	! freebsd_setup:
		38	! @cp ls.1 gnuls.1
		39	! @cp ls.x gnuls.x
		40
		41	.SUFFIXES:
		42	$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
		43	***************
		44	* 228,234 **
		45	uninstall all installdirs mostlyclean-generic distclean-generic \
		46	clean-generic maintainer-clean-generic clean mostlyclean distclean \
		47	maintainer-clean
		48	-
		49
		50	# For additional rules usually of interest only to the maintainer,
		51	# see GNUmakefile and Makefile.maint.
		52	--- 230,235 ----

Lines 1-90 Link Here

(-)gnuls/patches/patch-ae (-78 / +37 lines)
1	*** man/ls.1.orig Sun Aug 10 17:54:52 1997	1	*** man/ls.1.orig Sat Feb 20 08:55:59 1999
2	--- man/ls.1 Sun Aug 10 17:55:42 1997	2	--- man/ls.1 Sat Feb 20 09:02:36 1999
3	***************	3	***************
4	* 1,8 **	4	* 1,9 **
5	! .TH LS 1 "GNU File Utilities" "FSF" \" -- nroff --	5	." DO NOT MODIFY THIS FILE! It was generated by help2man 1.5.1.2.
		6	! .TH LS 1 "November 1998" "GNU fileutils 4.0" "FSF"
6	.SH NAME	7	.SH NAME
7	! ls, dir, vdir \- list contents of directories	8	! ls \- list directory contents
8	.SH SYNOPSIS	9	.SH SYNOPSIS
9	! .B ls	10	! .B ls
10	[\-abcdfgiklmnpqrstuxABCFGLNQRSUX1] [\-w cols] [\-T cols] [\-I pattern]	11	[\fIOPTION\fR]... [\fIFILE\fR]...
11	[\-\-all] [\-\-escape] [\-\-directory] [\-\-inode] [\-\-kilobytes]	12	.SH DESCRIPTION
12	[\-\-numeric-uid-gid] [--no-group] [\-\-hide-control-chars] [\-\-reverse]	13	.PP
13	--- 1,8 ----	14	--- 1,9 ----
14	! .TH GNULS 1 "GNU File Utilities" "FSF" \" -- nroff --	15	." DO NOT MODIFY THIS FILE! It was generated by help2man 1.5.1.2.
		16	! .TH GNULS 1 "November 1998" "GNU fileutils 4.0" "FSF"
15	.SH NAME	17	.SH NAME
16	! gnuls, dir, vdir \- list contents of directories	18	! gnuls \- list directory contents
17	.SH SYNOPSIS	19	.SH SYNOPSIS
18	! .B gnuls	20	! .B gnuls
19	[\-abcdfgiklmnpqrstuxABCFGLNQRSUX1] [\-w cols] [\-T cols] [\-I pattern]	21	[\fIOPTION\fR]... [\fIFILE\fR]...
20	[\-\-all] [\-\-escape] [\-\-directory] [\-\-inode] [\-\-kilobytes]	22	.SH DESCRIPTION
21	[\-\-numeric-uid-gid] [--no-group] [\-\-hide-control-chars] [\-\-reverse]
22	***************
23	* 19,34 **
24	.PP	23	.PP
25	This manual page
26	documents the GNU version of
27	! .BR ls .
28	.B dir
29	and
30	.B vdir
31	are versions of
32	! .B ls
33	with different default output formats.
34	These programs list each given file or directory name. Directory contents are
35	sorted alphabetically. For
36	! .BR ls ,
37	files are by default listed in columns, sorted
38	vertically, if the standard output is a terminal; otherwise they are
39	listed one per line. For
40	--- 19,34 ----
41	.PP
42	This manual page
43	documents the GNU version of
44	! .BR gnuls .
45	.B dir
46	and
47	.B vdir
48	are versions of
49	! .B gnuls
50	with different default output formats.
51	These programs list each given file or directory name. Directory contents are
52	sorted alphabetically. For
53	! .BR gnuls ,
54	files are by default listed in columns, sorted
55	vertically, if the standard output is a terminal; otherwise they are
56	listed one per line. For
57	***************	24	***************
58	* 163,169 **	25	* 171,182 **
59	stored on the disk. This option is not called	26	Report bugs to <bug-fileutils@gnu.org>.
60	.I \-f	27	.SH "SEE ALSO"
61	because the Unix	28	The full documentation for
62	! .B ls	29	! .B ls
63	.I \-f	30	is maintained as a Texinfo manual. If the
64	option also enables	31	.B info
65	.I \-a	32	! and
66	--- 163,169 ----
67	stored on the disk. This option is not called
68	.I \-f
69	because the Unix
70	! .B gnuls
71	.I \-f
72	option also enables
73	.I \-a
74	***************
75	* 229,235 **
76	When using the
77	.I "\-\-color"
78	option, this version of
79	! .B ls	33	! .B ls
80	will colorize the file names printed according to the name and type of	34	! programs are properly installed at your site, the command
81	file. By default, this colorization is by type only, and the codes	35	.IP
82	used are ISO 6429 (ANSI) compliant.	36	.B info ls
83	--- 229,235 ----	37	.PP
84	When using the	38	--- 171,181 ----
85	.I "\-\-color"	39	Report bugs to <bug-fileutils@gnu.org>.
86	option, this version of	40	.SH "SEE ALSO"
		41	The full documentation for
87	! .B gnuls	42	! .B gnuls
88	will colorize the file names printed according to the name and type of	43	is maintained as a Texinfo manual. If the
89	file. By default, this colorization is by type only, and the codes	44	.B info
90	used are ISO 6429 (ANSI) compliant.	45	! program and the full suite of GNU fileutils
		46	! are properly installed at your site, the command
		47	.IP
		48	.B info ls
		49	.PP

Line 0 Link Here

(-)gnuls/patches/patch-af (+22 lines)
	1	*** man/dircolors.1.orig Sat Feb 20 09:28:05 1999
	2	--- man/dircolors.1 Sat Feb 20 09:29:10 1999
	3	***************
	4	* 37,45 **
	5	.B dircolors
	6	is maintained as a Texinfo manual. If the
	7	.B info
	8	! and
	9	! .B dircolors
	10	! programs are properly installed at your site, the command
	11	.IP
	12	.B info dircolors
	13	.PP
	14	--- 37,44 ----
	15	.B dircolors
	16	is maintained as a Texinfo manual. If the
	17	.B info
	18	! program and the full suite of GNU fileutils
	19	! are properly installed at your site, the command
	20	.IP
	21	.B info dircolors
	22	.PP

Line 0 Link Here

(-)gnuls/patches/patch-ag (+22 lines)
	1	*** man/dir.1.orig Sat Feb 20 09:29:26 1999
	2	--- man/dir.1 Sat Feb 20 09:29:45 1999
	3	***************
	4	* 174,182 **
	5	.B dir
	6	is maintained as a Texinfo manual. If the
	7	.B info
	8	! and
	9	! .B dir
	10	! programs are properly installed at your site, the command
	11	.IP
	12	.B info dir
	13	.PP
	14	--- 174,181 ----
	15	.B dir
	16	is maintained as a Texinfo manual. If the
	17	.B info
	18	! program and the full suite of GNU fileutils
	19	! are properly installed at your site, the command
	20	.IP
	21	.B info dir
	22	.PP

Line 0 Link Here

(-)gnuls/patches/patch-ah (+22 lines)
	1	*** man/vdir.1.orig Sat Feb 20 09:29:29 1999
	2	--- man/vdir.1 Sat Feb 20 09:30:04 1999
	3	***************
	4	* 174,182 **
	5	.B vdir
	6	is maintained as a Texinfo manual. If the
	7	.B info
	8	! and
	9	! .B vdir
	10	! programs are properly installed at your site, the command
	11	.IP
	12	.B info vdir
	13	.PP
	14	--- 174,181 ----
	15	.B vdir
	16	is maintained as a Texinfo manual. If the
	17	.B info
	18	! program and the full suite of GNU fileutils
	19	! are properly installed at your site, the command
	20	.IP
	21	.B info vdir
	22	.PP

Lines 1-25 Link Here

(-)gnuls/pkg/DESCR (-15 / +13 lines)
1	`gnuls' is a port of the GNU colorized `ls' program--the one most Linux	1	`gnuls' is a port of the GNU colorized `ls' program--the one most Linux
2	users are familiar with. The port was formerly called `linuxls', since it	2	users are familiar with.
3	had been adapted from the colorized Linux version of `ls' -- which, in	3
4	turn, was a patched version of GNU's stock `ls' program. The folks at GNU	4	The port installs four programs in `/usr/local/bin': `gnuls', `dir', `vdir'
5	have since rolled the colorization mods into their official version of	5	and `dircolors'. It also installs man pages for all four programs. See the
6	`ls'; this port's name now reflects that change.	6	individual man pages for details on each program.
7
8	The port installs five programs in `/usr/local/bin': `gnuls', `linuxls'
9	(for backward compatibility), `dir', `vdir' and `dircolors'. It also
10	installs man pages for `gnuls' (but not `linuxls') and `dircolors'.
11		7
12	NOTES:	8	NOTES:
13		9
14	1. This port modifies the GNU `fileutils' make procedure so that it	10	1. This port modifies the GNU `fileutils' make procedure so that it
15	installs only programs and man pages listed above.	11	installs only programs and man pages listed above. In particular, it
16		12	does not install the various GNU info files associated with the
17	2. This port installs GNU's `ls' as `gnuls' and `linuxls' so it won't	13	programs.
18	conflict with the normal BSD `ls' program or the BSD `colorls' program	14
19	(the latter available from the ports collection).	15	2. This port installs GNU's `ls' as `gnuls' so it won't conflict with the
		16	normal BSD `ls' program or the BSD `colorls' program (the latter
		17	available from the ports collection).
20		18
21	3. This colorized `ls' program is not the same as the `colorls' program	19	3. This colorized `ls' program is not the same as the `colorls' program
22	available from the ports collection.	20	available from the ports collection.
23		21
24	Brian Clapper <bmc@WillsCreek.COM>	22	Brian Clapper <bmc@WillsCreek.COM>
25	10 August 1997	23	20 February, 1999