6 files changed, 38 insertions, 22 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index fcbb445c29c9..e69ee7de1dfc 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/sobomax/
@@ -14,16 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/www/${MOZILLA}:build
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		${X11BASE}/lib/${MOZILLA}:${PORTSDIR}/www/${MOZILLA}
+		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
+BUILD_DEPENDS+=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+MOZHEADERS=	${X11BASE}/include/${MOZILLA}
+MOZLIBS=	${X11BASE}/lib/${MOZILLA}
 .else
 MOZILLA=	mozilla
+BUILD_DEPENDS+=	/nonexistent:${PORTSDIR}/www/${MOZILLA}:build
+MOZHEADERS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include
+MOZLIBS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
 .endif
 
 USE_X_PREFIX=	yes
@@ -32,12 +37,12 @@ GNU_CONFIGURE=	yes
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE
+CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE -fno-rtti
 
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-mozilla-headers=${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include \
-		--with-mozilla-libs=${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
+		--with-mozilla-includes="${MOZHEADERS}" \
+		--with-mozilla-libs="${MOZLIBS}"
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index f3bb1d653e04..70b9b850080c 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.7.2.tar.gz) = 279e2123cd747eaf8097ab1d901ac510
+MD5 (galeon-0.7.5.tar.gz) = 0f28369da74283eb482cb786c30f0387
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 26ee789ce5ca..3d0f9420f5f5 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -1,5 +1,6 @@
 bin/galeon
 bin/galeon-bin
+etc/CORBA/servers/galeon.gnorba
 share/gnome/apps/Internet/galeon.desktop
 share/gnome/galeon/anim_01.png
 share/gnome/galeon/anim_02.png
@@ -15,21 +16,23 @@ share/gnome/galeon/anim_11.png
 share/gnome/galeon/anim_12.png
 share/gnome/galeon/anim_13.png
 share/gnome/galeon/anim_14.png 
-share/gnome/galeon/bookmarks.xml
 share/gnome/galeon/galeon.glade
 share/gnome/galeon/logo.png
-share/gnome/galeon/preferences.xml
+share/gnome/galeon/myportal.css
 share/gnome/pixmaps/galeon.png
-share/gnome/pixmaps/galeon/logo.jpg
 share/locale/da/LC_MESSAGES/galeon.mo
 share/locale/de/LC_MESSAGES/galeon.mo
 share/locale/es/LC_MESSAGES/galeon.mo
 share/locale/et/LC_MESSAGES/galeon.mo
 share/locale/fr/LC_MESSAGES/galeon.mo
+share/locale/gl/LC_MESSAGES/galeon.mo
+share/locale/hr/LC_MESSAGES/galeon.mo
 share/locale/it/LC_MESSAGES/galeon.mo
 share/locale/ko/LC_MESSAGES/galeon.mo
+share/locale/nl/LC_MESSAGES/galeon.mo
+share/locale/no/LC_MESSAGES/galeon.mo
+share/locale/pl/LC_MESSAGES/galeon.mo
 share/locale/ru/LC_MESSAGES/galeon.mo
 share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
-@dirrm share/gnome/pixmaps/galeon
 @dirrm share/gnome/galeon
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index fcbb445c29c9..e69ee7de1dfc 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/sobomax/
@@ -14,16 +14,21 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/www/${MOZILLA}:build
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		glade.4:${PORTSDIR}/devel/libglade
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		${X11BASE}/lib/${MOZILLA}:${PORTSDIR}/www/${MOZILLA}
+		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
+BUILD_DEPENDS+=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+MOZHEADERS=	${X11BASE}/include/${MOZILLA}
+MOZLIBS=	${X11BASE}/lib/${MOZILLA}
 .else
 MOZILLA=	mozilla
+BUILD_DEPENDS+=	/nonexistent:${PORTSDIR}/www/${MOZILLA}:build
+MOZHEADERS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include
+MOZLIBS=	${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
 .endif
 
 USE_X_PREFIX=	yes
@@ -32,12 +37,12 @@ GNU_CONFIGURE=	yes
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE
+CFLAGS+=	-D_REENTRANT -D_THREAD_SAFE -fno-rtti
 
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-mozilla-headers=${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include \
-		--with-mozilla-libs=${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib
+		--with-mozilla-includes="${MOZHEADERS}" \
+		--with-mozilla-libs="${MOZLIBS}"
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index f3bb1d653e04..70b9b850080c 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.7.2.tar.gz) = 279e2123cd747eaf8097ab1d901ac510
+MD5 (galeon-0.7.5.tar.gz) = 0f28369da74283eb482cb786c30f0387
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 26ee789ce5ca..3d0f9420f5f5 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -1,5 +1,6 @@
 bin/galeon
 bin/galeon-bin
+etc/CORBA/servers/galeon.gnorba
 share/gnome/apps/Internet/galeon.desktop
 share/gnome/galeon/anim_01.png
 share/gnome/galeon/anim_02.png
@@ -15,21 +16,23 @@ share/gnome/galeon/anim_11.png
 share/gnome/galeon/anim_12.png
 share/gnome/galeon/anim_13.png
 share/gnome/galeon/anim_14.png 
-share/gnome/galeon/bookmarks.xml
 share/gnome/galeon/galeon.glade
 share/gnome/galeon/logo.png
-share/gnome/galeon/preferences.xml
+share/gnome/galeon/myportal.css
 share/gnome/pixmaps/galeon.png
-share/gnome/pixmaps/galeon/logo.jpg
 share/locale/da/LC_MESSAGES/galeon.mo
 share/locale/de/LC_MESSAGES/galeon.mo
 share/locale/es/LC_MESSAGES/galeon.mo
 share/locale/et/LC_MESSAGES/galeon.mo
 share/locale/fr/LC_MESSAGES/galeon.mo
+share/locale/gl/LC_MESSAGES/galeon.mo
+share/locale/hr/LC_MESSAGES/galeon.mo
 share/locale/it/LC_MESSAGES/galeon.mo
 share/locale/ko/LC_MESSAGES/galeon.mo
+share/locale/nl/LC_MESSAGES/galeon.mo
+share/locale/no/LC_MESSAGES/galeon.mo
+share/locale/pl/LC_MESSAGES/galeon.mo
 share/locale/ru/LC_MESSAGES/galeon.mo
 share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
-@dirrm share/gnome/pixmaps/galeon
 @dirrm share/gnome/galeon