Thu Dec 19 22:25:27 2019 UTC ()
Spell include path correctly, even though it is not actually used.


(joerg)
diff -r1.2 -r1.3 pkgsrc/www/R-httpuv/distinfo
diff -r1.1 -r1.2 pkgsrc/www/R-httpuv/patches/patch-src_Makevars
cvs diff -r1.2 -r1.3 pkgsrc/www/R-httpuv/distinfo (expand / switch to unified diff)

--- pkgsrc/www/R-httpuv/distinfo 2019/12/18 12:44:39 1.2
+++ pkgsrc/www/R-httpuv/distinfo 2019/12/19 22:25:27 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2019/12/18 12:44:39 joerg Exp $ 1$NetBSD: distinfo,v 1.3 2019/12/19 22:25:27 joerg Exp $
2 2
3SHA1 (R/httpuv_1.5.1.tar.gz) = 5dd42f39bfda919ad890eea978089d27b2bc72da 3SHA1 (R/httpuv_1.5.1.tar.gz) = 5dd42f39bfda919ad890eea978089d27b2bc72da
4RMD160 (R/httpuv_1.5.1.tar.gz) = 24558208c04722e5844ccbe87fdcefc8db9aaa29 4RMD160 (R/httpuv_1.5.1.tar.gz) = 24558208c04722e5844ccbe87fdcefc8db9aaa29
5SHA512 (R/httpuv_1.5.1.tar.gz) = 17d1d9a922c17ebd738a59d3671e3d29f097937ef60774898f71dcfa0468d73d8c3b32915b6990941c9b7b03929fbdd6405932fa69672b004a0d129d3cded8c0 5SHA512 (R/httpuv_1.5.1.tar.gz) = 17d1d9a922c17ebd738a59d3671e3d29f097937ef60774898f71dcfa0468d73d8c3b32915b6990941c9b7b03929fbdd6405932fa69672b004a0d129d3cded8c0
6Size (R/httpuv_1.5.1.tar.gz) = 1758514 bytes 6Size (R/httpuv_1.5.1.tar.gz) = 1758514 bytes
7SHA1 (patch-src_Makevars) = d4fa4eea362aca5647b859cfaefa0fda6bd55c4e 7SHA1 (patch-src_Makevars) = f7e94a101f70eef615db462d3c6c97c1235821bc
cvs diff -r1.1 -r1.2 pkgsrc/www/R-httpuv/patches/patch-src_Makevars (expand / switch to unified diff)

--- pkgsrc/www/R-httpuv/patches/patch-src_Makevars 2019/12/18 12:44:39 1.1
+++ pkgsrc/www/R-httpuv/patches/patch-src_Makevars 2019/12/19 22:25:27 1.2
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-src_Makevars,v 1.1 2019/12/18 12:44:39 joerg Exp $ 1$NetBSD: patch-src_Makevars,v 1.2 2019/12/19 22:25:27 joerg Exp $
2 2
3--- src/Makevars.orig 2019-04-05 20:06:25.000000000 +0000 3--- src/Makevars.orig 2019-04-05 20:06:25.000000000 +0000
4+++ src/Makevars 4+++ src/Makevars
5@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin) 5@@ -9,7 +9,7 @@ ifeq ($(UNAME), Darwin)
6 FRAMEWORK = -framework CoreServices 6 FRAMEWORK = -framework CoreServices
7 endif 7 endif
8  8
9-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread 9-PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread
10+PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread 10+PKG_LIBS = -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o $(FRAMEWORK) -pthread
11 ifeq ($(UNAME), SunOS) 11 ifeq ($(UNAME), SunOS)
12 PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet 12 PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet
13 endif 13 endif
14@@ -22,7 +22,7 @@ endif 14@@ -22,7 +22,7 @@ endif
15  15
16 PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS 16 PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
17 PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS 17 PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
18-PKG_CPPFLAGS = -Ilibuv/include -pthread 18-PKG_CPPFLAGS = -Ilibuv/include -pthread
19+PKG_CPPFLAGS = -I${PREFIX} -pthread 19+PKG_CPPFLAGS = -I${PREFIX}/include -pthread
20  20
21 # To avoid spurious warnings from `R CMD check --as-cran`, about compiler 21 # To avoid spurious warnings from `R CMD check --as-cran`, about compiler
22 # warning flags like -Werror. 22 # warning flags like -Werror.
23@@ -44,7 +44,7 @@ CONFIGURE_FLAGS="--quiet" 23@@ -44,7 +44,7 @@ CONFIGURE_FLAGS="--quiet"
24 # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS 24 # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS
25  25
26  26
27-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o 27-$(SHLIB): libuv/.libs/libuv.a http-parser/http_parser.o sha1/sha1.o base64/base64.o
28+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o 28+$(SHLIB): http-parser/http_parser.o sha1/sha1.o base64/base64.o
29  29
30 # We needed to rename lt~obsolete.m4 because the name causes problems with R 30 # We needed to rename lt~obsolete.m4 because the name causes problems with R
31 # CMD check. Here we rename it back. 31 # CMD check. Here we rename it back.