Attachment #106161 for bug #146710

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

Lines 7-38 Link Here

(-)/usr/ports/www/midori/Makefile (-10 / +50 lines)
7	#	7	#
8		8
9	PORTNAME= midori	9	PORTNAME= midori
10	PORTVERSION= 0.2.4	10	PORTVERSION= 0.2.5
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/	12	MASTER_SITES= http://archive.xfce.org/src/%SUBDIR%/
		13	MASTER_SITE_SUBDIR= apps/${PORTNAME}/${PORTVERSION:R}
		14	DIST_SUBDIR= xfce4
13		15
14	MAINTAINER= ahze@FreeBSD.org	16	MAINTAINER= ahze@FreeBSD.org
15	COMMENT= Lightweight web browser using WebKit browser engine	17	COMMENT= Lightweight web browser using WebKit browser engine
16		18
		19	RUN_DEPENDS= python:${PORTSDIR}/lang/python
		20
17	LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \	21	LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 \
18	sqlite3.8:${PORTSDIR}/databases/sqlite3 \	22	notify.1:${PORTSDIR}/devel/libnotify
19	soup-2.4:${PORTSDIR}/devel/libsoup	23
20	BUILD_DEPENDS= python:${PORTSDIR}/lang/python \	24	BUILD_DEPENDS= ${RUN_DEPENDS} \
21	rsvg-convert:${PORTSDIR}/graphics/librsvg2	25	rsvg-convert:${PORTSDIR}/graphics/librsvg2
22		26
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	28	LDFLAGS="-L${LOCALBASE}/lib"
25	CONFIGURE_ARGS+=--disable-unique \	29	CONFIGURE_ARGS+= --prefix=${LOCALBASE} \
26	--jobs=${MAKE_JOBS_NUMBER}	30	--disable-unique \
		31	--disable-libidn \
		32	--enable-sqlite \
		33	--enable-libnotify \
		34	--enable-addons \
		35	--disable-hildon \
27		36
28	MAKE_JOBS_SAFE= yes
29	HAS_CONFIGURE= yes
30	USE_GMAKE= yes
31	USE_BZIP2= yes	37	USE_BZIP2= yes
32	USE_GNOME= glib20 gtk20 intltool libxml2 pkgconfig	38	USE_GNOME= glib20 gtk20 intltool libxml2 pkgconfig
33	INSTALLS_ICONS= yes	39	INSTALLS_ICONS= yes
34	USE_LDCONFIG= yes	40	USE_LDCONFIG= yes
35		41
		42	PLIST_SUB= VERSION="${PORTVERSION:R}"
		43
		44	OPTIONS= NLS "Enable Native Language support" on
		45
36	.include <bsd.port.pre.mk>	46	.include <bsd.port.pre.mk>
37		47
38	# WAF needs that	48	# WAF needs that
Lines 46-49 Link Here
46	PLIST_SUB+= NLS="@comment "	56	PLIST_SUB+= NLS="@comment "
47	.endif	57	.endif
48		58
		59	.if exists(${LOCALBASE}/bin/rst2html)
		60	CONFIGURE_ARGS+= --enable-userdocs \
		61	--enable-apidocs
		62	PLIST_SUB+= DOCUTILS=""
		63	.else
		64	CONFIGURE_ARGS+= --disable-userdocs \
		65	--disable-apidocs
		66	PLIST_SUB+= DOCUTILS="@comment "
		67	.endif
		68
		69	# Support for « external applications » (see ChangeLog) with Vala
		70	.if exists(${LOCALBASE}/bin/valac)
		71	PLIST_SUB+= VALAC=""
		72	.else
		73	PLIST_SUB+= VALAC="@comment "
		74	.endif
		75
		76	do-configure:
		77	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf configure \
		78	${CONFIGURE_ARGS} && ${TRUE}
		79
		80	do-build:
		81	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf build && ${TRUE}
		82
		83	do-install:
		84	@cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} waf install && ${TRUE}
		85
		86	post-install:
		87	@-update-desktop-database
		88
