Re: list broken homepages
Daniel Jakots writes: > Hi, > > I wrote a script [1] to check the HOMEPAGEs. It uses sqlports so > there's some lag: some HOMEPAGE may have already been fixed (like php). ... > Do you think sending this output to ports@ regularly (like once a month) > would be a good thing? Any other opinions? Sending automated output regularly to the list is iffy. Bulk build failures are very important, and because most people don't run unusual architectures or have the infrastructure to run a bulk those emails serve an important purpose. Fixing broken homepages is worthwhile, but I don't think it's important enough to send script output to the list, especially repeatedly, when anyone interested can run the script on any machine at any time.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2019/01/05 22:38:23 Modified files: productivity/tryton/5.0/account: Makefile distinfo productivity/tryton/5.0/account_deposit: Makefile distinfo productivity/tryton/5.0/account_payment_clearing: Makefile distinfo productivity/tryton/5.0/sale_shipment_cost: Makefile distinfo productivity/tryton/5.0/sao: Makefile distinfo productivity/tryton/5.0/sao/files: sao-dependencies.sh productivity/tryton/5.0/stock: Makefile distinfo productivity/tryton/5.0/tryton: Makefile distinfo productivity/tryton/5.0/trytond: Makefile distinfo Log message: maintenance update for 5.0 branch of productivity/tryton "reads good" danj@
Re: [M. UPDATE] print/lyx 2.3.1 -> 2.3.2
On Sat, 5 Jan 2019 15:03:38 -0300, "Elias M. Mariani" wrote: > Changelog: > https://www.lyx.org/announce/2_3_2.txt > Mostly bugfixes. > > amd64: > Build => OK > Run => OK > > Comments ? OK ? > Elias. ok danj@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/05 16:19:26 Modified files: lang/php/7.1 : Makefile lang/php/7.2 : Makefile lang/php : Makefile.inc Log message: switch HOMEPAGE for php ports to https://secure.php.net/ https://www.php.net/ isn't reliably working across the various servers hosting the site as reported by danj@ (e.g. at least one instance has a certificate with CN=ilia.ws, and some don't seem to have port 443 open at all).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2019/01/05 16:09:44 Modified files: net: Makefile Log message: +msdl
Re: CVS: cvs.openbsd.org: ports
On 2019/01/03 06:36, Antoine Jacoutot wrote: > CVSROOT: /cvs > Module name: ports > Changes by: ajacou...@cvs.openbsd.org 2019/01/03 06:36:23 > > Modified files: > x11/gnome/gvfs : Makefile distinfo > x11/gnome/gvfs/pkg: PLIST-main > Removed files: > x11/gnome/gvfs/patches: patch-codegen_py > patch-common_meson_build > patch-meson_build > patch-metadata_meson_build > > Log message: > Update to gvfs-1.38.1. > Build fails on ld.bfd arches: FAILED: metadata/gvfsd-metadata cc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata@exe/meta-daemon.c.o' -L/usr/local/lib -Wl,--as-needed -O2 -pipe -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /usr/local/lib/libgio-2.0.so.4200.8 /usr/local/lib/libgobject-2.0.so.4200.8 /usr/local/lib/libglib-2.0.so.4201.1 /usr/local/lib/libintl.so.6.0 -Wl,--end-group -Wl,-z,origin '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/usr/obj/ports/gvfs-1.38.1-no_smb-no_goa-no_nfs-no_google-bootstrap/build-i386-no_smb-no_goa-no_nfs-no_google-bootstrap/common:/usr/obj/ports/gvfs-1.38.1-no_smb-no_goa-no_nfs-no_google-bootstrap/build-i386-no_smb-no_goa-no_nfs-no_google-bootstrap/metadata /usr/local/lib/libgio-2.0.so.4200.8: warning: strcpy() is almost always misused, please use strlcpy() /usr/local/lib/libglib-2.0.so.4201.1: warning: stpcpy() is dangerous; do not use it /usr/local/lib/libglib-2.0.so.4201.1: warning: vsprintf() is often misused, please use vsnprintf() /usr/local/lib/libgobject-2.0.so.4200.8: warning: strcat() is almost always misused, please use strlcat() /usr/local/lib/libglib-2.0.so.4201.1: warning: sprintf() is often misused, please use snprintf() metadata/libmetadata.a(metatree.c.o): In function `safe_open': metatree.c:(.text+0x3ec4): undefined reference to `gvfs_randomize_string' cc: error: linker command failed with exit code 1 (use -v to see invocation) ninja: build stopped: subcommand failed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2019/01/05 16:06:38 Added files: net/msdl : Makefile distinfo net/msdl/patches: patch-src_url_c patch-src_url_h net/msdl/pkg : DESCR PLIST Log message: Initial commit, ok by landry@
Re: CVS: cvs.openbsd.org: ports
On 2018/12/22 05:17, Robert Nagy wrote: > CVSROOT: /cvs > Module name: ports > Changes by: rob...@cvs.openbsd.org 2018/12/22 05:17:49 > > Modified files: > mail/kopano: Makefile.inc > mail/kopano/core: Makefile distinfo > mail/kopano/core/pkg: PLIST-main > > Log message: > update to 8.7.80.355 > Build fails on ld.bfd arches: /usr/local/bin/libtool --tag=CXX --mode=link c++ -Wall -Wmissing-declarations -std=c++14 -Wno-variadic-macros -O2 -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wno-sign-compare -O2 -pipe -o tests/zcpmd5 tests/zcpmd5.o -lcrypto libkcutil.la libtool: link: c++ -Wall -Wmissing-declarations -std=c++14 -Wno-variadic-macros -O2 -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -Wno-sign-compare -O2 -pipe -o tests/.libs/zcpmd5 tests/zcpmd5.o -L./.libs -lkcutil -L/usr/local/lib -lpthread -lcurl -lnghttp2 -lz -licui18n -licuuc -licudata -ljsoncpp -lHX -lssl -lcrypto -pthread -Wl,-rpath,/usr/local/lib ./.libs/libkcutil.so.0.0: warning: strcpy() is almost always misused, please use strlcpy() /usr/local/lib/libHX.so.0.0: warning: rand() may return deterministic values, is that what you want? /usr/local/lib/libicui18n.so.14.0: warning: strcat() is almost always misused, please use strlcat() /usr/local/lib/libcurl.so.25.19: warning: sprintf() is often misused, please use snprintf() ./.libs/libkcutil.so.0.0: undefined reference to `libiconv_open' ./.libs/libkcutil.so.0.0: undefined reference to `libiconv_close' ./.libs/libkcutil.so.0.0: undefined reference to `libintl_bind_textdomain_codeset' ./.libs/libkcutil.so.0.0: undefined reference to `libintl_dcgettext' ./.libs/libkcutil.so.0.0: undefined reference to `libiconv' c++: error: linker command failed with exit code 1 (use -v to see invocation) gmake[2]: Leaving directory '/usr/obj/ports/kopanocore-8.7.80.355/kopanocore-8.7.80.355'
Re: CVS: cvs.openbsd.org: ports
On 2019/01/02 14:30, Landry Breuil wrote: > CVSROOT: /cvs > Module name: ports > Changes by: lan...@cvs.openbsd.org 2019/01/02 14:30:48 > > Modified files: > audio/ncmpc: Makefile distinfo > audio/ncmpc/patches: patch-doc_meson_build patch-src_screen_cxx > audio/ncmpc/pkg: PLIST > Added files: > audio/ncmpc/patches: patch-src_ProgressBar_cxx >patch-src_StatusBar_cxx >patch-src_TitleBar_cxx >patch-src_screen_init_cxx > Removed files: > audio/ncmpc/patches: patch-src_colors_cxx > > Log message: > Update to ncmpc 0.33. > > Maintainer timeout.. > Build fails on ld.bfd arches, test on amd64 with "make USE_LLD=No" if you have current infrastructure. -- [58/70] c++ -o test/run_hscroll 'test/9f86d08@@run_hscroll@exe/run_hscroll.cxx.o' 'ncmpc@exe/src_BasicMarquee.cxx.o' 'ncmpc@exe/src_util_LocaleString.cxx.o' -L/usr/local/lib -Wl,--as-needed -O2 -pipe -Wl,--start-group -lintl -Wl,--end- group FAILED: test/run_hscroll c++ -o test/run_hscroll 'test/9f86d08@@run_hscroll@exe/run_hscroll.cxx.o' 'ncmpc@exe/src_BasicMarquee.cxx.o' 'ncmpc@e xe/src_util_LocaleString.cxx.o' -L/usr/local/lib -Wl,--as-needed -O2 -pipe -Wl,--start-group -lintl -Wl,--end-group /usr/bin/../lib/libc++abi.so.0.1: undefined reference to `pthread_rwlock_rdlock' /usr/bin/../lib/libc++.so.2.0: undefined reference to `pthread_mutexattr_destroy' /usr/bin/../lib/libc++abi.so.0.1: undefined reference to `pthread_rwlock_unlock' /usr/bin/../lib/libc++.so.2.0: undefined reference to `pthread_detach' /usr/bin/../lib/libc++abi.so.0.1: undefined reference to `pthread_rwlock_wrlock' /usr/bin/../lib/libc++.so.2.0: undefined reference to `pthread_mutexattr_settype' /usr/bin/../lib/libc++.so.2.0: undefined reference to `pthread_mutexattr_init' /usr/bin/../lib/libc++.so.2.0: undefined reference to `pthread_join' c++: error: linker command failed with exit code 1 (use -v to see invocation) ninja: build stopped: subcommand failed. *** Error 1 in audio/ncmpc (/usr/ports/devel/meson/meson.port.mk:51 'do-build') --
Re: CVS: cvs.openbsd.org: ports
On 2018/12/24 10:03, Pascal Stumpf wrote: > CVSROOT: /cvs > Module name: ports > Changes by: pas...@cvs.openbsd.org 2018/12/24 10:03:03 > > Modified files: > games/hedgewars: Makefile distinfo > games/hedgewars/pkg: PLIST-main PLIST-server > > Log message: > Update to hedgewars 0.9.25. > Build failed for me: -- [22/390] /usr/obj/ports/hedgewars-src-0.9.25/bin/clang -I/usr/local/include -I/usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl -I/usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/misc/libphyslayer -I/usr/local/include/lua-5.1 -O2 -pipe -fPIC -fstack-protector-all -fstack-protector -fvisibility=hidden -Wall -pipe -DNDEBUG -O2 -MD -MT project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o -MF project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o.d -o project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o -c /usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl/fileio.c FAILED: project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o /usr/obj/ports/hedgewars-src-0.9.25/bin/clang -I/usr/local/include -I/usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl -I/usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/misc/libphyslayer -I/usr/local/include/lua-5.1 -O2 -pipe -fPIC -fstack-protector-all -fstack-protector -fvisibility=hidden -Wall -pipe -DNDEBUG -O2 -MD -MT project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o -MF project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o.d -o project_files/hwc/rtl/CMakeFiles/fpcrtl.dir/fileio.c.o -c /usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl/fileio.c In file included from /usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl/fileio.c:5: In file included from /usr/obj/ports/hedgewars-src-0.9.25/hedgewars-src-0.9.25/project_files/hwc/rtl/misc.h:11: /usr/local/include/GL/glew.h:1205:14: fatal error: 'GL/glu.h' file not found #include ^~ 1 error generated. ninja: build stopped: subcommand failed. -- Full log below. >>> Building on i386-2 under games/hedgewars,-main BDEPENDS = [lang/ghc;security/hs-entropy;devel/sdl2-mixer;devel/sdl2-image;graphics/freeglut;devel/hs-vector;x11/qt5/qttools,-main;devel/hs-utf8-string;x11/qt5/qtbase,-main;devel/sdl2-net;devel/hs-regex-tdfa;devel/ninja;devel/sdl2-ttf;devel/hs-sandi;devel/physfs;security/hs-SHA;archivers/hs-zlib;textproc/hs-bytestring-show;devel/cmake;devel/hs-hslogger;devel/hs-random;lang/lua/5.1;converters/libiconv;devel/hs-network;lang/fpc;archivers/bzip2] DIST = [games/hedgewars,-server:hedgewars-src-0.9.25.tar.bz2] FULLPKGNAME = hedgewars-0.9.25 RDEPENDS = [devel/sdl2-ttf;devel/physfs;graphics/freeglut;devel/sdl2-image;devel/sdl2-mixer;devel/sdl2-net;x11/qt5/qtbase,-main;lang/lua/5.1] (Junk lock obtained for i386-2 at 1546690107) >>> Running depends in games/hedgewars,-main at 1546690107 last junk was in textproc/pear-File-Find /usr/sbin/pkg_add -aI -Drepair bzip2-1.0.6p9 cmake-3.10.2p1v0 fpc-3.0.4p0 freeglut-3.0.0 ghc-8.2.2p2 hs-SHA-1.6.4.2p3 hs-bytestring-show-0.3.5.6p4 hs-entropy-0.2.1p7 hs-hslogger-1.2.10p1 hs-network-2.6.2.1p3 hs-random-1.1p3 hs-regex-tdfa-1.2.1p2 hs-sandi-0.4.1p0 hs-utf8-string-1.0.1.1p3 hs-vector-0.12.0.1 hs-zlib-0.5.4.2p3 lua-5.1.5p6 ninja-1.8.2p0 physfs-3.0.1p0 qtbase-5.9.7p1 qttools-5.9.7 sdl2-image-2.0.3 sdl2-mixer-2.0.2 sdl2-net-2.0.1p0 sdl2-ttf-2.0.14p0 was: /usr/sbin/pkg_add -aI -Drepair bzip2-1.0.6p9 cmake-3.10.2p1v0 fpc-3.0.4p0 freeglut-3.0.0 ghc-8.2.2p2 hs-SHA-1.6.4.2p3 hs-bytestring-show-0.3.5.6p4 hs-entropy-0.2.1p7 hs-hslogger-1.2.10p1 hs-network-2.6.2.1p3 hs-random-1.1p3 hs-regex-tdfa-1.2.1p2 hs-sandi-0.4.1p0 hs-utf8-string-1.0.1.1p3 hs-vector-0.12.0.1 hs-zlib-0.5.4.2p3 libiconv-1.14p3 lua-5.1.5p6 ninja-1.8.2p0 physfs-3.0.1p0 qtbase-5.9.7p1 qttools-5.9.7 sdl2-image-2.0.3 sdl2-mixer-2.0.2 sdl2-net-2.0.1p0 sdl2-ttf-2.0.14p0 /usr/sbin/pkg_add -aI -Drepair bzip2-1.0.6p9 cmake-3.10.2p1v0 fpc-3.0.4p0 freeglut-3.0.0 ghc-8.2.2p2 hs-SHA-1.6.4.2p3 hs-bytestring-show-0.3.5.6p4 hs-entropy-0.2.1p7 hs-hslogger-1.2.10p1 hs-network-2.6.2.1p3 hs-random-1.1p3 hs-regex-tdfa-1.2.1p2 hs-sandi-0.4.1p0 hs-utf8-string-1.0.1.1p3 hs-vector-0.12.0.1 hs-zlib-0.5.4.2p3 lua-5.1.5p6 ninja-1.8.2p0 physfs-3.0.1p0 qtbase-5.9.7p1 qttools-5.9.7 sdl2-image-2.0.3 sdl2-mixer-2.0.2 sdl2-net-2.0.1p0 sdl2-ttf-2.0.14p0 SHA-1.6.4.2: Warning: library-dirs: /usr/local/lib/i386-openbsd-ghc-8.2.2 doesn't exist or isn't a directory bytestring-show-0.3.5.6: Warning: library-dirs: /usr/local/lib/i386-openbsd-ghc-8.2.2 doesn't exist or isn't a directory entropy-0.2.1: Warning: library-dirs: /usr/local/lib/i386-openbsd-ghc-8.2.2 doesn't exist or isn't a directory network-2.6.2.1: Warning: library-dirs: /usr/local/lib/i386-openbsd-ghc-8.2.2 doesn't exist or isn't a directory hslogger-1.2.10: Warning: library-dirs:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2019/01/05 15:56:20 Modified files: www/drupal7: drupal7.port.mk www/drupal7/CKeditor: Makefile www/drupal7/abt: Makefile www/drupal7/alternate_login: Makefile www/drupal7/auto_nodetitle: Makefile www/drupal7/backup_migrate: Makefile www/drupal7/colorbox: Makefile www/drupal7/compact_forms: Makefile www/drupal7/content_access: Makefile www/drupal7/core7: Makefile www/drupal7/ctools: Makefile www/drupal7/date: Makefile www/drupal7/devel: Makefile www/drupal7/disable_messages: Makefile www/drupal7/entity: Makefile www/drupal7/genpass: Makefile www/drupal7/globalredirect: Makefile www/drupal7/google_analytics: Makefile www/drupal7/jquery_plugin: Makefile www/drupal7/locale-fr: Makefile www/drupal7/locale-nl: Makefile www/drupal7/masquerade: Makefile www/drupal7/nodeaccess_userreference: Makefile www/drupal7/nodesinblock: Makefile www/drupal7/pathauto: Makefile www/drupal7/printer-friendly: Makefile www/drupal7/references: Makefile www/drupal7/rules: Makefile www/drupal7/scheduler: Makefile www/drupal7/schema: Makefile www/drupal7/securelogin: Makefile www/drupal7/slideshow_creator: Makefile www/drupal7/theme-adaptivetheme: Makefile www/drupal7/theme-atcommerce: Makefile www/drupal7/theme-danland: Makefile www/drupal7/theme-newsflash: Makefile www/drupal7/token: Makefile www/drupal7/ubercart: Makefile www/drupal7/user_readonly: Makefile www/drupal7/views: Makefile www/drupal7/webform: Makefile Log message: Fix HOMEPAGE (http; vs http:) and bump ok PLIST_DB (via sthen@)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2019/01/05 15:52:22 ports/net/msdl Update of /cvs/ports/net/msdl In directory cvs.openbsd.org:/tmp/cvs-serv84862/msdl Log Message: Directory /cvs/ports/net/msdl added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2019/01/05 15:52:44 ports/net/msdl/pkg Update of /cvs/ports/net/msdl/pkg In directory cvs.openbsd.org:/tmp/cvs-serv62732/pkg Log Message: Directory /cvs/ports/net/msdl/pkg added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2019/01/05 15:52:44 ports/net/msdl/patches Update of /cvs/ports/net/msdl/patches In directory cvs.openbsd.org:/tmp/cvs-serv62732/patches Log Message: Directory /cvs/ports/net/msdl/patches added to the repository
Re: gmake bug triggered by net/munin
On 2019-01-05, Christian Weisgerber wrote:
> The net/munin port triggers a bug in gmake. [...]
Found it (read.c):
p = value;
while ((name = find_next_token ((const char **), )) != 0)
{
if (*p != '\0')
*p++ = '\0';
eval_makefile (name, RM_NO_DEFAULT_GOAL|RM_INCLUDED|RM_DONTCARE);
}
free (value);
The "name" pointer is stored away in eval_makefile(), and when a
later error routine outputs the string, that memory has already
been freed. Basically, a missing strdup().
Turns out the upstream git repository already had a fix.
--
Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/01/05 15:20:18 Modified files: net/munin : Makefile Log message: no longer BROKEN; the gmake bug has been fixed
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2019/01/05 15:19:17 Modified files: devel/gmake: Makefile Added files: devel/gmake/patches: patch-read_c Log message: Fix a use-after-free bug that caused regular segfaults on i386 when building net/munin.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2019/01/05 15:08:11 Modified files: lang/gcc/8 : distinfo Makefile lang/gcc/8/pkg : PFRAG.powerpc-main Log message: Update powerpc bootstrap and plist.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/05 15:00:20 Modified files: devel/glib2: Makefile Added files: devel/glib2/patches: patch-meson_build Log message: unbreak some glib2 users on 32-bit arches, ok aja@ The old autoconf build has the following additional check after determining a valid type for gsize, which is not present in meson.build.: dnl If int/long are the same size, we see which one produces dnl warnings when used in the location as size_t. (This matters dnl on AIX with xlc) dnl AS_IF([test $ac_cv_sizeof_size_t = $ac_cv_sizeof_int && test $ac_cv_sizeof_size_t = $ac_cv_sizeof_long], It matters on OpenBSD too. Since my meson-fu is lacking, the patch simply reorders the if statement to put the one we need earlier.
[UPDATE] textproc/p5-List-UtilsBy 0.10 -> 0.11
I'm proposing an update for List::UtilsBy that will fix the build with Perl 5.28. What's new upstream [1]: - Added 'minmax_by' - Fix build without '.' in @INC What's new in the port: - Enabled Pod testing Testing: - 'make test' passes - There are 2 consumers, converters/p5-Convert-Color and www/rt. No new failures are introduced by this update [2]. Charlène. [1] https://metacpan.org/changes/release/PEVANS/List-UtilsBy-0.11 [2] https://transfer.sh/OJx85/p5-List-UtilsBy.tgz Index: Makefile === RCS file: /cvs/ports/textproc/p5-List-UtilsBy/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile20 Mar 2016 19:57:06 - 1.6 +++ Makefile5 Jan 2019 19:58:34 - @@ -4,12 +4,14 @@ COMMENT= higher-order list utility func MODULES= cpan PKG_ARCH= * -DISTNAME = List-UtilsBy-0.10 +DISTNAME = List-UtilsBy-0.11 CATEGORIES=textproc # Perl PERMIT_PACKAGE_CDROM= Yes CONFIGURE_STYLE= modbuild + +MAKE_ENV +=TEST_POD=Yes .include Index: distinfo === RCS file: /cvs/ports/textproc/p5-List-UtilsBy/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo14 Aug 2015 15:02:12 - 1.4 +++ distinfo5 Jan 2019 19:58:34 - @@ -1,2 +1,2 @@ -SHA256 (List-UtilsBy-0.10.tar.gz) = vtdAlMYlqjSlrpSn4f4YVvCOG9Jri6FSv+elHTJ3GS4= -SIZE (List-UtilsBy-0.10.tar.gz) = 21845 +SHA256 (List-UtilsBy-0.11.tar.gz) = +t30O0vCHbjkwOiaJuXyP+YmzeNJHsZRtqozhif1d1o= +SIZE (List-UtilsBy-0.11.tar.gz) = 22939
update: productivity/tryton/5.0: maintenance update
Hi, Maintenance update for 5.0 branch of productivity/tryton. - tryton: update to 5.0.4 - trytond: update to 5.0.3 - sao: update to 5.0.2 (+ regen sao-dependencies with latest c3 update) - account: update to 5.0.3 - account_deposit: update to 5.0.1 - account_payment_clearing: update to 5.0.1 - sale_shipment_cost: update to 5.0.1 - stock: update to 5.0.2 All ports tested on amd64. Comments or OK ? -- Sebastien Marie Index: account/Makefile === RCS file: /cvs/ports/productivity/tryton/5.0/account/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- account/Makefile3 Dec 2018 12:51:22 - 1.2 +++ account/Makefile5 Jan 2019 19:13:58 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.2 2018/12/03 12:51:22 semarie Exp $ -MODPY_EGG_VERSION =5.0.2 +MODPY_EGG_VERSION =5.0.3 TRYTON_MODULE =account TRYTON_DEPENDS += party \ Index: account/distinfo === RCS file: /cvs/ports/productivity/tryton/5.0/account/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- account/distinfo3 Dec 2018 12:51:22 - 1.2 +++ account/distinfo5 Jan 2019 19:13:58 - @@ -1,2 +1,2 @@ -SHA256 (tryton/trytond_account-5.0.2.tar.gz) = 1QrJSkq5pRkJJlSCduTOTF/SzZiL3LMFwe3if9djiKU= -SIZE (tryton/trytond_account-5.0.2.tar.gz) = 398729 +SHA256 (tryton/trytond_account-5.0.3.tar.gz) = z8xnfXCXbbuOUPfOnz1LiCL4fdArXG5nmEvDSVcDXC0= +SIZE (tryton/trytond_account-5.0.3.tar.gz) = 398910 Index: account_deposit/Makefile === RCS file: /cvs/ports/productivity/tryton/5.0/account_deposit/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- account_deposit/Makefile3 Dec 2018 12:28:19 - 1.1.1.1 +++ account_deposit/Makefile5 Jan 2019 19:13:58 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.1.1.1 2018/12/03 12:28:19 semarie Exp $ -MODPY_EGG_VERSION =5.0.0 +MODPY_EGG_VERSION =5.0.1 TRYTON_MODULE =account_deposit TRYTON_DEPENDS += account \ Index: account_deposit/distinfo === RCS file: /cvs/ports/productivity/tryton/5.0/account_deposit/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- account_deposit/distinfo3 Dec 2018 12:28:19 - 1.1.1.1 +++ account_deposit/distinfo5 Jan 2019 19:13:58 - @@ -1,2 +1,2 @@ -SHA256 (tryton/trytond_account_deposit-5.0.0.tar.gz) = 1ocFucJ6yr4KZdoGLCZKKjfRYxAr/oW92pL+9wkwBcQ= -SIZE (tryton/trytond_account_deposit-5.0.0.tar.gz) = 27307 +SHA256 (tryton/trytond_account_deposit-5.0.1.tar.gz) = 895Qv40e5N0jHitfbsoAqZQRbjoO8c3rmT2WOekrQBQ= +SIZE (tryton/trytond_account_deposit-5.0.1.tar.gz) = 27411 Index: account_payment_clearing/Makefile === RCS file: /cvs/ports/productivity/tryton/5.0/account_payment_clearing/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- account_payment_clearing/Makefile 3 Dec 2018 12:28:19 - 1.1.1.1 +++ account_payment_clearing/Makefile 5 Jan 2019 19:13:58 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.1.1.1 2018/12/03 12:28:19 semarie Exp $ -MODPY_EGG_VERSION =5.0.0 +MODPY_EGG_VERSION =5.0.1 TRYTON_MODULE =account_payment_clearing TRYTON_DEPENDS += account_payment Index: account_payment_clearing/distinfo === RCS file: /cvs/ports/productivity/tryton/5.0/account_payment_clearing/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- account_payment_clearing/distinfo 3 Dec 2018 12:28:19 - 1.1.1.1 +++ account_payment_clearing/distinfo 5 Jan 2019 19:13:58 - @@ -1,2 +1,2 @@ -SHA256 (tryton/trytond_account_payment_clearing-5.0.0.tar.gz) = 0H+scmbdT84MwM2495Uf5ORW9Ec17PEO+NjzWVe8I8Q= -SIZE (tryton/trytond_account_payment_clearing-5.0.0.tar.gz) = 28728 +SHA256 (tryton/trytond_account_payment_clearing-5.0.1.tar.gz) = 8PYT/msYv+q/uHEWQ6qCxjvX5R4DKLVsfgpBBOUYp+Y= +SIZE (tryton/trytond_account_payment_clearing-5.0.1.tar.gz) = 28751 Index: sale_shipment_cost/Makefile === RCS file: /cvs/ports/productivity/tryton/5.0/sale_shipment_cost/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- sale_shipment_cost/Makefile 19 Dec 2018 08:27:19 - 1.1.1.1 +++ sale_shipment_cost/Makefile 5 Jan 2019 19:13:58 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.1.1.1 2018/12/19 08:27:19 semarie Exp $ -MODPY_EGG_VERSION =5.0.0 +MODPY_EGG_VERSION =5.0.1 TRYTON_MODULE =sale_shipment_cost TRYTON_DEPENDS += account_invoice \ Index: sale_shipment_cost/distinfo === RCS file:
Re: [NEW] x11/jgmenu with fixes
I forwarded the xsettingsd bug to upstream and this commit resulted https://github.com/johanmalm/jgmenu/commit/38e4e11a15fc2f2ac24ce2bae0f19754a175cd66 When upstream releases, I'll update the cleaned up version. On Jan 02, 2019: 14:26, Stuart Henderson wrote: On 2019/01/01 13:29, Heppler, J. Scott wrote: Attached is the latest release of jgmenu. Upstream addressed multiple issues that Stuart Henderson brought up and now tests on their own install of OpenBSD. https://marc.info/?l=openbsd-ports=154275564823284=2 I started a new thread as the port version and pkg/README were updated. In x11/openbox, I've tested lx and ob menu generation. pmenu, lx and xdg work in the base fvwm, cwm and twm. ff-bookmarks also worked but may be removed upstream in the future. Additional testing, comments and consideration for adding to ports appreciated. -- J. Scott Heppler Cleaned up version attached. "jgmenu init" uses gnu-specific tar things so I've added it as a dependency. This one is OK sthen@ if somebody would like to import it. There is still a coredump if I have xsettingsd running with my usual config: $ cat .xsettingsd Net/ThemeName "Adwaita" but that's probably uncommon enough that I don't think it should block import. -- J. Scott Heppler
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/05 11:41:46 Modified files: productivity/gnucash: Makefile distinfo Log message: Fix gnucash-docs DISTFILE. reported by naddy@ and kili@
Re: [UPDATE] security/p5-Crypt-OpenSSL-X509 1.807 -> 1.812
On Sat, 5 Jan 2019 17:55:51 +0100
Charlene Wendling wrote:
> Hi ports,
>
> Here is an update for Crypt::OpenSSL::X509 that will fix the build
> with our future Perl 5.28.
>
> Upstream changes are mostly to fix compilation on various systems
> [1].
>
> What's new in the port:
>
> - Had to fix the Makefile.PL patch
> - Added ssl to WANTLIB because it was missing
> - Enabled Pod testing
>
> Testing:
>
> - 'make test' passes on amd64 and macppc (XS module)
> - There are 2 consumers, they pass without issues [2].
>
>
> Any comments/feedback?
>
> Charlène.
>
> [1]
> https://metacpan.org/source/JONASBN/Crypt-OpenSSL-X509-1.812/Changes
> [2] https://transfer.sh/NPsj3/p5-Crypt-OpenSSL-X509.tgz
>
>
Here is the diff with the fixed WANTLIB. Sorry for the noise.
Index: Makefile
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile23 Sep 2017 10:51:07 - 1.9
+++ Makefile5 Jan 2019 18:22:51 -
@@ -2,16 +2,17 @@
COMMENT = access OpenSSL's X509 API from Perl#'
-DISTNAME = Crypt-OpenSSL-X509-1.807
-REVISION = 0
+DISTNAME = Crypt-OpenSSL-X509-1.812
CATEGORIES = security
# Perl
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c crypto perl
+WANTLIB += c crypto perl ssl
MODULES = cpan
+
+MAKE_ENV +=TEST_POD=Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo30 Apr 2017 13:56:43 - 1.5
+++ distinfo5 Jan 2019 18:22:51 -
@@ -1,2 +1,2 @@
-SHA256 (Crypt-OpenSSL-X509-1.807.tar.gz) =
Wse6PXSGOubPK4qN+RK+f3pTNwN7Za3sqA+SdL8Augw=
-SIZE (Crypt-OpenSSL-X509-1.807.tar.gz) = 45947
+SHA256 (Crypt-OpenSSL-X509-1.812.tar.gz) =
whKD0zrU6n/ECdtRWbfXpnkyW93yOP1Ap6385GioRlk=
+SIZE (Crypt-OpenSSL-X509-1.812.tar.gz) = 47890
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/patches/patch-Makefile_PL,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile_PL
--- patches/patch-Makefile_PL 24 May 2017 00:59:48 - 1.1
+++ patches/patch-Makefile_PL 5 Jan 2019 18:22:51 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2017/0
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -22,7 +22,7 @@ requires_external_cc();
- } elsif ($Config::Config{myuname} =~ /sunos|solaris/i) {
- # Any SunStudio flags?
- } else {
-- cc_optimize_flags('-O2 -g -Wall -Werror');
-+ cc_optimize_flags('-O2 -g -Wall -Werror
-Wno-ignored-optimization-argument');
- }
+@@ -22,7 +22,7 @@ if ($Config::Config{myuname} =~ /darwin/i) {
+ } elsif ($Config::Config{myuname} =~ /sunos|solaris/i) {
+ # Any SunStudio flags?
+ } else {
+- cc_optimize_flags('-O2 -g -Wall -Werror');
++ cc_optimize_flags('-O2 -g -Wall -Werror
-Wno-ignored-optimization-argument');
+ }
auto_install();
[UPDATE] sysutils/p5-File-NFSLock 1.27 -> 1.29
Here is an update for File::NFSLock. The update only includes a build fix for newer Perl versions [1]. Port-wise it's a simple version bump. Testing: - 'make test' passes - There are consumers and all pass [2]. Any comments/feedback? Charlène. [1] https://metacpan.org/changes/distribution/File-NFSLock [2] https://transfer.sh/izMDA/p5-File-NFSLock.tgz Index: Makefile === RCS file: /cvs/ports/sysutils/p5-File-NFSLock/Makefile,v retrieving revision 1.8 diff -u -p -u -p -r1.8 Makefile --- Makefile20 Mar 2016 19:57:02 - 1.8 +++ Makefile5 Jan 2019 17:23:29 - @@ -2,7 +2,7 @@ COMMENT = module to do NFS (or not) locking -DISTNAME = File-NFSLock-1.27 +DISTNAME = File-NFSLock-1.29 CATEGORIES = sysutils # perl Index: distinfo === RCS file: /cvs/ports/sysutils/p5-File-NFSLock/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo2 Sep 2015 12:35:33 - 1.3 +++ distinfo5 Jan 2019 17:23:29 - @@ -1,2 +1,2 @@ -SHA256 (File-NFSLock-1.27.tar.gz) = D0HWz+qkSYciGzjjH6aGKTPMw5C7EQN7WCj5tSobEEI= -SIZE (File-NFSLock-1.27.tar.gz) = 21518 +SHA256 (File-NFSLock-1.29.tar.gz) = YdQVmbSBFk7fm4vsq77y0j9iKpcn9sGDZekrV4LU+jc= +SIZE (File-NFSLock-1.29.tar.gz) = 21743
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2019/01/05 11:04:57 Modified files: mail/grepmail : Makefile Log message: Missing dependency on devel/p5-File-HomeDir.
[M. UPDATE] print/lyx 2.3.1 -> 2.3.2
Changelog: https://www.lyx.org/announce/2_3_2.txt Mostly bugfixes. amd64: Build => OK Run => OK Comments ? OK ? Elias. lyx-2.3.2.diff Description: Binary data
[UPDATE] security/p5-Crypt-OpenSSL-X509 1.807 -> 1.812
Hi ports,
Here is an update for Crypt::OpenSSL::X509 that will fix the build with
our future Perl 5.28.
Upstream changes are mostly to fix compilation on various systems [1].
What's new in the port:
- Had to fix the Makefile.PL patch
- Added ssl to WANTLIB because it was missing
- Enabled Pod testing
Testing:
- 'make test' passes on amd64 and macppc (XS module)
- There are 2 consumers, they pass without issues [2].
Any comments/feedback?
Charlène.
[1] https://metacpan.org/source/JONASBN/Crypt-OpenSSL-X509-1.812/Changes
[2] https://transfer.sh/NPsj3/p5-Crypt-OpenSSL-X509.tgz
Index: Makefile
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile23 Sep 2017 10:51:07 - 1.9
+++ Makefile5 Jan 2019 16:21:57 -
@@ -2,8 +2,7 @@
COMMENT = access OpenSSL's X509 API from Perl#'
-DISTNAME = Crypt-OpenSSL-X509-1.807
-REVISION = 0
+DISTNAME = Crypt-OpenSSL-X509-1.812
CATEGORIES = security
@@ -13,5 +12,7 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += c crypto perl
MODULES = cpan
+
+MAKE_ENV +=TEST_POD=Yes
.include
Index: distinfo
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo30 Apr 2017 13:56:43 - 1.5
+++ distinfo5 Jan 2019 16:21:57 -
@@ -1,2 +1,2 @@
-SHA256 (Crypt-OpenSSL-X509-1.807.tar.gz) =
Wse6PXSGOubPK4qN+RK+f3pTNwN7Za3sqA+SdL8Augw=
-SIZE (Crypt-OpenSSL-X509-1.807.tar.gz) = 45947
+SHA256 (Crypt-OpenSSL-X509-1.812.tar.gz) =
whKD0zrU6n/ECdtRWbfXpnkyW93yOP1Ap6385GioRlk=
+SIZE (Crypt-OpenSSL-X509-1.812.tar.gz) = 47890
Index: patches/patch-Makefile_PL
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-X509/patches/patch-Makefile_PL,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Makefile_PL
--- patches/patch-Makefile_PL 24 May 2017 00:59:48 - 1.1
+++ patches/patch-Makefile_PL 5 Jan 2019 16:21:57 -
@@ -3,12 +3,12 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2017/0
Index: Makefile.PL
--- Makefile.PL.orig
+++ Makefile.PL
-@@ -22,7 +22,7 @@ requires_external_cc();
- } elsif ($Config::Config{myuname} =~ /sunos|solaris/i) {
- # Any SunStudio flags?
- } else {
-- cc_optimize_flags('-O2 -g -Wall -Werror');
-+ cc_optimize_flags('-O2 -g -Wall -Werror
-Wno-ignored-optimization-argument');
- }
+@@ -22,7 +22,7 @@ if ($Config::Config{myuname} =~ /darwin/i) {
+ } elsif ($Config::Config{myuname} =~ /sunos|solaris/i) {
+ # Any SunStudio flags?
+ } else {
+- cc_optimize_flags('-O2 -g -Wall -Werror');
++ cc_optimize_flags('-O2 -g -Wall -Werror
-Wno-ignored-optimization-argument');
+ }
auto_install();
gmake bug triggered by net/munin
The net/munin port triggers a bug in gmake. sthen@ has marked munin as BROKEN on i386 because during the build gmake regularly segfaults, but that's just dumb luck. Here is a much simpler GNUmakefile that reproduces the problem: > DUMMY := $(shell echo "===> I'm being parsed!" >&2) MAKEFILES := GNUmakefile all: $(MAKE) sub-all sub-all: < The output is something like this: ===> I'm being parsed! gmake sub-all gmake[1]: Entering directory '/home/naddy' ===> I'm being parsed! ===> I'm being parsed! GNUmakefile:6: warning: overriding recipe for target 'all' ...:6: warning: ignoring old recipe for target 'all' gmake[1]: Nothing to be done for 'sub-all'. gmake[1]: Leaving directory '/home/naddy' The first warning is prefixed by the file name. The second warning is prefixed by garbage. Sometimes you get a segfault there. MAKEFILES is a special variable. The files listed there are included by each gmake invocation. The bug is triggered by a recursive call to gmake with MAKEFILES set to the default makefile, causing it to be read twice. The fact that the garbage starts with a sequence of 0xdf bytes suggests a use-after-free bug, but I haven't managed to track it down yet. -- Christian "naddy" Weisgerber na...@mips.inka.de
replace alioth.debian.org
Hi,
Debian moved from alioth to salsa. They moved some projects (but not
all) and they put a alioth-archive to get the sources archives.
Here's a diff replacing HOMEPAGE and MASTER_SITES when I found a better
one. There's two alioth link I couldn't change:
devel/iso-codes/Makefile:MASTER_SITES=
http://pkg-isocodes.alioth.debian.org/downloads/
textproc/pinfo/Makefile:HOMEPAGE=
https://alioth.debian.org/frs/?group_id=30592
Sometimes stuff is barely better (like libhid homepage), other times I
just removed the homepage to get the one from the module
(p5-Net_SSLeay).
Opinion on this?
Cheers,
Daniel
Index: comms/minicom/Makefile
===
RCS file: /cvs/ports/comms/minicom/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- comms/minicom/Makefile 6 May 2017 22:00:53 - 1.62
+++ comms/minicom/Makefile 5 Jan 2019 15:53:12 -
@@ -3,11 +3,11 @@
COMMENT= MS-DOS Telix-like serial communication program
DISTNAME= minicom-2.7.1
-REVISION= 0
+REVISION= 1
CATEGORIES=comms
-MASTER_SITES= https://www.alioth.debian.org/frs/download.php/latestfile/3/
+MASTER_SITES= https://alioth-archive.debian.org/releases/minicom/Source/2.7.1/
-HOMEPAGE= http://alioth.debian.org/projects/minicom/
+HOMEPAGE= https://salsa.debian.org/minicom-team/minicom
LIB_DEPENDS= devel/gettext
RUN_DEPENDS= comms/kermit \
Index: devel/iso-codes/Makefile
===
RCS file: /cvs/ports/devel/iso-codes/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- devel/iso-codes/Makefile15 May 2018 10:51:24 - 1.67
+++ devel/iso-codes/Makefile5 Jan 2019 15:53:12 -
@@ -6,10 +6,10 @@ DISTNAME= iso-codes-3.77
CATEGORIES=devel
-HOMEPAGE= http://alioth.debian.org/projects/pkg-isocodes/
+HOMEPAGE= https://salsa.debian.org/iso-codes-team/iso-codes
MAINTAINER=Jasper Lievisse Adriaanse
-REVISION = 0
+REVISION = 1
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
Index: devel/libhid/Makefile
===
RCS file: /cvs/ports/devel/libhid/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/libhid/Makefile 9 Apr 2017 10:49:17 - 1.12
+++ devel/libhid/Makefile 5 Jan 2019 15:53:12 -
@@ -3,13 +3,13 @@
COMMENT = user-space USB HID access library written in C
DISTNAME = libhid-0.2.16
-REVISION = 1
+REVISION = 2
SHARED_LIBS = hid 0.0
CATEGORIES = devel
-HOMEPAGE = http://libhid.alioth.debian.org/
+HOMEPAGE = https://directory.fsf.org/wiki/Libhid
MAINTAINER = Jonathan Armani
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c usb pthread usb-1.0
-MASTER_SITES= https://www.alioth.debian.org/frs/download.php/latestfile/336/
+MASTER_SITES= https://alioth-archive.debian.org/releases/libhid/libhid/0.2.16/
LIB_DEPENDS = devel/libusb-compat
Index: graphics/sane-backends/Makefile
===
RCS file: /cvs/ports/graphics/sane-backends/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- graphics/sane-backends/Makefile 18 Nov 2018 15:52:18 - 1.82
+++ graphics/sane-backends/Makefile 5 Jan 2019 15:53:12 -
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c execinfo jpeg m png pthread tiff usb-1.0 v4l1 v4l2
WANTLIB += v4lconvert z
-MASTER_SITES= https://alioth.debian.org/frs/download.php/file/4224/ \
+MASTER_SITES=
https://alioth-archive.debian.org/releases/sane/sane-backends/1.0.27/ \
https://distfiles.bsdfrog.org/
BUILD_DEPENDS= devel/gettext-tools
Index: misc/reprepro/Makefile
===
RCS file: /cvs/ports/misc/reprepro/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- misc/reprepro/Makefile 14 Apr 2018 10:14:05 - 1.3
+++ misc/reprepro/Makefile 5 Jan 2019 15:53:12 -
@@ -11,7 +11,7 @@ WRKDIST= ${WRKDIR}/reprepro-${V}
CATEGORIES=misc databases sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/r/reprepro/}
-HOMEPAGE= https://mirrorer.alioth.debian.org/
+HOMEPAGE= https://salsa.debian.org/brlink/reprepro
MAINTAINER=Donovan Watteau
Index: net/axel/Makefile
===
RCS file: /cvs/ports/net/axel/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- net/axel/Makefile 19 Nov 2017 00:53:16 - 1.10
+++ net/axel/Makefile 5 Jan 2019 15:53:12 -
@@ -2,17 +2,17 @@
COMMENT= tiny download accelerator
DISTNAME= axel-2.4
-REVISION= 0
+REVISION= 1
CATEGORIES=net
-HOMEPAGE= http://axel.alioth.debian.org/
+HOMEPAGE=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2019/01/05 08:42:44 Modified files: archivers/lzip/lunzip: Makefile distinfo Log message: Update to lunzip 1.11. From Sascha Paunovic.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2019/01/05 08:41:45 Modified files: archivers/lzip/pdlzip: Makefile distinfo Log message: Update to pdlzip 1.10. From Sascha Paunovic.
Re: aarch64: use gcc8 as ports-gcc
On Sat, 5 Jan 2019 13:55:41 +0100, Marc Espie wrote:
> On Fri, Jan 04, 2019 at 07:15:00PM +0100, Pascal Stumpf wrote:
> > On Fri, 4 Jan 2019 17:11:01 +, Stuart Henderson wrote:
> > > On 2019/01/04 17:57, Pascal Stumpf wrote:
> > > > This switches aarch64 to use GCC 8.2.0 as default. Doesn't do any harm
> > > > because this is the first GCC port that works there.
> > > >
> > > > We still need to decide whether to hook up gcc8 on all archs or aarch64
> > > > only ...
> > >
> > > It needs hooking up in lang/gcc/Makefile for all arches. If you want to
> > > restrict it to only certain arches then that needs doing via
> > > ONLY_FOR_ARCHS
> > > / NOT_FOR_ARCHS in gcc/8/Makefile.
> > >
> > > > Index: gcc4.port.mk
> > > > ===
> > > > RCS file: /cvs/ports/infrastructure/mk/gcc4.port.mk,v
> > > > retrieving revision 1.12
> > > > diff -u -p -r1.12 gcc4.port.mk
> > > > --- gcc4.port.mk8 Mar 2016 16:46:05 - 1.12
> > > > +++ gcc4.port.mk4 Jan 2019 16:02:48 -
> > > > @@ -1,2 +1,6 @@
> > > > +.if ${MACHINE_ARCH} == "aarch64"
> > > > +MODGCC4_VERSION?=8
> > > > +.else
> > > > MODGCC4_VERSION?=4.9
> > > > +.endif
> > > > .include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"
> > > >
> > >
> > > It needs some work in arch-defines.mk as well, maybe also
> > > compiler.port.mk and fortran.port.mk. I had a quick look but can't pay
> > > it enough attention at the moment to find my way through the maze of
> > > gcc4, gcc49 etc.
> > >
> >
> > Indeed. We should probably rename GCC49_ARCHS to something more
> > sensible and adjust the tree accordingly. Untested diff:
>
> I'm not sure you want to remove any version reference there.
>
> In fact, using GCC49_ARCHS instead of PORTS_GCC name was deliberate.
>
> What happens when we get split gcc versions because of unsupported/badly
> supported arches in the ports tree ?
Then PORTS_GCC_ARCHS will indicate "there is a ports gcc on this
architecture", and, if a consumer port absolutely needs to know the
specific gcc version, it can look at MODGCC4_VERSION.
What is the use case of a split GCC49_ARCHS and GCC8_ARCHS other than
making arch-defines.mk and compiler.port.mk more complicated?
> What is the exact plan wrt which arch is going to move to what/when ?
That's independent of the naming question, but: aarch64 can "switch"
right away. The other base-clang archs maybe with a little effort. All
others need bulk builds.
> are we suddenly going to retire gcc 4.9 everywhere and switch to gcc 8 ?
Not "suddenly" for sure. But that is the long-term goal, yes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2019/01/05 07:17:12 Modified files: devel/spidermonkey52: Makefile Log message: Spidermonkey builds fine on aarch64. ok jasper@ (maintainer)
Re: [update] lang/node to 10.15.0
On Sat, Jan 5, 2019 at 12:56 PM Aaron Bieber wrote:
> Clobbered the diff with emacs! Here is a link to a working copy:
> https://deftly.net/patches/node-v10.15.0.diff
>
> Thanks for reporting!
>
Thanks for the update! This diff applies, packages, and so far I have
nightscout running fine with this on amd64.
> PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
>
>
> On Jan 5, 2019, at 4:12 AM, viq wrote:
>
> On Fri, Dec 28, 2018 at 1:02 AM Aaron Bieber wrote:
>
>> Hola!
>>
>> Here is a diff that brings node to the latest LTS. The deps/openssl
>> bits were kindly put together by naddy@, so thanks for that!
>>
>> I am reviving my pine64 to test a build on and phessler@ will get it
>> in a bulk here shortly.
>>
>> Any other testing would be greately appreciated!
>>
>
> I spent last evening banging my head against this,
> curl 'https://marc.info/?l=openbsd-ports=154595534806449=raw' >
> node.patch
> patch -p3 -C -E < /tmp/node.patch
> fails to apply, first offender is patches/patch-Makefile, even though it
> looks identical to what your patch expects. Any idea what am I doing wrong?
>
>
>> Cheers,
>> Aaron
>>
>> diff --git a/lang/node/Makefile b/lang/node/Makefile
>> index 7bef5fb0802..23f6624ebdc 100644
>> --- a/lang/node/Makefile
>> +++ b/lang/node/Makefile
>> @@ -11,14 +11,12 @@ USE_WXNEEDED = Yes
>>
>> COMMENT = V8 JavaScript for clients and servers
>>
>> -NODE_VERSION = v8.12.0
>> -
>> +NODE_VERSION = v10.15.0
>> PLEDGE_VER = 1.1.0
>> DISTFILES =node-pledge-{}${PLEDGE_VER}.tar.gz:0
>> ${DISTNAME}.tar.gz
>>
>> DISTNAME = node-${NODE_VERSION}
>> PKGNAME = ${DISTNAME:S/v//g}
>> -REVISION = 1
>>
>> MASTER_SITES0 =
>> https://github.com/qbit/node-pledge/archive/
>>
>> @@ -35,7 +33,7 @@ MASTER_SITES =
>> ${HOMEPAGE}dist/${NODE_VERSION}/
>>
>> MODULES = lang/python
>>
>> -WANTLIB += c execinfo kvm m pthread util z ${COMPILER_LIBCXX}
>> +WANTLIB += c execinfo kvm m pthread util ${COMPILER_LIBCXX}
>>
>> COMPILER = base-clang ports-gcc base-gcc
>>
>> @@ -53,12 +51,7 @@ CONFIGURE_STYLE =simple
>>
>> # libpath and includes aren't picked up, but I added them here as a note.
>> # The patch for node.gyp is where they are actually being set.
>> -CONFIGURE_ARGS = --prefix=${PREFIX} \
>> - --shared-zlib
>> -
>> -.if "${MACHINE_ARCH}" == "aarch64"
>> -CONFIGURE_ARGS += --openssl-no-asm
>> -.endif
>> +CONFIGURE_ARGS = --prefix=${PREFIX}
>>
>> SUBST_VARS += DISTNAME
>> SUBST_VARS += DISTFILES
>> @@ -78,13 +71,6 @@ do-extract:
>> mv ${WRKSRC}/deps/npm/node_modules/node-pledge-${PLEDGE_VER} \
>> ${WRKSRC}/deps/npm/node_modules/node-pledge
>>
>> -post-extract:
>> - # Currently tarbals exclude tools/eslint, while the tests that
>> require it
>> - # are still in tree
>> - cd ${WRKSRC} && for x in $$(grep -r "tools/eslint" test/* | awk
>> -F: '{print $$1}' | sort | uniq); do \
>> - rm $$x; \
>> - done
>> -
>> pre-configure:
>> @# Bad practice, but prevents a whole stack of patches.
>> ln -sf ${LOCALBASE}/bin/python${MODPY_VERSION}
>> ${WRKDIR}/bin/python
>> @@ -95,13 +81,12 @@ pre-configure:
>> ${WRKDIST}/node.gyp \
>> ${WRKDIST}/common.gypi \
>> ${WRKDIST}/tools/test.py
>> -# generate PIC assembly code
>> -.if ${MACHINE_ARCH} == "i386"
>> - find ${WRKDIST}/deps/openssl/asm/x86-elf-gas -name '*.s' -delete
>> - find ${WRKDIST}/deps/openssl/asm -type f -exec touch {} +
>> - cd ${WRKDIST}/deps/openssl/asm && \
>> - ${MAKE_PROGRAM} -j${MAKE_JOBS} CC="${CC}" ASM="${CC}" all
>> -.endif
>> + cd ${WRKDIST}/deps/openssl/config && \
>> + ${MAKE_PROGRAM} ARCHS=BSD-x86-elf
>> +
>> +post-configure:
>> + sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk
>> + sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/
>> openssl-cli.target.mk
>>
>> post-install:
>> ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
>> diff --git a/lang/node/distinfo b/lang/node/distinfo
>> index b9bc179edc8..03d88505a8c 100644
>> --- a/lang/node/distinfo
>> +++ b/lang/node/distinfo
>> @@ -1,4 +1,4 @@
>> SHA256 (node-pledge-1.1.0.tar.gz) =
>> BuKnrXSkqpTb5Tfap1AHk+l7ucTJLEWbMFNbgQkNBsw=
>> -SHA256 (node-v8.12.0.tar.gz) =
>> tHl4QxNu3ZGVwoIhoWgK5Swp2Gf8X8HJn31uLyEmpns=
>> +SHA256 (node-v10.15.0.tar.gz) =
>> 2+Rn49q7aFT8sM2W4ECCJoyx4xPOl6S3EAsu0VKwoKs=
>> SIZE (node-pledge-1.1.0.tar.gz) = 2560
>> -SIZE (node-v8.12.0.tar.gz) = 30393516
>> +SIZE (node-v10.15.0.tar.gz) = 36300933
>> diff --git a/lang/node/patches/patch-Makefile
>> b/lang/node/patches/patch-Makefile
>> index 033b6f8510d..ef77e1de3fb 100644
>> --- a/lang/node/patches/patch-Makefile
>> +++ b/lang/node/patches/patch-Makefile
>> @@ -2,33 +2,33 @@ $OpenBSD: patch-Makefile,v 1.7
Re: UPDATE: x11/i3
On Sat, Jan 05, 2019 at 10:55:31AM +0100, Rafael Sadowski wrote: > On Fri Dec 28, 2018 at 04:36:27PM +0100, Theo Buehler wrote: > > +dcoppa > > > > On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote: > > > Simple update to the latest version 4.16. > > > > > > Works fine on amd64, OK? > > > > Tested on macppc and amd64. Works fine, thanks. Please reinstate/port > > the hunks you lost in i3-nagbar/main.c and man/i3.man. > > > > With that: > > > > ok tb > > (provided dcoppa is fine with it/doesn't object) > > > > Hi i3 users, > > new diff based on edd@'s work from openbsd-wip. He tweaks the test case. I > guess this is the more clean way to go into the tree!? I don't see any lost > parts in the patches, do I? > > A general question: I would like to port a i3 with gaps[1], should we go > with a second port (i3-gaps) of should we improve x11/i3 with patches? > > RS Tested on amd64 just now. Works fine. As a user, I'm OK with gaps as either a subpackage or as a separate port as I don't have a need for it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/01/05 07:04:07 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add net/openconnect to CVE table.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2019/01/05 07:02:12 Modified files: net/openconnect: Makefile distinfo net/openconnect/pkg: PLIST Log message: Update to openconnect-8.01. Fixes a potential information leak (CVE-2018-20319), and adds some new features including support for PAN GlobalProtect. - minor of SHARED_LIBS has been bumped as symbols have been added - switched HOMEPAGE to https - drop wrapper scripts that are not useful for us, e.g tncc-wrapper.py needs the icedtea-web plugin that we don't have and the CSD scripts involve running a linux binary (suggested by sthen@) Feedback and OK from sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2019/01/05 06:07:47 Modified files: devel/go-sys : Makefile distinfo devel/go-sys/pkg: PLIST Log message: Update go-sys to a version with working vm related sysctls. When the sysctls were updated for OpenBSD 6.3, the vm related sysctls were incorrectly dropped. This updates to a later commit where the vm related sysctls have been restored. Noted by landry@ who discovered the issue via the telegraf port.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2019/01/05 06:04:40 Modified files: x11/gnome/at-spi2-atk: Makefile Log message: unbreak with ld.bfd; same as at-spi2-core ok aja@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: js...@cvs.openbsd.org 2019/01/05 05:59:25 Modified files: lang/go: Makefile Added files: lang/go/patches: patch-src_cmd_link_internal_ld_lib_go patch-src_cmd_link_internal_loadelf_ldelf_go Log message: Allow weak symbols to be duplicated when already defined. When -mretpoline is enabled with clang, a __llvm_retpoline_r11 weak symbol is emitted in each compilation unit. This results in the Go linker complaining when processing a package archive that contains cgo linkages, since it finds the same weak symbol defined in multiple object files. Relax the duplicate symbol detection such that weak symbols are permitted to be duplicated. This makes it possible to build Go with clang again and addresses a similar duplicate weak symbol issue that results from retguard. Also backport an upstream commit that corrects the handling of libgcc vs libcompiler_rt. Combined with the above fix `make regress` now passes with both gcc and clang.
Re: aarch64: use gcc8 as ports-gcc
On Fri, Jan 04, 2019 at 07:15:00PM +0100, Pascal Stumpf wrote:
> On Fri, 4 Jan 2019 17:11:01 +, Stuart Henderson wrote:
> > On 2019/01/04 17:57, Pascal Stumpf wrote:
> > > This switches aarch64 to use GCC 8.2.0 as default. Doesn't do any harm
> > > because this is the first GCC port that works there.
> > >
> > > We still need to decide whether to hook up gcc8 on all archs or aarch64
> > > only ...
> >
> > It needs hooking up in lang/gcc/Makefile for all arches. If you want to
> > restrict it to only certain arches then that needs doing via ONLY_FOR_ARCHS
> > / NOT_FOR_ARCHS in gcc/8/Makefile.
> >
> > > Index: gcc4.port.mk
> > > ===
> > > RCS file: /cvs/ports/infrastructure/mk/gcc4.port.mk,v
> > > retrieving revision 1.12
> > > diff -u -p -r1.12 gcc4.port.mk
> > > --- gcc4.port.mk 8 Mar 2016 16:46:05 - 1.12
> > > +++ gcc4.port.mk 4 Jan 2019 16:02:48 -
> > > @@ -1,2 +1,6 @@
> > > +.if ${MACHINE_ARCH} == "aarch64"
> > > +MODGCC4_VERSION?=8
> > > +.else
> > > MODGCC4_VERSION?=4.9
> > > +.endif
> > > .include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"
> > >
> >
> > It needs some work in arch-defines.mk as well, maybe also
> > compiler.port.mk and fortran.port.mk. I had a quick look but can't pay
> > it enough attention at the moment to find my way through the maze of
> > gcc4, gcc49 etc.
> >
>
> Indeed. We should probably rename GCC49_ARCHS to something more
> sensible and adjust the tree accordingly. Untested diff:
I'm not sure you want to remove any version reference there.
In fact, using GCC49_ARCHS instead of PORTS_GCC name was deliberate.
What happens when we get split gcc versions because of unsupported/badly
supported arches in the ports tree ?
What is the exact plan wrt which arch is going to move to what/when ?
are we suddenly going to retire gcc 4.9 everywhere and switch to gcc 8 ?
Re: security/wpa_supplicant: Reassoc on NWID change
On Fri, Jan 04, 2019 at 10:51:50PM GMT, Stuart Henderson wrote: > > Probably obvious anyway but just checking... you haven't forced bssid > or chan via hostname.if / ifconfig have you? > It is *always* worth checking for the obvious, IMHO :^) No, hostname.if is pretty vanilla: join home wpakey abc join other wpakey xyz join work wpaakms 802.1x join eduroam wpaakms 802.1x dhcp Thanks for checking anyway, Raf
Re: security/wpa_supplicant: Reassoc on NWID change
On Fri, Jan 04, 2019 at 10:43:14PM GMT, Peter Hessler wrote: > > Yes, can you turn on debug for the interface: ifconfig iwm0 debug > (replace iwm0 with your actual wifi device if it is different). > > That will give a lot more output in the dmesg buffer, but also the > results of channel scans and when it is looking for a new bssid to > connect to. > > The kernel needs to select a new bssid to connect to, move to it, then > this patch lets wpa_supplicant listen for those changes and react to > them. > I focused on wpa_supplicant and hadn't actually thought of doing that. I'll do it all next week. Ta, Raf
patch: emulators/dosbox add 'dyncore', 'nosplash' flavours
zeur here.
[not subscribed to this list so please Cc me on reply. thanks!]
It's seldom that I feel the urgent need to patch something in ports, but
here we are... the below patches add the following flavours:
'dyncore': re-enable the dynamic core;
'nosplash': disable the spam upon invocation.
Hope this is useful to somebody :)
--zeurkous.
Index: ports/emulators/dosbox/Makefile
===
RCS file: /cvs/ports/emulators/dosbox/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- ports/emulators/dosbox/Makefile 29 Jul 2017 08:59:35 - 1.38
+++ ports/emulators/dosbox/Makefile 5 Jan 2019 10:10:08 -
@@ -34,8 +34,21 @@ CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/i
CONFIGURE_ENV+=LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
CONFIGURE_ARGS+= --disable-alsatest
+PATCH_LIST=patch-*
+
+FLAVORS= dyncore nosplash
+FLAVOR?=
+
+.if ${FLAVOR:L:Mnosplash}
+PATCH_LIST+= nosplash
+.endif
+
+.if ${FLAVOR:L:Mdyncore}
+PATCH_LIST+= wxneeded
+.else
# needs W+X memory
CONFIGURE_ARGS+= --disable-dynamic-core
+.endif
pre-configure:
cp ${FILESDIR}/midi_sndio.h ${WRKSRC}/src/gui
--- /dev/null Sat Jan 5 10:11:15 2019
+++ ports/emulators/dosbox/patches/nosplash Sat Jan 5 08:54:58 2019
@@ -0,0 +1,44 @@
+--- src/gui/..ar/0/sdlmain.cpp Mon May 10 17:43:54 2010
src/gui/sdlmain.cppSat Jan 5 08:54:39 2019
+@@ -986,7 +986,9 @@
+ static unsigned char logo[32*32*4]= {
+ #include "dosbox_logo.h"
+ };
++#ifdef TOTAL_WANKER
+ #include "dosbox_splash.h"
++#endif
+
+ //extern void UI_Run(bool);
+ static void GUI_StartUp(Section * sec) {
+@@ -1169,6 +1171,7 @@
+ Bit32u bmask = 0x00ff;
+ //#endif
+
++#ifdef TOTAL_WANKER
+ /* Please leave the Splash screen stuff in working order in DOSBox. We spend
a lot of time making DOSBox. */
+ SDL_Surface* splash_surf = SDL_CreateRGBSurface(SDL_SWSURFACE, 640,
400, 32, rmask, gmask, bmask, 0);
+ if (splash_surf) {
+@@ -1229,6 +1232,7 @@
+ delete [] tmpbufp;
+
+ }
++#endif
+
+ /* Get some Event handlers */
+ MAPPER_AddHandler(KillSwitch,MK_f9,MMOD1,"shutdown","ShutDown");
+@@ -1542,6 +1546,7 @@
+ Bit32u gmask = 0xff00;
+ Bit32u bmask = 0x00ff;
+ #endif
++#ifdef TOTAL_WANKER
+ SDL_Surface* splash_surf = SDL_CreateRGBSurface(SDL_SWSURFACE, 640,
400, 32, rmask, gmask, bmask, 0);
+ if (!splash_surf) return;
+
+@@ -1562,6 +1567,7 @@
+ SDL_BlitSurface(splash_surf, NULL, sdl.surface, NULL);
+ SDL_Flip(sdl.surface);
+ SDL_Delay(12000);
++#endif
+ }
+
+ static void launcheditor() {
--- /dev/null Sat Jan 5 10:11:26 2019
+++ ports/emulators/dosbox/patches/wxneeded Sat Jan 5 09:36:25 2019
@@ -0,0 +1,10 @@
+--- src/..ar/0/Makefile.am Mon May 10 17:43:54 2010
src/Makefile.amSat Jan 5 09:34:46 2019
+@@ -14,6 +14,7 @@
+ dosbox_SOURCES = dosbox.cpp $(ico_stuff)
+ dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a
hardware/libhardware.a gui/libgui.a \
+ints/libints.a misc/libmisc.a shell/libshell.a
hardware/serialport/libserial.a libs/gui_tk/libgui_tk.a
++dosbox_LDFLAGS = -z wxneeded
+
+ EXTRA_DIST = winres.rc dosbox.ico
+
Re: UPDATE: x11/i3
On 2019/01/05 10:55, Rafael Sadowski wrote: > A general question: I would like to port a i3 with gaps[1], should we go > with a second port (i3-gaps) of should we improve x11/i3 with patches? > > RS > > [1]: https://github.com/Airblader/i3/tree/gaps That looks like it should be a separate port. I think ideally it shouldn't conflict with i3, so it's possible to try it out more easily?
Re: Qt5 without -O3 optimizations
On 2019/01/05 10:23, Rafael Sadowski wrote:
> If qmake ports use QMAKE_CFLAGS_OPTIMIZE_FULL and/or the macro
> "optimize_full" they will always build with -O3.
>
> I saw this in x11/qt5/{qtmultimedia,qtlocation}.
>
> OK so zap -O3 from our qmake-qt5?
It shouldn't force -O2 either, but use whatever is in CFLAGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/01/05 04:38:49 Modified files: devel/llvm : Makefile Log message: Actually depend on the g++ package on non-clang archs On non-clang archs, ports-clang uses the libestdc++ backend from ports-gcc, so it needs the headers in the g++ package at runtime. Testing CHOSEN_COMPILER == "ports-gcc" is nice semantically but since it happens after including bsd.port.mk, it's too late to change TEST/RUN_DEPENDS. Use a different test that may not be optimal but works in practice, so that the dep is correctly registered. This should fix random build failures due to dpb junking in bulk builds on non-clang archs. Problem pointed out by Goerge Koehler, ok sthen@
Re: [update] lang/node to 10.15.0
On Fri, Dec 28, 2018 at 1:02 AM Aaron Bieber wrote:
> Hola!
>
> Here is a diff that brings node to the latest LTS. The deps/openssl
> bits were kindly put together by naddy@, so thanks for that!
>
> I am reviving my pine64 to test a build on and phessler@ will get it
> in a bulk here shortly.
>
> Any other testing would be greately appreciated!
>
I spent last evening banging my head against this,
curl 'https://marc.info/?l=openbsd-ports=154595534806449=raw' >
node.patch
patch -p3 -C -E < /tmp/node.patch
fails to apply, first offender is patches/patch-Makefile, even though it
looks identical to what your patch expects. Any idea what am I doing wrong?
> Cheers,
> Aaron
>
> diff --git a/lang/node/Makefile b/lang/node/Makefile
> index 7bef5fb0802..23f6624ebdc 100644
> --- a/lang/node/Makefile
> +++ b/lang/node/Makefile
> @@ -11,14 +11,12 @@ USE_WXNEEDED = Yes
>
> COMMENT = V8 JavaScript for clients and servers
>
> -NODE_VERSION = v8.12.0
> -
> +NODE_VERSION = v10.15.0
> PLEDGE_VER = 1.1.0
> DISTFILES =node-pledge-{}${PLEDGE_VER}.tar.gz:0
> ${DISTNAME}.tar.gz
>
> DISTNAME = node-${NODE_VERSION}
> PKGNAME = ${DISTNAME:S/v//g}
> -REVISION = 1
>
> MASTER_SITES0 =
> https://github.com/qbit/node-pledge/archive/
>
> @@ -35,7 +33,7 @@ MASTER_SITES =
> ${HOMEPAGE}dist/${NODE_VERSION}/
>
> MODULES = lang/python
>
> -WANTLIB += c execinfo kvm m pthread util z ${COMPILER_LIBCXX}
> +WANTLIB += c execinfo kvm m pthread util ${COMPILER_LIBCXX}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> @@ -53,12 +51,7 @@ CONFIGURE_STYLE =simple
>
> # libpath and includes aren't picked up, but I added them here as a note.
> # The patch for node.gyp is where they are actually being set.
> -CONFIGURE_ARGS = --prefix=${PREFIX} \
> - --shared-zlib
> -
> -.if "${MACHINE_ARCH}" == "aarch64"
> -CONFIGURE_ARGS += --openssl-no-asm
> -.endif
> +CONFIGURE_ARGS = --prefix=${PREFIX}
>
> SUBST_VARS += DISTNAME
> SUBST_VARS += DISTFILES
> @@ -78,13 +71,6 @@ do-extract:
> mv ${WRKSRC}/deps/npm/node_modules/node-pledge-${PLEDGE_VER} \
> ${WRKSRC}/deps/npm/node_modules/node-pledge
>
> -post-extract:
> - # Currently tarbals exclude tools/eslint, while the tests that
> require it
> - # are still in tree
> - cd ${WRKSRC} && for x in $$(grep -r "tools/eslint" test/* | awk
> -F: '{print $$1}' | sort | uniq); do \
> - rm $$x; \
> - done
> -
> pre-configure:
> @# Bad practice, but prevents a whole stack of patches.
> ln -sf ${LOCALBASE}/bin/python${MODPY_VERSION} ${WRKDIR}/bin/python
> @@ -95,13 +81,12 @@ pre-configure:
> ${WRKDIST}/node.gyp \
> ${WRKDIST}/common.gypi \
> ${WRKDIST}/tools/test.py
> -# generate PIC assembly code
> -.if ${MACHINE_ARCH} == "i386"
> - find ${WRKDIST}/deps/openssl/asm/x86-elf-gas -name '*.s' -delete
> - find ${WRKDIST}/deps/openssl/asm -type f -exec touch {} +
> - cd ${WRKDIST}/deps/openssl/asm && \
> - ${MAKE_PROGRAM} -j${MAKE_JOBS} CC="${CC}" ASM="${CC}" all
> -.endif
> + cd ${WRKDIST}/deps/openssl/config && \
> + ${MAKE_PROGRAM} ARCHS=BSD-x86-elf
> +
> +post-configure:
> + sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/openssl.target.mk
> + sed -i 's/-ldl //' ${WRKSRC}/out/deps/openssl/
> openssl-cli.target.mk
>
> post-install:
> ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> diff --git a/lang/node/distinfo b/lang/node/distinfo
> index b9bc179edc8..03d88505a8c 100644
> --- a/lang/node/distinfo
> +++ b/lang/node/distinfo
> @@ -1,4 +1,4 @@
> SHA256 (node-pledge-1.1.0.tar.gz) =
> BuKnrXSkqpTb5Tfap1AHk+l7ucTJLEWbMFNbgQkNBsw=
> -SHA256 (node-v8.12.0.tar.gz) =
> tHl4QxNu3ZGVwoIhoWgK5Swp2Gf8X8HJn31uLyEmpns=
> +SHA256 (node-v10.15.0.tar.gz) =
> 2+Rn49q7aFT8sM2W4ECCJoyx4xPOl6S3EAsu0VKwoKs=
> SIZE (node-pledge-1.1.0.tar.gz) = 2560
> -SIZE (node-v8.12.0.tar.gz) = 30393516
> +SIZE (node-v10.15.0.tar.gz) = 36300933
> diff --git a/lang/node/patches/patch-Makefile
> b/lang/node/patches/patch-Makefile
> index 033b6f8510d..ef77e1de3fb 100644
> --- a/lang/node/patches/patch-Makefile
> +++ b/lang/node/patches/patch-Makefile
> @@ -2,33 +2,33 @@ $OpenBSD: patch-Makefile,v 1.7 2018/09/19 19:10:27
> abieber Exp $
> Index: Makefile
> --- Makefile.orig
> +++ Makefile
> -@@ -101,7 +101,7 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_par
> - config.gypi: configure
> - $(error Missing or stale $@, please run ./$<)
> +@@ -138,7 +138,7 @@ config.gypi: configure configure.py
> + fi
>
> + .PHONY: install
> -install: all ## Installs node into $PREFIX (default=/usr/local).
> +install: all build-pledge ## Installs node into $PREFIX
> (default=/usr/local).
> $(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
>
> - uninstall:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:51:20 Modified files: devel : Makefile Log message: + p5-Devel-Hide
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:50:38 Log message: import p5-Devel-Hide 0.0010 Forces the unavailability of specified Perl modules (for testing) from Charlene Wendling Status: Vendor Tag: steven Release Tags: steven-20190105 N ports/devel/p5-Devel-Hide/Makefile N ports/devel/p5-Devel-Hide/distinfo N ports/devel/p5-Devel-Hide/pkg/DESCR N ports/devel/p5-Devel-Hide/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:39:52 Modified files: devel : Makefile Log message: + p5-Test-utf8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:38:03 Log message: import p5-Test-utf8 1.0.1 from Charlene Wendling Status: Vendor Tag: steven Release Tags: steven-20190105 N ports/devel/p5-Test-utf8/Makefile N ports/devel/p5-Test-utf8/distinfo N ports/devel/p5-Test-utf8/pkg/DESCR N ports/devel/p5-Test-utf8/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:15:12 Modified files: math/p5-Math-FFT: Makefile distinfo Log message: update to 1.34 from Charlene Wendling
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: aw...@cvs.openbsd.org 2019/01/05 03:10:32 Modified files: devel/zeal : Makefile distinfo devel/zeal/pkg : PLIST Log message: Update devel/zeal to 0.6.1 OK rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ste...@cvs.openbsd.org 2019/01/05 03:08:33 Modified files: graphics/pstoedit: Makefile distinfo graphics/pstoedit/patches: patch-src_Makefile_in graphics/pstoedit/pkg: PLIST Log message: maintenance update to 3.73
Re: UPDATE: x11/i3
On Fri Dec 28, 2018 at 04:36:27PM +0100, Theo Buehler wrote:
> +dcoppa
>
> On Thu, Dec 27, 2018 at 08:35:09PM +0100, Rafael Sadowski wrote:
> > Simple update to the latest version 4.16.
> >
> > Works fine on amd64, OK?
>
> Tested on macppc and amd64. Works fine, thanks. Please reinstate/port
> the hunks you lost in i3-nagbar/main.c and man/i3.man.
>
> With that:
>
> ok tb
> (provided dcoppa is fine with it/doesn't object)
>
Hi i3 users,
new diff based on edd@'s work from openbsd-wip. He tweaks the test case. I
guess this is the more clean way to go into the tree!? I don't see any lost
parts in the patches, do I?
A general question: I would like to port a i3 with gaps[1], should we go
with a second port (i3-gaps) of should we improve x11/i3 with patches?
RS
[1]: https://github.com/Airblader/i3/tree/gaps
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.113
diff -u -p -u -p -r1.113 Makefile
--- Makefile27 Jun 2018 21:04:12 - 1.113
+++ Makefile5 Jan 2019 09:43:16 -
@@ -2,8 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.15
-REVISION = 0
+DISTNAME = i3-4.16
CATEGORIES = x11
@@ -36,7 +35,10 @@ RUN_DEPENDS =devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
-TEST_DEPENDS = x11/p5-AnyEvent-I3
+
+# Tests now use the X11::XCB Perl module, not yet in ports.
+NO_TEST = Yes
+#TEST_DEPENDS =x11/p5-AnyEvent-I3
FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 distinfo
--- distinfo29 Mar 2018 21:05:32 - 1.29
+++ distinfo5 Jan 2019 09:43:16 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.15.tar.bz2) = IX1STR+8ha40ayX2hI0be80sIxhOyI0pEUv1piE4UyY=
-SIZE (i3-4.15.tar.bz2) = 1196263
+SHA256 (i3-4.16.tar.bz2) = zGCl9RjF43tBQ7ZEqEC7KtKmPqencZVMMyzVY322VbQ=
+SIZE (i3-4.16.tar.bz2) = 1213251
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/x11/i3/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 29 Mar 2018 21:05:32 - 1.4
+++ patches/patch-Makefile_in 5 Jan 2019 09:43:16 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -752,10 +752,7 @@ i3include_HEADERS = \
+@@ -754,10 +754,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -911,9 +908,6 @@ docs_poddir = ${docdir}
+@@ -913,9 +910,6 @@ docs_poddir = ${docdir}
@BUILD_MANS_TRUE@ man/i3-nagbar.1 \
@BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
@BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3174,7 +3168,7 @@ distclean-tags:
+@@ -3217,7 +3211,7 @@ distclean-tags:
# Leading 'am--fnord' is there to ensure the list of targets does not
# expand to empty, as could happen e.g. with make check TESTS=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3740,7 +3734,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -3783,7 +3777,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/i3/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 4 Sep 2017 14:33:07 - 1.2
+++ patches/patch-configure 5 Jan 2019 09:43:16 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.2 2017/09/
Index: configure
--- configure.orig
+++ configure
-@@ -6388,7 +6388,7 @@ char iconv_open ();
+@@ -6392,7 +6392,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-i3-nagbar_main_c
===
RCS file: /cvs/ports/x11/i3/patches/patch-i3-nagbar_main_c,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-i3-nagbar_main_c
--- patches/patch-i3-nagbar_main_c 21 Oct 2017 19:22:04 - 1.13
+++ patches/patch-i3-nagbar_main_c 5 Jan 2019 09:43:16 -
@@ -3,16 +3,16 @@ $OpenBSD: patch-i3-nagbar_main_c,v 1.13
Index: i3-nagbar/main.c
--- i3-nagbar/main.c.orig
+++ i3-nagbar/main.c
-@@ -184,7 +184,7 @@ static void handle_button_release(xcb_connection_t *co
- }
+@@ -189,7
Re: devel/zeal 0.6.0 => 0.6.1
forgot to cc ports. - Forwarded message from Adam Wolk - Date: Sat, 5 Jan 2019 10:47:08 +0100 From: Adam Wolk To: Rafael Sadowski Subject: Re: devel/zeal 0.6.0 => 0.6.1 User-Agent: Mutt/1.11.1 (2018-12-01) On Sat, Jan 05, 2019 at 10:12:21AM +0100, Rafael Sadowski wrote: > On Fri Jan 04, 2019 at 10:08:39PM +0100, Adam Wolk wrote: > > Hi ports@, > > > > attaching a trivial bump for devel/zeal > > > > Feedback? OK's? > > > > Regards, > > Adam > > Works fine here on amd64. Please find a diff with the following tweaks: > > - User kf5 module, it includes qt5 and cmake. > - remove qtbase as dependency. qtbase comes with x11/qt5 nice > - add sqlite3 as dependency > great catch, I should have checked ldd output > RS > OK awolk@ for your diff, want to commit it or should I do it? Regards, Adam - End forwarded message -
Qt5 without -O3 optimizations
If qmake ports use QMAKE_CFLAGS_OPTIMIZE_FULL and/or the macro
"optimize_full" they will always build with -O3.
I saw this in x11/qt5/{qtmultimedia,qtlocation}.
OK so zap -O3 from our qmake-qt5?
RS
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile30 Nov 2018 15:24:09 - 1.24
+++ Makefile4 Jan 2019 23:55:14 -
@@ -17,7 +17,7 @@ PKGNAME-psql =qt5-postgresql-${VERSION
PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
-REVISION-main =1
+REVISION-main =2
PKG_ARCH-global = *
PKG_ARCH-examples =*
Index: patches/patch-mkspecs_common_gcc-base_conf
===
RCS file: patches/patch-mkspecs_common_gcc-base_conf
diff -N patches/patch-mkspecs_common_gcc-base_conf
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mkspecs_common_gcc-base_conf 4 Jan 2019 23:55:14 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: mkspecs/common/gcc-base.conf
+--- mkspecs/common/gcc-base.conf.orig
mkspecs/common/gcc-base.conf
+@@ -32,7 +32,7 @@
+ #
+
+ QMAKE_CFLAGS_OPTIMIZE = -O2
+-QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
++QMAKE_CFLAGS_OPTIMIZE_FULL = -O2
+ QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
+
Re: CVS: cvs.openbsd.org: ports
On Fri, Jan 04, 2019 at 03:00:40PM -0700, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: st...@cvs.openbsd.org 2019/01/04 15:00:40 > > Modified files: > net/munin : Makefile > > Log message: > mark BROKEN-i386, gmake segfaults It happens on amd64 as well from time to time. -- Antoine
Re: devel/zeal 0.6.0 => 0.6.1
On Fri Jan 04, 2019 at 10:08:39PM +0100, Adam Wolk wrote:
> Hi ports@,
>
> attaching a trivial bump for devel/zeal
>
> Feedback? OK's?
>
> Regards,
> Adam
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/zeal/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 29 Jun 2018 22:16:11 - 1.12
> +++ Makefile 4 Jan 2019 21:06:25 -
> @@ -5,9 +5,8 @@ USE_WXNEEDED =Yes
>
> COMMENT =simple offline API documentation browser
>
> -V = 0.6.0
> +V = 0.6.1
> DISTNAME = zeal-${V}
> -REVISION = 2
>
> CATEGORIES = devel
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/zeal/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 4 Mar 2018 14:00:36 - 1.6
> +++ distinfo 4 Jan 2019 21:06:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (zeal-0.6.0.tar.xz) = 2eBFhGAbxQRh2Z41RRbkaJO/Leu+N3yxc9FUHU/glYo=
> -SIZE (zeal-0.6.0.tar.xz) = 670416
> +SHA256 (zeal-0.6.1.tar.xz) = +7knkjPSuCRbSd4CKK4NBEWEqK50z9UjnBbVCIsfx4s=
> +SIZE (zeal-0.6.1.tar.xz) = 671432
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/zeal/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 29 Jun 2018 22:16:11 - 1.3
> +++ pkg/PLIST 4 Jan 2019 21:06:25 -
> @@ -1,10 +1,12 @@
> @comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:11 espie Exp $
> @bin bin/zeal
> -share/applications/zeal.desktop
> +share/applications/org.zealdocs.Zeal.desktop
> share/icons/hicolor/128x128/apps/zeal.png
> share/icons/hicolor/16x16/apps/zeal.png
> share/icons/hicolor/24x24/apps/zeal.png
> share/icons/hicolor/32x32/apps/zeal.png
> share/icons/hicolor/64x64/apps/zeal.png
> +share/metainfo/
> +share/metainfo/org.zealdocs.Zeal.appdata.xml
> @tag update-desktop-database
> @tag gtk-update-icon-cache %D/share/icons/hicolor
Works fine here on amd64. Please find a diff with the following tweaks:
- User kf5 module, it includes qt5 and cmake.
- remove qtbase as dependency. qtbase comes with x11/qt5
- add sqlite3 as dependency
RS
Index: Makefile
===
RCS file: /cvs/ports/devel/zeal/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile29 Jun 2018 22:16:11 - 1.12
+++ Makefile5 Jan 2019 09:08:13 -
@@ -5,9 +5,8 @@ USE_WXNEEDED = Yes
COMMENT = simple offline API documentation browser
-V =0.6.0
+V =0.6.1
DISTNAME = zeal-${V}
-REVISION = 2
CATEGORIES = devel
@@ -18,20 +17,21 @@ MAINTAINER =Adam Wolk https://github.com/zealdocs/zeal/releases/download/v${V}/
EXTRACT_SUFX = .tar.xz
-MODULES = devel/cmake x11/qt5
-BUILD_DEPENDS =devel/kf5/extra-cmake-modules
-RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic
-LIB_DEPENDS = archivers/libarchive \
- x11/qt5/qtbase \
+MODULES = devel/kf5
+
+RUN_DEPENDS += devel/desktop-file-utils \
+ x11/gtk+3,-guic
+
+LIB_DEPENDS += archivers/libarchive \
+ databases/sqlite3 \
x11/qt5/qtwebkit \
x11/qt5/qtx11extras
Index: distinfo
===
RCS file: /cvs/ports/devel/zeal/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo4 Mar 2018 14:00:36 - 1.6
+++ distinfo5 Jan 2019 09:08:13 -
@@ -1,2 +1,2 @@
-SHA256 (zeal-0.6.0.tar.xz) = 2eBFhGAbxQRh2Z41RRbkaJO/Leu+N3yxc9FUHU/glYo=
-SIZE (zeal-0.6.0.tar.xz) = 670416
+SHA256 (zeal-0.6.1.tar.xz) = +7knkjPSuCRbSd4CKK4NBEWEqK50z9UjnBbVCIsfx4s=
+SIZE (zeal-0.6.1.tar.xz) = 671432
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/zeal/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 29 Jun 2018 22:16:11 - 1.3
+++ pkg/PLIST 5 Jan 2019 09:08:13 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:11 espie Exp $
@bin bin/zeal
-share/applications/zeal.desktop
+share/applications/org.zealdocs.Zeal.desktop
share/icons/hicolor/128x128/apps/zeal.png
share/icons/hicolor/16x16/apps/zeal.png
share/icons/hicolor/24x24/apps/zeal.png
@@ -8,3 +8,5 @@ share/icons/hicolor/32x32/apps/zeal.png
share/icons/hicolor/64x64/apps/zeal.png
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/metainfo/
+share/metainfo/org.zealdocs.Zeal.appdata.xml
