Mon Apr 1 01:18:01 2013 UTC ()
Define INSTALL_INFODIR for cmake.


(sbd)
diff -r1.8 -r1.9 pkgsrc/databases/mysql55-server/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/databases/mysql55-server/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/mysql55-server/Attic/Makefile 2013/02/12 20:36:29 1.8
+++ pkgsrc/databases/mysql55-server/Attic/Makefile 2013/04/01 01:18:00 1.9
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.8 2013/02/12 20:36:29 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2013/04/01 01:18:00 sbd Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4SVR4_PKGNAME= mysqs 4SVR4_PKGNAME= mysqs
5COMMENT= MySQL 5, a free SQL database (server) 5COMMENT= MySQL 5, a free SQL database (server)
6 6
7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} 7CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
8 8
9# might be removed in the future 9# might be removed in the future
10# if mysqld_safe script is installed here, or rc.d script invokes mysqld 10# if mysqld_safe script is installed here, or rc.d script invokes mysqld
11DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql55-client 11DEPENDS+= mysql-client>=${PKGVERSION_NOREV}:../../databases/mysql55-client
12 12
13.include "../../databases/mysql55-client/Makefile.common" 13.include "../../databases/mysql55-client/Makefile.common"
14 14
15INFO_FILES= yes 15INFO_FILES= yes
16CMAKE_ARGS+= -DWITH_LIBWRAP=ON 16CMAKE_ARGS+= -DWITH_LIBWRAP=ON
 17CMAKE_ARGS+= -DINSTALL_INFODIR=${PKGINFODIR}
17 18
18.if !empty(PKG_OPTIONS:Membedded-server) 19.if !empty(PKG_OPTIONS:Membedded-server)
19CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON 20CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER=ON
20PLIST.embedded= yes 21PLIST.embedded= yes
21.else 22.else
22# We only need readline to placate the configure script if we don't build 23# We only need readline to placate the configure script if we don't build
23# the embedded server as it is the only binary linked against "readline". 24# the embedded server as it is the only binary linked against "readline".
24BUILDLINK_DEPMETHOD.readline= build 25BUILDLINK_DEPMETHOD.readline= build
25.endif 26.endif
26 27
27# ndb-cluster does not configure with cmake 28# ndb-cluster does not configure with cmake
28#.if !empty(PKG_OPTIONS:Mndb-cluster) 29#.if !empty(PKG_OPTIONS:Mndb-cluster)
29#CMAKE_ARGS+= -DWITH_NDBCLUSTER_STORAGE_ENGINE=ON 30#CMAKE_ARGS+= -DWITH_NDBCLUSTER_STORAGE_ENGINE=ON