pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/same Updated same to 1.8.
details: https://anonhg.NetBSD.org/pkgsrc/rev/dc50b7c9412b
branches: trunk
changeset: 517133:dc50b7c9412b
user: rillig <rillig%pkgsrc.org@localhost>
date: Fri Aug 04 22:46:27 2006 +0000
description:
Updated same to 1.8.
Changes unknown.
diffstat:
sysutils/same/Makefile | 17 ++-
sysutils/same/PLIST | 3 +-
sysutils/same/distinfo | 10 +-
sysutils/same/files/Makefile | 17 +--
sysutils/same/files/same.1 | 180 ++++++++++++++++++----------------------
sysutils/same/patches/patch-ab | 133 ------------------------------
sysutils/same/patches/patch-ac | 130 +++++++++++++++++++++++++++++
7 files changed, 233 insertions(+), 257 deletions(-)
diffs (truncated from 552 to 300 lines):
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/Makefile
--- a/sysutils/same/Makefile Fri Aug 04 22:12:28 2006 +0000
+++ b/sysutils/same/Makefile Fri Aug 04 22:46:27 2006 +0000
@@ -1,20 +1,23 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/17 13:21:48 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2006/08/04 22:46:27 rillig Exp $
-DISTNAME= same-1.3
+DISTNAME= same-1.8
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.bitwizard.nl/same/
-MAINTAINER= roland.illig%gmx.de@localhost
+MAINTAINER= rillig%NetBSD.org@localhost
HOMEPAGE= http://www.bitwizard.nl/
COMMENT= Find identical files and link(2) them to save disk space
PKG_INSTALLATION_TYPES= overwrite pkgviews
-MAKEFILE= ${FILESDIR}/Makefile
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-INSTALLATION_DIRS= bin man/man1
+MAKE_FLAGS+= BINDIR=${PREFIX}/bin
+MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+= BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_FLAGS+= MANOWN=${MANOWN} MANGRP=${MANGRP}
-post-patch:
- @${CP} ${FILESDIR}/same.1 ${WRKSRC}
+post-extract:
+ cd ${FILESDIR} && cp -f Makefile same.1 ${WRKSRC}
.include "../../mk/bsd.pkg.mk"
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/PLIST
--- a/sysutils/same/PLIST Fri Aug 04 22:12:28 2006 +0000
+++ b/sysutils/same/PLIST Fri Aug 04 22:46:27 2006 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/17 13:21:48 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/08/04 22:46:27 rillig Exp $
bin/same
+man/cat1/same.0
man/man1/same.1
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/distinfo
--- a/sysutils/same/distinfo Fri Aug 04 22:12:28 2006 +0000
+++ b/sysutils/same/distinfo Fri Aug 04 22:46:27 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 13:40:57 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/08/04 22:46:27 rillig Exp $
-SHA1 (same-1.3.tar.gz) = 0638d10e53c022470e0ef724679f2c476607ebb2
-RMD160 (same-1.3.tar.gz) = dc0bc8b02a7e02b78f5deae1c3989ac7f92948c4
-Size (same-1.3.tar.gz) = 9119 bytes
-SHA1 (patch-ab) = 7df4a5ee747bf542911c5c2f7208494c68ce9561
+SHA1 (same-1.8.tar.gz) = 39d95e70c09703b5c7525a6ea896c097f744d288
+RMD160 (same-1.8.tar.gz) = 987e6dc1c99258f00ed831af3fa3f034ebe08134
+Size (same-1.8.tar.gz) = 9398 bytes
+SHA1 (patch-ac) = d8b2d46570c54f54b16b0562ae594ad3e23f8257
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/files/Makefile
--- a/sysutils/same/files/Makefile Fri Aug 04 22:12:28 2006 +0000
+++ b/sysutils/same/files/Makefile Fri Aug 04 22:46:27 2006 +0000
@@ -1,15 +1,6 @@
-same_OBJECTS= same.o crc32.o
-
-all: same
-
-install: all
- ${BSD_INSTALL_PROGRAM} same ${PREFIX}/bin/same
- ${BSD_INSTALL_MAN} same.1 ${PREFIX}/man/man1/same.1
+# $NetBSD: Makefile,v 1.2 2006/08/04 22:46:27 rillig Exp $
-.c.o:
- ${CC} ${CPPFLAGS} ${CFLAGS} -c $< -o $@
+PROG= same
+LDADD= -lz
-same: ${same_OBJECTS}
- ${CC} ${LDFLAGS} $(same_OBJECTS) ${LIBS} -o $@
-
-.PHONY: all install
+.include <bsd.prog.mk>
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/files/same.1
--- a/sysutils/same/files/same.1 Fri Aug 04 22:12:28 2006 +0000
+++ b/sysutils/same/files/same.1 Fri Aug 04 22:46:27 2006 +0000
@@ -1,114 +1,98 @@
-.TH same 1
-
-.SH NAME
-same \- find identical files and link them to save disk space.
-
-.SH SYNOPSIS
-
-\fBsame\fR [-d | --debug] [-hs \fIn\fR | --hashstart \fIn\fR]
-[-n | --dryrun] [-s] [-t | --timings] [-v | --verbose]
-[-z --nullfiles]
-
-.SH OPTIONS
-
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-Switch on debugging messages from the program.
-
-.TP
-\fB\-hs\fR \fIn\fR, \fB--hashstart\fR \fIn\fR
-Set the start value of the hash function.
-
-.TP
-\fB\-n\fR, \fB\-\-dryrun\fR
-Do not modify any file on the disk.
-
-.TP
-\fB\-s\fR
-Create symbolic links instead of hard links.
-
-.TP
-\fB\-t\fR, \fB\-\-timings\fR
-At the end of the program, output the time needed.
-
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Output some messages what is done.
-
-.TP
-\fB\-z\fR, \fB\-\-nullfiles\fR
-Even create links for empty files. Normally these files are ignored.
-
-
-.SH INTRODUCTION
-
-This program takes a list of files (e.g. the output of \fBfind . -type f\fR)
-on stdin. Each of the files is compared against each of the
-others. Whenever two files are found that match exactly, the two files
-are linked (soft or hard) together.
-
-
-.SH GOAL
-
+.\" $NetBSD: same.1,v 1.2 2006/08/04 22:46:27 rillig Exp $
+.Dd July 14, 2004
+.Dt SAME 1
+.Sh NAME
+.Nm same
+.Nd link identical files to save disk space
+.Sh SYNOPSIS
+.Nm
+.Fl HVcdhnstuvz
+.Sh DESCRIPTION
+.Nm
+takes a list of files (e.g. the output of find . -type f) on stdin.
+Each of the files is compared against each of the others.
+Whenever two files are found that match exactly, the two files are
+linked (soft or hard) together.
+.Ss Goal
The goal of this program is to conserve disk space when you have
-several different trees of large project on your disk. By creating
-hardlinks or softlinks between the files that are the same, you can
-save lots of disk space. For example, two different versions of the
-Linux kernel only differ in a small number of files. By running this
-program you only need to store the contents of those files once.
+several different trees of large projects on your disk.
+By creating hardlinks or softlinks between the files that are the same,
+you can save lots of disk space.
+For example, two different versions of the Linux kernel only differ in a
+small number of files.
+By running this program you only need to store the contents of those
+files once.
This is especially useful if you have different versions of complete
-trees lying around.
-
-.SH IMPLEMENTATION
-
+trees lying around.
+.Ss Implementation
The filesize of every file is used as an indication of wether two
files can be the same. Whenever the filesizes match, the hashes of
these two files are compared. Whenever these match, the file
contents are compared. For every matching pair one of the two
files is replaced by a hard link to the other file.
-With the \fB-s\fR option a softlink is used.
-
+With the -s option a softlink is used.
+.Pp
To allow you to do this incrementally, the "rm" is done on the file
with the least links. This allows you to "merge" a new tree with
several trees that have already been processed. The new tree has
link count 1, while the old tree has a higher link count for those
files that are likely candidates for linkage.
-
+.Pp
The current implementation keeps the "first" incantation of a file,
and replaces further occurrances of the same file. This is
-significant when using softlinks.
-
-.SH EXAMPLE
-
-.TP
-\fBfind . -type f | same\fR
-
-This links all files together under the current directory that are
-the same.
-
-.SH BUGS
-
-.IP \(bu
-Make sure that you have all the permissions required for
-execution of the commands.
-
-.IP \(bu
-RCS probably allows you to do similar things.
-
-.IP \(bu
+significant when using softlinks.
+.Ss Options
+.Bl -tag -width xxxxxx
+.It Fl H Ar n , Fl -hashstart Ar n
+Start at hash value
+.Ar n
+instead of 0.
+.It Fl V , Fl -version
+Print the version of the program and exit.
+.It Fl c Ar file , Fl -cache Ar file
+Keep a cache between runs in file
+.Ar file .
+.It Fl d , Fl -debug
+Output some debug messages.
+.It Fl h , Fl -help
+Output this page and exit successfully.
+.It Fl n , Fl -dryrun
+Only simulate.
+.It Fl s , Fl -softlinks
+Create soft links instead of hard links.
+.It Fl u , Fl -user
+Don't relink files owned by another user.
+.It Fl v , Fl -verbose
+Output verbose messages.
+.It Fl z , Fl -nullfiles
+Link empty files, too.
+By default, only non-empty files are linked.
+.El
+.Sh EXIT STATUS
+Zero on success, non-zero on failure.
+.Sh EXAMPLES
+.Bd -literal
+find . -type f -print | same
+.Ed
+.Sh SEE ALSO
+.Xr find 1
+.Sh AUTHORS
+.An "Roger E. Wolff" Aq R.E.Wolff%BitWizard.nl@localhost ,
+.An "Geert Uytterhoeven" Aq geert%linux-m68k.org@localhost ,
+.An "Roland Illig" Aq roland.illig%gmx.de@localhost .
+.Sh CAVEATS
+.Bl -bullet
+.It
If your editor does not move the original aside before writing a
new copy, you will change the file in ALL incarnations when
-editing a file. Patch works just fine: it moves the original
-aside before creating a new copy. I'm confident that I could
-learn Emacs to do it this way too. I'm too lazy to figure it out,
-so if you happen to know an easy way how to do this, please Email
-me at R.E.Wolff%BitWizard.nl@localhost
-
-.IP \(bu
-There is a 1024 character limit to pathnames when using symlinks.
-
-.SH AUTHOR
-
-This manpage was written by Roland Illig <roland.illig%gmx.de@localhost> for the
-pkgsrc distribution. Some sections are taken from the source code of
-`same'.
+editing a file.
+Patch works just fine: it moves the original aside before creating a new
+copy.
+I'm confident that I could learn Emacs to do it this way too.
+I'm too lazy to figure it out, so if you happen to know an easy way how
+to do this, please Email me at
+.Aq R.E.Wolff%BitWizard.nl@localhost .
+.It
+There is a 1024 (BUFSIZE) character limit to pathnames when using
+symlinks.
+.El
diff -r 8b2e8aad1354 -r dc50b7c9412b sysutils/same/patches/patch-ab
--- a/sysutils/same/patches/patch-ab Fri Aug 04 22:12:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/17 13:21:48 minskim Exp $
-
---- same.c.orig 2000-10-16 10:04:15.000000000 +0200
-+++ same.c 2004-01-31 20:14:29.000000000 +0100
-@@ -143,6 +143,9 @@
- dev_t device;
- ino_t inode;
- nlink_t nlink;
-+ mode_t mode;
-+ uid_t owner;
-+ gid_t group;
- long crc;
- struct inode_entry *next;
- struct name_entry *names;
-@@ -254,11 +257,19 @@
Home |
Main Index |
Thread Index |
Old Index