49	.include <bsd.port.post.mk>	89	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/usr/ports/www/midori/distinfo (-3 / +3 lines)
1	MD5 (midori-0.2.4.tar.bz2) = ccd2ae162993c2c92c9e0eac7778c62d	1	MD5 (xfce4/midori-0.2.5.tar.bz2) = 3aeacd04d4d3e5c3bc16824696ff57b2
2	SHA256 (midori-0.2.4.tar.bz2) = 02a2b13e2ca51badae828b0a331af92f09ae3d6a9ab0a56e647544db64f7790f	2	SHA256 (xfce4/midori-0.2.5.tar.bz2) = 88247235f3873d11f00e653adfbcc34b836e188b96b5d8a1c54d4de6fd940f2a
3	SIZE (midori-0.2.4.tar.bz2) = 645554	3	SIZE (xfce4/midori-0.2.5.tar.bz2) = 705277




--- data/search.orig	2009-09-12 00:09:38.000000000 +0200
+++ data/search	2009-10-05 16:37:43.000000000 +0200
@@ -6,6 +6,13 @@
 icon=
 token=g
 
+[FreshPorts]
+name=FreshPorts
+text=The change made to the FreeBSD ports tree
+uri=http://www.freshports.org/search.php?stype=name&method=match&query=%s&num=10&orderby=category&orderbyuptodown=asc&search=Search
+icon=
+token=fp
+
 [Wikipedia]
 name=Wikipedia
 text=The free encyclopedia




--- wscript.orig	2010-03-07 22:23:04.000000000 +0100
+++ wscript	2010-03-15 22:55:02.000000000 +0100
@@ -252,8 +252,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
%%VALAC%%include/midori-%%VERSION%%/extensions/external-applications.h
lib/midori/libadblock.so
lib/midori/libaddons.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
%%VALAC%%lib/midori/libexternal-applications.so
lib/midori/libfeed-panel.so
lib/midori/libformhistory.so
lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
lib/midori/libshortcuts.so
lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
lib/midori/libtab-switcher.so

%%DOCSDIR%%/ChangeLog
%%DOCSDIR%%/EXPAT
%%DOCSDIR%%/README
%%DOCUTILS%%%%DOCSDIR%%/user/midori.html
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/news-feed.png

%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
%%NLS%%share/locale/hr/LC_MESSAGES/midori.mo
%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
%%NLS%%share/locale/it/LC_MESSAGES/midori.mo

%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
%%NLS%%share/locale/no/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pa/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo

%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/res/autosuggestcontrol.css
share/midori/res/autosuggestcontrol.js
share/midori/res/error.html
share/midori/res/logo-shade.png
share/midori/res/mootools.js
share/midori/res/speeddial-head.html
share/midori/res/speeddial.json
%%VALAC%%share/vala/vapi/external-applications.deps
%%VALAC%%share/vala/vapi/external-applications.vapi
%%VALAC%%@dirrmtry share/vala/vapi
%%VALAC%%@dirrmtry share/vala
@dirrm share/midori/res
@dirrm share/midori
@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
@dirrmtry share/icons/hicolor/48x48/status
@dirrmtry share/icons/hicolor/48x48/categories
@dirrmtry share/icons/hicolor/48x48/apps
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor/32x32/status
@dirrmtry share/icons/hicolor/32x32/categories
@dirrmtry share/icons/hicolor/32x32/apps
@dirrmtry share/icons/hicolor/32x32
@dirrmtry share/icons/hicolor/24x24/status
@dirrmtry share/icons/hicolor/24x24/categories
@dirrmtry share/icons/hicolor/24x24/apps
@dirrmtry share/icons/hicolor/24x24
@dirrmtry share/icons/hicolor/22x22/status
@dirrmtry share/icons/hicolor/22x22/categories
@dirrmtry share/icons/hicolor/22x22/apps
@dirrmtry share/icons/hicolor/22x22
@dirrmtry share/icons/hicolor/16x16/status
@dirrmtry share/icons/hicolor/16x16/categories
@dirrmtry share/icons/hicolor/16x16/apps
@dirrmtry share/icons/hicolor/16x16
@exec mkdir -p %D/share/gir-1.0
%%VALAC%%@dirrmtry share/gir-1.0
%%DOCUTILS%%@dirrmtry %%DOCSDIR%%/user
@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm lib/midori
%%VALAC%%@dirrm include/midori-%%VERSION%%/extensions
%%VALAC%%@dirrm include/midori-%%VERSION%%
@dirrm etc/xdg/midori
@dirrmtry etc/xdg
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true

Return to bug 146710

Line 0 Link Here

