Sun Oct 29 22:16:03 2017 UTC ()
Use ${WRKDIR}/tmp for temporary files instead of $(mktemp -d)

This is more portable.

As suggested by joerg@.


(khorben)
diff -r1.10 -r1.11 pkgsrc/math/lp_solve/Makefile
diff -r1.7 -r1.8 pkgsrc/math/lp_solve/distinfo
diff -r1.4 -r1.5 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc
diff -r1.4 -r1.5 pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc
cvs diff -r1.10 -r1.11 pkgsrc/math/lp_solve/Makefile (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/Makefile 2016/09/08 05:12:39 1.10
+++ pkgsrc/math/lp_solve/Makefile 2017/10/29 22:16:03 1.11
@@ -1,35 +1,36 @@ @@ -1,35 +1,36 @@
1# $NetBSD: Makefile,v 1.10 2016/09/08 05:12:39 richard Exp $ 1# $NetBSD: Makefile,v 1.11 2017/10/29 22:16:03 khorben Exp $
2# 2#
3 3
4DISTNAME= lp_solve_5.5.2.3_source 4DISTNAME= lp_solve_5.5.2.3_source
5PKGNAME= ${DISTNAME:S/_source//:S/_5/-5/} 5PKGNAME= ${DISTNAME:S/_source//:S/_5/-5/}
6CATEGORIES= math devel 6CATEGORIES= math devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lpsolve/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lpsolve/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://lpsolve.sourceforge.net/ 10HOMEPAGE= http://lpsolve.sourceforge.net/
11COMMENT= Mixed Integer Linear Programming (MILP) solver 11COMMENT= Mixed Integer Linear Programming (MILP) solver
12#LICENSE= LGPL, unclear which version (see lp_lib.h) 12#LICENSE= LGPL, unclear which version (see lp_lib.h)
13 13
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
15 15
16WRKSRC= ${WRKDIR}/lp_solve_5.5 16WRKSRC= ${WRKDIR}/lp_solve_5.5
17 17
18SUBST_CLASSES+= dl 18SUBST_CLASSES+= dl
19SUBST_STAGE.dl= pre-build 19SUBST_STAGE.dl= pre-build
20SUBST_SED.dl+= -e s,-ldl,${DL_LIBS:Q},g 20SUBST_SED.dl+= -e s,-ldl,${DL_LIBS:Q},g
21SUBST_SED.dl+= -e s,^opts=.*,opts=\'${CFLAGS:Q}\',g 21SUBST_SED.dl+= -e s,^opts=.*,opts=\'${CFLAGS:Q}\',g
22SUBST_SED.dl+= -e s,-fpic,-fPIC,g 22SUBST_SED.dl+= -e s,-fpic,-fPIC,g
 23SUBST_VARS.dl+= WRKDIR
23SUBST_FILES.dl+= lp_solve/ccc 24SUBST_FILES.dl+= lp_solve/ccc
24SUBST_FILES.dl+= lpsolve55/ccc 25SUBST_FILES.dl+= lpsolve55/ccc
25SUBST_FILES.dl+= demo/ccc 26SUBST_FILES.dl+= demo/ccc
26 27
27.include "../../mk/bsd.fast.prefs.mk" 28.include "../../mk/bsd.fast.prefs.mk"
28 29
29.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" || \ 30.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" || \
30 ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64" 31 ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "aarch64"
31LPSOLVE_ARCH= ux64 32LPSOLVE_ARCH= ux64
32.else 33.else
33LPSOLVE_ARCH= ux32 34LPSOLVE_ARCH= ux32
34.endif 35.endif
35 36
cvs diff -r1.7 -r1.8 pkgsrc/math/lp_solve/distinfo (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/distinfo 2017/10/28 11:23:50 1.7
+++ pkgsrc/math/lp_solve/distinfo 2017/10/29 22:16:03 1.8
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.7 2017/10/28 11:23:50 khorben Exp $ 1$NetBSD: distinfo,v 1.8 2017/10/29 22:16:03 khorben Exp $
2 2
3SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7 3SHA1 (lp_solve_5.5.2.3_source.tar.gz) = 867a606fcc77612b71a0a6baa5f07a273f3023a7
4RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1 4RMD160 (lp_solve_5.5.2.3_source.tar.gz) = 5657c47cf996979072fb2a1135d071e48da52ea1
5SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf 5SHA512 (lp_solve_5.5.2.3_source.tar.gz) = ed4c9e993e6836fdc8bae76d4ff2f48594d6f9ababbedaf83253d0e31815faa8608b110866b03a0336a7334c531efb9987ec231f8e7a62eff7efea683a1868cf
6Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes 6Size (lp_solve_5.5.2.3_source.tar.gz) = 812420 bytes
7SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b 7SHA1 (patch-aa) = a77ec29e056252b3b82c1a1acdd463b5ff7f6f6b
8SHA1 (patch-demo_ccc) = dd5d00bce28fa89db343489bf22f0c96d3a9894b 8SHA1 (patch-demo_ccc) = dd5d00bce28fa89db343489bf22f0c96d3a9894b
9SHA1 (patch-lp__solve_ccc) = e8d3e4288a06781274a5bf3a8bbbf6712d0da3d9 9SHA1 (patch-lp__solve_ccc) = 667fafdffd207d987e2d2480d92ef81fc607e430
10SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34 10SHA1 (patch-lp__utils.c) = b0774bd7b323f12c97c7bc78c26f64a75c841f34
11SHA1 (patch-lpsolve55_ccc) = b993badb27095b34fb60436a7bc5e69b2911c6b3 11SHA1 (patch-lpsolve55_ccc) = c34feffbc0825fa14a46ec2f7733cc774b6ddf68
cvs diff -r1.4 -r1.5 pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc 2017/10/28 11:23:50 1.4
+++ pkgsrc/math/lp_solve/patches/patch-lp__solve_ccc 2017/10/29 22:16:03 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-lp__solve_ccc,v 1.4 2017/10/28 11:23:50 khorben Exp $ 1$NetBSD: patch-lp__solve_ccc,v 1.5 2017/10/29 22:16:03 khorben Exp $
2 2
3recent versions of gcc are noisy unless main() is declared returning 'int' 3recent versions of gcc are noisy unless main() is declared returning 'int'
4and isnan() needs a floating argument else NOISNAN is defined causing 4and isnan() needs a floating argument else NOISNAN is defined causing
5problems. 5problems.
6 6
7--- lp_solve/ccc.orig 2009-01-25 18:39:03.000000000 +0000 7--- lp_solve/ccc.orig 2009-01-25 18:39:03.000000000 +0000
8+++ lp_solve/ccc 8+++ lp_solve/ccc
9@@ -2,31 +2,36 @@ 9@@ -2,31 +2,36 @@
10 src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' 10 src='../lp_MDO.c ../shared/commonlib.c ../colamd/colamd.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c lp_solve.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
11 c=cc 11 c=cc
12  12
13+tmpdir=$(mktemp -d) 13+tmpdir="@WRKDIR@/tmp"
14+[ $? -eq 0 ] || return 2 14+mkdir "$tmpdir" || return 2
15+ 15+
16 #determine platform (32/64 bit) 16 #determine platform (32/64 bit)
17->/tmp/platform.c 17->/tmp/platform.c
18-echo '#include <stdlib.h>'>>/tmp/platform.c 18-echo '#include <stdlib.h>'>>/tmp/platform.c
19-echo '#include <stdio.h>'>>/tmp/platform.c 19-echo '#include <stdio.h>'>>/tmp/platform.c
20-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c 20-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c
21-$c /tmp/platform.c -o /tmp/platform 21-$c /tmp/platform.c -o /tmp/platform
22-PLATFORM=`/tmp/platform` 22-PLATFORM=`/tmp/platform`
23-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 23-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1
24+>$tmpdir/platform.c 24+>$tmpdir/platform.c
25+echo '#include <stdlib.h>'>>$tmpdir/platform.c 25+echo '#include <stdlib.h>'>>$tmpdir/platform.c
26+echo '#include <stdio.h>'>>$tmpdir/platform.c 26+echo '#include <stdio.h>'>>$tmpdir/platform.c
27+echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>$tmpdir/platform.c 27+echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>$tmpdir/platform.c
cvs diff -r1.4 -r1.5 pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc (expand / switch to unified diff)

--- pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc 2017/10/28 11:23:50 1.4
+++ pkgsrc/math/lp_solve/patches/patch-lpsolve55_ccc 2017/10/29 22:16:03 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-lpsolve55_ccc,v 1.4 2017/10/28 11:23:50 khorben Exp $ 1$NetBSD: patch-lpsolve55_ccc,v 1.5 2017/10/29 22:16:03 khorben Exp $
2 2
3recent versions of gcc are noisy unless main() is declared returning 'int' 3recent versions of gcc are noisy unless main() is declared returning 'int'
4and isnan() needs a floating argument else NOISNAN is defined causing 4and isnan() needs a floating argument else NOISNAN is defined causing
5problems. 5problems.
6 6
7--- lpsolve55/ccc.orig 2009-03-25 00:27:18.000000000 +0000 7--- lpsolve55/ccc.orig 2009-03-25 00:27:18.000000000 +0000
8+++ lpsolve55/ccc 8+++ lpsolve55/ccc
9@@ -2,29 +2,34 @@ 9@@ -2,29 +2,34 @@
10 src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' 10 src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
11 c=cc 11 c=cc
12  12
13+tmpdir=$(mktemp -d) 13+tmpdir="@WRKDIR@/tmp"
14+[ $? -eq 0 ] || return 2 14+mkdir "$tmpdir" || return 2
15+ 15+
16 #determine platform (32/64 bit) 16 #determine platform (32/64 bit)
17->/tmp/platform.c 17->/tmp/platform.c
18-echo '#include <stdlib.h>'>>/tmp/platform.c 18-echo '#include <stdlib.h>'>>/tmp/platform.c
19-echo '#include <stdio.h>'>>/tmp/platform.c 19-echo '#include <stdio.h>'>>/tmp/platform.c
20-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c 20-echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>/tmp/platform.c
21-$c /tmp/platform.c -o /tmp/platform 21-$c /tmp/platform.c -o /tmp/platform
22-PLATFORM=`/tmp/platform` 22-PLATFORM=`/tmp/platform`
23-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1 23-rm /tmp/platform /tmp/platform.c >/dev/null 2>&1
24+>$tmpdir/platform.c 24+>$tmpdir/platform.c
25+echo '#include <stdlib.h>'>>$tmpdir/platform.c 25+echo '#include <stdlib.h>'>>$tmpdir/platform.c
26+echo '#include <stdio.h>'>>$tmpdir/platform.c 26+echo '#include <stdio.h>'>>$tmpdir/platform.c
27+echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>$tmpdir/platform.c 27+echo 'main(){printf("ux%d", (int) (sizeof(void *)*8));}'>>$tmpdir/platform.c