From ad25933c83edec01fe390b5d88832e1454833a8a Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Mon, 30 Jul 2007 20:58:20 +0000 Subject: - Remove conflicts Approved by: sat (mentor, implicit) --- net-im/skype/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'net-im/skype') diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index 3871dbe124e9..2e22e7421245 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -15,8 +15,6 @@ DISTNAME= skype_staticQT-${PORTVERSION} MAINTAINER= beech@FreeBSD.org COMMENT= P2P VoIP software -CONFLICTS+= skype-devel-[0-9]* - RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat @@ -25,7 +23,7 @@ USE_LINUX= yes USE_X_PREFIX= yes ONLY_FOR_ARCHS= i386 amd64 -RESTRICTED= Redistribution not allowed yet. +RESTRICTED= Redistribution not allowed. OPTIONS= NVIDIA_GL "Enable Nvidia Support" off -- cgit v1.2.3