svn commit: r474942 - in head/devel/kore: . files
Tobias Kortkamp
tobik at FreeBSD.org
Thu Jul 19 09:18:54 UTC 2018
Author: tobik
Date: Thu Jul 19 09:18:52 2018
New Revision: 474942
URL: https://svnweb.freebsd.org/changeset/ports/474942
Log:
devel/kore: Fix patch
Last commit broke the flavored kodev-notls due to running make
makepatch without thinking.
Modified:
head/devel/kore/Makefile
head/devel/kore/files/patch-src_cli.c
Modified: head/devel/kore/Makefile
==============================================================================
--- head/devel/kore/Makefile Thu Jul 19 09:07:46 2018 (r474941)
+++ head/devel/kore/Makefile Thu Jul 19 09:18:52 2018 (r474942)
@@ -3,6 +3,7 @@
PORTNAME= kore
PORTVERSION= 3.1.0
+PORTREVISION= 1
CATEGORIES= devel www
MASTER_SITES= https://kore.io/releases/
Modified: head/devel/kore/files/patch-src_cli.c
==============================================================================
--- head/devel/kore/files/patch-src_cli.c Thu Jul 19 09:07:46 2018 (r474941)
+++ head/devel/kore/files/patch-src_cli.c Thu Jul 19 09:18:52 2018 (r474942)
@@ -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);
More information about the svn-ports-all
mailing list