Import of pkgsrc-2014Q1

chat/silc-client/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2013/05/31 12:39:41 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2013/10/11 09:58:53 roy Exp $
 #
 
 DISTNAME=		${SILC_CLIENT_DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		chat security
 MASTER_SITES=		http://www.silcnet.org/download/client/sources/ \
 			ftp://ftp.silcnet.org/silc/client/sources/ \
@@ -35,20 +35,11 @@ CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PKGBASE}
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-simdir=${PREFIX}/lib/${PKGBASE}/modules
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-terminfo
 CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--with-terminfo
+CONFIGURE_ARGS+=	--without-ncurses
 CONFIGURE_ARGS+=	--without-libtoolfix
 
-# Use native curses library.
-.if (${OPSYS} == "NetBSD") || (${OPSYS} == "SunOS")
-CONFIGURE_ARGS+=	--with-vcurses
-.elif (${OPSYS} == "Linux") || (${OPSYS} == "Darwin")
-CONFIGURE_ARGS+=	--with-ncurses
-.else
-# XXX: Need testing on other operating systems, use safe defaults for now.
-CONFIGURE_ARGS+=	--with-ncurses
-.endif
-
 # Assembler optimizations.
 #
 .if (${MACHINE_ARCH} != "i386")
@@ -74,6 +65,6 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

chat/silc-client/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2012/02/28 17:37:10 hans Exp $
+$NetBSD: distinfo,v 1.39 2013/10/27 20:30:44 joerg Exp $
 
 SHA1 (silc-client-1.1.8.tar.bz2) = 5936ab682e746ae413f938ce9c9b72215d6524c0
 RMD160 (silc-client-1.1.8.tar.bz2) = a010384b5e498a62cc6cd69e97602f3118b64d2f
@@ -10,3 +10,5 @@ SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755
 SHA1 (patch-ae) = c5b21eb9d65cb0bbc685f5e771849f1ccf07681b
 SHA1 (patch-af) = 29738fac989989fdd2a8865f9f5e2b3ea2ed7198
 SHA1 (patch-ag) = f0700879a6780283f62bda7022e89d702876c916
+SHA1 (patch-configure) = 2c8d60e1b29a285f95cd73e77bcb9bfa9192094b
+SHA1 (patch-configure.ac) = c3f770c7b0199233a65181f77b55436bc76f0907

chat/silc-client/patches/patch-configure

@@ -0,0 +1,12 @@
+$NetBSD: patch-configure,v 1.1 2013/10/27 20:30:44 joerg Exp $
+
+--- configure.orig	2013-10-17 11:14:11.000000000 +0000
++++ configure
+@@ -22229,7 +22229,6 @@ esac
+ fi
+ 
+  tmp_CFLAGS="SILC_CRYPTO_CFLAGS"
+-  SILC_CRYPTO_CFLAGS="${SILC_CRYPTO_CFLAGS} -fno-regmove"
+   { $as_echo "$as_me:$LINENO: checking whether $CC accepts -fno-regmove flag" >&5
+ $as_echo_n "checking whether $CC accepts -fno-regmove flag... " >&6; }
+   cat >conftest.$ac_ext <<_ACEOF

chat/silc-client/patches/patch-configure.ac

@@ -0,0 +1,12 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/10/27 20:30:44 joerg Exp $
+
+--- configure.ac.orig	2013-10-17 11:14:15.000000000 +0000
++++ configure.ac
+@@ -1292,7 +1292,6 @@ case "$host_cpu" in
+ esac
+ fi
+ 
+-SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
+ if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
+   SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fomit-frame-pointer -O3)
+ fi