diff options
| author | beech <beech@FreeBSD.org> | 2007-07-31 04:58:20 +0800 |
|---|---|---|
| committer | beech <beech@FreeBSD.org> | 2007-07-31 04:58:20 +0800 |
| commit | df0c5c4171f4b3f10dfafa1be9bc3d06e6203699 (patch) | |
| tree | f68d19a752cbaa4f5930d239545e9e605cb1e25d /net-im | |
| parent | ea519e55a649446512ca6a9199011674aa6f8a69 (diff) | |
| download | freebsd-ports-gnome-df0c5c4171f4b3f10dfafa1be9bc3d06e6203699.tar.gz freebsd-ports-gnome-df0c5c4171f4b3f10dfafa1be9bc3d06e6203699.tar.zst freebsd-ports-gnome-df0c5c4171f4b3f10dfafa1be9bc3d06e6203699.zip | |
- Remove conflicts
Approved by: sat (mentor, implicit)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/skype/Makefile | 4 | ||||
| -rw-r--r-- | net-im/skype20/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
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 diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile index 3871dbe124e9..2e22e7421245 100644 --- a/net-im/skype20/Makefile +++ b/net-im/skype20/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 |