mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

devel/kore: Fix patch

Browse Source 
Last commit broke the flavored kodev-notls due to running make
makepatch without thinking.
This commit is contained in:
Tobias Kortkamp 2018-07-19 09:18:52 +00:00
parent e1372c364e
commit 9a3359913a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=474942
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devel/kore/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= kore
PORTVERSION= 3.1.0
PORTREVISION= 1
CATEGORIES= devel www
MASTER_SITES= https://kore.io/releases/

31
devel/kore/files/patch-src_cli.c
View File

@ -1,12 +1,39 @@
--- src/cli.c.orig 2018-07-18 14:25:49 UTC
+++ src/cli.c
@@ -800,7 +800,7 @@ cli_info(int argc, char **argv)
printf("kore source \t %s\n", bopt->kore_source);
} else {
cli_kore_features(bopt, &features, &len);
- printf("kore binary \t %s/bin/kore\n", prefix);
+ printf("kore binary \t %s/bin/kore%%SUFFIX%%\n", prefix);
printf("kore features\t %.*s\n", (int)len, features);
free(features);
}
@@ -1537,7 +1537,7 @@ cli_run_kore(void)
(void)cli_vasprintf(&cmd, "./%s", appl);
} else {
flags = "-fnrc";
- (void)cli_vasprintf(&cmd, "%s/bin/kore", prefix);
+ (void)cli_vasprintf(&cmd, "%s/bin/kore%%SUFFIX%%", prefix);
(void)cli_vasprintf(&cpath, "conf/%s.conf", appl);
}
@@ -1838,6 +1838,9 @@ cli_build_flags_common(struct buildopt *bopt, struct c
else
cli_buf_appendf(buf, "-I%s/include ", bopt->kore_source);
+
+ cli_buf_appendf(buf, "-I/usr/local/include ");
+ cli_buf_appendf(buf, "-I%s/include/kore ", PREFIX);
+ cli_buf_appendf(buf, "-I%%OPENSSLINC%% ");
+ cli_buf_appendf(buf, "-I%s/include/kore%%SUFFIX%% ", PREFIX);
#if defined(__MACH__)
/* Add default openssl include path from homebrew / ports under OSX. */
cli_buf_appendf(buf, "-I/opt/local/include ");
@@ -1996,7 +1999,7 @@ cli_kore_features(struct buildopt *bopt, char **out, s
if (bopt->single_binary) {
(void)cli_vasprintf(&path, ".objs/features");
} else {
- (void)cli_vasprintf(&path, "%s/share/kore/features", prefix);
+ (void)cli_vasprintf(&path, "%s/share/kore%%SUFFIX%%/features", prefix);
}
cli_file_open(path, O_RDONLY, &fd);