diff options
| author | antoine <antoine@FreeBSD.org> | 2015-06-15 05:33:01 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2015-06-15 05:33:01 +0800 |
| commit | e47159320fe1700dd969c3fd7efe3b0f23b8310a (patch) | |
| tree | b123e191fd0fb3ba34028f45aec639161b9a5634 /databases | |
| parent | 0ecebe596077ba99ca9812dec8cb5183c42d348d (diff) | |
| download | freebsd-ports-gnome-e47159320fe1700dd969c3fd7efe3b0f23b8310a.tar.gz freebsd-ports-gnome-e47159320fe1700dd969c3fd7efe3b0f23b8310a.tar.zst freebsd-ports-gnome-e47159320fe1700dd969c3fd7efe3b0f23b8310a.zip | |
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
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-client/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql56-client/files/patch-cmake_readline.cmake | 11 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 25129ad91f3a..678baf9b43b6 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= mysql +PORTREVISION= 1 PKGNAMESUFFIX= 56-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql56-client/files/patch-cmake_readline.cmake b/databases/mysql56-client/files/patch-cmake_readline.cmake deleted file mode 100644 index 9feff78c080a..000000000000 --- a/databases/mysql56-client/files/patch-cmake_readline.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/readline.cmake.orig 2013-06-30 10:45:55.000000000 +0200 -+++ cmake/readline.cmake 2013-06-30 10:47:08.000000000 +0200 -@@ -147,7 +147,7 @@ - - FIND_LIBRARY(EDITLINE_LIBRARY - NAMES -- edit -+ readline - ) - MARK_AS_ADVANCED(EDITLINE_INCLUDE_DIR EDITLINE_LIBRARY) - diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 71b559d97933..7d4cfd7b3dc3 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -64,7 +64,8 @@ MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" .else -USES+= readline +BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit +RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit .endif post-patch: |