Update to 1.2.6. This release supports both Mozilla 1.0 and 1.1. It will

build with 1.0.x support by default, but this can be overwritten by
building with:

make -DWITH_MOZILLA_DEVEL

6 files changed, 46 insertions, 16 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 0372f5ffd66b..58d42107e4e7 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,40 +6,52 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
+BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 WITH_FULL_MOZILLA=	"Problems with SSL, general performance, and usability"
 
+.if defined(WITH_MOZILLA_DEVEL)
+HEADERS_SUFX=	-devel
+.if !defined(WITH_FULL_MOZILLA)
+MOZILLA=	mozilla-embedded-devel
+.else
+MOZILLA=	mozilla-devel
+.endif
+.else
+HEADERS_SUFX=
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
 .else
 MOZILLA=	mozilla
 .endif
+.endif
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo libglade gnomevfs
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
+CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
-		--enable-nautilus-view \
-		--with-mozilla-snapshot="trunk"
+		--enable-nautilus-view
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if !defined(WITH_MOZILLA_DEVEL)
+CONFIGURE_ARGS+=	--with-mozilla-snapshot="1.0"
+.endif
+
 MAN1=		galeon.1
 
 .include <bsd.port.pre.mk>
@@ -62,8 +74,10 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
+	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g'
 	@${MKDIR} ${WRKSRC}/src/libnautilus
 
 post-configure:
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index aa9a3dca128e..506ed1a5003e 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.5.tar.gz) = 8e41655bebe6a5f08ad43b1403b858b2
+MD5 (galeon-1.2.6.tar.gz) = 85738f037bef3504e08173e4d30e4ae3
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 5005be4ee87a..2caf115e6491 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -204,6 +204,7 @@ share/gnome/galeon/spinners/pipeon/012.png
 share/gnome/galeon/spinners/pipeon/013.png
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
+share/gnome/galeon/stock_trash.xpm
 share/gnome/galeon/stocks.png
 share/gnome/galeon/stop.png
 share/gnome/galeon/tabs.png
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 0372f5ffd66b..58d42107e4e7 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,40 +6,52 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
+BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 WITH_FULL_MOZILLA=	"Problems with SSL, general performance, and usability"
 
+.if defined(WITH_MOZILLA_DEVEL)
+HEADERS_SUFX=	-devel
+.if !defined(WITH_FULL_MOZILLA)
+MOZILLA=	mozilla-embedded-devel
+.else
+MOZILLA=	mozilla-devel
+.endif
+.else
+HEADERS_SUFX=
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
 .else
 MOZILLA=	mozilla
 .endif
+.endif
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo libglade gnomevfs
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
+CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
-		--enable-nautilus-view \
-		--with-mozilla-snapshot="trunk"
+		--enable-nautilus-view
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if !defined(WITH_MOZILLA_DEVEL)
+CONFIGURE_ARGS+=	--with-mozilla-snapshot="1.0"
+.endif
+
 MAN1=		galeon.1
 
 .include <bsd.port.pre.mk>
@@ -62,8 +74,10 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
+	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g'
 	@${MKDIR} ${WRKSRC}/src/libnautilus
 
 post-configure:
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index aa9a3dca128e..506ed1a5003e 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.5.tar.gz) = 8e41655bebe6a5f08ad43b1403b858b2
+MD5 (galeon-1.2.6.tar.gz) = 85738f037bef3504e08173e4d30e4ae3
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 5005be4ee87a..2caf115e6491 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -204,6 +204,7 @@ share/gnome/galeon/spinners/pipeon/012.png
 share/gnome/galeon/spinners/pipeon/013.png
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
+share/gnome/galeon/stock_trash.xpm
 share/gnome/galeon/stocks.png
 share/gnome/galeon/stop.png
 share/gnome/galeon/tabs.png