Mon May 28 12:00:39 2018 UTC ()
Link with -lsocket on SunOS.


(schmonz)
diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh
diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/fdtools/Makefile 2017/10/03 00:43:22 1.1
+++ pkgsrc/sysutils/fdtools/Makefile 2018/05/28 12:00:39 1.2
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1# $NetBSD: Makefile,v 1.1 2017/10/03 00:43:22 schmonz Exp $ 1# $NetBSD: Makefile,v 1.2 2018/05/28 12:00:39 schmonz Exp $
2 2
3DISTNAME= fdtools-2015.03.28 3DISTNAME= fdtools-2015.03.28
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= http://code.dogmap.org/fdtools/releases/ 5MASTER_SITES= http://code.dogmap.org/fdtools/releases/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= http://code.dogmap.org/fdtools/ 9HOMEPAGE= http://code.dogmap.org/fdtools/
10COMMENT= Manipulate file descriptor properties from shell scripts 10COMMENT= Manipulate file descriptor properties from shell scripts
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DJB_RESTRICTED= no 13DJB_RESTRICTED= no
14 14
15WRKSRC= ${WRKDIR}/misc/${PKGNAME_NOREV} 15WRKSRC= ${WRKDIR}/misc/${PKGNAME_NOREV}
16DJB_SLASHPACKAGE= YES 16DJB_SLASHPACKAGE= YES
17 17
 18CPPFLAGS+= -I ${PREFIX:Q}/include
 19LDFLAGS+= -L ${PREFIX:Q}/lib/skalibs
 20LDFLAGS.SunOS+= -lsocket
 21
