diff --git a/www/midori/Makefile b/www/midori/Makefile index b57e4670feba..26969f0d7aaf 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,94 +1,95 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= midori PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= www xfce MASTER_SITES= http://www.midori-browser.org/downloads/ DISTNAME= ${PORTNAME}_${PORTVERSION}_all_ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ valac:${PORTSDIR}/lang/vala LIB_DEPENDS= webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 \ sqlite3:${PORTSDIR}/databases/sqlite3 \ notify:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-addons \ --enable-docs \ --disable-gtk3 \ --jobs=${MAKE_JOBS_NUMBER} MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_PYTHON_BUILD= yes USE_BZIP2= yes USE_GNOME= glib20 gtk20 intltool libxml2 USE_XORG= xscrnsaver INSTALLS_ICONS= yes USE_LDCONFIG= yes USES= desktop-file-utils pkgconfig PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= APIDOCS NLS UNIQUE ZEITGEIST OPTIONS_DEFAULT= NLS UNIQUE APIDOCS_DESC= Build API documentation UNIQUE_DESC= Single instance support ZEITGEIST_DESC= User logs activities .include # WAF needs that CONFIGURE_ENV+= CC="${CC}" .if ${PORT_OPTIONS:MNLS} USES+= gettext PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MAPIDOCS} BUILD_DEPENDS+= gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc CONFIGURE_ARGS+=--enable-apidocs PLIST_SUB+= APIDOCS="" .else CONFIGURE_ARGS+=--disable-apidocs PLIST_SUB+= APIDOCS="@comment " .endif .if ${PORT_OPTIONS:MUNIQUE} LIB_DEPENDS+= unique-1:${PORTSDIR}/x11-toolkits/unique CONFIGURE_ARGS+=--enable-unique .else CONFIGURE_ARGS+=--disable-unique .endif .if ${PORT_OPTIONS:MZEITGEIST} LIB_DEPENDS+= zeitgeist-1:${PORTSDIR}/sysutils/libzeitgeist CONFIGURE_ARGS+=--enable-zeitgeist .else CONFIGURE_ARGS+=--disable-zeitgeist .endif post-install: .if ${PORT_OPTIONS:MAPIDOCS} ${MKDIR} ${DOCSDIR}/api/katze/html ${MKDIR} ${DOCSDIR}/api/midori/html (cd ${WRKSRC}/_build/docs/api/katze/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/katze/html) (cd ${WRKSRC}/_build/docs/api/midori/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/midori/html) .endif .include diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript new file mode 100644 index 000000000000..da84b9e23682 --- /dev/null +++ b/www/midori/files/patch-wscript @@ -0,0 +1,29 @@ +Fix PACKAGE_VERSION in gtk_about_dialog widget. +https://bugs.launchpad.net/midori/+bug/1200903 + +--- ./wscript.orig 2013-07-15 22:38:28.000000000 +0000 ++++ ./wscript 2013-07-21 16:02:48.000000000 +0000 +@@ -29,7 +29,7 @@ + + APPNAME = 'midori' + VERSION = VERSION_FULL = '0.5.4' +-VERSION_SUFFIX = ' (%s)' % VERSION ++#VERSION_SUFFIX = ' (%s)' % VERSION + + try: + if os.path.isdir ('.git'): +@@ -44,8 +44,12 @@ + folder = os.getcwd () + if VERSION in folder: + VERSION_FULL = os.path.basename (folder) +- if VERSION in VERSION_FULL: +- VERSION_SUFFIX = VERSION_FULL.replace (VERSION, '') ++ if VERSION_FULL.endswith ('_all_'): ++ VERSION_FULL = VERSION_FULL.replace('_all_', '') ++ if APPNAME in VERSION_FULL: ++ VERSION_FULL = VERSION_FULL.replace(APPNAME, '')[1:] ++ ++ VERSION_SUFFIX = ' (%s)' % VERSION_FULL + except: + pass +