CVS commit: pkgsrc/sysutils/fdupes

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Apr  3 22:06:17 UTC 2020

Modified Files:
        pkgsrc/sysutils/fdupes: Makefile distinfo
        pkgsrc/sysutils/fdupes/patches: patch-ac

Log Message:
fdupes: honor CFLAGS and LDFLAGS.

Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/fdupes/Makefile \
    pkgsrc/sysutils/fdupes/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/fdupes/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/fdupes/Makefile
diff -u pkgsrc/sysutils/fdupes/Makefile:1.4 pkgsrc/sysutils/fdupes/Makefile:1.5
--- pkgsrc/sysutils/fdupes/Makefile:1.4 Fri Apr  1 11:12:27 2016
+++ pkgsrc/sysutils/fdupes/Makefile     Fri Apr  3 22:06:17 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/04/01 11:12:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2020/04/03 22:06:17 wiz Exp $
 
 DISTNAME=      fdupes-1.51
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://fdupes.googlecode.com/files/
 
Index: pkgsrc/sysutils/fdupes/distinfo
diff -u pkgsrc/sysutils/fdupes/distinfo:1.4 pkgsrc/sysutils/fdupes/distinfo:1.5
--- pkgsrc/sysutils/fdupes/distinfo:1.4 Fri Apr  1 11:12:27 2016
+++ pkgsrc/sysutils/fdupes/distinfo     Fri Apr  3 22:06:17 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2016/04/01 11:12:27 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2020/04/03 22:06:17 wiz Exp $
 
 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
+SHA1 (patch-ac) = d04133bbb697d79019383f31d3ee252fc7f32db2

Index: pkgsrc/sysutils/fdupes/patches/patch-ac
diff -u pkgsrc/sysutils/fdupes/patches/patch-ac:1.3 pkgsrc/sysutils/fdupes/patches/patch-ac:1.4
--- pkgsrc/sysutils/fdupes/patches/patch-ac:1.3 Fri Apr  1 11:12:27 2016
+++ pkgsrc/sysutils/fdupes/patches/patch-ac     Fri Apr  3 22:06:17 2020
@@ -1,7 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2016/04/01 11:12:27 jperkin Exp $
+$NetBSD: patch-ac,v 1.4 2020/04/03 22:06:17 wiz Exp $
 
 Fix various target paths.
 Add a rule in order not to depend on gmake.
+Honor CFLAGS and LDFLAGS.
 
 --- Makefile.orig      2013-04-20 17:51:58.000000000 +0000
 +++ Makefile
@@ -30,6 +31,15 @@ Add a rule in order not to depend on gma
  MAN_DIR = $(MAN_BASE_DIR)/man1
  MAN_EXT = 1
  
+@@ -80,7 +80,7 @@ MKDIR   = mkdir -p
+ CC = gcc
+ COMPILER_OPTIONS = -Wall -O -g
+ 
+-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
++CFLAGS+= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
+ 
+ INSTALL_PROGRAM = $(INSTALL) -c -m 0755
+ INSTALL_DATA    = $(INSTALL) -c -m 0644
 @@ -91,7 +91,9 @@ INSTALL_DATA    = $(INSTALL) -c -m 0644
  #
  #ADDITIONAL_OBJECTS = getopt.o
@@ -41,3 +51,12 @@ Add a rule in order not to depend on gma
  
  #####################################################################
  # no need to modify anything beyond this point                      #
+@@ -100,7 +102,7 @@ OBJECT_FILES = fdupes.o md5/md5.o $(ADDI
+ 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)