(-)/usr/ports/www/midori/files/patch-data_search (+16 lines)
	1	--- data/search.orig 2009-09-12 00:09:38.000000000 +0200
	2	+++ data/search 2009-10-05 16:37:43.000000000 +0200
	3	@@ -6,6 +6,13 @@
	4	icon=
	5	token=g
	6
	7	+[FreshPorts]
	8	+name=FreshPorts
	9	+text=The change made to the FreeBSD ports tree
	10	+uri=http://www.freshports.org/search.php?stype=name&method=match&query=%s&num=10&orderby=category&orderbyuptodown=asc&search=Search
	11	+icon=
	12	+token=fp
	13	+
	14	[Wikipedia]
	15	name=Wikipedia
	16	text=The free encyclopedia

Line 0 Link Here

(-)/usr/ports/www/midori/files/patch-wscript (+12 lines)
	1	--- wscript.orig 2010-03-07 22:23:04.000000000 +0100
	2	+++ wscript 2010-03-15 22:55:02.000000000 +0100
	3	@@ -252,8 +252,7 @@
	4	if not conf.env['HAVE_UNIQUE']:
	5	if Options.platform == 'win32':
	6	conf.check (lib='ws2_32')
	7	- check_pkg ('openssl', mandatory=False)
	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')])
	10	conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')])
	11	conf.check (header_name='sys/wait.h')
	12	conf.check (header_name='sys/select.h')

Lines 1-13 Link Here

(-)/usr/ports/www/midori/pkg-plist (-16 / +47 lines)
1	bin/midori	1	bin/midori
2	etc/xdg/midori/search	2	etc/xdg/midori/search
		3	%%VALAC%%include/midori-%%VERSION%%/extensions/external-applications.h
3	lib/midori/libadblock.so	4	lib/midori/libadblock.so
		5	lib/midori/libaddons.so
4	lib/midori/libcolorful-tabs.so	6	lib/midori/libcolorful-tabs.so
5	lib/midori/libcookie-manager.so	7	lib/midori/libcookie-manager.so
		8	%%VALAC%%lib/midori/libexternal-applications.so
6	lib/midori/libfeed-panel.so	9	lib/midori/libfeed-panel.so
7	lib/midori/libformhistory.so	10	lib/midori/libformhistory.so
8	lib/midori/libmouse-gestures.so	11	lib/midori/libmouse-gestures.so
9	lib/midori/libpage-holder.so	12	lib/midori/libpage-holder.so
10	lib/midori/libshortcuts.so	13	lib/midori/libshortcuts.so
		14	lib/midori/libstatus-clock.so
11	lib/midori/libstatusbar-features.so	15	lib/midori/libstatusbar-features.so
12	lib/midori/libtab-panel.so	16	lib/midori/libtab-panel.so
13	lib/midori/libtab-switcher.so	17	lib/midori/libtab-switcher.so
Lines 19-24 Link Here
19	%%DOCSDIR%%/ChangeLog	23	%%DOCSDIR%%/ChangeLog
20	%%DOCSDIR%%/EXPAT	24	%%DOCSDIR%%/EXPAT
21	%%DOCSDIR%%/README	25	%%DOCSDIR%%/README
		26	%%DOCUTILS%%%%DOCSDIR%%/user/midori.html
22	share/icons/hicolor/16x16/apps/midori.png	27	share/icons/hicolor/16x16/apps/midori.png
23	share/icons/hicolor/16x16/categories/extension.png	28	share/icons/hicolor/16x16/categories/extension.png
24	share/icons/hicolor/16x16/status/news-feed.png	29	share/icons/hicolor/16x16/status/news-feed.png
Lines 47-52 Link Here
47	%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo	52	%%NLS%%share/locale/fr/LC_MESSAGES/midori.mo
48	%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo	53	%%NLS%%share/locale/gl/LC_MESSAGES/midori.mo
49	%%NLS%%share/locale/he/LC_MESSAGES/midori.mo	54	%%NLS%%share/locale/he/LC_MESSAGES/midori.mo
		55	%%NLS%%share/locale/hr/LC_MESSAGES/midori.mo
50	%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo	56	%%NLS%%share/locale/hu/LC_MESSAGES/midori.mo
51	%%NLS%%share/locale/id/LC_MESSAGES/midori.mo	57	%%NLS%%share/locale/id/LC_MESSAGES/midori.mo
52	%%NLS%%share/locale/it/LC_MESSAGES/midori.mo	58	%%NLS%%share/locale/it/LC_MESSAGES/midori.mo
Lines 54-59 Link Here
54	%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo	60	%%NLS%%share/locale/ko/LC_MESSAGES/midori.mo
55	%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo	61	%%NLS%%share/locale/nl/LC_MESSAGES/midori.mo
56	%%NLS%%share/locale/no/LC_MESSAGES/midori.mo	62	%%NLS%%share/locale/no/LC_MESSAGES/midori.mo
		63	%%NLS%%share/locale/pa/LC_MESSAGES/midori.mo
