Index: head/www/opera/Makefile
===================================================================
--- head/www/opera/Makefile	(revision 109133)
+++ head/www/opera/Makefile	(revision 109134)
@@ -1,94 +1,92 @@
 # New ports collection makefile for:		opera
 # Date created:					November 5th 2000
 # Whom:						des
 #
 # $FreeBSD$
 #
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
 CATEGORIES=	www
 MASTER_SITES=	http://ftp.scarlet.be/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://ftp.planetmirror.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		http://www.mehok.uni-miskolc.hu/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://ftp.heanet.ie/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://opera.nsc.no/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		http://ftp.task.gda.pl/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://ftp.idilis.ro/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		http://www.fastmirrors.org/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		http://ftp.sunet.se/pub/www/clients/Opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://mirror.switch.ch/mirror/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		http://ftp.ankara.edu.tr/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		ftp://files.downloadthat.com/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/&,} \
 		ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}/${OPERA_REL}/en/static/
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386.freebsd-en
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 
 OPERA_VER=	7.50
 OPERA_REL=	final
 OPERA_DATE=	20040511
 
-CONFLICTS=	linux-opera-*
-
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500000
 LIB_DEPENDS+=	c_r.4:${PORTSDIR}/misc/compat4x
 .endif
 
 .if exists(/etc/X11/applnk)
 PLIST_SUB+=	APPLNK=""
 .else
 PLIST_SUB+=	APPLNK="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome)
 PLIST_SUB+=	GNOME=""
 .else
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Internet)
 PLIST_SUB+=	KDE=""
 .else
 PLIST_SUB+=	KDE="@comment "
 .endif
 
 .if exists(${X11BASE}/share/applnk/Networking)
 PLIST_SUB+=	KDE2=""
 .else
 PLIST_SUB+=	KDE2="@comment "
 .endif
 
 .if exists(${X11BASE}/share/gnome/apps)
 PLIST_SUB+=	GNOMELNK=""
 .else
 PLIST_SUB+=	GNOMELNK="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11PREFIX%%|${X11BASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/install.sh
 
 do-install:
 	(cd ${WRKSRC} && ./install.sh --prefix=${PREFIX})
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/opera/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.29
\ No newline at end of property
+1.30
\ No newline at end of property