Merge pull request #5002 from yopito/fdupes-1.6.1

fdupes: update to 1.6.1
This commit is contained in:
Michael Gehring 2016-10-20 09:28:13 +02:00 committed by GitHub
commit c32deb2f71
3 changed files with 21 additions and 30 deletions

View file

@ -1,23 +1,14 @@
--- Makefile.orig
+++ Makefile
@@ -72,9 +72,9 @@
--- Makefile.orig 2016-08-21 06:54:46.000000000 +0200
+++ Makefile 2016-10-19 23:07:16.658682733 +0200
@@ -71,9 +71,9 @@
# Make Configuration
#
CC = gcc
CC ?= gcc
-COMPILER_OPTIONS = -Wall -O -g
+CFLAGS ?= -Wall -O -g
-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+CFLAGS += -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+CFLAGS += -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
INSTALL_PROGRAM = $(INSTALL) -c -m 0755
INSTALL_DATA = $(INSTALL) -c -m 0644
@@ -94,7 +94,7 @@
all: fdupes
fdupes: $(OBJECT_FILES)
- $(CC) $(CFLAGS) -o fdupes $(OBJECT_FILES)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o fdupes $(OBJECT_FILES)
installdirs:
test -d $(BIN_DIR) || $(MKDIR) $(BIN_DIR)

View file

@ -1,26 +1,24 @@
# Template file for 'fdupes'
pkgname=fdupes
version=1.51
revision=6
distfiles="https://github.com/adrianlopezroche/fdupes/archive/$pkgname-$version.tar.gz"
checksum=761e16d4ecfef7302c62fe7ef1e181cd34f5c6ce5377dcad96e3ed44fb364986
# version 1.51 is earlier than 1.6.x but is a higher version.
# so use "reverts" to make XBPS upgrade happens.
# More conventional numbering scheme since 1.6.0
reverts="1.51_6"
version=1.6.1
revision=1
distfiles="https://github.com/adrianlopezroche/fdupes/archive/v$version.tar.gz"
checksum=9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea
maintainer="Steven R <dev@styez.com>"
homepage="https://github.com/adrianlopezroche/fdupes"
license="MIT"
short_desc="Identifying or deleting duplicate files residing within specified directories"
wrksrc="$pkgname-$pkgname-$version"
post_extract() {
# can't assign to stdin on musl
sed -i 's/stdin = freopen/FILE *tty = freopen/' -i fdupes.c
sed -i 's/deletefiles(files, 1, stdin);/deletefiles(files, 1, tty);/' -i fdupes.c
}
short_desc="Identify or delete duplicate files within specified directories"
do_build() {
make CC="$CC"
make CC="$CC"
}
do_install() {
vinstall fdupes 755 usr/bin
vinstall fdupes.1 644 usr/share/man/man1
vbin fdupes
vman fdupes.1
vlicense README
}

2
srcpkgs/fdupes/update Normal file
View file

@ -0,0 +1,2 @@
# 1.5x earlier than 1.6.x
ignore="1.5*"