Date: Sun, 10 Aug 1997 21:00:15 -0400 (EDT) From: bmc@WillsCreek.COM To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: bmc@WillsCreek.COM Subject: ports/4267: Updated (and renamed) linux-ls port; fixes build problems Message-ID: <199708110100.VAA01482@current.willscreek.com> Resent-Message-ID: <199708110110.SAA28301@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4267 >Category: ports >Synopsis: Updated (and renamed) linux-ls port; fixes build problems >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Aug 10 18:10:02 PDT 1997 >Last-Modified: >Originator: Brian Clapper >Organization: Wills Creek Associates >Release: FreeBSD 2.2.2-RELEASE i386 >Environment: FreeBSD-2.2.2 >Description: I received mail from Bill Fenner <fenner@FreeBSD.ORG> indicating that the linux-ls port no longer builds because the sources it downloads from the 'net cannot be resolved. The port is way out of date. The enclosed diffs will update the port so that it builds against the latest sources. NOTE: The port has been renamed from "linux-ls" to "gnuls". The original port consisted of the stock GNU `ls' program plus Linux-specific patches necessary to produce a Linux-style colorized `ls'. The GNU `ls' program now officially contains support for colorization, and the port has been renamed accordingly. >How-To-Repeat: >Fix: Below is the result of a "diff -uNr linux-ls-3.12.0.2 gnuls-3.16". Please contact me if I've screwed any of this up. diff -uNr linux-ls-3.12.0.2/Makefile gnuls-3.16/Makefile --- linux-ls-3.12.0.2/Makefile Sun Jan 7 10:12:58 1996 +++ gnuls-3.16/Makefile Sun Aug 10 17:03:05 1997 @@ -1,25 +1,19 @@ # New ports collection makefile for: Linux-style colorized `ls' # Version required: FreeBSD 2.0.5 or better # Based on: GNU fileutils 3.12 -# Date created: 06 January 1996 +# Date created: 10 August 1997 # Whom: bmc@WillsCreek.COM # # $Id$ # --------------------------------------------------------------------------- -PKGNAME = linux-ls-3.12.0.2 +PKGNAME = gnuls-3.16 -DISTNAME = fileutils-3.12 +DISTNAME = fileutils-3.16 MASTER_SITES = \ ftp://prep.ai.mit.edu/pub/gnu/ \ - ftp://ftp.cdrom.com/pub/linux/slackware_source/a/bin/ + ftp://gatekeeper.dec.com/pub/GNU -PATCHFILES = color-ls-3.12.0.2.patch.gz -PATCH_SITES = \ - ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/a/bin/ \ - ftp://ftp.cdrom.com/pub/linux/slackware_source/a/bin/ - -PATCH_DIST_STRIP = -p1 CATEGORIES += utilities MAINTAINER = bmc@WillsCreek.COM diff -uNr linux-ls-3.12.0.2/files/md5 gnuls-3.16/files/md5 --- linux-ls-3.12.0.2/files/md5 Sat Jan 6 18:30:01 1996 +++ gnuls-3.16/files/md5 Sun Aug 10 17:03:40 1997 @@ -1,2 +1 @@ -MD5 (fileutils-3.12.tar.gz) = 4a9aa33e8d06eff7594153d8fc1d8e54 -MD5 (color-ls-3.12.0.2.patch.gz) = 6f15a6de66baf555753b058388419386 +MD5 (fileutils-3.16.tar.gz) = b64c38f1f14ec82d55d8b967035ede8f diff -uNr linux-ls-3.12.0.2/patches/patch-aa gnuls-3.16/patches/patch-aa --- linux-ls-3.12.0.2/patches/patch-aa Sun Jan 7 10:28:05 1996 +++ gnuls-3.16/patches/patch-aa Sun Aug 10 19:11:54 1997 @@ -1,437 +1,20 @@ -*** Makefile.in.orig Fri Nov 4 09:53:23 1994 ---- Makefile.in Sun Jan 7 10:14:02 1996 +*** Makefile.in.orig Sun Aug 10 17:06:15 1997 +--- Makefile.in Sun Aug 10 17:07:03 1997 *************** -*** 37,43 **** - mkdir mkfifo mknod mv rm rmdir sync touch vdir @PROGS@ +*** 49,55 **** - # Subdirectories to run make in for the primary targets. -! SUBDIRS = lib src man doc + AUTOMAKE_OPTIONS = gnits 1.1k - .SUFFIXES: +! SUBDIRS = lib intl src doc man m4 po ---- 37,43 ---- - mkdir mkfifo mknod mv rm rmdir sync touch vdir @PROGS@ + acdir = m4 + ACLOCAL = $(top_srcdir)/aclocal.m4 +--- 49,56 ---- - # Subdirectories to run make in for the primary targets. -! SUBDIRS = lib src man + AUTOMAKE_OPTIONS = gnits 1.1k - .SUFFIXES: +! #SUBDIRS = lib intl src doc man m4 po +! SUBDIRS = lib intl src man -*** src/Makefile.in.orig Sun Jan 7 10:13:58 1996 ---- src/Makefile.in Sun Jan 7 10:25:08 1996 -*************** -*** 1,4 **** ---- 1,7 ---- - # Makefile for GNU file utilities. -+ # -+ # Modified by bmc@WillsCreek.COM to build only `ls' and `dircolors' -+ # - # Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -*************** -*** 37,50 **** - LN = @LN@ - MV = @MV@ - -! SOURCES = chmod.c chgrp.c chown.c cp-aux.c cp-hash.c cp.c \ -! dd.c df.c du.c install.c ln.c ls.c mkdir.c mkfifo.c mknod.c mv.c mvdir.c \ -! rm.c rmdir.c sync.c touch.c version.c ls-ls.c ls-dir.c ls-vdir.c \ - dircolors.c - -! OBJECTS = chmod.o chgrp.o chown.o cp-aux.o cp-hash.o cp.o \ -! dd.o df.o du.o install.o ln.o ls.o mkdir.o mkfifo.o mknod.o mv.o mvdir.o \ -! rm.o rmdir.o sync.o touch.o version.o ls-ls.o ls-dir.o ls-vdir.o \ - dircolors.o - - DISTFILES = Makefile.in cp.h ls.h version.h $(SOURCES) \ ---- 40,49 ---- - LN = @LN@ - MV = @MV@ - -! SOURCES = ls.c ls-ls.c \ - dircolors.c - -! OBJECTS = ls.o ls-ls.o \ - dircolors.o - - DISTFILES = Makefile.in cp.h ls.h version.h $(SOURCES) \ -*************** -*** 54,61 **** - # confusion with the `install' target. The install rule transforms `ginstall' - # to install before applying any user-specified name transformations. - -! PROGS = chgrp chown chmod cp dd du ginstall ln ls mkdir \ -! mkfifo mknod mv rm rmdir sync touch dircolors @PROGS@ - - LIBPROGS = @LIBPROGS@ - ---- 53,59 ---- - # confusion with the `install' target. The install rule transforms `ginstall' - # to install before applying any user-specified name transformations. - -! PROGS = linuxls dircolors dir vdir - - LIBPROGS = @LIBPROGS@ - -*************** -*** 83,92 **** - done - if [ "x$(LIBPROGS)" = x ]; then : ; else \ - $(INSTALL_PROGRAM) -o root -m 4755 $(LIBPROGS) $(libdir); fi -! cd $(bindir) && \ -! $(RM) -f d v && \ -! $(LN) `echo dir|sed '$(transform)'` d && \ -! $(LN) `echo vdir|sed '$(transform)'` v - - uninstall: - for f in $(LIBPROGS); do \ ---- 81,92 ---- - done - if [ "x$(LIBPROGS)" = x ]; then : ; else \ - $(INSTALL_PROGRAM) -o root -m 4755 $(LIBPROGS) $(libdir); fi -! # -! # NOTE: `dircolors' defines `d' and `v' aliases. - bmc@WillsCreek.COM -! # cd $(bindir) && \ -! # $(RM) -f d v && \ -! # $(LN) `echo dir|sed '$(transform)'` d && \ -! # $(LN) `echo vdir|sed '$(transform)'` v - - uninstall: - for f in $(LIBPROGS); do \ -*************** -*** 145,152 **** - #dir: ls.o ls-dir.o - # $(link_command) ls.o ls-dir.o ../lib/libfu.a version.o $(LIBS) - -! dir: ls ln -! ./ln ls dir - - dircolors: dircolors.o - $(link_command) dircolors.o ../lib/libfu.a version.o $(LIBS) ---- 145,152 ---- - #dir: ls.o ls-dir.o - # $(link_command) ls.o ls-dir.o ../lib/libfu.a version.o $(LIBS) - -! dir: linuxls -! ln linuxls dir - - dircolors: dircolors.o - $(link_command) dircolors.o ../lib/libfu.a version.o $(LIBS) -*************** -*** 160,166 **** - ln: ln.o - $(link_command) ln.o ../lib/libfu.a version.o $(LIBS) - -! ls: ls.o ls-ls.o - $(link_command) ls.o ls-ls.o ../lib/libfu.a version.o $(LIBS) - - mkdir: mkdir.o ---- 160,166 ---- - ln: ln.o - $(link_command) ln.o ../lib/libfu.a version.o $(LIBS) - -! linuxls: ls.o ls-ls.o - $(link_command) ls.o ls-ls.o ../lib/libfu.a version.o $(LIBS) - - mkdir: mkdir.o -*************** -*** 193,200 **** - #vdir: ls.o ls-vdir.o - # $(link_command) ls.o ls-vdir.o ../lib/libfu.a version.o $(LIBS) - -! vdir: ls ln -! ./ln vdir ls - - $(PROGS) $(LIBPROGS): ../lib/libfu.a version.o - $(OBJECTS): ../lib/pathmax.h ---- 193,200 ---- - #vdir: ls.o ls-vdir.o - # $(link_command) ls.o ls-vdir.o ../lib/libfu.a version.o $(LIBS) - -! vdir: linuxls -! ln linuxls vdir - - $(PROGS) $(LIBPROGS): ../lib/libfu.a version.o - $(OBJECTS): ../lib/pathmax.h -*** man/Makefile.in.orig Sun Jan 7 10:13:57 1996 ---- man/Makefile.in Sun Jan 7 10:14:02 1996 -*************** -*** 1,4 **** ---- 1,7 ---- - # Makefile for GNU file utilities documentation. -+ # -+ # Modified by bmc@WillsCreek.COM to build only `ls' and `dircolors' man pages -+ # - # Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify -*************** -*** 28,39 **** - INSTALL_DATA = @INSTALL_DATA@ - RM = @RM@ - -! MANFILES = chgrp.1 chown.1 chmod.1 cp.1 dd.1 df.1 du.1 install.1 \ -! ln.1 ls.1 mkdir.1 mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 touch.1 dircolors.1 - - DISTFILES = Makefile.in $(MANFILES) - -! all: dircolors.1 - - .SUFFIXES: - ---- 31,41 ---- - INSTALL_DATA = @INSTALL_DATA@ - RM = @RM@ - -! MANFILES = linuxls.1 dircolors.1 - - DISTFILES = Makefile.in $(MANFILES) - -! all: dircolors.1 linuxls.1 - - .SUFFIXES: - -*************** -*** 85,90 **** ---- 87,95 ---- - dircolors.1: dircolors.1.in - sed -e "s:XXX_PREFIX_XXX:$(prefix):g" < dircolors.1.in | \ - sed -e 's:///*:/:g' > dircolors.1 -+ -+ linuxls.1: ls.1 -+ ln ls.1 linuxls.1 - - # Tell versions [3.59,3.63) of GNU make not to export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -*** src/dircolors.c.orig Sun Jan 7 10:14:00 1996 ---- src/dircolors.c Sun Jan 7 10:14:03 1996 -*************** -*** 12,17 **** ---- 12,23 ---- - #include <string.h> - #include "version.h" - -+ #ifdef linux -+ #define LS_COMMAND_NAME "ls" -+ #else -+ #define LS_COMMAND_NAME "linuxls" -+ #endif -+ - #define USER_FILE ".dir_colors" /* Versus user's home directory */ - #define SYSTEM_FILE "//DIR_COLORS" /* System-wide file in directory SYSTEM_DIR - (defined on the cc command line) */ -*************** -*** 436,442 **** - if ( *(q-1) != '/' ) - *(q++) = '/'; - -! strcpy(q, "ls"); - if ( access(line, X_OK) == 0 ) - { - no_path = 0; /* Found it */ ---- 442,448 ---- - if ( *(q-1) != '/' ) - *(q++) = '/'; - -! strcpy(q, LS_COMMAND_NAME); - if ( access(line, X_OK) == 0 ) - { - no_path = 0; /* Found it */ -*** man/dircolors.1.in.orig Sun Jan 7 10:13:57 1996 ---- man/dircolors.1.in Sun Jan 7 10:14:03 1996 -*************** -*** 1,7 **** - .TH DIRCOLORS 1L \" -*- nroff -*- - .SH NAME - dircolors \- Set color parameters for -! .BR ls (1) - .SH SYNOPSIS - .TP - \fBeval `dircolors\fR [\-abckstzPS] [filename]\fB`\fR ---- 1,7 ---- - .TH DIRCOLORS 1L \" -*- nroff -*- - .SH NAME - dircolors \- Set color parameters for -! .BR linuxls (1) - .SH SYNOPSIS - .TP - \fBeval `dircolors\fR [\-abckstzPS] [filename]\fB`\fR -*************** -*** 71,81 **** - .TP - .I "\-P" - Do not seek the path to find the location of the -! .B ls - binary. By default, - .B dircolors - will find the location of the -! .B ls - binary at the time it is run, and include it in the shell function or - alias, which for most shells results in a significant speed - improvement. ---- 71,81 ---- - .TP - .I "\-P" - Do not seek the path to find the location of the -! .B linuxls - binary. By default, - .B dircolors - will find the location of the -! .B linuxls - binary at the time it is run, and include it in the shell function or - alias, which for most shells results in a significant speed - improvement. -*************** -*** 88,94 **** - statement, even if there is a - .B COLOR - statement in the global section of the file. This is for -! compatibility with Slackware GNU - .B ls - for which the order of the statements did not matter. - .TP ---- 88,94 ---- - statement, even if there is a - .B COLOR - statement in the global section of the file. This is for -! compatibility with Slackware Linux GNU - .B ls - for which the order of the statements did not matter. - .TP -*************** -*** 146,154 **** - .TP - .B OPTIONS \fIoptions\fR - Adds command line options to the default -! .B ls - command line. The options can be any valid -! .B ls - command line options, and should include the leading minus sign. - Please note that - .B dircolors ---- 146,154 ---- - .TP - .B OPTIONS \fIoptions\fR - Adds command line options to the default -! .B linuxls - command line. The options can be any valid -! .B linuxls - command line options, and should include the leading minus sign. - Please note that - .B dircolors -*************** -*** 169,175 **** - .B ORPHAN \fIcolor-sequence\fR - Specifies the color used for an orphanned symbolic link (one which - points to a nonexistent file). If this is unspecified, -! .B ls - will use the - .B LINK - color instead. ---- 169,175 ---- - .B ORPHAN \fIcolor-sequence\fR - Specifies the color used for an orphanned symbolic link (one which - points to a nonexistent file). If this is unspecified, -! .B linuxls - will use the - .B LINK - color instead. -*************** -*** 177,183 **** - .B MISSING \fIcolor-sequence\fR - Specifies the color used for a missing file (a nonexistent file which - nevertheless has a symbolic link pointing to it). If this is unspecified, -! .B ls - will use the - .B FILE - color instead. ---- 177,183 ---- - .B MISSING \fIcolor-sequence\fR - Specifies the color used for a missing file (a nonexistent file which - nevertheless has a symbolic link pointing to it). If this is unspecified, -! .B linuxls - will use the - .B FILE - color instead. -*************** -*** 230,236 **** - .B xterm - and the widely used and cloned DEC VT100, will recognize ISO 6429 color - codes and harmlessly eliminate them from the output or emulate them. -! .B ls - uses ISO 6429 codes by default, assuming colorization is enabled. - - ISO 6429 color sequences are composed of sequences of numbers ---- 230,236 ---- - .B xterm - and the widely used and cloned DEC VT100, will recognize ISO 6429 color - codes and harmlessly eliminate them from the output or emulate them. -! .B linuxls - uses ISO 6429 codes by default, assuming colorization is enabled. - - ISO 6429 color sequences are composed of sequences of numbers -*************** -*** 264,270 **** - .sp - Not all commands will work on all systems or display devices. - .PP -! .B ls - uses the following defaults: - .sp - .RS +.2i ---- 264,270 ---- - .sp - Not all commands will work on all systems or display devices. - .PP -! .B linuxls - uses the following defaults: - .sp - .RS +.2i -*************** -*** 303,309 **** - definitions. - .PP - When writing out a filename, -! .B ls - generates the following output sequence: - .B LEFTCODE - .I typecode ---- 303,309 ---- - definitions. - .PP - When writing out a filename, -! .B linuxls - generates the following output sequence: - .B LEFTCODE - .I typecode -*************** -*** 385,390 **** ---- 385,391 ---- - .SH AUTHOR - H. Peter Anvin <hpa@nwu.edu> with input from Patrick Volkerding, - creator of the Slackware Linux distribution. -+ Ported to FreeBSD by Brian Clapper <bmc@willscreek.com>. - .SH BUGS - Currently is somewhat poorly integrated into the GNU fileutils - package. For example, it does not support long options and is -*** man/ls.1.orig Sun Jan 7 10:13:57 1996 ---- man/ls.1 Sun Jan 7 10:14:03 1996 -*************** -*** 18,24 **** - This manual page - documents the GNU version of - .BR ls , -! with color extensions. - .B dir - and - .B vdir ---- 18,25 ---- - This manual page - documents the GNU version of - .BR ls , -! with color extensions (installed on this machine as -! .BR linuxls ). - .B dir - and - .B vdir + acdir = m4 + ACLOCAL = $(top_srcdir)/aclocal.m4 diff -uNr linux-ls-3.12.0.2/patches/patch-ab gnuls-3.16/patches/patch-ab --- linux-ls-3.12.0.2/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ gnuls-3.16/patches/patch-ab Sun Aug 10 19:12:03 1997 @@ -0,0 +1,20 @@ +*** intl/Makefile.in.orig Sun Aug 10 18:05:44 1997 +--- intl/Makefile.in Sun Aug 10 18:06:26 1997 +*************** +*** 97,103 **** + # 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: install-exec install-data + install-exec: all + if test "$(PACKAGE)" = "gettext" \ + && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ +--- 97,104 ---- + # 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 \ diff -uNr linux-ls-3.12.0.2/patches/patch-ac gnuls-3.16/patches/patch-ac --- linux-ls-3.12.0.2/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ gnuls-3.16/patches/patch-ac Sun Aug 10 19:14:42 1997 @@ -0,0 +1,50 @@ +*** src/Makefile.in.orig Sun Aug 10 17:14:46 1997 +--- src/Makefile.in Sun Aug 10 19:14:33 1997 +*************** +*** 49,57 **** + EXTRAdir = $(bindir) + EXTRA_PROGRAMS = df mvdir + +! bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \ +! ginstall ln dir vdir ls mkdir \ +! mkfifo mknod mv rm rmdir sync touch @DF_PROG@ + + libexec_PROGRAMS = @MVDIR_PROG@ + datadir = $(prefix)/@DATADIRNAME@ +--- 49,55 ---- + EXTRAdir = $(bindir) + EXTRA_PROGRAMS = df mvdir + +! bin_PROGRAMS = dircolors gnuls + + libexec_PROGRAMS = @MVDIR_PROG@ + datadir = $(prefix)/@DATADIRNAME@ +*************** +*** 247,252 **** +--- 245,253 ---- + $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ + else :; fi; \ + done ++ ln $(bindir)/gnuls $(bindir)/linuxls ++ ln $(bindir)/gnuls $(bindir)/vdir ++ ln $(bindir)/gnuls $(bindir)/dir + + uninstall-binPROGRAMS: + list="$(bin_PROGRAMS)"; for p in $$list; do \ +*************** +*** 392,398 **** + $(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS) + $(ls_OBJECTS): ../config.h + +! ls: $(ls_OBJECTS) $(ls_DEPENDENCIES) + $(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS) + $(mkdir_OBJECTS): ../config.h + +--- 393,399 ---- + $(LINK) $(vdir_LDFLAGS) $(vdir_OBJECTS) $(vdir_LDADD) $(LIBS) + $(ls_OBJECTS): ../config.h + +! gnuls: $(ls_OBJECTS) $(ls_DEPENDENCIES) + $(LINK) $(ls_LDFLAGS) $(ls_OBJECTS) $(ls_LDADD) $(LIBS) + $(mkdir_OBJECTS): ../config.h + diff -uNr linux-ls-3.12.0.2/patches/patch-ad gnuls-3.16/patches/patch-ad --- linux-ls-3.12.0.2/patches/patch-ad Wed Dec 31 19:00:00 1969 +++ gnuls-3.16/patches/patch-ad Sun Aug 10 19:50:09 1997 @@ -0,0 +1,183 @@ +*** man/Makefile.in.orig Sun Jan 26 21:26:52 1997 +--- man/Makefile.in Sun Aug 10 19:50:02 1997 +*************** +*** 47,58 **** + LN = @LN@ + RM = @RM@ + +! man_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 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +! 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 + + + NROFF = nroff +--- 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 + + + NROFF = nroff +*************** +*** 80,211 **** + $(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 + + tags: TAGS diff -uNr linux-ls-3.12.0.2/patches/patch-ae gnuls-3.16/patches/patch-ae --- linux-ls-3.12.0.2/patches/patch-ae Wed Dec 31 19:00:00 1969 +++ gnuls-3.16/patches/patch-ae Sun Aug 10 19:12:32 1997 @@ -0,0 +1,90 @@ +*** man/ls.1.orig Sun Aug 10 17:54:52 1997 +--- man/ls.1 Sun Aug 10 17:55:42 1997 +*************** +*** 1,8 **** +! .TH LS 1 "GNU File Utilities" "FSF" \" -*- nroff -*- + .SH NAME +! ls, dir, vdir \- list contents of directories + .SH SYNOPSIS +! .B ls + [\-abcdfgiklmnpqrstuxABCFGLNQRSUX1] [\-w cols] [\-T cols] [\-I pattern] + [\-\-all] [\-\-escape] [\-\-directory] [\-\-inode] [\-\-kilobytes] + [\-\-numeric-uid-gid] [--no-group] [\-\-hide-control-chars] [\-\-reverse] +--- 1,8 ---- +! .TH GNULS 1 "GNU File Utilities" "FSF" \" -*- nroff -*- + .SH NAME +! gnuls, dir, vdir \- list contents of directories + .SH SYNOPSIS +! .B gnuls + [\-abcdfgiklmnpqrstuxABCFGLNQRSUX1] [\-w cols] [\-T cols] [\-I pattern] + [\-\-all] [\-\-escape] [\-\-directory] [\-\-inode] [\-\-kilobytes] + [\-\-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 +*************** +*** 163,169 **** + stored on the disk. This option is not called + .I \-f + because the Unix +! .B ls + .I \-f + option also enables + .I \-a +--- 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 + will colorize the file names printed according to the name and type of + file. By default, this colorization is by type only, and the codes + used are ISO 6429 (ANSI) compliant. +--- 229,235 ---- + When using the + .I "\-\-color" + option, this version of +! .B gnuls + will colorize the file names printed according to the name and type of + file. By default, this colorization is by type only, and the codes + used are ISO 6429 (ANSI) compliant. diff -uNr linux-ls-3.12.0.2/pkg/COMMENT gnuls-3.16/pkg/COMMENT --- linux-ls-3.12.0.2/pkg/COMMENT Sun Jan 7 10:14:33 1996 +++ gnuls-3.16/pkg/COMMENT Sun Aug 10 19:20:29 1997 @@ -1 +1 @@ -FreeBSD port of Linux Slackware colorized GNU `ls'. +FreeBSD port of colorized GNU `ls'. diff -uNr linux-ls-3.12.0.2/pkg/DESCR gnuls-3.16/pkg/DESCR --- linux-ls-3.12.0.2/pkg/DESCR Sun Jan 7 10:27:42 1996 +++ gnuls-3.16/pkg/DESCR Sun Aug 10 20:48:07 1997 @@ -1,26 +1,26 @@ -This is a port of the Slackware Linux colorized `ls' program, which is, in -turn, adapted from the `ls' program that comes with the GNU `fileutils' -package. It is based on GNU fileutils version 3.12. The port installs -four programs in `/usr/local/bin': `linuxls', `dir', `vdir' and -`dircolors'. It also installs man pages for `linuxls' and `dircolors'. -The programs are compatible with their counterparts in Slackware Linux -releases. -Standard xterm doesn't know about colors, so you should use color_xterm or -kterm (available from the ports collection). +`gnuls' is a port of the GNU colorized `ls' program--the one most Linux +users are familiar with. The port was formerly called `linuxls', since it +had been adapted from the colorized Linux version of `ls' -- which, in +turn, was a patched version of GNU's stock `ls' program. The folks at GNU +have since rolled the colorization mods into their official version of +`ls'; this port's name now reflects that change. + +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 (as originally - patched for Linux) so that it installs only programs and man pages - listed above. - -2. Unlike the Slackware Linux version, this port installs `ls' as `linuxls' - so it won't conflict with the normal BSD `ls' program or the BSD - `colorls' program (the latter available from the ports collection). +1. This port modifies the GNU `fileutils' make procedure so that it + installs only programs and man pages listed above. + +2. This port installs GNU's `ls' as `gnuls' and `linuxls' 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> -07 January 1996 +10 August 1997 diff -uNr linux-ls-3.12.0.2/pkg/PLIST gnuls-3.16/pkg/PLIST --- linux-ls-3.12.0.2/pkg/PLIST Sun Jan 7 10:32:41 1996 +++ gnuls-3.16/pkg/PLIST Sun Aug 10 20:44:58 1997 @@ -1,8 +1,9 @@ bin/linuxls +bin/gnuls bin/dircolors bin/dir bin/vdir -man/man1/linuxls.1 +man/man1/gnuls.1 man/man1/dircolors.1 -man/cat1/linuxls.1.gz +man/cat1/gnuls.1.gz man/cat1/dircolors.1.gz >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199708110100.VAA01482>