Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,19 +1,18 @@
# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:01 asau Exp $
# $NetBSD: Makefile,v 1.4 2016/04/01 11:12:27 jperkin Exp $
DISTNAME= fdupes-1.40
DISTNAME= fdupes-1.51
CATEGORIES= sysutils
MASTER_SITES= http://netdial.caribe.net/~adrian2/programs/
MASTER_SITES= http://fdupes.googlecode.com/files/
MAINTAINER= ef@math.uni-bonn.de
HOMEPAGE= http://netdial.caribe.net/~adrian2/fdupes.html
COMMENT= Program for identifying or deleting duplicate files
LICENSE= mit
USE_LANGUAGES= c
NO_CONFIGURE= yes
MAKE_FLAGS= INSTALLDIR=${PREFIX}/bin MANPAGEDIR=${PREFIX}/${PKGMANDIR}
BUILD_TARGET= fdupes
MAKE_FLAGS= INSTALLDIR=${PREFIX}/bin
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1

View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.1.1.1 2008/12/17 11:56:26 obache Exp $
$NetBSD: distinfo,v 1.4 2016/04/01 11:12:27 jperkin Exp $
SHA1 (fdupes-1.40.tar.gz) = e1bce9bdf50d7bf700dda3eb8a3d218b181b3931
RMD160 (fdupes-1.40.tar.gz) = 0abd2f0dfee38cb333c1069363a65f8ab37e18dd
Size (fdupes-1.40.tar.gz) = 16026 bytes
SHA1 (patch-aa) = c84138d46bef74db226e3ea1226de874e5a7e01a
SHA1 (patch-ab) = 8e988a6f42682b0393454b8564b6068e1fc70df9
SHA1 (patch-ac) = 833aaa5903efb59acaa1f3f505090f7b018903f8
SHA1 (fdupes-1.51.tar.gz) = 8276b39026f57a2f9503d7af18efca0a7d42b8ec
RMD160 (fdupes-1.51.tar.gz) = cf2c3524a2f827c50ce2ef257d3d7f9b75951c48
SHA512 (fdupes-1.51.tar.gz) = 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
Size (fdupes-1.51.tar.gz) = 48942 bytes
SHA1 (patch-aa) = 925d3c4923fe1d784273b292ef3be0a36371a9f2
SHA1 (patch-ac) = 597dd70e23aee5db32152f3e9579c3c0059011f9

View File

