aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2004-08-16 07:42:55 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2004-08-16 07:42:55 +0000
commit016a218ba906f7083d62aead3cf9dafee314ce02 (patch)
treeb055056101877eefdbaa7818c2dccbbdbf5fa1f8 /net
parent22f0da95df2affcd7061d2875c21e7549b11db75 (diff)
downloadports-016a218ba906f7083d62aead3cf9dafee314ce02.tar.gz
ports-016a218ba906f7083d62aead3cf9dafee314ce02.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/skype-devel/Makefile4
-rw-r--r--net/skype/Makefile4
2 files changed, 8 insertions, 0 deletions
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} != ""