summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-07-22 12:28:04 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-07-22 12:28:04 +0800
commit3ea2989c33e6e3f59ed5e59da49c9be231a9aaac (patch)
tree3db526672e5653ed9d3924e8ec0029e5877def33 /www
parent87cb795e592afdd8ec186893abfb797a0c167fe2 (diff)
downloadmarcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar.gz
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar.bz2
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar.lz
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar.xz
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.tar.zst
marcuscom-ports-3ea2989c33e6e3f59ed5e59da49c9be231a9aaac.zip
- Remove CONFLICTS since we only have 1 galeon now.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4287 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
-rw-r--r--www/galeon/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 6c89fc76e..954cb0787 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -3,7 +3,7 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom$
+# $MCom: ports/www/galeon/Makefile,v 1.1 2005/07/22 04:27:17 ahze Exp $
#
PORTNAME= galeon
@@ -62,8 +62,6 @@ GCONF_SCHEMAS= galeon.schemas
FLASHPLAYER= ${LOCALBASE}/lib/libflashplayer.so.1
-CONFLICTS= galeon-[0-9]*
-
.include <bsd.port.pre.mk>
.if ${OSVERSION} > 500000