diff options
-rw-r--r-- | net-im/skype-devel/Makefile | 4 | ||||
-rw-r--r-- | net-im/skype/Makefile | 4 | ||||
-rw-r--r-- | net-im/skype20/Makefile | 4 | ||||
-rw-r--r-- | net/skype-devel/Makefile | 4 | ||||
-rw-r--r-- | net/skype/Makefile | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/net-im/skype-devel/Makefile b/net-im/skype-devel/Makefile index c84bb62fe4a3..7a89f799387f 100644 --- a/net-im/skype-devel/Makefile +++ b/net-im/skype-devel/Makefile @@ -26,6 +26,10 @@ ONLY_FOR_ARCHS= i386 RESTRICTED= Redistribution not allowed yet. +.if defined(PACKAGE_BUILDING) +IGNORE= conflicts between linux_base and linux_base-8 +.endif + .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomehier} != "" diff --git a/net-im/skype/Makefile b/net-im/skype/Makefile index c84bb62fe4a3..7a89f799387f 100644 --- a/net-im/skype/Makefile +++ b/net-im/skype/Makefile @@ -26,6 +26,10 @@ ONLY_FOR_ARCHS= i386 RESTRICTED= Redistribution not allowed yet. +.if defined(PACKAGE_BUILDING) +IGNORE= conflicts between linux_base and linux_base-8 +.endif + .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomehier} != "" diff --git a/net-im/skype20/Makefile b/net-im/skype20/Makefile index c84bb62fe4a3..7a89f799387f 100644 --- a/net-im/skype20/Makefile +++ b/net-im/skype20/Makefile @@ -26,6 +26,10 @@ ONLY_FOR_ARCHS= i386 RESTRICTED= Redistribution not allowed yet. +.if defined(PACKAGE_BUILDING) +IGNORE= conflicts between linux_base and linux_base-8 +.endif + .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomehier} != "" diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile index c84bb62fe4a3..7a89f799387f 100644 --- a/net/skype-devel/Makefile +++ b/net/skype-devel/Makefile @@ -26,6 +26,10 @@ ONLY_FOR_ARCHS= i386 RESTRICTED= Redistribution not allowed yet. +.if defined(PACKAGE_BUILDING) +IGNORE= conflicts between linux_base and linux_base-8 +.endif + .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomehier} != "" diff --git a/net/skype/Makefile b/net/skype/Makefile index c84bb62fe4a3..7a89f799387f 100644 --- a/net/skype/Makefile +++ b/net/skype/Makefile @@ -26,6 +26,10 @@ ONLY_FOR_ARCHS= i386 RESTRICTED= Redistribution not allowed yet. +.if defined(PACKAGE_BUILDING) +IGNORE= conflicts between linux_base and linux_base-8 +.endif + .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomehier} != "" |