57	%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo	64	%%NLS%%share/locale/pl/LC_MESSAGES/midori.mo
58	%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo	65	%%NLS%%share/locale/pt/LC_MESSAGES/midori.mo
59	%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo	66	%%NLS%%share/locale/pt_BR/LC_MESSAGES/midori.mo
Lines 67-89 Link Here
67	%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo	74	%%NLS%%share/locale/uk/LC_MESSAGES/midori.mo
68	%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo	75	%%NLS%%share/locale/zh_CN/LC_MESSAGES/midori.mo
69	%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo	76	%%NLS%%share/locale/zh_TW/LC_MESSAGES/midori.mo
70	%%DATADIR%%/res/autosuggestcontrol.css	77	share/midori/res/autosuggestcontrol.css
71	%%DATADIR%%/res/autosuggestcontrol.js	78	share/midori/res/autosuggestcontrol.js
72	%%DATADIR%%/res/error.html	79	share/midori/res/error.html
73	%%DATADIR%%/res/logo-shade.png	80	share/midori/res/logo-shade.png
74	%%DATADIR%%/res/mootools.js	81	share/midori/res/mootools.js
75	%%DATADIR%%/res/speeddial-head.html	82	share/midori/res/speeddial-head.html
76	%%DATADIR%%/res/speeddial.json	83	share/midori/res/speeddial.json
77	@dirrm %%DATADIR%%/res	84	%%VALAC%%share/vala/vapi/external-applications.deps
78	@dirrm %%DATADIR%%	85	%%VALAC%%share/vala/vapi/external-applications.vapi
79	%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES	86	%%VALAC%%@dirrmtry share/vala/vapi
80	%%NLS%%@dirrmtry share/locale/sr@latin	87	%%VALAC%%@dirrmtry share/vala
81	%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES	88	@dirrm share/midori/res
82	%%NLS%%@dirrmtry share/locale/ast	89	@dirrm share/midori
		90	@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null \|\| true
		91	@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null \|\| true
		92	@dirrmtry share/icons/hicolor/48x48/status
		93	@dirrmtry share/icons/hicolor/48x48/categories
		94	@dirrmtry share/icons/hicolor/48x48/apps
		95	@dirrmtry share/icons/hicolor/48x48
		96	@dirrmtry share/icons/hicolor/32x32/status
		97	@dirrmtry share/icons/hicolor/32x32/categories
		98	@dirrmtry share/icons/hicolor/32x32/apps
		99	@dirrmtry share/icons/hicolor/32x32
		100	@dirrmtry share/icons/hicolor/24x24/status
		101	@dirrmtry share/icons/hicolor/24x24/categories
		102	@dirrmtry share/icons/hicolor/24x24/apps
		103	@dirrmtry share/icons/hicolor/24x24
		104	@dirrmtry share/icons/hicolor/22x22/status
		105	@dirrmtry share/icons/hicolor/22x22/categories
		106	@dirrmtry share/icons/hicolor/22x22/apps
		107	@dirrmtry share/icons/hicolor/22x22
		108	@dirrmtry share/icons/hicolor/16x16/status
		109	@dirrmtry share/icons/hicolor/16x16/categories
		110	@dirrmtry share/icons/hicolor/16x16/apps
		111	@dirrmtry share/icons/hicolor/16x16
		112	@exec mkdir -p %D/share/gir-1.0
		113	%%VALAC%%@dirrmtry share/gir-1.0
		114	%%DOCUTILS%%@dirrmtry %%DOCSDIR%%/user
83	@dirrm %%DOCSDIR%%	115	@dirrm %%DOCSDIR%%
84	@dirrmtry share/applications
85	@dirrm lib/midori	116	@dirrm lib/midori
		117	%%VALAC%%@dirrm include/midori-%%VERSION%%/extensions
		118	%%VALAC%%@dirrm include/midori-%%VERSION%%
86	@dirrm etc/xdg/midori	119	@dirrm etc/xdg/midori
87	@dirrmtry etc/xdg	120	@dirrmtry etc/xdg
88	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
89	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true