CVS commit: pkgsrc/sysutils/fdtools

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon May 28 12:00:39 UTC 2018

Modified Files:
        pkgsrc/sysutils/fdtools: Makefile distinfo
        pkgsrc/sysutils/fdtools/patches:
            patch-conf-compile_defaults_host__compile.sh
            patch-conf-compile_defaults_host__link.sh

Log Message:
Link with -lsocket on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/fdtools/Makefile \
    pkgsrc/sysutils/fdtools/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh \
    pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh

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

Modified files:

Index: pkgsrc/sysutils/fdtools/Makefile
diff -u pkgsrc/sysutils/fdtools/Makefile:1.1 pkgsrc/sysutils/fdtools/Makefile:1.2
--- pkgsrc/sysutils/fdtools/Makefile:1.1        Tue Oct  3 00:43:22 2017
+++ pkgsrc/sysutils/fdtools/Makefile    Mon May 28 12:00:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/10/03 00:43:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/28 12:00:39 schmonz Exp $
 
 DISTNAME=              fdtools-2015.03.28
 CATEGORIES=            sysutils
@@ -15,6 +15,10 @@ DJB_RESTRICTED=              no
 WRKSRC=                        ${WRKDIR}/misc/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=      YES
 
+CPPFLAGS+=             -I ${PREFIX:Q}/include
+LDFLAGS+=              -L ${PREFIX:Q}/lib/skalibs
+LDFLAGS.SunOS+=                -lsocket
+
 INSTALLATION_DIRS+=    bin
 
 do-configure:
Index: pkgsrc/sysutils/fdtools/distinfo
diff -u pkgsrc/sysutils/fdtools/distinfo:1.1 pkgsrc/sysutils/fdtools/distinfo:1.2
--- pkgsrc/sysutils/fdtools/distinfo:1.1        Tue Oct  3 00:43:22 2017
+++ pkgsrc/sysutils/fdtools/distinfo    Mon May 28 12:00:39 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2017/10/03 00:43:22 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2018/05/28 12:00:39 schmonz Exp $
 
 SHA1 (fdtools-2015.03.28.tar.bz2) = 7bd1c9e067df8297e1f4bc430c33903899585aee
 RMD160 (fdtools-2015.03.28.tar.bz2) = d1bfed8c1718b5ec178cc763416f677f4cc26f0d
 SHA512 (fdtools-2015.03.28.tar.bz2) = e6b5665869538758edd90876c1696d753aa5859e9dc2ceffbcac98ea682e730424ea972126d20d90945d554a833278059558d85ce5290c09b3f339d0191f565c
 Size (fdtools-2015.03.28.tar.bz2) = 40057 bytes
-SHA1 (patch-conf-compile_defaults_host__compile.sh) = 07d7dcb943e664f838c7b1a72f8bb92d4ad994a0
-SHA1 (patch-conf-compile_defaults_host__link.sh) = d7e2ba5574885e4f09158678681f58e457a14732
+SHA1 (patch-conf-compile_defaults_host__compile.sh) = d30f146419e30cd717c299b8196918db3095f3e8
+SHA1 (patch-conf-compile_defaults_host__link.sh) = 77e80f0ed9adc0ead6f9afea9b76dbb630ff2ce0
 SHA1 (patch-src_recvfd.c) = 4fe086cae8fa9623e29954cb03ee5a63a72d25af
 SHA1 (patch-src_sigsched.c) = ed4cf2111ab65fb80f5cbcfd6aa0c49db12a845a

Index: pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh
diff -u pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh:1.1 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh:1.2
--- pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh:1.1    Tue Oct  3 00:43:22 2017
+++ pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh        Mon May 28 12:00:39 2018
@@ -1,13 +1,13 @@
-$NetBSD: patch-conf-compile_defaults_host__compile.sh,v 1.1 2017/10/03 00:43:22 schmonz Exp $
+$NetBSD: patch-conf-compile_defaults_host__compile.sh,v 1.2 2018/05/28 12:00:39 schmonz Exp $
 
 Find skalibs.
 
---- conf-compile/defaults/host_compile.sh.orig 2015-03-28 22:14:58.000000000 +0000
+--- conf-compile/defaults/host_compile.sh.orig 2015-03-28 22:14:58.219617961 +0000
 +++ conf-compile/defaults/host_compile.sh
 @@ -4,5 +4,5 @@
  # create, respectively.  The arguments are -I search directives; make sure to
  # include them in the compilation command.
  
 -gcc -O2 ${1+"$@"} -c "${input?}" -o "${output?}" \
-+gcc -O2 -I ${PREFIX}/include ${1+"$@"} -c "${input?}" -o "${output?}" \
++gcc ${CFLAGS} ${CPPFLAGS} ${1+"$@"} -c "${input?}" -o "${output?}" \
    -Wall -W -Wpointer-arith -Wcast-align -Wwrite-strings
Index: pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh
diff -u pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh:1.1 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh:1.2
--- pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh:1.1       Tue Oct  3 00:43:22 2017
+++ pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh   Mon May 28 12:00:39 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-conf-compile_defaults_host__link.sh,v 1.1 2017/10/03 00:43:22 schmonz Exp $
+$NetBSD: patch-conf-compile_defaults_host__link.sh,v 1.2 2018/05/28 12:00:39 schmonz Exp $
 
 Find skalibs.
 
---- conf-compile/defaults/host_link.sh.orig    2015-03-28 22:14:58.000000000 +0000
+--- conf-compile/defaults/host_link.sh.orig    2015-03-28 22:14:58.223617960 +0000
 +++ conf-compile/defaults/host_link.sh
 @@ -3,4 +3,4 @@
  # variable $output names the library file to create.  The arguments are -L
  # search directives and the input object files and libraries.
  
 -gcc -o "${output?}" -s ${1+"$@"}
-+gcc -o "${output?}" -s -L ${PREFIX}/lib/skalibs ${1+"$@"}
++gcc ${LDFLAGS} -o "${output?}" -s ${1+"$@"}