8 files changed, 40 insertions, 10 deletions
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index c2a9fd0ec0dc..9296cc4dcee1 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.22.20031103
+PORTVERSION=	7.23.20031119
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/722/final/en/i386/static/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2003/-2003/}.1-static-qt.i386-en
 
@@ -20,8 +20,15 @@ RESTRICTED=	"not redistributable; commercial software"
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif
 
-USE_BZIP2=	yes
+.if defined(WITH_XFT2)
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
+		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
+		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+.else
 USE_LINUX=	yes
+.endif
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
@@ -61,6 +68,13 @@ PLIST_SUB+=	GNOMELNK:=""
 PLIST_SUB+=	GNOMELNK:="@comment "
 .endif
 
+pre-everything::
+.if !defined(WITH_XFT2)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "WITH_XFT2=yes for use Xft2 (requires linux_base-8) with nicer anti-aliased fonts."
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/www/linux-opera-devel/distinfo b/www/linux-opera-devel/distinfo
index 8e133a074b7b..a6c39e817f03 100644
--- a/www/linux-opera-devel/distinfo
+++ b/www/linux-opera-devel/distinfo
@@ -1 +1 @@
-MD5 (opera-7.22-20031103.1-static-qt.i386-en.tar.bz2) = 86efbee18a13596977874377ccf3cb01
+MD5 (opera-7.23-20031119.1-static-qt.i386-en.tar.bz2) = f3d22181a3016896b9bcc2c71afb28f7
diff --git a/www/linux-opera-devel/pkg-message b/www/linux-opera-devel/pkg-message
index 8f17df069659..5d8873f1bbeb 100644
--- a/www/linux-opera-devel/pkg-message
+++ b/www/linux-opera-devel/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelogs for 7.22 Final: http://www.opera.com/linux/changelogs/722/
+Changelogs for 7.23 Final: http://www.opera.com/linux/changelogs/723/
 
 If you are upgrade from version 6 final, 7 development or 7.11, it might be a
 good idea to backup your personal "~/.opera" directory and remove it. This can
diff --git a/www/linux-opera-devel/pkg-plist b/www/linux-opera-devel/pkg-plist
index 897082b10326..8e98d4f5b13b 100644
--- a/www/linux-opera-devel/pkg-plist
+++ b/www/linux-opera-devel/pkg-plist
@@ -78,6 +78,7 @@ share/opera/locale/english.lng
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/operamotifwrapper
+share/opera/plugins/operamotifwrapper-3
 share/opera/plugins/operaplugincleaner
 share/opera/search.ini
 share/opera/skin/standard_skin.zip
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index c2a9fd0ec0dc..9296cc4dcee1 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	7.22.20031103
+PORTVERSION=	7.23.20031119
 CATEGORIES=	www linux
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/722/final/en/i386/static/
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/723/final/en/i386/static/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.2003/-2003/}.1-static-qt.i386-en
 
@@ -20,8 +20,15 @@ RESTRICTED=	"not redistributable; commercial software"
 
 RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif
 
-USE_BZIP2=	yes
+.if defined(WITH_XFT2)
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs \
+		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
+		${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+.else
 USE_LINUX=	yes
+.endif
+
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
@@ -61,6 +68,13 @@ PLIST_SUB+=	GNOMELNK:=""
 PLIST_SUB+=	GNOMELNK:="@comment "
 .endif
 
+pre-everything::
+.if !defined(WITH_XFT2)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} " "
+	@${ECHO_MSG} "WITH_XFT2=yes for use Xft2 (requires linux_base-8) with nicer anti-aliased fonts."
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/www/linux-opera/distinfo b/www/linux-opera/distinfo
index 8e133a074b7b..a6c39e817f03 100644
--- a/www/linux-opera/distinfo
+++ b/www/linux-opera/distinfo
@@ -1 +1 @@
-MD5 (opera-7.22-20031103.1-static-qt.i386-en.tar.bz2) = 86efbee18a13596977874377ccf3cb01
+MD5 (opera-7.23-20031119.1-static-qt.i386-en.tar.bz2) = f3d22181a3016896b9bcc2c71afb28f7
diff --git a/www/linux-opera/pkg-message b/www/linux-opera/pkg-message
index 8f17df069659..5d8873f1bbeb 100644
--- a/www/linux-opera/pkg-message
+++ b/www/linux-opera/pkg-message
@@ -1,5 +1,5 @@
 ##
-Changelogs for 7.22 Final: http://www.opera.com/linux/changelogs/722/
+Changelogs for 7.23 Final: http://www.opera.com/linux/changelogs/723/
 
 If you are upgrade from version 6 final, 7 development or 7.11, it might be a
 good idea to backup your personal "~/.opera" directory and remove it. This can
diff --git a/www/linux-opera/pkg-plist b/www/linux-opera/pkg-plist
index 897082b10326..8e98d4f5b13b 100644
--- a/www/linux-opera/pkg-plist
+++ b/www/linux-opera/pkg-plist
@@ -78,6 +78,7 @@ share/opera/locale/english.lng
 share/opera/opera6.adr
 share/opera/plugins/libnpp.so
 share/opera/plugins/operamotifwrapper
+share/opera/plugins/operamotifwrapper-3
 share/opera/plugins/operaplugincleaner
 share/opera/search.ini
 share/opera/skin/standard_skin.zip