CVS commit: pkgsrc/net/freeDiameter

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 25 12:59:26 UTC 2018

Modified Files:
        pkgsrc/net/freeDiameter: Makefile distinfo
Added Files:
        pkgsrc/net/freeDiameter/patches: patch-cmake_Modules_FindMySQL.cmake

Log Message:
freeDiameter: Fix mysql detection.

Fixes build.

Based on patch by Mustafa Dogan in private mail.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/freeDiameter/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/freeDiameter/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freeDiameter/Makefile
diff -u pkgsrc/net/freeDiameter/Makefile:1.16 pkgsrc/net/freeDiameter/Makefile:1.17
--- pkgsrc/net/freeDiameter/Makefile:1.16       Tue Apr 17 22:29:44 2018
+++ pkgsrc/net/freeDiameter/Makefile    Tue Sep 25 12:59:25 2018
@@ -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

Index: pkgsrc/net/freeDiameter/distinfo
diff -u pkgsrc/net/freeDiameter/distinfo:1.7 pkgsrc/net/freeDiameter/distinfo:1.8
--- pkgsrc/net/freeDiameter/distinfo:1.7        Wed Nov  4 00:35:00 2015
+++ pkgsrc/net/freeDiameter/distinfo    Tue Sep 25 12:59:25 2018
@@ -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

Added files:

Index: pkgsrc/net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake
diff -u /dev/null pkgsrc/net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake:1.1
--- /dev/null   Tue Sep 25 12:59:26 2018
+++ pkgsrc/net/freeDiameter/patches/patch-cmake_Modules_FindMySQL.cmake Tue Sep 25 12:59:26 2018
@@ -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