ports/154422: [UPDATE] www/midori to 0.3.0

Olivier Duchateau duchateau.olivier at gmail.com
Mon Jan 31 19:50:08 UTC 2011


>Number:         154422
>Category:       ports
>Synopsis:       [UPDATE] www/midori to 0.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 31 19:50:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Olivier Duchateau
>Release:        FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010     root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Announce: http://foo-projects.org/pipermail/xfce/2011-January/028245.html

- Add a PLIST_SUB variable in Makefile, for extensions headers in pkg-plist.

Note: In Mk/bsd.sites.mk, Xfce's mirrors are not up to date, I used Olivier's list (the maintainer of Xfce in ports tree).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/www/midori/Makefile midori/Makefile
--- /usr/ports/www/midori/Makefile	2010-11-14 23:00:44.000000000 +0100
+++ midori/Makefile	2011-01-31 20:21:45.000000000 +0100
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.2.9
+PORTVERSION=	0.3.0
 CATEGORIES=	www xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}/
@@ -45,6 +45,8 @@
 USE_GETTEXT=	yes
 .endif
 
+PLIST_SUB=	VERSION="${PORTVERSION:R}"
+
 OPTIONS=	NLS "Enable Native Language support" on \
 		USERDOCS "Build user documentation" off \
 		APIDOCS "Build api documentation" off
diff -urN /usr/ports/www/midori/distinfo midori/distinfo
--- /usr/ports/www/midori/distinfo	2010-11-14 23:00:44.000000000 +0100
+++ midori/distinfo	2011-01-31 20:21:39.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.2.9.tar.bz2) = 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
-SIZE (xfce4/midori-0.2.9.tar.bz2) = 802627
+SHA256 (xfce4/midori-0.3.0.tar.bz2) = 56860b2eb2e5f223af0e64d103eef66c4b3574f4ed9a3cfd1ca20844563f0ae7
+SIZE (xfce4/midori-0.3.0.tar.bz2) = 819092
diff -urN /usr/ports/www/midori/files/patch-wscript midori/files/patch-wscript
--- /usr/ports/www/midori/files/patch-wscript	2010-05-28 10:10:54.000000000 +0200
+++ midori/files/patch-wscript	2011-01-31 20:22:05.000000000 +0100
@@ -1,12 +1,12 @@
---- wscript.orig	2010-05-26 12:34:09.000000000 +0200
-+++ wscript	2010-05-26 12:35:30.000000000 +0200
-@@ -267,8 +267,7 @@
+--- 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_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')
diff -urN /usr/ports/www/midori/pkg-plist midori/pkg-plist
--- /usr/ports/www/midori/pkg-plist	2010-11-14 23:00:44.000000000 +0100
+++ midori/pkg-plist	2011-01-31 20:21:51.000000000 +0100
@@ -1,6 +1,6 @@
 bin/midori
 etc/xdg/midori/search
-include/midori-0.2/extensions/history-list.h
+include/midori-%%VERSION%%/extensions/history-list.h
 lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
@@ -93,6 +93,7 @@
 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
@@ -157,8 +158,8 @@
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm lib/midori
- at dirrm include/midori-0.2/extensions
- at dirrm include/midori-0.2
+ at dirrm include/midori-%%VERSION%%/extensions
+ at dirrm include/midori-%%VERSION%%
 @dirrm etc/xdg/midori
 @dirrmtry etc/xdg
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list