diff options
| author | flo <flo@FreeBSD.org> | 2015-06-21 19:29:11 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2015-06-21 19:29:11 +0800 |
| commit | f9bcbc6f64adcd374c9b910e3a54dc6afefbf12e (patch) | |
| tree | 33e210617f18d4478100c1245e7baba47a7385d5 | |
| parent | 64ae9880e2fca9f6330748c9422de718c719fb03 (diff) | |
| download | freebsd-ports-gnome-f9bcbc6f64adcd374c9b910e3a54dc6afefbf12e.tar.gz freebsd-ports-gnome-f9bcbc6f64adcd374c9b910e3a54dc6afefbf12e.tar.zst freebsd-ports-gnome-f9bcbc6f64adcd374c9b910e3a54dc6afefbf12e.zip | |
Merge r389659 by antoine.
Unbreak on head: instead of using headers from base libedit and
linking against readline, use libedit from ports
Note: this may need a bit more patching during next libedit port update
Reported by: pkg-fallout
| -rw-r--r-- | databases/percona56-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/percona56-client/files/patch-cmake_readline.cmake | 11 | ||||
| -rw-r--r-- | databases/percona56-server/Makefile | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile index e8f1ec8b5744..8260fac019a2 100644 --- a/databases/percona56-client/Makefile +++ b/databases/percona56-client/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= percona +PORTREVISION= 1 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake deleted file mode 100644 index 65d14549da47..000000000000 --- a/databases/percona56-client/files/patch-cmake_readline.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/readline.cmake.orig 2013-06-28 21:04:29.807976388 +0200 -+++ cmake/readline.cmake 2013-06-28 21:04:49.685326016 +0200 -@@ -147,7 +147,7 @@ - - FIND_LIBRARY(EDITLINE_LIBRARY - NAMES -- edit -+ readline - ) - MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) - diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 0bd34f97f945..c5b4c7a2846a 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -87,7 +87,8 @@ post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .else -USES+= readline +BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit +RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit .endif post-patch: |