[Midnightbsd-cvs] mports: www/opera: enable the compat 6x libraries for current so we can

[laffer1 at midnightbsd.org]

Log Message:
-----------
enable the compat 6x libraries for current so we can use the freebsd 6 version of opera

Modified Files:
--------------
    mports/www/opera:
        Makefile (r1.25 -> r1.26)
        pkg-plist (r1.11 -> r1.12)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/opera/pkg-plist,v
retrieving revision 1.11
retrieving revision 1.12
diff -L www/opera/pkg-plist -L www/opera/pkg-plist -u -r1.11 -r1.12
--- www/opera/pkg-plist
+++ www/opera/pkg-plist
@@ -207,7 +207,6 @@
 share/opera/styles/plugins.css
 share/opera/styles/search.css
 share/opera/styles/warning.css
-share/opera/webfeeds.html
 share/opera/styles/wml.css
 share/opera/skin/standard_skin.zip
 share/opera/skin/windows_skin.zip
@@ -276,11 +275,11 @@
 @dirrm share/opera/java
 @dirrm share/opera/plugins
 @dirrm share/opera
- at dirrm share/apps/Internet
- at dirrm share/apps
- at dirrm share/pixmaps
- at dirrm share/applnk/Internet
- at dirrm share/applnk
+ at dirrmtry share/apps/Internet
+ at dirrmtry share/apps
+ at dirrmtry share/pixmaps
+ at dirrmtry share/applnk/Internet
+ at dirrmtry share/applnk
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/22x22/apps
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/opera/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -L www/opera/Makefile -L www/opera/Makefile -u -r1.25 -r1.26
--- www/opera/Makefile
+++ www/opera/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
 		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
@@ -66,8 +66,9 @@
 .endif
 
 .if ${OSVERSION} >= 3000
-BROKEN=		Does not run pending GCC 4 migration
-OPERA_TYPE=	7
+#OPERA_TYPE=	7 switch after GCC 4 migration
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+OPERA_TYPE=	6
 .else
 OPERA_TYPE=	6
 .endif
@@ -104,8 +105,8 @@
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${TRUE_PREFIX} --DESTDIR=${FAKE_DESTDIR})
 	@${MKDIR} ${PREFIX}/share/bin
-	@${CP} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/bin/operapluginwrapper.midnightbsd
-	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${PREFIX}/share/bin
+	@${CP} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/opera/bin/operapluginwrapper.midnightbsd
+	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${PREFIX}/share/opera/bin
 	@${MKDIR} ${PREFIX}/share/apps/Internet
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${MKDIR} ${PREFIX}/share/applnk/Internet