svn commit: r318765 - in head/www/xombrero: . files

[Niclas Zeising]

Author: zeising
Date: Wed May 22 12:46:46 2013
New Revision: 318765
URL: http://svnweb.freebsd.org/changeset/ports/318765

Log:
  Update to 1.5.0
  Changelog: https://opensource.conformal.com/fluxbb/viewtopic.php?id=981
  
  Add options to select between GTK2 and GTK3 version, with GTK3 as default.

Modified:
  head/www/xombrero/Makefile
  head/www/xombrero/distinfo
  head/www/xombrero/files/patch-freebsd__Makefile

Modified: head/www/xombrero/Makefile
==============================================================================
--- head/www/xombrero/Makefile	Wed May 22 12:03:16 2013	(r318764)
+++ head/www/xombrero/Makefile	Wed May 22 12:46:46 2013	(r318765)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xombrero
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	www
 MASTER_SITES=	https://opensource.conformal.com/snapshots/xombrero/
 EXTRACT_SUFX=	.tgz
@@ -14,31 +13,40 @@ COMMENT=	Minimalists vi-like web browser
 LICENSE=	ISCL
 
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
-		soup-2.4:${PORTSDIR}/devel/libsoup \
-		webkitgtk-1:${PORTSDIR}/www/webkit-gtk2
+		soup-2.4:${PORTSDIR}/devel/libsoup
 
 USES=		pkgconfig
 USE_PERL5_BUILD=yes
-USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 
-MAKE_ENV=	GTK_VERSION="gtk2"
-
 MAN1=		xombrero.1
 PORTEXAMPLES=	favorites playflash.sh xombrero.conf
 
 BUILD_WRKSRC=	${WRKSRC}/freebsd
 
 OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_SINGLE=	GTK
+OPTIONS_SINGLE_GTK=GTK2 GTK3
+OPTIONS_DEFAULT=EXAMPLES GTK3
 
 SUB_FILES=	xombrero
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 800041
 BROKEN=		does not build due to missing arc4random_buf in libc
 .endif
 
+.if ${PORT_OPTIONS:MGTK2}
+USE_GNOME=	gtk20
+LIB_DEPENDS+=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+MAKE_ENV+=	GTK_VERSION="gtk2"
+.else # GTK3
+USE_GNOME=	gtk30
+LIB_DEPENDS+=	webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3
+MAKE_ENV+=	GTK_VERSION="gtk3"
+.endif
+
 post-patch:
 	@cd ${WRKSRC}; ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		-e 's|# ssl_ca_file|ssl_ca_file|' \
@@ -66,4 +74,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/playflash.sh ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/xombrero/distinfo
==============================================================================
--- head/www/xombrero/distinfo	Wed May 22 12:03:16 2013	(r318764)
+++ head/www/xombrero/distinfo	Wed May 22 12:46:46 2013	(r318765)
@@ -1,2 +1,2 @@
-SHA256 (xombrero-1.4.0.tgz) = 4ad3f1b2f3c31849c257fb412a4bb61c10d35f07a1ddc0b90af29c94c8fc8f65
-SIZE (xombrero-1.4.0.tgz) = 288503
+SHA256 (xombrero-1.5.0.tgz) = d98b3e9901dc273d4aba3b85dfb8a08776725bdbc18aa8bff1f81dedffaedb0d
+SIZE (xombrero-1.5.0.tgz) = 287679

Modified: head/www/xombrero/files/patch-freebsd__Makefile
==============================================================================
--- head/www/xombrero/files/patch-freebsd__Makefile	Wed May 22 12:03:16 2013	(r318764)
+++ head/www/xombrero/files/patch-freebsd__Makefile	Wed May 22 12:46:46 2013	(r318765)
@@ -1,11 +1,11 @@
---- freebsd/Makefile.orig	2012-12-11 14:25:00.000000000 +0100
-+++ freebsd/Makefile	2012-12-11 14:25:07.000000000 +0100
+--- freebsd/Makefile.orig	2013-05-16 18:12:42.000000000 +0200
++++ freebsd/Makefile	2013-05-22 13:40:50.369368284 +0200
 @@ -9,7 +9,7 @@
  LDADD= -lutil -lgcrypt
  GTK_CFLAGS!= pkg-config --cflags $(LIBS)
  GTK_LDFLAGS!= pkg-config --libs $(LIBS)
--CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -pthread -I. -I..
+-CFLAGS+= $(GTK_CFLAGS) -O2 -Wall -I. -I..
 +CFLAGS+= $(GTK_CFLAGS) -Wall -I. -I..
- LDFLAGS+= $(GTK_LDFLAGS) -pthread
+ LDFLAGS+= $(GTK_LDFLAGS)
  
  PREFIX?= /usr/local