[pkgsrc/trunk]: pkgsrc/chat/psi Use devel/libidn rather than bundled version,...

[jdolecek <jdolecek%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed592204dd79
branches:  trunk
changeset: 500065:ed592204dd79
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sat Oct 01 22:02:00 2005 +0000

description:
Use devel/libidn rather than bundled version, since compilation of the
latter bombs if devel/libidn is installed, and it's preferable to use
the non-bundled, pkgsrc libidn rather than fix build of the bundled version

Fixes PR pkg/30336 by Perry E. Metzger and PR pkg/31413 by Steven M. Bellovin

diffstat:

 chat/psi/Makefile         |   5 +++--
 chat/psi/distinfo         |   3 ++-
 chat/psi/patches/patch-ae |  18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 2cc3902e2b8e -r ed592204dd79 chat/psi/Makefile
--- a/chat/psi/Makefile Sat Oct 01 22:00:07 2005 +0000
+++ b/chat/psi/Makefile Sat Oct 01 22:02:00 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/09/14 14:18:16 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.27 2005/10/01 22:02:00 jdolecek Exp $
 
 PSI_VERSION=   0.9.3
 DISTNAME=      psi-${PSI_VERSION}
-PKGREVISION=   # empty
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=  .tar.bz2
@@ -73,4 +73,5 @@
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/qca/buildlink3.mk"
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2cc3902e2b8e -r ed592204dd79 chat/psi/distinfo
--- a/chat/psi/distinfo Sat Oct 01 22:00:07 2005 +0000
+++ b/chat/psi/distinfo Sat Oct 01 22:02:00 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2005/09/14 14:18:16 dmcmahill Exp $
+$NetBSD: distinfo,v 1.13 2005/10/01 22:02:00 jdolecek Exp $
 
 SHA1 (psi-0.9.3/psi-0.9.3.tar.bz2) = dc5e7dbf5d791db2f0c4189cad055a40b21cf9b6
 RMD160 (psi-0.9.3/psi-0.9.3.tar.bz2) = 66983a9746812b27a5c8a1c072e9b33aca638d30
@@ -45,3 +45,4 @@
 SHA1 (patch-aa) = 1f3fbbe1f32df44db06a76d33d32555dd0fe7b6f
 SHA1 (patch-ac) = 6faea4967d2682c087aa5de12b7c83ac5848d1b5
 SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
+SHA1 (patch-ae) = 93896bc73cb834a42d81e3eed1419940b75a49a0
diff -r 2cc3902e2b8e -r ed592204dd79 chat/psi/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/psi/patches/patch-ae Sat Oct 01 22:02:00 2005 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/10/01 22:02:00 jdolecek Exp $
+
+--- iris.pri.orig      2005-10-01 22:20:56.000000000 +0200
++++ iris.pri   2005-10-01 22:22:05.000000000 +0200
+@@ -1,7 +1,10 @@
+ # libidn
+-LIBIDN_BASE = $$IRIS_BASE/libidn
+-CONFIG += libidn
+-include($$IRIS_BASE/libidn.pri)
++#LIBIDN_BASE = $$IRIS_BASE/libidn
++#CONFIG += libidn
++#include($$IRIS_BASE/libidn.pri)
++unix:{
++      LIBS += -lidn
++}
+ 
+ # qca
+ #unix:{