diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2004-08-16 07:42:55 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2004-08-16 07:42:55 +0000 |
| commit | 016a218ba906f7083d62aead3cf9dafee314ce02 (patch) | |
| tree | b055056101877eefdbaa7818c2dccbbdbf5fa1f8 /net | |
| parent | - Update to 0.9.0 beta1 (diff) | |
Temporary IGNORE in the PACKAGE_BUILDING case (a dependency depends upon
linux_base, this conflicts with linux_base-8).
Noticed by: kris (pointyhat)
Notes
Notes:
svn path=/head/; revision=116359
Diffstat (limited to 'net')
| -rw-r--r-- | net/skype-devel/Makefile | 4 | ||||
| -rw-r--r-- | net/skype/Makefile | 4 |
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} != "" |