From 2fbc04974c3619da735cc4c19e4b37688869f356 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Tue, 7 Sep 2021 13:00:31 -1000 Subject: [PATCH] devel/msitools: Fix build and minor tweaks PR: 258333 --- devel/msitools/Makefile | 9 ++- devel/msitools/distinfo | 6 +- devel/msitools/pkg-plist | 154 +++++++++++++++++++-------------------- 3 files changed, 88 insertions(+), 81 deletions(-) diff --git a/devel/msitools/Makefile b/devel/msitools/Makefile index 6bc145447d2b0..e69511d0c6d74 100644 --- a/devel/msitools/Makefile +++ b/devel/msitools/Makefile @@ -1,8 +1,12 @@ PORTNAME= msitools -PORTVERSION= 0.101 +DISTVERSION= 0.101 CATEGORIES= devel MASTER_SITES= GNOME +PATCH_SITES= https://gitlab.gnome.org/GNOME/msitools/-/commit/ +PATCHFILES= b08275d549bb12a09a420ef9ccaeb0974e00008a.patch:-p1 \ + 25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch:-p1 + MAINTAINER= romain@FreeBSD.org COMMENT= Inspect and build Windows Installer (.MSI) files @@ -20,8 +24,7 @@ USE_LDCONFIG= yes USE_GNOME= glib20 introspection libxml2 SHEBANG_FILES= tools/msidiff.in \ tools/msidump.in -INSTALL_TARGET= install-strip -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= DISTVERSION=${DISTVERSION} OPTIONS_DEFINE= NLS OPTIONS_SUB= yes diff --git a/devel/msitools/distinfo b/devel/msitools/distinfo index e355b9a42a520..446af309364d6 100644 --- a/devel/msitools/distinfo +++ b/devel/msitools/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1628459283 +TIMESTAMP = 1631000892 SHA256 (msitools-0.101.tar.xz) = 0cc4d2e0d108fa6f2b4085b9a97dd5bc6d9fcadecdd933f2094f86bafdbe85fe SIZE (msitools-0.101.tar.xz) = 594076 +SHA256 (b08275d549bb12a09a420ef9ccaeb0974e00008a.patch) = a37e5823b35fc0f0760bc813ac34baaa5daf1600f0d73381b1af15932ad892e5 +SIZE (b08275d549bb12a09a420ef9ccaeb0974e00008a.patch) = 913 +SHA256 (25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch) = ef088d20c25437f3de94403e3bd2ef8dff49b3075fe391a3463d4975bb7995c0 +SIZE (25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch) = 922 diff --git a/devel/msitools/pkg-plist b/devel/msitools/pkg-plist index 0e9902ac506e5..38b5ffdf549fb 100644 --- a/devel/msitools/pkg-plist +++ b/devel/msitools/pkg-plist @@ -54,80 +54,80 @@ share/gir-1.0/Libmsi-1.0.gir %%NLS%%share/locale/zh_CN/LC_MESSAGES/msitools.mo share/vala/vapi/libmsi-1.0.deps share/vala/vapi/libmsi-1.0.vapi -share/wixl-%%PORTVERSION%%/include/SDL.wxi -share/wixl-%%PORTVERSION%%/include/adwaita-icon-theme.wxi -share/wixl-%%PORTVERSION%%/include/atk.wxi -share/wixl-%%PORTVERSION%%/include/brotli.wxi -share/wixl-%%PORTVERSION%%/include/bzip2.wxi -share/wixl-%%PORTVERSION%%/include/cairo.wxi -share/wixl-%%PORTVERSION%%/include/curl.wxi -share/wixl-%%PORTVERSION%%/include/dlfcn.wxi -share/wixl-%%PORTVERSION%%/include/expat.wxi -share/wixl-%%PORTVERSION%%/include/fontconfig.wxi -share/wixl-%%PORTVERSION%%/include/freetype.wxi -share/wixl-%%PORTVERSION%%/include/fribidi.wxi -share/wixl-%%PORTVERSION%%/include/gcc-c++.wxi -share/wixl-%%PORTVERSION%%/include/gcc.wxi -share/wixl-%%PORTVERSION%%/include/gdk-pixbuf.wxi -share/wixl-%%PORTVERSION%%/include/gettext.wxi -share/wixl-%%PORTVERSION%%/include/glib-networking.wxi -share/wixl-%%PORTVERSION%%/include/glib2.wxi -share/wixl-%%PORTVERSION%%/include/gmp.wxi -share/wixl-%%PORTVERSION%%/include/gnutls.wxi -share/wixl-%%PORTVERSION%%/include/gsm.wxi -share/wixl-%%PORTVERSION%%/include/gstreamer1-plugins-bad-free.wxi -share/wixl-%%PORTVERSION%%/include/gstreamer1-plugins-base.wxi -share/wixl-%%PORTVERSION%%/include/gstreamer1-plugins-good.wxi -share/wixl-%%PORTVERSION%%/include/gstreamer1.wxi -share/wixl-%%PORTVERSION%%/include/gtk-vnc2.wxi -share/wixl-%%PORTVERSION%%/include/gtk2.wxi -share/wixl-%%PORTVERSION%%/include/gtk3.wxi -share/wixl-%%PORTVERSION%%/include/gvnc.wxi -share/wixl-%%PORTVERSION%%/include/harfbuzz.wxi -share/wixl-%%PORTVERSION%%/include/hicolor-icon-theme.wxi -share/wixl-%%PORTVERSION%%/include/icu.wxi -share/wixl-%%PORTVERSION%%/include/jasper.wxi -share/wixl-%%PORTVERSION%%/include/json-glib.wxi -share/wixl-%%PORTVERSION%%/include/libcacard.wxi -share/wixl-%%PORTVERSION%%/include/libepoxy.wxi -share/wixl-%%PORTVERSION%%/include/libffi.wxi -share/wixl-%%PORTVERSION%%/include/libgcrypt.wxi -share/wixl-%%PORTVERSION%%/include/libgovirt.wxi -share/wixl-%%PORTVERSION%%/include/libgpg-error.wxi -share/wixl-%%PORTVERSION%%/include/libidn2.wxi -share/wixl-%%PORTVERSION%%/include/libjpeg-turbo.wxi -share/wixl-%%PORTVERSION%%/include/libogg.wxi -share/wixl-%%PORTVERSION%%/include/libpng.wxi -share/wixl-%%PORTVERSION%%/include/libpsl.wxi -share/wixl-%%PORTVERSION%%/include/libsoup.wxi -share/wixl-%%PORTVERSION%%/include/libssh2.wxi -share/wixl-%%PORTVERSION%%/include/libtasn1.wxi -share/wixl-%%PORTVERSION%%/include/libtheora.wxi -share/wixl-%%PORTVERSION%%/include/libtiff.wxi -share/wixl-%%PORTVERSION%%/include/libunistring.wxi -share/wixl-%%PORTVERSION%%/include/libusbx.wxi -share/wixl-%%PORTVERSION%%/include/libvirt-glib.wxi -share/wixl-%%PORTVERSION%%/include/libvirt.wxi -share/wixl-%%PORTVERSION%%/include/libvorbis.wxi -share/wixl-%%PORTVERSION%%/include/libxml2.wxi -share/wixl-%%PORTVERSION%%/include/nettle.wxi -share/wixl-%%PORTVERSION%%/include/openssl.wxi -share/wixl-%%PORTVERSION%%/include/opus.wxi -share/wixl-%%PORTVERSION%%/include/orc.wxi -share/wixl-%%PORTVERSION%%/include/p11-kit.wxi -share/wixl-%%PORTVERSION%%/include/pango.wxi -share/wixl-%%PORTVERSION%%/include/pcre.wxi -share/wixl-%%PORTVERSION%%/include/pixman.wxi -share/wixl-%%PORTVERSION%%/include/portablexdr.wxi -share/wixl-%%PORTVERSION%%/include/readline.wxi -share/wixl-%%PORTVERSION%%/include/rest.wxi -share/wixl-%%PORTVERSION%%/include/speex.wxi -share/wixl-%%PORTVERSION%%/include/spice-glib.wxi -share/wixl-%%PORTVERSION%%/include/spice-gtk3.wxi -share/wixl-%%PORTVERSION%%/include/sqlite.wxi -share/wixl-%%PORTVERSION%%/include/termcap.wxi -share/wixl-%%PORTVERSION%%/include/usbredir.wxi -share/wixl-%%PORTVERSION%%/include/wavpack.wxi -share/wixl-%%PORTVERSION%%/include/win-iconv.wxi -share/wixl-%%PORTVERSION%%/include/winpthreads.wxi -share/wixl-%%PORTVERSION%%/include/zlib.wxi +share/wixl-%%DISTVERSION%%/include/SDL.wxi +share/wixl-%%DISTVERSION%%/include/adwaita-icon-theme.wxi +share/wixl-%%DISTVERSION%%/include/atk.wxi +share/wixl-%%DISTVERSION%%/include/brotli.wxi +share/wixl-%%DISTVERSION%%/include/bzip2.wxi +share/wixl-%%DISTVERSION%%/include/cairo.wxi +share/wixl-%%DISTVERSION%%/include/curl.wxi +share/wixl-%%DISTVERSION%%/include/dlfcn.wxi +share/wixl-%%DISTVERSION%%/include/expat.wxi +share/wixl-%%DISTVERSION%%/include/fontconfig.wxi +share/wixl-%%DISTVERSION%%/include/freetype.wxi +share/wixl-%%DISTVERSION%%/include/fribidi.wxi +share/wixl-%%DISTVERSION%%/include/gcc-c++.wxi +share/wixl-%%DISTVERSION%%/include/gcc.wxi +share/wixl-%%DISTVERSION%%/include/gdk-pixbuf.wxi +share/wixl-%%DISTVERSION%%/include/gettext.wxi +share/wixl-%%DISTVERSION%%/include/glib-networking.wxi +share/wixl-%%DISTVERSION%%/include/glib2.wxi +share/wixl-%%DISTVERSION%%/include/gmp.wxi +share/wixl-%%DISTVERSION%%/include/gnutls.wxi +share/wixl-%%DISTVERSION%%/include/gsm.wxi +share/wixl-%%DISTVERSION%%/include/gstreamer1-plugins-bad-free.wxi +share/wixl-%%DISTVERSION%%/include/gstreamer1-plugins-base.wxi +share/wixl-%%DISTVERSION%%/include/gstreamer1-plugins-good.wxi +share/wixl-%%DISTVERSION%%/include/gstreamer1.wxi +share/wixl-%%DISTVERSION%%/include/gtk-vnc2.wxi +share/wixl-%%DISTVERSION%%/include/gtk2.wxi +share/wixl-%%DISTVERSION%%/include/gtk3.wxi +share/wixl-%%DISTVERSION%%/include/gvnc.wxi +share/wixl-%%DISTVERSION%%/include/harfbuzz.wxi +share/wixl-%%DISTVERSION%%/include/hicolor-icon-theme.wxi +share/wixl-%%DISTVERSION%%/include/icu.wxi +share/wixl-%%DISTVERSION%%/include/jasper.wxi +share/wixl-%%DISTVERSION%%/include/json-glib.wxi +share/wixl-%%DISTVERSION%%/include/libcacard.wxi +share/wixl-%%DISTVERSION%%/include/libepoxy.wxi +share/wixl-%%DISTVERSION%%/include/libffi.wxi +share/wixl-%%DISTVERSION%%/include/libgcrypt.wxi +share/wixl-%%DISTVERSION%%/include/libgovirt.wxi +share/wixl-%%DISTVERSION%%/include/libgpg-error.wxi +share/wixl-%%DISTVERSION%%/include/libidn2.wxi +share/wixl-%%DISTVERSION%%/include/libjpeg-turbo.wxi +share/wixl-%%DISTVERSION%%/include/libogg.wxi +share/wixl-%%DISTVERSION%%/include/libpng.wxi +share/wixl-%%DISTVERSION%%/include/libpsl.wxi +share/wixl-%%DISTVERSION%%/include/libsoup.wxi +share/wixl-%%DISTVERSION%%/include/libssh2.wxi +share/wixl-%%DISTVERSION%%/include/libtasn1.wxi +share/wixl-%%DISTVERSION%%/include/libtheora.wxi +share/wixl-%%DISTVERSION%%/include/libtiff.wxi +share/wixl-%%DISTVERSION%%/include/libunistring.wxi +share/wixl-%%DISTVERSION%%/include/libusbx.wxi +share/wixl-%%DISTVERSION%%/include/libvirt-glib.wxi +share/wixl-%%DISTVERSION%%/include/libvirt.wxi +share/wixl-%%DISTVERSION%%/include/libvorbis.wxi +share/wixl-%%DISTVERSION%%/include/libxml2.wxi +share/wixl-%%DISTVERSION%%/include/nettle.wxi +share/wixl-%%DISTVERSION%%/include/openssl.wxi +share/wixl-%%DISTVERSION%%/include/opus.wxi +share/wixl-%%DISTVERSION%%/include/orc.wxi +share/wixl-%%DISTVERSION%%/include/p11-kit.wxi +share/wixl-%%DISTVERSION%%/include/pango.wxi +share/wixl-%%DISTVERSION%%/include/pcre.wxi +share/wixl-%%DISTVERSION%%/include/pixman.wxi +share/wixl-%%DISTVERSION%%/include/portablexdr.wxi +share/wixl-%%DISTVERSION%%/include/readline.wxi +share/wixl-%%DISTVERSION%%/include/rest.wxi +share/wixl-%%DISTVERSION%%/include/speex.wxi +share/wixl-%%DISTVERSION%%/include/spice-glib.wxi +share/wixl-%%DISTVERSION%%/include/spice-gtk3.wxi +share/wixl-%%DISTVERSION%%/include/sqlite.wxi +share/wixl-%%DISTVERSION%%/include/termcap.wxi +share/wixl-%%DISTVERSION%%/include/usbredir.wxi +share/wixl-%%DISTVERSION%%/include/wavpack.wxi +share/wixl-%%DISTVERSION%%/include/win-iconv.wxi +share/wixl-%%DISTVERSION%%/include/winpthreads.wxi +share/wixl-%%DISTVERSION%%/include/zlib.wxi