Re: UPDATE: editors/{,py-}qscintilla 2.11.2
On Sun, Jul 21, 2019 at 03:17:33PM +0200, Caspar Schutijser wrote:
> On Sun, Jul 21, 2019 at 02:02:00PM +0200, Landry Breuil wrote:
> > On the diff itself, dependency between py- and the lib should be
> > enforced, otherwise you get this:
> >
> > Error: QScintilla 2.10.1 is being used but the Python bindings 2.11.2
> > are being built. Please use matching versions.
> >
> > LIB_DEPENDS = editors/qscintilla,qt5>=2.11.2 (and its equivalent for the
> > default FLAVOR, and maybe even = and not >= ) in py-qscintilla Makefile
> > does the trick.
> >
> > Landry
>
> That's a very good point indeed, thank you. Below is a diff that
> addresses your feedback. I choose to depend on
> editors/qscintilla,qt5=${VERSION} so those lines doesn't have to be
> adjusted with every update.
qgis 3.8 is happy at runtime with this update, so this update is ok for
me if anyone plans to commit it.
Landry
Re: UPDATE: net/snort 2.9.14
On Fri, 19 Jul 2019 at 22:01:53 -0400, Lawrence Teo wrote: > This updates Snort to 2.9.14. > > https://blog.snort.org/2019/07/snort-29140-has-been-released.html > > ok? Builds and runs fine here! When I start it with "-d" I see: snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_GetCFA' snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_DeleteException' snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetGR' snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_SetIP' snort:/usr/local/lib/libluajit-5.1.so.1.0: undefined symbol '_Unwind_RaiseException' I think this might be a combo of the packages / snapshot I have. I will update and report back. If you aren't seeing the undefined symbols, OK abieber@ > Index: Makefile > === > RCS file: /cvs/ports/net/snort/Makefile,v > retrieving revision 1.103 > diff -u -p -r1.103 Makefile > --- Makefile 12 Jul 2019 20:48:49 - 1.103 > +++ Makefile 19 Jul 2019 20:17:17 - > @@ -2,8 +2,8 @@ > > COMMENT =highly flexible sniffer/NIDS > > -DISTNAME = snort-2.9.13 > -RULESV = 29130 > +DISTNAME = snort-2.9.14 > +RULESV = 29140 > SUBST_VARS = RULESV > > CATEGORIES = net security > Index: distinfo > === > RCS file: /cvs/ports/net/snort/distinfo,v > retrieving revision 1.39 > diff -u -p -r1.39 distinfo > --- distinfo 2 Jun 2019 02:07:44 - 1.39 > +++ distinfo 19 Jul 2019 20:17:52 - > @@ -1,2 +1,2 @@ > -SHA256 (snort-2.9.13.tar.gz) = MURzk9FShrhIgQ3XirLLOtIx/NHxZj+VlYdpDu6nVBM= > -SIZE (snort-2.9.13.tar.gz) = 6553425 > +SHA256 (snort-2.9.14.tar.gz) = wDBtuc5k9FzHxkya/HCr6WidqoYAIDRew7oJmSi3Rks= > +SIZE (snort-2.9.14.tar.gz) = 6688482 > Index: patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c > === > RCS file: > /cvs/ports/net/snort/patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-src_preprocessors_Stream6_snort_stream_tcp_c > --- patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c2 Jun > 2019 02:07:44 - 1.7 > +++ patches/patch-src_preprocessors_Stream6_snort_stream_tcp_c19 Jul > 2019 20:18:18 - > @@ -2,7 +2,7 @@ $OpenBSD: patch-src_preprocessors_Stream > Index: src/preprocessors/Stream6/snort_stream_tcp.c > --- src/preprocessors/Stream6/snort_stream_tcp.c.orig > +++ src/preprocessors/Stream6/snort_stream_tcp.c > -@@ -8562,7 +8562,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet > +@@ -8575,7 +8575,7 @@ static int ProcessTcp(SessionControlBlock *scb, Packet > char src_addr[17]; > char dst_addr[17]; > memset((char *)timestamp, 0, TIMEBUF_SIZE); -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: lang/gcc fails on -current
On 07/20, Nigel Taylor wrote:
> I can get past the sinfo.h error, treeprs.ads and osnames errors, but
> there are more afterwards. Too many errors to fix by hand.
>
> The problem I think lies in opening files for writing when they don't
> exist, it fails to create an empty file. So I manually touch sinfo.h to
> create the empty file. Same for other missing files.
>
> Add env FLAVOR=no_ada to the make or if using dpb lang/gcc/8,no_ada
>
>
> Not sure where the error is could be with the ada bootstrap file, needs
> regenerating.
The same problem here, please find the diff for gcc8 attached.
--
With best regards,
Pavel Korovin
Index: patches/patch-gcc_ada_Make-generated_in
===
RCS file: patches/patch-gcc_ada_Make-generated_in
diff -N patches/patch-gcc_ada_Make-generated_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-gcc_ada_Make-generated_in 22 Jul 2019 05:25:01 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: gcc/ada/Make-generated.in
+--- gcc/ada/Make-generated.in.orig
gcc/ada/Make-generated.in
+@@ -28,6 +28,7 @@ $(ADA_GEN_SUBDIR)/treeprs.ads : $(ADA_GEN_SUBDIR)/tree
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/treeprs
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/treeprs/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/treeprs
++ touch $(ADA_GEN_SUBDIR)/bldtools/treeprs/treeprs.ads
+ (cd $(ADA_GEN_SUBDIR)/bldtools/treeprs; gnatmake -q xtreeprs ;
./xtreeprs treeprs.ads )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/treeprs/treeprs.ads
$(ADA_GEN_SUBDIR)/treeprs.ads
+
+@@ -42,6 +43,7 @@ $(ADA_GEN_SUBDIR)/sinfo.h : $(ADA_GEN_SUBDIR)/sinfo.ad
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/sinfo
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/sinfo/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/sinfo
++ touch $(ADA_GEN_SUBDIR)/bldtools/sinfo/sinfo.h
+ (cd $(ADA_GEN_SUBDIR)/bldtools/sinfo; gnatmake -q xsinfo ; ./xsinfo
sinfo.h )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/sinfo/sinfo.h
$(ADA_GEN_SUBDIR)/sinfo.h
+
+@@ -50,6 +52,7 @@ $(ADA_GEN_SUBDIR)/stamp-snames : $(ADA_GEN_SUBDIR)/sna
+ -$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/snamest
+ $(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/snamest/,$(notdir $^))
+ $(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/snamest
++ touch $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.n{b,h,s}
+ (cd $(ADA_GEN_SUBDIR)/bldtools/snamest; gnatmake -q xsnamest ;
./xsnamest )
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.ns
$(ADA_GEN_SUBDIR)/snames.ads
+ $(MOVE_IF_CHANGE) $(ADA_GEN_SUBDIR)/bldtools/snamest/snames.nb
$(ADA_GEN_SUBDIR)/snames.adb
Index: patches/patch-gcc_ada_gcc-interface_Makefile_in
===
RCS file:
/cvs/ports/lang/gcc/8/patches/patch-gcc_ada_gcc-interface_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gcc_ada_gcc-interface_Makefile_in
--- patches/patch-gcc_ada_gcc-interface_Makefile_in 4 Jan 2019 15:50:40
- 1.1.1.1
+++ patches/patch-gcc_ada_gcc-interface_Makefile_in 22 Jul 2019 05:25:01
-
@@ -240,3 +240,18 @@ Index: gcc/ada/gcc-interface/Makefile.in
tb-gcc.c libgnarl/thread.c $(EXTRA_LIBGNAT_SRCS)
# GNATRTL_NONTASKING_OBJS and GNATRTL_TASKING_OBJS can be found in
+@@ -2398,12 +2613,14 @@ OSCONS_EXTRACT=$(OSCONS_CC) $(GNATLIBCFLAGS_FOR_C) -S
+ ./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb
+ -$(MKDIR) ./bldtools/oscons
+ $(RM) $(addprefix ./bldtools/oscons/,$(notdir $^))
++ touch ./bldtools/oscons/xoscons
+ $(CP) $^ ./bldtools/oscons
+ (cd ./bldtools/oscons ; gnatmake -q xoscons)
+
+ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c
gsocket.h ./bldtools/oscons/xoscons
+ $(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s
+ (cd $(RTSDIR) ; \
++ touch s-oscons.{ads,h}; \
+ $(OSCONS_CPP) ; \
+ $(OSCONS_EXTRACT) ; \
+ ../bldtools/oscons/xoscons s-oscons)
[Update] databases/p5-DBIx-DBSchema : Update to 0.45
Hi, ports@:
Here is a patch for databases/p5-DBIx-DBSchema to update to 0.45.
It build well and passed all tests on amd64-head system.
Two ports depends on databases/p5-DBIx-DBSchema:
1) databases/p5-DBIx-SearchBuilder: build well and passed all tests with
this update
2) databases/p5-Jifty-DBI: Without this update p5-Jifty-DBI failed many
tests and skiped some tests.
This port should be updated and then fix tests.
Comments? OK?
wen
Index: Makefile
===
RCS file: /cvs/ports/databases/p5-DBIx-DBSchema/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile12 Jul 2019 20:43:56 - 1.12
+++ Makefile22 Jul 2019 02:29:00 -
@@ -2,8 +2,7 @@
COMMENT= database-independent schema objects
-DISTNAME= DBIx-DBSchema-0.32
-REVISION= 1
+DISTNAME= DBIx-DBSchema-0.45
CATEGORIES=databases
MODULES= cpan
PKG_ARCH= *
Index: distinfo
===
RCS file: /cvs/ports/databases/p5-DBIx-DBSchema/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:13:02 - 1.4
+++ distinfo22 Jul 2019 02:29:00 -
@@ -1,2 +1,2 @@
-SHA256 (DBIx-DBSchema-0.32.tar.gz) =
y2mTHvA5gDkkg7VuF8zxw+oUETdUqERqXJGLtsye7wE=
-SIZE (DBIx-DBSchema-0.32.tar.gz) = 22482
+SHA256 (DBIx-DBSchema-0.45.tar.gz) =
eiqXj7bZ/qo+SxCcccljsmoAii0TDFh27PJMWnIzih0=
+SIZE (DBIx-DBSchema-0.45.tar.gz) = 29144
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/p5-DBIx-DBSchema/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 6 May 2006 19:36:12 - 1.1.1.1
+++ pkg/PLIST 22 Jul 2019 02:29:00 -
@@ -2,10 +2,6 @@
${P5SITE}/DBIx/
${P5SITE}/DBIx/DBSchema/
${P5SITE}/DBIx/DBSchema.pm
-${P5SITE}/DBIx/DBSchema/ColGroup/
-${P5SITE}/DBIx/DBSchema/ColGroup.pm
-${P5SITE}/DBIx/DBSchema/ColGroup/Index.pm
-${P5SITE}/DBIx/DBSchema/ColGroup/Unique.pm
${P5SITE}/DBIx/DBSchema/Column.pm
${P5SITE}/DBIx/DBSchema/DBD/
${P5SITE}/DBIx/DBSchema/DBD.pm
@@ -14,12 +10,11 @@ ${P5SITE}/DBIx/DBSchema/DBD/Pg.pm
${P5SITE}/DBIx/DBSchema/DBD/SQLite.pm
${P5SITE}/DBIx/DBSchema/DBD/Sybase.pm
${P5SITE}/DBIx/DBSchema/DBD/mysql.pm
+${P5SITE}/DBIx/DBSchema/ForeignKey.pm
+${P5SITE}/DBIx/DBSchema/Index.pm
${P5SITE}/DBIx/DBSchema/Table.pm
${P5SITE}/DBIx/DBSchema/_util.pm
@man man/man3p/DBIx::DBSchema.3p
-@man man/man3p/DBIx::DBSchema::ColGroup.3p
-@man man/man3p/DBIx::DBSchema::ColGroup::Index.3p
-@man man/man3p/DBIx::DBSchema::ColGroup::Unique.3p
@man man/man3p/DBIx::DBSchema::Column.3p
@man man/man3p/DBIx::DBSchema::DBD.3p
@man man/man3p/DBIx::DBSchema::DBD::Oracle.3p
@@ -27,4 +22,6 @@ ${P5SITE}/DBIx/DBSchema/_util.pm
@man man/man3p/DBIx::DBSchema::DBD::SQLite.3p
@man man/man3p/DBIx::DBSchema::DBD::Sybase.3p
@man man/man3p/DBIx::DBSchema::DBD::mysql.3p
+@man man/man3p/DBIx::DBSchema::ForeignKey.3p
+@man man/man3p/DBIx::DBSchema::Index.3p
@man man/man3p/DBIx::DBSchema::Table.3p
NEW: x11/qtfm
Hi ports -- Cleaning out some backlog. Attached is a new port, x11/qtfm. QtFM is a desktop-independent file manager. --- pkg/DESCR: QtFM is a desktop-independent file manager. Features: * XDG integration * Customizable interface * Powerful custom command system * Customizable key bindings * Drag & drop functionality * Tabs support * Removable storage support * System tray daemon (qtfm-tray(1)) * Extensive thumbnail support --- Works well on amd64, where I've been using it for months without issue. Note that there are some things I haven't tried, like removable storage support and the system tray daemon (they're things I don't need) so perhaps they are not as advertised on OpenBSD; would be willing to hear tests on those things. OK? ~Brian qtfm.tgz Description: application/compressed-tar
Re: UPDATE: editors/dhex 0.68 => 0.69
On Sun, Jul 21, 2019 at 12:17:47AM -0400, Brian Callahan wrote: > > > On 7/21/19 12:14 AM, Kurt Mosiejczuk wrote: > > On Sun, Jul 21, 2019 at 12:06:11AM -0400, Brian Callahan wrote: > > > Hi ports -- > > > Trivial bugfix update to editors/dhex. > > > OK? > > Works on sparc64. OK kmos@ > > > > > > Better than gbc :) ok! Thanks Brian and Kurt! :) > > ~Brian signature.asc Description: PGP signature
UPDATE: lang/apl 1.7 => 1.8
Hi ports --
Attached is a diff to update GNU APL to its latest 1.8 release. It's a
major update but there's no well-maintained changelog to point you all
to. But there's been a lot of changes, notably graphics support via Gtk+
now.
Vanilla GNU APL 1.8 would segfault on startup. I filed a bug report and
there are some patches in the update that fix that. Those patches are
already in the GNU APL tree, so they'll go away next update.
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/apl/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 12 Jul 2019 20:47:16 - 1.4
+++ Makefile 21 Jul 2019 17:00:44 -
@@ -1,16 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:16 sthen Exp $
COMMENT = interpreter for the programming language APL
-DISTNAME = apl-1.7
+DISTNAME = apl-1.8
CATEGORIES = lang
-REVISION = 1
SHARED_LIBS += _sql 0.0 # 0.0
-SHARED_LIBS += _template_F0 0.0 # 0.0
-SHARED_LIBS += _template_F12 0.0 # 0.0
-SHARED_LIBS += _template_OP1 0.0 # 0.0
-SHARED_LIBS += _template_OP2 0.0 # 0.0
-SHARED_LIBS += emacs 0.0 # 0.0
+SHARED_LIBS += emacs 0.1 # 0.1
HOMEPAGE = https://www.gnu.org/software/apl/
MAINTAINER = Giuseppe Cocomazzi
@@ -18,18 +13,31 @@ MAINTAINER = Giuseppe Cocomazzi
+ #include
+ #include
+ #include
+@@ -41,6 +42,7 @@ enum { MAX_RANK = MAX_RANK_WANTED };
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+
Index: patches/patch-src_Output_cc
===
RCS file: patches/patch-src_Output_cc
diff -N patches/patch-src_Output_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Output_cc 21 Jul 2019 17:00:44 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix for startup segfault.
+http://svn.savannah.gnu.org/viewvc/apl?view=revision=1180
+
+Index: src/Output.cc
+--- src/Output.cc.orig
src/Output.cc
+@@ -89,8 +89,6 @@ int Output::color_UERR_background = 8;
+ /// a filebuf for CERR
+ ErrOut CERR_filebuf;
+
+-bool ErrOut::used = false;
+-
+ DiffOut DOUT_filebuf(false);
+ DiffOut UERR_filebuf(true);
+
Index: patches/patch-src_Performance_def
===
RCS file: patches/patch-src_Performance_def
diff -N patches/patch-src_Performance_def
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Performance_def 21 Jul 2019 17:00:44 -
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+http://svn.savannah.gnu.org/viewvc/apl/trunk/src/Performance.def?r1=1090=1178
+
+Index: src/Performance.def
+--- src/Performance.def.orig
src/Performance.def
+@@ -1,3 +1,12 @@
++// windows seems to #define _B and/or _AB. We therefore #undef it just in case
++//
++#ifdef _B
++# undef _B
++#endif
++
++#ifdef _AB
++# undef _AB
++#endif
+
+ perfo_1(F12_PLUS , _B, " + B", 888ULL)
+ perfo_1(F12_MINUS , _B, " - B", 888ULL)
Index: patches/patch-src_Quad_GTK_cc
===
RCS file: patches/patch-src_Quad_GTK_cc
diff -N patches/patch-src_Quad_GTK_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Quad_GTK_cc 21 Jul 2019 17:00:44 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/Quad_GTK.cc
+--- src/Quad_GTK.cc.orig
src/Quad_GTK.cc
+@@ -387,7 +387,7 @@ pollfd fds[count];
+loop(w, count)
+{
+ fds[w].fd = open_windows[w].fd;
+- fds[w].events = POLLIN | POLLRDHUP;
++ fds[w].events = POLLIN | POLLHUP;
+ fds[w].revents = 0;
+}
+
+@@ -414,7 +414,7 @@ again:
+
+ pollfd pfd;
+pfd.fd = fd;
+- pfd.events = POLLIN | POLLRDHUP;
++ pfd.events = POLLIN | POLLHUP;
+pfd.revents = 0;
+
+ const int ready = poll(, 1, 0);
Index: patches/patch-src_Workspace_cc
===
RCS file: patches/patch-src_Workspace_cc
diff -N patches/patch-src_Workspace_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_Workspace_cc 21 Jul 2019 17:00:44 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix for startup segfault.
+http://svn.savannah.gnu.org/viewvc/apl?view=revision=1180
+
+Index: src/Workspace.cc
+--- src/Workspace.cc.orig
src/Workspace.cc
+@@ -61,6 +61,13 @@ Workspace::Workspace()
+distinguished_names.add_function(q, ID_ ## x, x::fun); }
+
+ #include "SystemVariable.def"
++
++ // (re-) instantiate âŽâ¢CR, âŽâ¢EC, and âŽâ¢ES needed by macros...
++ // This is (in theory) not needed, but may be for some compilers
++ //
++ new (_CR::_fun) Quad_CR; Quad_CR::fun = _CR ::_fun;
++ new (_EC::_fun) Quad_EC; Quad_EC::fun = _EC ::_fun;
++ new (_ES::_fun) Quad_ES; Quad_ES::fun = _ES ::_fun;
+ }
+ //-
+ void
Index: patches/patch-src_buildtag
Re: [ports-gcc] Unbreak graphics/vulkan-loader
On Fri, Jul 19 2019, Charlene Wendling wrote: > On Thu, 18 Jul 2019 23:13:14 -0600 > Thomas Frohwein wrote: > >> Thanks, I appreciate that you found the fix for it! I'm traveling >> currently and can commit the change only on Sunday. Well, Charlene wrote the diff and can commit it. :) >> I'm not sure if this should really be built if there is truly no >> hardware that's compatible... The alternative would excluding PPC and >> maybe a few other arches that are known to not work with any >> compatible hardware. > > Well, there are 2 problems in fact: > > - the one i address here is for all base-gcc archs, not macppc only > - but in fact most of these archs have no vulkan capable video cards > > As far as macppc is concerned, all G4 system are AGP-based so no amdgpu > for them, hence no vulkan. > > Some G5 ones have PCI-Express and the best upgrade official upgrade you > could get is a Radeon X1900 that doesn't as well. I'm not sure more > modern third party cards are available. > > CC'ing Jeremie and Kurt, as i don't know how sparc64 is doing in this > regard. > > I guess it should be only for x86* and arm* in the end. Consumers should be taken into account. I can imagine some ports using vulkan-loader unconditionally at build time, try to use it at runtime and fallback on another backend if vulkan-loader doesn't work. If you use NOT_FOR_ARCHS in vulkan-loader, said ports won't even get a chance to build even though runtime might be ok. Those are only guesses. There are no such ports right now; vkquake supposedly has a hard requirement on vulkan-loader. But such ports might pop up in the future, so I'd prefer vulkan-loader to be available on all arches. ok jca@ for the COMPILER line, I'm not sure the "Thread Local Storage" comment makes sense since you're not only addressing a TLS problem. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: editors/{,py-}qscintilla 2.11.2
On Sun, Jul 21, 2019 at 02:02:00PM +0200, Landry Breuil wrote:
> On the diff itself, dependency between py- and the lib should be
> enforced, otherwise you get this:
>
> Error: QScintilla 2.10.1 is being used but the Python bindings 2.11.2
> are being built. Please use matching versions.
>
> LIB_DEPENDS = editors/qscintilla,qt5>=2.11.2 (and its equivalent for the
> default FLAVOR, and maybe even = and not >= ) in py-qscintilla Makefile
> does the trick.
>
> Landry
That's a very good point indeed, thank you. Below is a diff that
addresses your feedback. I choose to depend on
editors/qscintilla,qt5=${VERSION} so those lines doesn't have to be
adjusted with every update.
Thanks,
Caspar Schutijser
Index: qscintilla/Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- qscintilla/Makefile 12 Jul 2019 20:46:06 - 1.23
+++ qscintilla/Makefile 21 Jul 2019 13:10:54 -
@@ -3,10 +3,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.10.1
+VERSION = 2.11.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = qscintilla-${VERSION}
-REVISION = 0
CATEGORIES = editors x11
@@ -15,7 +14,7 @@ HOMEPAGE =http://www.riverbankcomputing
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
WANTLIB = ${COMPILER_LIBCXX} m
MODULES = devel/qmake
@@ -30,13 +29,13 @@ CXXFLAGS += -std=c++11
FULLPKGNAME = qscintilla-qt5-${VERSION}
QTVER =qt5
MODULES += x11/qt5
-SHARED_LIBS = qscintilla2_qt5 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt5 1.0 # 15.0
WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
.else
QTVER =qt4
MODULES += x11/qt4
-SHARED_LIBS = qscintilla2_qt4 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt4 1.0 # 15.0
WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
WANTLIB += freetype pthread
Index: qscintilla/distinfo
===
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- qscintilla/distinfo 30 Oct 2017 13:49:31 - 1.7
+++ qscintilla/distinfo 21 Jul 2019 13:10:54 -
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
+SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
Index: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
===
RCS file: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
diff -N qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h21 Jul 2019
13:10:54 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: Qt4Qt5/Qsci/qsciscintillabase.h
+--- Qt4Qt5/Qsci/qsciscintillabase.h.orig
Qt4Qt5/Qsci/qsciscintillabase.h
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
+@@ -37,7 +38,6 @@ class QImage;
+ class QMimeData;
+ class QPainter;
+ class QPixmap;
+-class QUrl;
+ QT_END_NAMESPACE
+
+ class QsciScintillaQt;
Index: qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
===
RCS file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Qt4Qt5_qscintilla_pro
--- qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 30 Oct 2017 13:49:31
- 1.4
+++ qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 21 Jul 2019 13:10:54
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-Qt4Qt5_qscintilla_pro,v
Index: Qt4Qt5/qscintilla.pro
--- Qt4Qt5/qscintilla.pro.orig
+++ Qt4Qt5/qscintilla.pro
-@@ -66,7 +66,7 @@ unix:!macx {
+@@ -68,7 +68,7 @@ unix:!macx {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
Index: qscintilla/pkg/PLIST
===
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- qscintilla/pkg/PLIST30 Oct 2017 13:49:31 - 1.6
+++ qscintilla/pkg/PLIST21 Jul 2019 13:10:54 -
@@ -18,6 +18,7 @@ include/X11/${QTVER}/Qsci/qscilexercss.h
include/X11/${QTVER}/Qsci/qscilexercustom.h
include/X11/${QTVER}/Qsci/qscilexerd.h
include/X11/${QTVER}/Qsci/qscilexerdiff.h
+include/X11/${QTVER}/Qsci/qscilexeredifact.h
include/X11/${QTVER}/Qsci/qscilexerfortran.h
include/X11/${QTVER}/Qsci/qscilexerfortran77.h
include/X11/${QTVER}/Qsci/qscilexerhtml.h
@@ -67,6
[macppc] lang/gcc/8: add crt* symbols
Hi,
(I know the timing is unfortunate due to gcc-8 being broken on amd64,
but the proposed changes only impact macppc).
php-7.3 is broken on macppc [0] because it is missing some
_savegpr_/_restgpr_ symbols coming from crt* in libgcc.a.
I'm proposing here a diff that adds additional symbols in libgcc.a,
fixing the php-7.3 build [1]. I've chosen to add them all to avoid
further issues in this regard.
Bumping SHARED_LIBS seems not needed as the additional symbols are not
added to them.
Comments/feedback are welcome,
Charlène.
[0]
http://build-failures.rhaalovely.net/powerpc/2019-04-14/lang/php/7.3.log
[1] https://bin.charlenew.xyz/php73.log.gz
Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile13 Jun 2019 17:00:47 - 1.15
+++ Makefile21 Jul 2019 12:15:29 -
@@ -16,8 +16,8 @@ USE_LLD = No
DPB_PROPERTIES = parallel
V = 8.3.0
-REVISION = 1
-REVISION-libs = 2
+REVISION = 2
+REVISION-libs = 3
FULL_VERSION = $V
FULL_PKGVERSION = $V
Index: patches/patch-libgcc_config_host
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-libgcc_config_host,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-libgcc_config_host
--- patches/patch-libgcc_config_host4 Jan 2019 15:50:39 - 1.1.1.1
+++ patches/patch-libgcc_config_host21 Jul 2019 12:15:29 -
@@ -45,7 +45,7 @@ Index: libgcc/config.host
tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
+ ;;
+powerpc-*-openbsd*)
-+ tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff"
++ tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff
rs6000/t-openbsd"
;;
powerpc-*-eabispe*)
tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr
rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
Index: patches/patch-libgcc_config_rs6000_t-openbsd
===
RCS file: patches/patch-libgcc_config_rs6000_t-openbsd
diff -N patches/patch-libgcc_config_rs6000_t-openbsd
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libgcc_config_rs6000_t-openbsd21 Jul 2019 12:15:29
-
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Add crt* since some symbols are required by lang/php/7.3+
+
+Index: libgcc/config/rs6000/t-openbsd
+--- libgcc/config/rs6000/t-openbsd.orig
libgcc/config/rs6000/t-openbsd
+@@ -0,0 +1,12 @@
++# already added in libgcc/config/rs6000/t-ppccomm
++# LIB2ADD = $(srcdir)/config/rs6000/tramp.S
++
++LIB2ADD_ST += \
++ $(srcdir)/config/rs6000/crtsavfpr.S \
++ $(srcdir)/config/rs6000/crtresfpr.S \
++ $(srcdir)/config/rs6000/crtsavgpr.S \
++ $(srcdir)/config/rs6000/crtresgpr.S \
++ $(srcdir)/config/rs6000/crtresxfpr.S \
++ $(srcdir)/config/rs6000/crtresxgpr.S \
++ $(srcdir)/config/rs6000/crtsavevr.S \
++ $(srcdir)/config/rs6000/crtrestvr.S
Re: UPDATE: editors/{,py-}qscintilla 2.11.2
On Sun, Jul 21, 2019 at 01:36:15PM +0200, Caspar Schutijser wrote:
> Hi,
>
> On Fri, May 31, 2019 at 08:10:03PM +0200, Landry Breuil wrote:
> > Bah, spoke too fast, we have pyqt 5.9 because qt 5.9. Still py-sip is
> > lagging behind a bit :)
>
> landry@ recently updated the py-sip port (thank you!). So with that
> out of the way, I hope we can look at updating editors/{,py-}qscintilla
> again. In the meantime, a new version was released so I updated the
> diff. I performed the same amount of testing as last time, to repeat:
>
> I build-tested the following ports that depend on {,py-}qscintilla:
> cad/openscad
> databases/sqliteman
> geo/qgis
> x11/kde4/p5-qt
> x11/kde4/qyoto
> x11/kde4/ruby-qt
> x11/kde4/smokeqt
>
> In the case of the ports below, I did not only build-test them, I also
> performed some run-time testing:
> databases/sqlitebrowser
> devel/tortoisehg
> math/octave (very light testing)
>
> Feedback is appreciated.
On the diff itself, dependency between py- and the lib should be
enforced, otherwise you get this:
Error: QScintilla 2.10.1 is being used but the Python bindings 2.11.2
are being built. Please use matching versions.
LIB_DEPENDS = editors/qscintilla,qt5>=2.11.2 (and its equivalent for the
default FLAVOR, and maybe even = and not >= ) in py-qscintilla Makefile
does the trick.
Landry
Re: CVS: cvs.openbsd.org: ports
On Sat, Jul 20 2019, Brian Callahan wrote: > CVSROOT: /cvs > Module name: ports > Changes by: bcal...@cvs.openbsd.org 2019/07/20 22:12:10 > > Modified files: > math/gbc : Makefile > > Log message: > Mark gbc BROKEN-sparc64. This has never built on sparc64. It fails with a > Bus error during build. Changing -O levels did nothing. Changing to egcc > did nothing. If you need an alternative bc/dc on sparc64, there's ebc. > > Thanks to kmos@ for testing with me. The error comes from --with-libedit: the libedit glue doesn't respect alignement. I might come up with a fix when time permits, or maybe this could just use readline instead. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: editors/{,py-}qscintilla 2.11.2
On Sun, Jul 21, 2019 at 01:36:15PM +0200, Caspar Schutijser wrote:
> Hi,
>
> On Fri, May 31, 2019 at 08:10:03PM +0200, Landry Breuil wrote:
> > Bah, spoke too fast, we have pyqt 5.9 because qt 5.9. Still py-sip is
> > lagging behind a bit :)
>
> landry@ recently updated the py-sip port (thank you!). So with that
> out of the way, I hope we can look at updating editors/{,py-}qscintilla
> again. In the meantime, a new version was released so I updated the
> diff. I performed the same amount of testing as last time, to repeat:
>
> I build-tested the following ports that depend on {,py-}qscintilla:
> cad/openscad
> databases/sqliteman
> geo/qgis
will test qgis at runtime with this update, thanks !
Re: UPDATE: editors/{,py-}qscintilla 2.11.2
Hi,
On Fri, May 31, 2019 at 08:10:03PM +0200, Landry Breuil wrote:
> Bah, spoke too fast, we have pyqt 5.9 because qt 5.9. Still py-sip is
> lagging behind a bit :)
landry@ recently updated the py-sip port (thank you!). So with that
out of the way, I hope we can look at updating editors/{,py-}qscintilla
again. In the meantime, a new version was released so I updated the
diff. I performed the same amount of testing as last time, to repeat:
I build-tested the following ports that depend on {,py-}qscintilla:
cad/openscad
databases/sqliteman
geo/qgis
x11/kde4/p5-qt
x11/kde4/qyoto
x11/kde4/ruby-qt
x11/kde4/smokeqt
In the case of the ports below, I did not only build-test them, I also
performed some run-time testing:
databases/sqlitebrowser
devel/tortoisehg
math/octave (very light testing)
Feedback is appreciated.
Thanks,
Caspar Schutijser
Index: qscintilla/Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- qscintilla/Makefile 12 Jul 2019 20:46:06 - 1.23
+++ qscintilla/Makefile 21 Jul 2019 08:28:01 -
@@ -3,10 +3,9 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.10.1
+VERSION = 2.11.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = qscintilla-${VERSION}
-REVISION = 0
CATEGORIES = editors x11
@@ -15,7 +14,7 @@ HOMEPAGE =http://www.riverbankcomputing
# GPLv2/GPLv3
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=pyqt/}
+MASTER_SITES =
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
WANTLIB = ${COMPILER_LIBCXX} m
MODULES = devel/qmake
@@ -30,13 +29,13 @@ CXXFLAGS += -std=c++11
FULLPKGNAME = qscintilla-qt5-${VERSION}
QTVER =qt5
MODULES += x11/qt5
-SHARED_LIBS = qscintilla2_qt5 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt5 1.0 # 15.0
WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
.else
QTVER =qt4
MODULES += x11/qt4
-SHARED_LIBS = qscintilla2_qt4 0.0 #13.0
+SHARED_LIBS = qscintilla2_qt4 1.0 # 15.0
WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender fontconfig
WANTLIB += freetype pthread
Index: qscintilla/distinfo
===
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- qscintilla/distinfo 30 Oct 2017 13:49:31 - 1.7
+++ qscintilla/distinfo 21 Jul 2019 08:28:01 -
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.11.2.tar.gz) =
ApvcR2oGn9os6jzZN7oZzH+mFPuQV4yu+Y7XA7ZY9KE=
+SIZE (QScintilla_gpl-2.11.2.tar.gz) = 2986600
Index: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
===
RCS file: qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
diff -N qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ qscintilla/patches/patch-Qt4Qt5_Qsci_qsciscintillabase_h21 Jul 2019
08:28:01 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: Qt4Qt5/Qsci/qsciscintillabase.h
+--- Qt4Qt5/Qsci/qsciscintillabase.h.orig
Qt4Qt5/Qsci/qsciscintillabase.h
+@@ -26,6 +26,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
+@@ -37,7 +38,6 @@ class QImage;
+ class QMimeData;
+ class QPainter;
+ class QPixmap;
+-class QUrl;
+ QT_END_NAMESPACE
+
+ class QsciScintillaQt;
Index: qscintilla/patches/patch-Qt4Qt5_qscintilla_pro
===
RCS file: /cvs/ports/editors/qscintilla/patches/patch-Qt4Qt5_qscintilla_pro,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Qt4Qt5_qscintilla_pro
--- qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 30 Oct 2017 13:49:31
- 1.4
+++ qscintilla/patches/patch-Qt4Qt5_qscintilla_pro 21 Jul 2019 08:28:01
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-Qt4Qt5_qscintilla_pro,v
Index: Qt4Qt5/qscintilla.pro
--- Qt4Qt5/qscintilla.pro.orig
+++ Qt4Qt5/qscintilla.pro
-@@ -66,7 +66,7 @@ unix:!macx {
+@@ -68,7 +68,7 @@ unix:!macx {
# Scintilla namespace rather than pollute the global namespace.
#DEFINES += SCI_NAMESPACE
Index: qscintilla/pkg/PLIST
===
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- qscintilla/pkg/PLIST30 Oct 2017 13:49:31 - 1.6
+++ qscintilla/pkg/PLIST21 Jul 2019 08:28:01 -
@@ -18,6 +18,7 @@ include/X11/${QTVER}/Qsci/qscilexercss.h
include/X11/${QTVER}/Qsci/qscilexercustom.h
include/X11/${QTVER}/Qsci/qscilexerd.h
include/X11/${QTVER}/Qsci/qscilexerdiff.h
+include/X11/${QTVER}/Qsci/qscilexeredifact.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2019/07/21 05:10:23 Modified files: databases/sqlports/files: Var.pm Log message: cleaner way to deal with paths, no functional change
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2019/07/21 04:26:40 Modified files: x11/i3lock : Makefile distinfo x11/i3lock/patches: patch-Makefile_in Log message: update to i3lock-2.12
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:40:10 Modified files: x11/xfce4/xfce4-cpugraph: Makefile distinfo x11/xfce4/xfce4-cpugraph/pkg: PLIST Log message: Update to xfce4-cpugraph 1.1.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:38:46 Modified files: x11/xfce4/terminal: Makefile distinfo x11/xfce4/terminal/pkg: PLIST Log message: Update to xfce4-terminal 0.8.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:33:14 Modified files: x11/xfce4/xfce4-screensaver: Makefile distinfo x11/xfce4/xfce4-screensaver/pkg: PLIST Log message: Update to xfce4-screensaver 0.1.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:32:37 Modified files: x11/xfce4/xfce4-power-manager: Makefile distinfo x11/xfce4/xfce4-power-manager/pkg: PLIST Log message: Update to xfce4-power-manager 1.6.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:31:30 Modified files: x11/xfce4/xfmpc: Makefile distinfo x11/xfce4/xfmpc/pkg: PLIST Log message: Update to xfmpc 0.3.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:30:43 Modified files: x11/xfce4/tumbler: Makefile distinfo x11/xfce4/tumbler/pkg: PLIST Log message: Update to tumbler 0.2.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:30:56 Modified files: x11/xfce4/garcon: Makefile distinfo x11/xfce4/garcon/pkg: PLIST Log message: Update to garcon 0.6.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2019/07/21 03:30:14 Modified files: sysutils/testdisk: Makefile distinfo sysutils/testdisk/pkg: PLIST Log message: Update to testdisk 7.1
Re: sparc64 bulk build report
On Sat, Jul 20, 2019 at 09:30:38PM -0600, lan...@openbsd.org wrote: > bulk build on sparc64-3.ports.openbsd.org > started on Thu Jul 18 10:06:09 MDT 2019 > finished at Sat Jul 20 21:30:14 MDT 2019 > lasted 03D04h24m > done with kern.version=OpenBSD 6.5-current (GENERIC.MP) #228: Tue Jul 16 > 14:25:34 MDT 2019 > > built packages:7527 > Jul 18:4325 > Jul 19:2036 > Jul 20:1165 > > > critical path missing pkgs: > http://build-failures.rhaalovely.net//sparc64/2019-07-18/summary.log To the ones looking at those failures, the 'important' ones are: > http://build-failures.rhaalovely.net//sparc64/2019-07-18/databases/postgresql.log > http://build-failures.rhaalovely.net//sparc64/2019-07-18/devel/libidn2.log > http://build-failures.rhaalovely.net//sparc64/2019-07-18/devel/llvm,,-main.log im not going to start another bulk with libidn2 broken, it takes out too many pkgs. Maybe that's just a fluke though..
回复: [Update] devel/p5-Object-Signature : Update to 1.08
Revised patch. Thank cwen@ ! wen 发件人: Charlene Wendling 发送时间: 2019年7月20日 19:25 收件人: wen heping 抄送: ports@openbsd.org 主题: Re: [Update] devel/p5-Object-Signature : Update to 1.08 On Wed, 17 Jul 2019 08:56:06 + wen heping wrote: > Hi, ports@ : > >Here is a patch to update devel/p5-Object-Signature to 1.08. >It build well and passed all tests on my amd64-head system. > >Three ports depends on devel/p5-Object-Signature: > www/p5-Dancer-Plugin-Thumbnail and > www/p5-Catalyst-Plugin-Session-PerUser build well and passed all > tests. > www/p5-Catalyst-Plugin-Session: build well , 1 tests failed > but it was not caused by the update of devel/p5-Object-Signature. It's known to upstream [0], but they are doing nothing about it, and it's not trivial to fix as the bug report implies. > Comments? OK? As usual with ETHER's modules, it does not work when PORTS_PRIVSEP is enabled: drwx-- 5 _pbuild _pbuild 512B Jul 20 13:03 /usr/ports/pobj/p5-Object-Signature-1.08/Object-Signature-1.08 It requires: FIX_EXTRACT_PERMISSIONS = Yes I also removed the mixed use of space/tabs in the Makefile Charlène. [0] https://rt.cpan.org/Public/Bug/Display.html?id=71142 Index: Makefile === RCS file: /cvs/ports/devel/p5-Object-Signature/Makefile,v retrieving revision 1.14 diff -u -p -u -p -r1.14 Makefile --- Makefile12 Jul 2019 21:02:17 - 1.14 +++ Makefile20 Jul 2019 11:08:56 - @@ -1,11 +1,12 @@ # $OpenBSD: Makefile,v 1.14 2019/07/12 21:02:17 sthen Exp $ -COMMENT=cryptographic signatures for objects +COMMENT= cryptographic signatures for objects MODULES=cpan PKG_ARCH= * -DISTNAME= Object-Signature-1.07 -CATEGORIES= devel +DISTNAME= Object-Signature-1.08 +CATEGORIES=devel +FIX_EXTRACT_PERMISSIONS= Yes # perl PERMIT_PACKAGE= Yes Index: distinfo === RCS file: /cvs/ports/devel/p5-Object-Signature/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo18 Nov 2015 13:16:47 - 1.4 +++ distinfo20 Jul 2019 11:08:56 - @@ -1,2 +1,2 @@ -SHA256 (Object-Signature-1.07.tar.gz) = xhHWRGgzxqGKaP1EiPAX0p/Hd7ftzfrNBn3LVVI4FDE= -SIZE (Object-Signature-1.07.tar.gz) = 29588 +SHA256 (Object-Signature-1.08.tar.gz) = hCFTyU2pPiucs7VN7lcrUGS79JmjanPDiiN5mgIDaYo= +SIZE (Object-Signature-1.08.tar.gz) = 25746 Index: Makefile === RCS file: /cvs/ports/devel/p5-Object-Signature/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile12 Jul 2019 21:02:17 - 1.14 +++ Makefile21 Jul 2019 06:36:43 - @@ -1,11 +1,12 @@ # $OpenBSD: Makefile,v 1.14 2019/07/12 21:02:17 sthen Exp $ -COMMENT=cryptographic signatures for objects +COMMENT= cryptographic signatures for objects MODULES= cpan PKG_ARCH= * -DISTNAME= Object-Signature-1.07 -CATEGORIES= devel +DISTNAME= Object-Signature-1.08 +CATEGORIES=devel +FIX_EXTRACT_PERMISSIONS= Yes # perl PERMIT_PACKAGE=Yes Index: distinfo === RCS file: /cvs/ports/devel/p5-Object-Signature/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo18 Nov 2015 13:16:47 - 1.4 +++ distinfo21 Jul 2019 06:36:43 - @@ -1,2 +1,2 @@ -SHA256 (Object-Signature-1.07.tar.gz) = xhHWRGgzxqGKaP1EiPAX0p/Hd7ftzfrNBn3LVVI4FDE= -SIZE (Object-Signature-1.07.tar.gz) = 29588 +SHA256 (Object-Signature-1.08.tar.gz) = hCFTyU2pPiucs7VN7lcrUGS79JmjanPDiiN5mgIDaYo= +SIZE (Object-Signature-1.08.tar.gz) = 25746
