diff options
| author | mezz <mezz@FreeBSD.org> | 2010-10-01 10:21:02 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2010-10-01 10:21:02 +0800 |
| commit | 106717ec136fff37476e503dc08a34401be2203a (patch) | |
| tree | 89f78622a8064c258966036ae377df33e88a0d5a | |
| parent | fcd10669efc0649e4bffbf1e012bd23eda629f11 (diff) | |
| download | freebsd-ports-gnome-106717ec136fff37476e503dc08a34401be2203a.tar.gz freebsd-ports-gnome-106717ec136fff37476e503dc08a34401be2203a.tar.zst freebsd-ports-gnome-106717ec136fff37476e503dc08a34401be2203a.zip | |
Do not run uninstall-opera if it exists or it will uninstall www/opera. Remove
the CONFLICTS with www/opera.
Reported by: itetcu
| -rw-r--r-- | www/linux-opera-devel/Makefile | 5 | ||||
| -rw-r--r-- | www/linux-opera/Makefile | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile index 0a4657197f9c..cf90b146d972 100644 --- a/www/linux-opera-devel/Makefile +++ b/www/linux-opera-devel/Makefile @@ -25,8 +25,6 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux MAINTAINER= mezz@FreeBSD.org COMMENT= A blazingly fast, full-featured, standards-compliant browser -CONFLICTS= opera-[0-9]* # removes installed www/opera's file on make install - RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes @@ -102,7 +100,8 @@ post-patch: s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \ s|^.*rmdir.*mime/packages.*||g ; \ s|^.*GX - bin/uninstall-opera@.*||g ; \ - s|[$$]tempdir/damaged|${WRKSRC}/damaged|g' \ + s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \ + s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \ ${WRKSRC}/install @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \ /Exec/s|opera|${UNIQUENAME}|g ; \ diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile index 0a4657197f9c..cf90b146d972 100644 --- a/www/linux-opera/Makefile +++ b/www/linux-opera/Makefile @@ -25,8 +25,6 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux MAINTAINER= mezz@FreeBSD.org COMMENT= A blazingly fast, full-featured, standards-compliant browser -CONFLICTS= opera-[0-9]* # removes installed www/opera's file on make install - RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes @@ -102,7 +100,8 @@ post-patch: s|opera-widget-manager)|${UNIQUENAME}-widget-manager)|g ; \ s|^.*rmdir.*mime/packages.*||g ; \ s|^.*GX - bin/uninstall-opera@.*||g ; \ - s|[$$]tempdir/damaged|${WRKSRC}/damaged|g' \ + s|[$$]tempdir/damaged|${WRKSRC}/damaged|g ; \ + s|PREFIX/bin/uninstall-opera|PREFIX/bin/disabled-opera|g' \ ${WRKSRC}/install @${REINPLACE_CMD} -e '/^Name/s|$$| (Linux version)|g ; \ /Exec/s|opera|${UNIQUENAME}|g ; \ |