18INSTALLATION_DIRS+= bin 22INSTALLATION_DIRS+= bin
19 23
20do-configure: 24do-configure:
21 ${ECHO} ${PREFIX} > ${WRKSRC}/conf-compile/defaults/package_home 25 ${ECHO} ${PREFIX} > ${WRKSRC}/conf-compile/defaults/package_home
22 ${ECHO} ${PREFIX}/lib/skalibs/sysdeps > ${WRKSRC}/conf-compile/defaults/depend_skalibs_sysdeps 26 ${ECHO} ${PREFIX}/lib/skalibs/sysdeps > ${WRKSRC}/conf-compile/defaults/depend_skalibs_sysdeps
23 27
24do-install: 28do-install:
25 cd ${WRKSRC}/command; \ 29 cd ${WRKSRC}/command; \
26 for i in *; do \ 30 for i in *; do \
27 ${INSTALL_PROGRAM} $${i} ${DESTDIR}${PREFIX}/bin; \ 31 ${INSTALL_PROGRAM} $${i} ${DESTDIR}${PREFIX}/bin; \
28 done 32 done
29 33
30.include "../../devel/skalibs/buildlink3.mk" 34.include "../../devel/skalibs/buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/fdtools/distinfo 2017/10/03 00:43:22 1.1
+++ pkgsrc/sysutils/fdtools/distinfo 2018/05/28 12:00:39 1.2
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.1 2017/10/03 00:43:22 schmonz Exp $ 1$NetBSD: distinfo,v 1.2 2018/05/28 12:00:39 schmonz Exp $
2 2
3SHA1 (fdtools-2015.03.28.tar.bz2) = 7bd1c9e067df8297e1f4bc430c33903899585aee 3SHA1 (fdtools-2015.03.28.tar.bz2) = 7bd1c9e067df8297e1f4bc430c33903899585aee
4RMD160 (fdtools-2015.03.28.tar.bz2) = d1bfed8c1718b5ec178cc763416f677f4cc26f0d 4RMD160 (fdtools-2015.03.28.tar.bz2) = d1bfed8c1718b5ec178cc763416f677f4cc26f0d
5SHA512 (fdtools-2015.03.28.tar.bz2) = e6b5665869538758edd90876c1696d753aa5859e9dc2ceffbcac98ea682e730424ea972126d20d90945d554a833278059558d85ce5290c09b3f339d0191f565c 5SHA512 (fdtools-2015.03.28.tar.bz2) = e6b5665869538758edd90876c1696d753aa5859e9dc2ceffbcac98ea682e730424ea972126d20d90945d554a833278059558d85ce5290c09b3f339d0191f565c
6Size (fdtools-2015.03.28.tar.bz2) = 40057 bytes 6Size (fdtools-2015.03.28.tar.bz2) = 40057 bytes
7SHA1 (patch-conf-compile_defaults_host__compile.sh) = 07d7dcb943e664f838c7b1a72f8bb92d4ad994a0 7SHA1 (patch-conf-compile_defaults_host__compile.sh) = d30f146419e30cd717c299b8196918db3095f3e8
8SHA1 (patch-conf-compile_defaults_host__link.sh) = d7e2ba5574885e4f09158678681f58e457a14732 8SHA1 (patch-conf-compile_defaults_host__link.sh) = 77e80f0ed9adc0ead6f9afea9b76dbb630ff2ce0
9SHA1 (patch-src_recvfd.c) = 4fe086cae8fa9623e29954cb03ee5a63a72d25af 9SHA1 (patch-src_recvfd.c) = 4fe086cae8fa9623e29954cb03ee5a63a72d25af
10SHA1 (patch-src_sigsched.c) = ed4cf2111ab65fb80f5cbcfd6aa0c49db12a845a 10SHA1 (patch-src_sigsched.c) = ed4cf2111ab65fb80f5cbcfd6aa0c49db12a845a
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh 2017/10/03 00:43:22 1.1
+++ pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__compile.sh 2018/05/28 12:00:39 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-conf-compile_defaults_host__compile.sh,v 1.1 2017/10/03 00:43:22 schmonz Exp $ 1$NetBSD: patch-conf-compile_defaults_host__compile.sh,v 1.2 2018/05/28 12:00:39 schmonz Exp $
2 2
3Find skalibs. 3Find skalibs.
4 4
5--- conf-compile/defaults/host_compile.sh.orig 2015-03-28 22:14:58.000000000 +0000 5--- conf-compile/defaults/host_compile.sh.orig 2015-03-28 22:14:58.219617961 +0000
6+++ conf-compile/defaults/host_compile.sh 6+++ conf-compile/defaults/host_compile.sh
7@@ -4,5 +4,5 @@ 7@@ -4,5 +4,5 @@
8 # create, respectively. The arguments are -I search directives; make sure to 8 # create, respectively. The arguments are -I search directives; make sure to
9 # include them in the compilation command. 9 # include them in the compilation command.
10  10
11-gcc -O2 ${1+"$@"} -c "${input?}" -o "${output?}" \ 11-gcc -O2 ${1+"$@"} -c "${input?}" -o "${output?}" \
12+gcc -O2 -I ${PREFIX}/include ${1+"$@"} -c "${input?}" -o "${output?}" \ 12+gcc ${CFLAGS} ${CPPFLAGS} ${1+"$@"} -c "${input?}" -o "${output?}" \
13 -Wall -W -Wpointer-arith -Wcast-align -Wwrite-strings 13 -Wall -W -Wpointer-arith -Wcast-align -Wwrite-strings
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh (expand / switch to unified diff)

--- pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh 2017/10/03 00:43:22 1.1
+++ pkgsrc/sysutils/fdtools/patches/patch-conf-compile_defaults_host__link.sh 2018/05/28 12:00:39 1.2
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: patch-conf-compile_defaults_host__link.sh,v 1.1 2017/10/03 00:43:22 schmonz Exp $ 1$NetBSD: patch-conf-compile_defaults_host__link.sh,v 1.2 2018/05/28 12:00:39 schmonz Exp $
2 2
3Find skalibs. 3Find skalibs.
4 4
5--- conf-compile/defaults/host_link.sh.orig 2015-03-28 22:14:58.000000000 +0000 5--- conf-compile/defaults/host_link.sh.orig 2015-03-28 22:14:58.223617960 +0000
6+++ conf-compile/defaults/host_link.sh 6+++ conf-compile/defaults/host_link.sh
7@@ -3,4 +3,4 @@ 7@@ -3,4 +3,4 @@
8 # variable $output names the library file to create. The arguments are -L 8 # variable $output names the library file to create. The arguments are -L
9 # search directives and the input object files and libraries. 9 # search directives and the input object files and libraries.
10  10
11-gcc -o "${output?}" -s ${1+"$@"} 11-gcc -o "${output?}" -s ${1+"$@"}
12+gcc -o "${output?}" -s -L ${PREFIX}/lib/skalibs ${1+"$@"} 12+gcc ${LDFLAGS} -o "${output?}" -s ${1+"$@"}