pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/freeDiameter freeDiameter: Fix mysql detection.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3f7712f6b83a
branches:  trunk
changeset: 313307:3f7712f6b83a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Sep 25 12:59:25 2018 +0000

description:
freeDiameter: Fix mysql detection.

Fixes build.

Based on patch by Mustafa Dogan in private mail.

diffstat:

 net/freeDiameter/Makefile                                    |   5 +--
 net/freeDiameter/distinfo                                    |   3 +-
 net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake |  15 ++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 8ef682a8acba -r 3f7712f6b83a net/freeDiameter/Makefile
--- a/net/freeDiameter/Makefile Tue Sep 25 12:55:53 2018 +0000
+++ b/net/freeDiameter/Makefile Tue Sep 25 12:59:25 2018 +0000
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2018/04/17 22:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/09/25 12:59:25 wiz Exp $
 
 DISTNAME=      1.2.0
 PKGNAME=       freeDiameter-${DISTNAME}
 PKGREVISION=   5
 CATEGORIES=    net
 MASTER_SITES=  http://www.freediameter.net/hg/freeDiameter/archive/
+DIST_SUBDIR=   freeDiameter
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.freediameter.net/trac/
 COMMENT=       Open source Diameter protocol implementation
 LICENSE=       modified-bsd
 
-DIST_SUBDIR=   freeDiameter
-
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 USE_CMAKE=     yes
 CMAKE_ARGS+=   -DDISABLE_SCTP:BOOL=ON
diff -r 8ef682a8acba -r 3f7712f6b83a net/freeDiameter/distinfo
--- a/net/freeDiameter/distinfo Tue Sep 25 12:55:53 2018 +0000
+++ b/net/freeDiameter/distinfo Tue Sep 25 12:59:25 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 00:35:00 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/09/25 12:59:25 wiz Exp $
 
 SHA1 (freeDiameter/1.2.0.tar.gz) = 687bd9d551eb4261c3600fcbe35ea519b711e9f7
 RMD160 (freeDiameter/1.2.0.tar.gz) = c998ef87eb5ba00d58723a545d30c9d0d53be50e
 SHA512 (freeDiameter/1.2.0.tar.gz) = 4dbb56107b82c521218a01488955722a38518fb0dc2e2920fc07b35409cb86604de29ce296da3f0043b4bf0215f6acfd397608078611ddcfde3e4c2f1d202ea3
 Size (freeDiameter/1.2.0.tar.gz) = 855257 bytes
+SHA1 (patch-cmake_Modules_FindMySQL.cmake) = adc23081a5f99331f97a68959e252a008a939513
diff -r 8ef682a8acba -r 3f7712f6b83a net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake      Tue Sep 25 12:59:25 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_Modules_FindMySQL.cmake,v 1.1 2018/09/25 12:59:26 wiz Exp $
+
+Fix detection of mysql library.
+
+--- cmake/Modules/FindMySQL.cmake.orig 2013-09-14 10:09:01.000000000 +0000
++++ cmake/Modules/FindMySQL.cmake
+@@ -21,7 +21,7 @@ FIND_PATH(MySQL_INCLUDE_DIR 
+ 
+ # Library
+ #SET(MySQL_NAMES mysqlclient mysqlclient_r)
+-SET(MySQL_NAMES mysqlclient_r)
++SET(MySQL_NAMES mysqlclient_r mysqlclient)
+ FIND_LIBRARY(MySQL_LIBRARY
+   NAMES ${MySQL_NAMES}
+   PATHS /usr/lib /usr/local/lib



Home | Main Index | Thread Index | Old Index