aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-10-11 14:13:35 +0800
committermarcus <marcus@FreeBSD.org>2003-10-11 14:13:35 +0800
commit38ba3750cad17555a3fbc275e80dc9ead3203d21 (patch)
tree2d7ba53ca2bfb8975470e78805f9b3cb9ddbb64b
parent68ff0fb502c24e9e2220d8e4267adb7af2e9a389 (diff)
downloadfreebsd-ports-graphics-38ba3750cad17555a3fbc275e80dc9ead3203d21.tar.gz
freebsd-ports-graphics-38ba3750cad17555a3fbc275e80dc9ead3203d21.tar.zst
freebsd-ports-graphics-38ba3750cad17555a3fbc275e80dc9ead3203d21.zip
galeon and galeon2 conflict with each other.
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
-rw-r--r--www/galeon/Makefile2
-rw-r--r--www/galeon2/Makefile2
2 files changed, 4 insertions, 0 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 417fab1bdf0..4252349e637 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -50,6 +50,8 @@ MAN1= galeon.1
FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
+CONFLICTS= galeon2-*
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500000
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 0902801e9c8..abc38937e45 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -55,6 +55,8 @@ MAN1= galeon.1
FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
+CONFLICTS= galeon-*
+
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500000