From owner-freebsd-ports Sat Feb 20 10:30:14 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 1EF4D1186C for ; Sat, 20 Feb 1999 10:30:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id KAA00584; Sat, 20 Feb 1999 10:30:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from sparcy.delanet.com (sparcy.delanet.com [208.9.136.54]) by hub.freebsd.org (Postfix) with SMTP id 2A3DB10E6E for ; Sat, 20 Feb 1999 07:04:56 -0800 (PST) (envelope-from bmc@WillsCreek.COM) Received: (qmail 11132 invoked from network); 20 Feb 1999 14:59:57 -0000 Received: from modem682.delanet.com (HELO footbridge.willscreek.com) (209.186.57.131) by sparcy.delanet.com with SMTP; 20 Feb 1999 14:59:57 -0000 Received: from current.willscreek.com (current.willscreek.com [172.16.87.1]) by footbridge.willscreek.com (8.9.1a/8.9.1) with ESMTP id KAA20211; Sat, 20 Feb 1999 10:04:33 -0500 (EST) Received: (from bmc@localhost) by current.willscreek.com (8.9.1/8.8.5) id KAA27349; Sat, 20 Feb 1999 10:04:32 -0500 (EST) Message-Id: <199902201504.KAA27349@current.willscreek.com> Date: Sat, 20 Feb 1999 10:04:32 -0500 (EST) From: Brian Clapper Reply-To: bmc@WillsCreek.COM To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/10173: [UPDATE] gnuls port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 10173 >Category: ports >Synopsis: Update to gnuls port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 20 10:30:03 PST 1999 >Closed-Date: >Last-Modified: >Originator: Brian M. Clapper >Release: FreeBSD 3.0-RELEASE i386 >Organization: WillsCreek.COM >Environment: Built and tested on FreeBSD 3.0-RELEASE. *Not* tested on 2.x. >Description: Enclosed is an update to the `gnuls' port, to bring it up to date with the latest version (4.0) of the GNU fileutils software, on which the port is based. >How-To-Repeat: >Fix: Enclosed is the result of a "diff -uNr gnuls-3.16 gnuls". Apply this recursive patch to bring the port up-to-date. I've also enclosed a uuencoded copy of the new port's tarball, in case it's easier to update that way. diff -uNr gnuls-3.16/Makefile gnuls/Makefile --- gnuls-3.16/Makefile Thu Sep 18 13:40:24 1997 +++ gnuls/Makefile Sat Feb 20 09:06:45 1999 @@ -1,19 +1,19 @@ -# New ports collection makefile for: Linux-style colorized `ls' -# Version required: 3.12.0.2 (GNU fileutils 3.12) +# 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-3.16 -PKGNAME= gnuls-3.16 +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 +MAN1= gnuls.1 dircolors.1 dir.1 vdir.1 .include diff -uNr gnuls-3.16/files/md5 gnuls/files/md5 --- gnuls-3.16/files/md5 Thu Sep 18 13:40:31 1997 +++ gnuls/files/md5 Thu Feb 18 08:33:21 1999 @@ -1 +1 @@ -MD5 (fileutils-3.16.tar.gz) = b64c38f1f14ec82d55d8b967035ede8f +MD5 (fileutils-4.0.tar.gz) = 082ab37b7f37c00e768b04e37bc736be diff -uNr gnuls-3.16/patches/patch-aa gnuls/patches/patch-aa --- gnuls-3.16/patches/patch-aa Thu Sep 18 13:40:32 1997 +++ gnuls/patches/patch-aa Fri Feb 19 19:27:11 1999 @@ -1,20 +1,20 @@ -*** Makefile.in.orig Sun Aug 10 17:06:15 1997 ---- Makefile.in Sun Aug 10 17:07:03 1997 +*** Makefile.in.orig Fri Feb 19 19:24:40 1999 +--- Makefile.in Fri Feb 19 19:27:05 1999 *************** -*** 49,55 **** +*** 92,98 **** - AUTOMAKE_OPTIONS = gnits 1.1k + AUTOMAKE_OPTIONS = gnits 1.2h -! SUBDIRS = lib intl src doc man m4 po +! SUBDIRS = lib intl src doc man m4 po tests - acdir = m4 - ACLOCAL = $(top_srcdir)/aclocal.m4 ---- 49,56 ---- + # Remove this file here (it is created via configure), not from within intl. + DISTCLEANFILES = intl/libintl.h +--- 92,99 ---- - AUTOMAKE_OPTIONS = gnits 1.1k + AUTOMAKE_OPTIONS = gnits 1.2h -! #SUBDIRS = lib intl src doc man m4 po +! #SUBDIRS = lib intl src doc man m4 po tests ! SUBDIRS = lib intl src man - acdir = m4 - ACLOCAL = $(top_srcdir)/aclocal.m4 + # Remove this file here (it is created via configure), not from within intl. + DISTCLEANFILES = intl/libintl.h diff -uNr gnuls-3.16/patches/patch-ab gnuls/patches/patch-ab --- gnuls-3.16/patches/patch-ab Thu Sep 18 13:41:28 1997 +++ gnuls/patches/patch-ab Fri Feb 19 19:21:21 1999 @@ -1,7 +1,7 @@ -*** intl/Makefile.in.orig Sun Aug 10 18:05:44 1997 ---- intl/Makefile.in Sun Aug 10 18:06:26 1997 +*** intl/Makefile.in.orig Fri Feb 19 19:20:37 1999 +--- intl/Makefile.in Fri Feb 19 19:20:54 1999 *************** -*** 97,103 **** +*** 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'. @@ -9,12 +9,12 @@ install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ ---- 97,104 ---- +--- 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" +! @echo Nothing to install in intl install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ diff -uNr gnuls-3.16/patches/patch-ac gnuls/patches/patch-ac --- gnuls-3.16/patches/patch-ac Wed Oct 29 18:25:44 1997 +++ gnuls/patches/patch-ac Fri Feb 19 19:21:38 1999 @@ -1,7 +1,7 @@ -*** src/Makefile.in.orig Sun Aug 10 17:14:46 1997 ---- src/Makefile.in Sun Aug 10 19:14:33 1997 +*** src/Makefile.in.orig Thu Feb 18 08:40:27 1999 +--- src/Makefile.in Thu Feb 18 08:44:15 1999 *************** -*** 49,57 **** +*** 95,103 **** EXTRAdir = $(bindir) EXTRA_PROGRAMS = df mvdir @@ -11,184 +11,47 @@ libexec_PROGRAMS = @MVDIR_PROG@ datadir = $(prefix)/@DATADIRNAME@ ---- 49,55 ---- +--- 95,101 ---- EXTRAdir = $(bindir) EXTRA_PROGRAMS = df mvdir -! bin_PROGRAMS = dircolors gnuls +! bin_PROGRAMS = gnuls dir vdir dircolors libexec_PROGRAMS = @MVDIR_PROG@ datadir = $(prefix)/@DATADIRNAME@ *************** -*** 247,252 **** ---- 245,253 ---- - $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ - done -+ ln -f $(bindir)/gnuls $(bindir)/linuxls -+ ln -f $(bindir)/gnuls $(bindir)/vdir -+ ln -f $(bindir)/gnuls $(bindir)/dir - - uninstall-binPROGRAMS: - list="$(bin_PROGRAMS)"; for p in $$list; do \ +*** 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) *************** -*** 392,398 **** +*** 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 ---- 393,399 ---- + 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; -! } - #ifdef S_ISLNK - 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; + mkdir: $(mkdir_OBJECTS) $(mkdir_DEPENDENCIES) diff -uNr gnuls-3.16/patches/patch-ad gnuls/patches/patch-ad --- gnuls-3.16/patches/patch-ad Thu Sep 18 13:41:29 1997 +++ gnuls/patches/patch-ad Sat Feb 20 09:20:30 1999 @@ -1,183 +1,52 @@ -*** man/Makefile.in.orig Sun Jan 26 21:26:52 1997 ---- man/Makefile.in Sun Aug 10 19:50:02 1997 +*** man/Makefile.in.orig Sat Nov 14 10:46:12 1998 +--- man/Makefile.in Sat Feb 20 09:20:26 1999 *************** -*** 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 +*** 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@ +! man_MANS = dir.1 dircolors.1 gnuls.1 vdir.1 + man_aux = $(man_MANS:.1=.x) - NROFF = nroff + EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \ *************** -*** 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 +*** 117,123 **** - tags: TAGS + 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 ---- diff -uNr gnuls-3.16/patches/patch-ae gnuls/patches/patch-ae --- gnuls-3.16/patches/patch-ae Thu Sep 18 13:41:30 1997 +++ gnuls/patches/patch-ae Sat Feb 20 09:04:13 1999 @@ -1,90 +1,49 @@ -*** man/ls.1.orig Sun Aug 10 17:54:52 1997 ---- man/ls.1 Sun Aug 10 17:55:42 1997 +*** man/ls.1.orig Sat Feb 20 08:55:59 1999 +--- man/ls.1 Sat Feb 20 09:02:36 1999 *************** -*** 1,8 **** -! .TH LS 1 "GNU File Utilities" "FSF" \" -*- nroff -*- +*** 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, dir, vdir \- list contents of directories +! ls \- list directory contents .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 -*- + [\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, dir, vdir \- list contents of directories +! gnuls \- list directory contents .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 **** + [\fIOPTION\fR]... [\fIFILE\fR]... + .SH DESCRIPTION .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 +*** 171,182 **** + Report bugs to . + .SH "SEE ALSO" + The full documentation for ! .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 + is maintained as a Texinfo manual. If the + .B info +! and ! .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 +! programs are properly installed at your site, the command + .IP + .B info ls + .PP +--- 171,181 ---- + Report bugs to . + .SH "SEE ALSO" + The full documentation for ! .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. + 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 diff -uNr gnuls-3.16/patches/patch-af gnuls/patches/patch-af --- gnuls-3.16/patches/patch-af Wed Dec 31 19:00:00 1969 +++ gnuls/patches/patch-af Sat Feb 20 09:30:32 1999 @@ -0,0 +1,22 @@ +*** 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 diff -uNr gnuls-3.16/patches/patch-ag gnuls/patches/patch-ag --- gnuls-3.16/patches/patch-ag Wed Dec 31 19:00:00 1969 +++ gnuls/patches/patch-ag Sat Feb 20 09:30:42 1999 @@ -0,0 +1,22 @@ +*** 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 diff -uNr gnuls-3.16/patches/patch-ah gnuls/patches/patch-ah --- gnuls-3.16/patches/patch-ah Wed Dec 31 19:00:00 1969 +++ gnuls/patches/patch-ah Sat Feb 20 09:30:51 1999 @@ -0,0 +1,22 @@ +*** 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 diff -uNr gnuls-3.16/pkg/COMMENT gnuls/pkg/COMMENT --- gnuls-3.16/pkg/COMMENT Thu Sep 18 13:40:33 1997 +++ gnuls/pkg/COMMENT Sat Feb 20 09:07:13 1999 @@ -1 +1 @@ -FreeBSD port of colorized GNU `ls'. +GNU colorized `ls'. diff -uNr gnuls-3.16/pkg/DESCR gnuls/pkg/DESCR --- gnuls-3.16/pkg/DESCR Thu Sep 18 13:40:33 1997 +++ gnuls/pkg/DESCR Sat Feb 20 09:26:54 1999 @@ -1,25 +1,23 @@ `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'. +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. NOTES: 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). + 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 -10 August 1997 +20 February, 1999 diff -uNr gnuls-3.16/pkg/PLIST gnuls/pkg/PLIST --- gnuls-3.16/pkg/PLIST Thu Sep 18 13:40:34 1997 +++ gnuls/pkg/PLIST Sat Feb 20 09:25:29 1999 @@ -1,7 +1,4 @@ bin/dir bin/dircolors bin/gnuls -bin/linuxls bin/vdir -man/man1/dircolors.1.gz -man/man1/gnuls.1.gz begin 644 gnuls-4.0.tar.gz M'XL("&7(SC8"`V=N=6QS+30N,"YT87(`[5Q[4]M($N=?^U-T"+7@E"TD6;;! MM]G"L0WQ!FS*-ONXRQ61I;&M0@^O'@;VZK[[=8\>MH&09!>4V^QT`9I'SZMG MYM<]+V9N9`?[6\]*H,F-6@VV`*"JR/P+T$B^G&2`>KU>K6F:K#0HLJXJ6U#; MRH&B(-1]@*V)8SS*-['LN"7HFYC_"STTYL^F`;Y` M_U>U*N&_HM8$_G^%_N??BJ[GBO^*7%?C_M=DN59%^T]1&UI5X'\>].K5*SC3 MKQBI`,ER)<^W9H5CWX)C-@'E$'^:JM;49'0<'A8KEP'PIW4Q'IRUWG4O!^?CWJ`_0H4S4$29M?IC<;MTVZK?]P[[5(M M*&(?J\(9YEP`G7'+`R=(*I M%[DFZ+#PV=+RHL"^Q1*QHVP;@>RD?P$S%H;L)B1(]'7_5N*Y]*9PZT5PK;LA MA!Y$`4$B`\]E6(!ES+$`AP4<[V*L7#(_L#P7O"DQ\CP6NG&ESUB9YS37"57C MG#ZL:E>I4!85RS7LR&1F):G,KH1HG52SF3HJ[(89F3#]L[>>:O]KG72+6TC^FXGN6_#>^+"^?+==S'C[E&O/SX=O/EQ=+2+C+L[ M>R?=\9C\I=U_4(-<3$*=%8N[GBJI;U+6P=4"LKE_:-.:]Q"IG[KK'L4+R5(,$H*TT\B&#Z]5RW-Y/%T M%7^HAU6Y6E;EP[2+[>`2L;';'E,!Z-NYD#S\5&)7S'#::74ZO!CN*L6AG>YY MM]_I]ML]OA(!2:*%"/U.(TG'YO*4QZ>M$XK&-+P?+T>#BV&;I^!^R;:EX<=\]>9L>ZB]-4_UT)\UC&6?)*9OZD_+5X*HA*[+T9E>)A:0=-#%@)KQ3[UF52XBH\+IFW M>ZW?@8I\![](D&D8R!/68A% M\=]]_6_F:O^I6KV6[O^K:JW.[;^ZV/_-S?YS=/>^_3?20UQ*+4'!=;S^RC& M2RSF\JS5SRP\28FM._Y%6X^^%$CZ$/]2N#F-_;&9@VZRZ=".B="9&G_HM"FM M3?&Q-E42NX\[7%Z"L\0_OL/_Q"QQ5F0'HH=;@OA=\C@"6:RL'MUP79M6O"DI MKZ6;!(5CRXVV5S=X"(;?=D_/5?24DG#,IY0LWDE:6JJ3/E=:B4#6Q,#G^3-7 M]\&M'J515M3JVK;_N#7$#''2H?ODG[US,G8J$UQ68Q/X4CX=6)@Y+S!.)HTN MCH][OW1'3?3L[.$*A`SB]5&X2BGI#K*$WN(R9V>!IM9[O*CF=S-V&QDIUZ''L^Z*9IA9;GZC;XDTR8D/FT7>.Y&!!Z?'=JE5^99Q(P1CM<3MI_NFNNQ,J9I7@94)510LD( M^=;U/\M7_ZMU+=7_)L#ZEN@+0N^&H7W%;`1:$A',B/T_%O:#@^9RT^2B77T:W]P/NJ-J+@W\8+T M7^^GO?A4]_UT^&])DG@(U3WQ)TD[W5%[V..,%')^'NN85`38?)D"T\/X1)-`L(N;]'1R5KSQ%6`T MB.U1MPNMT]&`VC=&E)]&J+=,SX@<;(9."@*FGK_6E5:PT@0FH+AU&+,;RZ6= M/]U%%2(!G6_$QQ28B&)(\[MFELD+6/C>S-<=3.PS\BR8OW%R@E/DUHM\"*R0 ME;GV,3S'H3PPS][Y*N>X3ME`X:+(]@&?411I5_Y!:23MYSHS3(L*(FPMJ=^- M(4BR>S(AB57[,^O_:<[WOY3JZOX?,O#[7ZK0_WGJ_[6UXGTS`)?T!]G5KM0, M6$MQE_FPJ<@?MP:JC;*6G?WCY%X_E/BSN+S*ZRGA>;V&*4I3*[)U^=.T(F<\ MO=LJ`88"_V/\G^6*_]#0:BO\3\[_-7'^GS?^?P3Y#[/-W#7D?PCSM4?._)6& MMF[>QWCY-'C_U$B_88EKZY;XGZUU_OC^:61_W.^P^<_YJ8_WG. M_^6C`'!G!VCY$`)4Y::L?0D"+)\&`I9/C0'+3X'`\J^$`LO'82"9_U>S9WP# M_@?>_U8;LGC_E:/]A_W?'IR==?OC9RCCD^]_U=7^?UWE[W\UL?^?#Q'>\%6@ M]3O"R@<[V)7$0O#OM_[#^<_WZ9^EC$^^_ZFOWO_*_/Z/HM;K8O[G01_X`-@E M8T8'?M`0O\Z`^\"06BZ52OK,@X[MX=1RHYMB%#`_MKVFNF/9%LJ47FU(Q2(= M0O",$^LEH.LUSXL!\%_K[M&;J]CW+>;4)2K3)\0/.%/F3&[!;)9OJ0 M[5OM2G18IMN!M\J;#LD6^HQ1*3Z_OK!1F@0CQI^I%.E"]=(RT4R[D\9D:-%A M3IX+3#?F:5)L27\PINL8146",;UGX:UR/-.:6I@V%=J'S'S;!;I60!D8S*27 M+`'=04#3S0K1(EO5F=]/6-FOV,95C>ADCNR]B;=DV%P*]D/+B&S=+R?YF![R MT6O.]-(&U62I^_22A]>(VX'\7WR@E1IXAL6/%9-W.62N0> M1=EZ&#(R7$%?8G?H$YO%KU7#9#@%-#IM9M")5@GK74WJ_?"8I?%-(J+4@>XP M:@6Y[Y?^F45BB6]\"[NI;>L+M,[A>P20HY\M%%;;9^Q*0G/JAR*NC'"!Y$>Z M?UN.ET;_O_A_?MH;C;\&_@/4E.S^9Z.JQ/__09S_Y$+8+-K/*R;?Y$"`?/'A M,+GX$E*82M^P_9?>>-OZ*O._OKK_C>9?C?__IYK8_\^%7D*?7=_3;I#=AT2+ MJ%FX;PL67\)/R6M>G_T663XSFX5"09-DV+MW]ZB$W!VT.=)_14&ZKTN)+9-CIF:L[K^4E*!)_DMC8EP_WE0-0&OR9H@93 MYKJHD;LW"]C!A$6ZPTPWGEX7-O[15?'\W4D#GJC2EHYS]K_DMLZ'^+R-'KC_&W.WS]4,6+R'79'O2/>R<70RSK ME@68I*^\+A32.]GK][3CF]O)+>VBE#QZ1NLB,"7J)Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message