Attachment #113367 for bug #154904

View | Details | Raw Unified | Return to bug 154904
Collapse All | Expand All




#

PORTNAME=	midori
PORTVERSION=	0.3.2
CATEGORIES=	www xfce
MASTER_SITES=	${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR=	xfce4

MAINTAINER=	kwm@FreeBSD.org
COMMENT=	Lightweight web browser using WebKit browser engine

LIB_DEPENDS=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
		notify.1:${PORTSDIR}/devel/libnotify
BUILD_DEPENDS=	rsvg-convert:${PORTSDIR}/graphics/librsvg2 \


CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--disable-libidn \
		--disable-libidn \
		--enable-libnotify \
		--enable-addons \
		--jobs=${MAKE_JOBS_NUMBER}


OPTIONS=	NLS "Enable Native Language support" on \
		USERDOCS "Build user documentation" off \
		APIDOCS "Build api documentation" off \
		UNIQUE "Enable single instance support" off

.include <bsd.port.pre.mk>


PLIST_SUB+=	APIDOCS="@comment "
.endif

.if defined(WITH_UNIQUE)
LIB_DEPENDS+=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
CONFIGURE_ARGS+=--enable-unique
.else
CONFIGURE_ARGS+=--disable-unique
.endif

post-install:
	@-update-desktop-database
.if defined(WITH_APIDOCS)

Lines 1-2 Link Here

(-)midori/distinfo (-2 / +2 lines)
1	SHA256 (xfce4/midori-0.3.0.tar.bz2) = 56860b2eb2e5f223af0e64d103eef66c4b3574f4ed9a3cfd1ca20844563f0ae7	1	SHA256 (xfce4/midori-0.3.2.tar.bz2) = 9316803fdd68842c43f06afe645ec4fa45206f142796f6131d2761ba3415e2bc
2	SIZE (xfce4/midori-0.3.0.tar.bz2) = 819092	2	SIZE (xfce4/midori-0.3.2.tar.bz2) = 826287




--- wscript.orig	2011-02-20 00:00:26.000000000 +0100
+++ wscript	2011-02-20 10:27:54.000000000 +0100
@@ -99,10 +99,9 @@
     conf.check_tool ('glib2')
 
     if option_enabled ('userdocs'):
-        conf.find_program ('rst2html.py', var='RST2HTML')
-        # debian renames the executable, check that as well :(
+        conf.find_program ('rst2html', var='RST2HTML')
         if not conf.env['RST2HTML']:
-            conf.find_program ('rst2html', var='RST2HTML')
+            conf.find_program ('rst2html.py', var='RST2HTML')
         if conf.env['RST2HTML']:
             user_docs = 'yes'
         else:
@@ -261,8 +260,7 @@
     if not conf.env['HAVE_UNIQUE']:
         if Options.platform == 'win32':
             conf.check (lib='ws2_32')

Return to bug 154904

Lines 7-22 Link Here

(-)midori/Makefile (-6 / +13 lines)
7	#	7	#
8		8
9	PORTNAME= midori	9	PORTNAME= midori
10	PORTVERSION= 0.3.0	10	PORTVERSION= 0.3.2
11	CATEGORIES= www xfce	11	CATEGORIES= www xfce
12	MASTER_SITES= ${MASTER_SITE_XFCE}	12	MASTER_SITES= ${MASTER_SITE_XFCE}
13	MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}/	13	MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
14	DIST_SUBDIR= xfce4	14	DIST_SUBDIR= xfce4
15		15
16	MAINTAINER= kwm@FreeBSD.org	16	MAINTAINER= kwm@FreeBSD.org
17	COMMENT= Lightweight web browser using WebKit browser engine	17	COMMENT= Lightweight web browser using WebKit browser engine
18		18
19	LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \	19	LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
20	sqlite3.8:${PORTSDIR}/databases/sqlite3 \	20	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
21	notify.1:${PORTSDIR}/devel/libnotify	21	notify.1:${PORTSDIR}/devel/libnotify
22	BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \	22	BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \
Lines 27-34 Link Here
27		27
28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
29	LDFLAGS="-L${LOCALBASE}/lib"	29	LDFLAGS="-L${LOCALBASE}/lib"
30	CONFIGURE_ARGS+=--disable-unique \	30	CONFIGURE_ARGS+=--disable-libidn \
31	--disable-libidn \
32	--enable-libnotify \	31	--enable-libnotify \
33	--enable-addons \	32	--enable-addons \
34	--jobs=${MAKE_JOBS_NUMBER}	33	--jobs=${MAKE_JOBS_NUMBER}
Lines 49-55 Link Here
49		48
50	OPTIONS= NLS "Enable Native Language support" on \	49	OPTIONS= NLS "Enable Native Language support" on \
51	USERDOCS "Build user documentation" off \	50	USERDOCS "Build user documentation" off \
52	APIDOCS "Build api documentation" off	51	APIDOCS "Build api documentation" off \
		52	UNIQUE "Enable single instance support" off
53		53
54	.include <bsd.port.pre.mk>	54	.include <bsd.port.pre.mk>
55		55
Lines 81-86 Link Here
81	PLIST_SUB+= APIDOCS="@comment "	81	PLIST_SUB+= APIDOCS="@comment "
82	.endif	82	.endif
83		83
		84	.if defined(WITH_UNIQUE)
		85	LIB_DEPENDS+= unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
		86	CONFIGURE_ARGS+=--enable-unique
		87	.else
		88	CONFIGURE_ARGS+=--disable-unique
		89	.endif
		90
84	post-install:	91	post-install:
85	@-update-desktop-database	92	@-update-desktop-database
86	.if defined(WITH_APIDOCS)	93	.if defined(WITH_APIDOCS)

Lines 1-6 Link Here

(-)midori/files/patch-wscript (-3 / +16 lines)
1	--- wscript.orig 2010-05-26 12:34:09.000000000 +0200	1	--- wscript.orig 2011-02-20 00:00:26.000000000 +0100
2	+++ wscript 2010-05-26 12:35:30.000000000 +0200	2	+++ wscript 2011-02-20 10:27:54.000000000 +0100
3	@@ -267,8 +267,7 @@	3	@@ -99,10 +99,9 @@
		4	conf.check_tool ('glib2')
		5
		6	if option_enabled ('userdocs'):
		7	- conf.find_program ('rst2html.py', var='RST2HTML')
		8	- # debian renames the executable, check that as well :(
		9	+ conf.find_program ('rst2html', var='RST2HTML')
		10	if not conf.env['RST2HTML']:
		11	- conf.find_program ('rst2html', var='RST2HTML')
		12	+ conf.find_program ('rst2html.py', var='RST2HTML')
		13	if conf.env['RST2HTML']:
		14	user_docs = 'yes'
		15	else:
		16	@@ -261,8 +260,7 @@
4	if not conf.env['HAVE_UNIQUE']:	17	if not conf.env['HAVE_UNIQUE']:
5	if Options.platform == 'win32':	18	if Options.platform == 'win32':
6	conf.check (lib='ws2_32')	19	conf.check (lib='ws2_32')