@@ -1,22 +1,37 @@
$NetBSD: patch-aa,v 1.1.1.1 2008/12/17 11:56:26 obache Exp $
$NetBSD: patch-aa,v 1.2 2015/12/12 04:00:30 kamil Exp $
--- fdupes.c.orig 2001-03-15 02:16:09.000000000 +0000
Add casts to silence printf errors.
Do not overwrite stdin.
--- fdupes.c.orig 2013-04-20 18:02:18.000000000 +0000
+++ fdupes.c
@@ -588,7 +588,7 @@ void printmatches(file_t *files)
@@ -643,7 +643,7 @@ void printmatches(file_t *files)
while (files != NULL) {
if (files->hasdupes) {
if (!ISFLAG(flags, F_OMITFIRST)) {
- if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", files->size,
+ if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", (long)files->size,
- if (ISFLAG(flags, F_SHOWSIZE)) printf("%lld byte%seach:\n", files->size,
+ if (ISFLAG(flags, F_SHOWSIZE)) printf("%lld byte%seach:\n", (long long)files->size,
(files->size != 1) ? "s " : " ");
if (ISFLAG(flags, F_DSAMELINE)) escapefilename("\\ ", &files->d_name);
printf("%s%c", files->d_name, ISFLAG(flags, F_DSAMELINE)?' ':'\n');
@@ -676,7 +676,7 @@ void autodelete(file_t *files)
@@ -796,7 +796,7 @@ void deletefiles(file_t *files, int prom
do {
printf("Set %d of %d, preserve files [1 - %d, all]",
curgroup, groups, counter);
- if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", files->size,
+ if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", (long)files->size,
- if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%lld byte%seach)", files->size,
+ if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%lld byte%seach)", (long long)files->size,
(files->size != 1) ? "s " : " ");
printf(": ");
fflush(stdout);
@@ -1164,8 +1164,9 @@ int main(int argc, char **argv) {
}
else
{
- stdin = freopen("/dev/tty", "r", stdin);
- deletefiles(files, 1, stdin);
+ FILE* fd;
+ fd = freopen("/dev/tty", "r", stdin);
+ deletefiles(files, 1, fd);
}
}

View File

@@ -1,21 +0,0 @@
$NetBSD: patch-ab,v 1.1.1.1 2008/12/17 11:56:26 obache Exp $
--- md5/md5.c.orig 1999-11-05 01:04:36.000000000 +0000
+++ md5/md5.c
@@ -38,6 +38,8 @@
1999-05-03 lpd Original version.
*/
+#include <string.h>
+
#include "md5.h"
#ifdef TEST
@@ -46,7 +48,6 @@
* The test program should print out the same values as given in section
* A.5 of RFC 1321, reproduced below.
*/
-#include <string.h>
main()
{
static const char *const test[7] = {

View File

@@ -1,15 +1,43 @@
$NetBSD: patch-ac,v 1.1.1.1 2008/12/17 11:56:26 obache Exp $
$NetBSD: patch-ac,v 1.3 2016/04/01 11:12:27 jperkin Exp $
--- Makefile.orig 2001-03-15 02:49:11.000000000 +0000
Fix various target paths.
Add a rule in order not to depend on gmake.
--- Makefile.orig 2013-04-20 17:51:58.000000000 +0000
+++ Makefile
@@ -38,8 +38,8 @@ fdupes: fdupes.c md5/md5.c
gcc fdupes.c md5/md5.c -Wall -o fdupes -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE)
@@ -11,7 +11,7 @@
# determination of the actual installation directories.
# Suggested values are "/usr/local", "/usr", "/pkgs/fdupes-$(VERSION)"
#
-PREFIX = /usr/local
+PREFIX ?= /usr/local
install: fdupes
- cp fdupes $(INSTALLDIR)
- cp fdupes.1 $(MANPAGEDIR)/man1
+ ${BSD_INSTALL_PROGRAM} fdupes ${DESTDIR}$(INSTALLDIR)
+ ${BSD_INSTALL_MAN} fdupes.1 ${DESTDIR}$(MANPAGEDIR)/man1
#
# When compiling for 32-bit systems, FILEOFFSET_64BIT must be enabled
@@ -50,13 +50,13 @@ PROGRAM_NAME=fdupes
# BIN_DIR indicates directory where program is to be installed.
# Suggested value is "$(PREFIX)/bin"
#
-BIN_DIR = $(PREFIX)/bin
+BIN_DIR = $(DESTDIR)$(PREFIX)/bin
tarball: clean
tar --directory=.. -c -z -v -f ../fdupes-$(VERSION).tar.gz fdupes-$(VERSION)
#
# MAN_DIR indicates directory where the fdupes man page is to be
# installed. Suggested value is "$(PREFIX)/man/man1"
#
-MAN_BASE_DIR = $(PREFIX)/man
+MAN_BASE_DIR = $(DESTDIR)$(PREFIX)/${PKGMANDIR}
MAN_DIR = $(MAN_BASE_DIR)/man1
MAN_EXT = 1
@@ -91,7 +91,9 @@ INSTALL_DATA = $(INSTALL) -c -m 0644
#
#ADDITIONAL_OBJECTS = getopt.o
-OBJECT_FILES = fdupes.o md5/md5.o $(ADDITIONAL_OBJECTS)
+OBJECT_FILES = fdupes.o md5.o $(ADDITIONAL_OBJECTS)
+
+md5.o: md5/md5.c
#####################################################################
# no need to modify anything beyond this point #