From 6e2e25904de71417a0df8c19d10565a9c76320af Mon Sep 17 00:00:00 2001
From: novel <novel@FreeBSD.org>
Date: Sun, 11 Sep 2005 11:23:24 +0000
Subject: - Revive CONFLICTS with gnutls-devel [1] - Do not build static
 libraries [2]

Requested by:	kris [1]
		vs [2]
---
 security/gnutls/Makefile  | 4 +++-
 security/gnutls/pkg-plist | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 1b76d86cf97a..cf0248a18744 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -29,6 +29,8 @@ LIB_DEPENDS+=	opencdk.8:${PORTSDIR}/security/opencdk
 LIB_DEPENDS+=	tasn1.2:${PORTSDIR}/security/libtasn1
 .endif
 
+CONFLICTS=	gnutls-devel-[0-9]*
+
 USE_GPG?=	yes
 SIG_SUFFIX=	.sig
 USE_ICONV=	yes
@@ -41,7 +43,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-included-lzo
+CONFIGURE_ARGS=	--with-included-lzo --disable-static
 
 MAN1=		certtool.1 gnutls-cli.1 gnutls-cli-debug.1 \
        		gnutls-serv.1 srptool.1
diff --git a/security/gnutls/pkg-plist b/security/gnutls/pkg-plist
index d039d24c8b4f..7aa977685217 100644
--- a/security/gnutls/pkg-plist
+++ b/security/gnutls/pkg-plist
@@ -15,15 +15,12 @@ include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
 include/gnutls/x509.h
-lib/libgnutls-extra.a
 lib/libgnutls-extra.la
 lib/libgnutls-extra.so
 lib/libgnutls-extra.so.12
-lib/libgnutls-openssl.a
 lib/libgnutls-openssl.la
 lib/libgnutls-openssl.so
 lib/libgnutls-openssl.so.12
-lib/libgnutls.a
 lib/libgnutls.la
 lib/libgnutls.so
 lib/libgnutls.so.12
-- 
cgit