diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2010-06-02 15:35:11 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2010-06-02 15:35:11 +0000 |
| commit | 607c1d806a70c5b78d92830d9fbc46edd481b7de (patch) | |
| tree | 5a68160f0e3a1a60f7cc11da2619658ae9bbeedc /irc | |
| parent | 04c55a23227ec2c7e08b9eb43432acba2c9df0aa (diff) | |
| download | ports-607c1d806a70c5b78d92830d9fbc46edd481b7de.tar.gz ports-607c1d806a70c5b78d92830d9fbc46edd481b7de.zip | |
- Fix build of gnutls module
PR: ports/144989
Submitted by: Austin Teague <opticshade@gmail.com>
Approved by: maintainer timeout (2 months)
Notes
Notes:
svn path=/head/; revision=255544
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/inspircd/Makefile | 1 | ||||
| -rw-r--r-- | irc/inspircd/files/patch-configure | 14 | ||||
| -rw-r--r-- | irc/inspircd/files/patch-m_ssl_gnutls.cpp | 13 |
3 files changed, 21 insertions, 7 deletions
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile index 22ed3497a8b6..68a7f8fb53bc 100644 --- a/irc/inspircd/Makefile +++ b/irc/inspircd/Makefile @@ -20,6 +20,7 @@ USE_GMAKE= yes USE_BZIP2= yes USE_LDCONFIG= ${PREFIX}/lib/inspircd USE_RC_SUBR= inspircd.sh +DISABLE_MAKE_JOBS= yes INSPIRCD_USR?= ircd INSPIRCD_UID?= 72 diff --git a/irc/inspircd/files/patch-configure b/irc/inspircd/files/patch-configure index 1f9f4dfd13e5..00dddc19ef86 100644 --- a/irc/inspircd/files/patch-configure +++ b/irc/inspircd/files/patch-configure @@ -1,11 +1,11 @@ ---- ./configure.orig 2008-02-21 20:35:25.000000000 +0000 -+++ ./configure 2008-04-18 09:12:20.000000000 +0100 -@@ -136,7 +136,7 @@ +--- ./configure.orig 2008-05-10 20:19:59.000000000 -0400 ++++ ./configure 2010-03-23 18:50:19.000000000 -0400 +@@ -135,7 +135,7 @@ + { $config{LIBRARY_DIR} = $opt_library_dir; } - chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. --chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version -+chomp($config{HAS_OPENSSL} = `openssl version | cut -d ' ' -f 2`); # Openssl version +-chomp($config{HAS_GNUTLS} = `libgnutls-config --version 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. ++chomp($config{HAS_GNUTLS} = `pkg-config gnutls --modversion 2>/dev/null | cut -c 1,2,3`); # GNUTLS Version. + chomp($config{HAS_OPENSSL} = `pkg-config --modversion openssl 2>/dev/null`); # Openssl version chomp($gnutls_ver = $config{HAS_GNUTLS}); chomp($openssl_ver = $config{HAS_OPENSSL}); - $config{USE_GNUTLS} = "n"; diff --git a/irc/inspircd/files/patch-m_ssl_gnutls.cpp b/irc/inspircd/files/patch-m_ssl_gnutls.cpp new file mode 100644 index 000000000000..2302df36f8cc --- /dev/null +++ b/irc/inspircd/files/patch-m_ssl_gnutls.cpp @@ -0,0 +1,13 @@ +--- ./src/modules/extra/m_ssl_gnutls.cpp.orig 2008-04-02 14:37:17.000000000 -0400 ++++ ./src/modules/extra/m_ssl_gnutls.cpp 2010-03-23 20:27:41.000000000 -0400 +@@ -32,8 +32,8 @@ + #endif + + /* $ModDesc: Provides SSL support for clients */ +-/* $CompileFlags: exec("libgnutls-config --cflags") */ +-/* $LinkerFlags: rpath("libgnutls-config --libs") exec("libgnutls-config --libs") */ ++/* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */ ++/* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */ + /* $ModDep: transport.h */ + + |