Attachment #112923 for bug #154422

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

Lines 7-13 Link Here

(-)midori/Makefile (-1 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= midori	9	PORTNAME= midori
10	PORTVERSION= 0.2.9	10	PORTVERSION= 0.3.0
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}/
Lines 45-50 Link Here
45	USE_GETTEXT= yes	45	USE_GETTEXT= yes
46	.endif	46	.endif
47		47
		48	PLIST_SUB= VERSION="${PORTVERSION:R}"
		49
48	OPTIONS= NLS "Enable Native Language support" on \	50	OPTIONS= NLS "Enable Native Language support" on \
49	USERDOCS "Build user documentation" off \	51	USERDOCS "Build user documentation" off \
50	APIDOCS "Build api documentation" off	52	APIDOCS "Build api documentation" off

Lines 1-2 Link Here

(-)midori/distinfo (-2 / +2 lines)
1	SHA256 (xfce4/midori-0.2.9.tar.bz2) = 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78	1	SHA256 (xfce4/midori-0.3.0.tar.bz2) = 56860b2eb2e5f223af0e64d103eef66c4b3574f4ed9a3cfd1ca20844563f0ae7
2	SIZE (xfce4/midori-0.2.9.tar.bz2) = 802627	2	SIZE (xfce4/midori-0.3.0.tar.bz2) = 819092




--- wscript.orig	2011-01-31 02:04:53.000000000 +0100
+++ wscript	2011-01-31 20:12:21.000000000 +0100
@@ -261,8 +261,7 @@
     if not conf.env['HAVE_UNIQUE']:
         if Options.platform == 'win32':
             conf.check (lib='ws2_32')
-        check_pkg ('openssl', mandatory=False)
-        conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1])
+        conf.define ('HAVE_OPENSSL', [0,1][conf.check(header_name='openssl/opensslv.h')])
         conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')])
         conf.check (header_name='sys/wait.h')
         conf.check (header_name='sys/select.h')




bin/midori
etc/xdg/midori/search
include/midori-%%VERSION%%/extensions/history-list.h
lib/midori/libadblock.so
lib/midori/libaddons.so
lib/midori/libcolorful-tabs.so

share/icons/hicolor/scalable/categories/extension.svg
share/icons/hicolor/scalable/status/news-feed.svg
%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ar/LC_MESSAGES/midori.mo
%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
%%NLS%%share/locale/da/LC_MESSAGES/midori.mo

@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm lib/midori
@dirrm include/midori-%%VERSION%%/extensions
@dirrm include/midori-%%VERSION%%
@dirrm etc/xdg/midori
@dirrmtry etc/xdg
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Return to bug 154422

Lines 1-12 Link Here

(-)midori/files/patch-wscript (-4 / +4 lines)
1	--- wscript.orig 2010-05-26 12:34:09.000000000 +0200	1	--- wscript.orig 2011-01-31 02:04:53.000000000 +0100
2	+++ wscript 2010-05-26 12:35:30.000000000 +0200	2	+++ wscript 2011-01-31 20:12:21.000000000 +0100
3	@@ -267,8 +267,7 @@	3	@@ -261,8 +261,7 @@
4	if not conf.env['HAVE_UNIQUE']:	4	if not conf.env['HAVE_UNIQUE']:
5	if Options.platform == 'win32':	5	if Options.platform == 'win32':
6	conf.check (lib='ws2_32')	6	conf.check (lib='ws2_32')
7	- check_pkg ('openssl', mandatory=False)	7	- check_pkg ('openssl', mandatory=False)
8	- conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1])	8	- conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1])
9	+ conf.define ('HAVE_OPENSSL', [0,1][conf.check (header_name='openssl/opensslv.h')])	9	+ conf.define ('HAVE_OPENSSL', [0,1][conf.check(header_name='openssl/opensslv.h')])
10	conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')])	10	conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')])
11	conf.check (header_name='sys/wait.h')	11	conf.check (header_name='sys/wait.h')
12	conf.check (header_name='sys/select.h')	12	conf.check (header_name='sys/select.h')

Lines 1-6 Link Here

(-)midori/pkg-plist (-3 / +4 lines)
1	bin/midori	1	bin/midori
2	etc/xdg/midori/search	2	etc/xdg/midori/search
3	include/midori-0.2/extensions/history-list.h	3	include/midori-%%VERSION%%/extensions/history-list.h
4	lib/midori/libadblock.so	4	lib/midori/libadblock.so
5	lib/midori/libaddons.so	5	lib/midori/libaddons.so
6	lib/midori/libcolorful-tabs.so	6	lib/midori/libcolorful-tabs.so
Lines 93-98 Link Here
93	share/icons/hicolor/scalable/categories/extension.svg	93	share/icons/hicolor/scalable/categories/extension.svg
94	share/icons/hicolor/scalable/status/news-feed.svg	94	share/icons/hicolor/scalable/status/news-feed.svg
95	%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo	95	%%NLS%%share/locale/ast/LC_MESSAGES/midori.mo
		96	%%NLS%%share/locale/ar/LC_MESSAGES/midori.mo
96	%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo	97	%%NLS%%share/locale/ca/LC_MESSAGES/midori.mo
97	%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo	98	%%NLS%%share/locale/cs/LC_MESSAGES/midori.mo
98	%%NLS%%share/locale/da/LC_MESSAGES/midori.mo	99	%%NLS%%share/locale/da/LC_MESSAGES/midori.mo
Lines 157-164 Link Here
157	@dirrm %%DOCSDIR%%	158	@dirrm %%DOCSDIR%%
158	@dirrmtry share/applications	159	@dirrmtry share/applications
159	@dirrm lib/midori	160	@dirrm lib/midori
160	@dirrm include/midori-0.2/extensions	161	@dirrm include/midori-%%VERSION%%/extensions
161	@dirrm include/midori-0.2	162	@dirrm include/midori-%%VERSION%%
162	@dirrm etc/xdg/midori	163	@dirrm etc/xdg/midori
163	@dirrmtry etc/xdg	164	@dirrmtry etc/xdg
164	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true	165	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true