Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/www/midori/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/www/midori/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.28 retrieving revision 1.123 diff -u -p -r1.28 -r1.123 --- pkgsrc/www/midori/Makefile 2011/03/11 21:04:52 1.28 +++ pkgsrc/www/midori/Makefile 2019/11/04 22:09:57 1.123 @@ -1,70 +1,41 @@ -# $NetBSD: Makefile,v 1.28 2011/03/11 21:04:52 drochner Exp $ +# $NetBSD: Makefile,v 1.123 2019/11/04 22:09:57 rillig Exp $ -DISTNAME= midori-0.3.2 +DISTNAME= midori-v9.0 +PKGNAME= ${DISTNAME:S/v//} +PKGREVISION= 1 CATEGORIES= www -MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.3/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=midori-browser/} +GITHUB_PROJECT= core +GITHUB_RELEASE= v${PKGVERSION_NOREV} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.twotoasts.de/index.php?/pages/midori_summary.html -COMMENT= Lightweight web browser using WebKit -EXTRACT_SUFX= .tar.bz2 - -HAS_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake intltool msgfmt pkg-config - -PKG_DESTDIR_SUPPORT= user-destdir -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --disable-vala - -REPLACE_PYTHON= waf wscript docs/api/wscript_build -REPLACE_PYTHON+= tests/wscript_build extensions/wscript_build -REPLACE_PYTHON+= icons/wscript_build midori/wscript_build - -BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils -BUILD_DEPENDS+= librsvg>=2.18:../../graphics/librsvg - -DEPENDS+= gnome-themes-[0-9]*:../../x11/gnome-themes - -EGDIR= ${PREFIX}/share/examples/midori -OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori -CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search - -.include "../../mk/bsd.prefs.mk" - -OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so -CONF_FILES+= ${EGDIR}/extensions/libadblock.so/config \ - ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config - -# XXX stupid hack. python has a marshal.h that gets included before -# the local marshal.h -SUBST_CLASSES+= marshal marshal2 -SUBST_STAGE.marshal= pre-configure -SUBST_MESSAGE.marshal= Gross hack (part one) in progress -SUBST_FILES.marshal= midori/midori-locationaction.c midori/midori-panel.c -SUBST_FILES.marshal+= midori/midori-view.c midori/midori-searchaction.c -SUBST_FILES.marshal+= midori/midori-browser.c -SUBST_FILES.marshal+= katze/katze-array.c katze/katze-arrayaction.c -SUBST_SED.marshal= -e 's/"marshal/"marshallocal/' -SUBST_STAGE.marshal2= pre-configure -SUBST_MESSAGE.marshal2= Gross hack (part two) in progress -SUBST_FILES.marshal2= midori/wscript_build -SUBST_SED.marshal2= -e s/\'marshal/\'marshallocal/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://midori-browser.org/ +COMMENT= Lightweight web browser using WebKit +LICENSE= gnu-lgpl-v2.1 +USE_GCC_RUNTIME= yes -pre-configure: - ${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list +USE_CMAKE= yes +USE_TOOLS+= intltool msgfmt pkg-config +BUILDLINK_TRANSFORM+= rm:-Werror + +CONFIGURE_ENV+= VALAC=${VALAC} + +.include "../../archivers/libarchive/buildlink3.mk" +.include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libidn/buildlink3.mk" -.include "../../devel/libsexy/buildlink3.mk" +.include "../../devel/libpeas/buildlink3.mk" +.include "../../graphics/adwaita-icon-theme/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../lang/python/application.mk" -BUILDLINK_API_DEPENDS.libsoup24+=libsoup24>=2.26.0 -.include "../../net/libsoup24/buildlink3.mk" +.include "../../net/libsoup/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../textproc/json-glib/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../www/webkit-gtk/buildlink3.mk" -.include "../../x11/libunique/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.include "../../x11/libXScrnSaver/buildlink3.mk" +.include "../../www/webkit-gtk/buildlink3.mk" +BUILDLINK_DEPMETHOD.vala= build +.include "../../lang/vala/buildlink3.mk" +.include "../../security/gcr/buildlink3.mk" .include "../../mk/bsd.pkg.mk"