Re: powerpc bulk build report
On Tue, 15 Dec 2020 08:42:58 +0100
Otto Moerbeek wrote:
> On Tue, Dec 15, 2020 at 02:28:01AM -0500, Brad Smith wrote:
>
> > On Tue, Dec 15, 2020 at 08:19:13AM +0100, Otto Moerbeek wrote:
> > > On Mon, Dec 14, 2020 at 11:05:45AM +0100, Otto Moerbeek wrote:
> > >
> > > > On Mon, Dec 14, 2020 at 02:52:02AM -0500, Brad Smith wrote:
> > > >
> > > > > On 12/14/2020 2:39 AM, Otto Moerbeek wrote:
> > > > > > On Mon, Dec 14, 2020 at 02:36:37AM -0500, Brad Smith wrote:
> > > > > >
> > > > > > > I'm on my phone and don't have another log to compare to
> > > > > > > but this line stuck out to me..
> > > > > > >
> > > > > > > checking for the toolset name used by Boost for c++...
> > > > > > > gcc42 -gcc
> > > > > > That configure line is alwasy reported, also on other
> > > > > > platforms, since it does not seem to cause issues there I
> > > > > > never looked into it.
> > > > >
> > > > > Could be a potential issue. Just something to consider. I'm
> > > > > curious to see what it says on amd64 and i386.
> > > >
> > > > amd64 and arm64:
> > > >
> > > > checking for the toolset name used by Boost for c++...
> > > > gcc42 -gcc
> > > >
> > > > I don't have an i386 at thand,
> > > >
> > > > -Otto
> > > >
> > >
> > > Removing pacthes/patch-libs_context_build_Jamfile_v2 in boost and
> > > bumping the revision produces a boost-md that has the correct
> > > symbols. Test build for pdns_recursor is still running, but it
> > > now detects the boost context functionality correctly.
> > >
> > > As for the toolchain configure check in pdns_recursor: the value
> > > produced is not used by the build afaiks. I'll put it on my list
> > > of things to look at, but it's not high priority.
> >
> > Ah, yes. I noticed that was merged upstream and released with 1.69
> > when looking at newer Boost. The patch there was mismerged by
> > patch(1).
>
> Yes, ok,
>
> -Otto
This also fixes that build failure:
> http://build-failures.rhaalovely.net/powerpc/2020-11-27/net/icinga/core2,-main.log
Thanks a lot! OK cwen@
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /home/cvs/ports/devel/boost/Makefile,v
> > retrieving revision 1.104
> > diff -u -p -u -p -r1.104 Makefile
> > --- Makefile26 Nov 2020 00:08:36 - 1.104
> > +++ Makefile15 Dec 2020 07:24:21 -
> > @@ -6,7 +6,7 @@ COMMENT-main= free peer-reviewed portabl
> > COMMENT-md=machine-dependent libraries for boost
> >
> > VERSION= 1.70.0
> > -REVISION= 0
> > +REVISION= 1
> > DISTNAME= boost_${VERSION:S/./_/g}
> > PKGNAME-main= boost-${VERSION}
> > PKGNAME-md=boost-md-${VERSION}
> > Index: patches/patch-libs_context_build_Jamfile_v2
> > ===
> > RCS file: patches/patch-libs_context_build_Jamfile_v2
> > diff -N patches/patch-libs_context_build_Jamfile_v2
> > --- patches/patch-libs_context_build_Jamfile_v2 5 Nov 2020
> > 11:23:03 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00
> > - @@ -1,17 +0,0 @@
> > -$OpenBSD: patch-libs_context_build_Jamfile_v2,v 1.3 2020/11/05
> > 11:23:03 sthen Exp $ -
> > -ppc32_sysv_elf has 2 instances of "clang".
> > -The second "clang" should be "gcc".
> > -
> > -Index: libs/context/build/Jamfile.v2
> > libs/context/build/Jamfile.v2.orig
> > -+++ libs/context/build/Jamfile.v2
> > -@@ -280,7 +280,7 @@ alias asm_sources
> > - 32
> > - power
> > - elf
> > -- clang
> > -+ gcc
> > -;
> > -
> > - alias asm_sources
>
[ld.bfd] Unbreak geo/spatialite/gui
Hi,
> http://build-failures.rhaalovely.net/powerpc/2020-11-27/geo/spatialite/gui.log
> http://build-failures.rhaalovely.net/sparc64/2020-12-09/geo/spatialite/gui.log
> http://build-failures.rhaalovely.net/mips64/2020-12-10/geo/spatialite/gui.log
This is what config.log says:
> configure:18572: cc -o conftest -O2 -pipe -I/usr/local/include
> -L/usr/local/lib conftest.c -lpq -lrasterlite2 -lspatialite
> -lspatialite -lspatialite -lminizip -lproj -lsqlite3 -L/usr/local/lib
> -lgeos_c >&5
> [...]
> /usr/bin/ld: warning: libfontconfig.so.13.0, needed by
> /usr/local/lib/librasterlite2.so.0.0, not found
> /usr/bin/ld: warning: libfreetype.so.30.0, needed
> by /usr/local/lib/librasterlite2.so.0.0, not found
> [...and many more, not only about rasterlite2...]
Indeed, useless libraries flags for this test are used. See
${WRKSRC}/configure.ac, the previous AC_CHECK_LIBS have populated
LIBS, because no "action-is-found" is defined [0].
LDFLAGS are already provided, but are discarded during the test.
We could totally bypass the test as mentioned in the diff comment.
Or playing with autotools. Yet, i'm proposing to add -L${X11BASE} to
LIBS, only for ld.bfd archs, because it seems to me the better
compromise.
This allows spatialite-gui to be built on macppc. Runtime is working
but is very slow as soon as i start querying a db. REVISION is not
needed, this version never built on ld.bfd archs.
Comments/feedback are welcome,
Charlène.
[0]
https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/Libraries.html
Index: Makefile
===
RCS file: /cvs/ports/geo/spatialite/gui/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile11 Oct 2020 16:37:53 - 1.17
+++ Makefile16 Dec 2020 01:10:40 -
@@ -37,6 +37,16 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CONFIGURE_ARGS += --disable-xlsxwriter
+
+# Checking libpq fails on ld.bfd archs; LIBS is crowded with flags coming
+# from other configure AC_CHECK_LIB checks, pulling X11 libraries.
+# ac_cv_lib_pq_PQconnectdb="yes" could have been used as well. The extra
+# space matters.
+.include
+.if !${PROPERTIES:Mlld}
+CONFIGURE_ENV += LIBS="-L${X11BASE}/lib "
+.endif
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/{pixmaps,applications}
${INSTALL_DATA} ${WRKSRC}/gnome_resource/*.desktop
${PREFIX}/share/applications/
Re: [update] icewm-2.0.0 (Was: [update] icewm-1.9.3)
On Sat, 19 Dec 2020 16:09:50 +0200
Timo Myyrä wrote:
> Charlene Wendling [2020-12-12, 13:37 +0100]:
>
> > Hi,
> >
> > On Sat, 05 Dec 2020 09:25:26 +0200
> > Timo Myyrä wrote:
> >
> >> Hi,
> >>
> >> This updates icewm to latest release, works for me on amd64.
> >>
> >> timo
> >
> > I've tested it successfully on macppc and amd64. OK cwen@
> >
>
> Icewm had new release since, here's updated diff.
> This version changes the default image rendering library from
> gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use Imlib2.
I think it's great to do it right now so we won't have any problem
later (gdk-pixbuf-xlib has been deprecated and archived by GNOME [0]).
> Works for me on amd64.
>
> timo
>
Looks like gdk-pixbuf-xlib used to pull some libraries that are now
missing; in an empty chroot i get:
Missing library for gio-2.0>=0.0
Missing library for glib-2.0>=0.0
Missing library for gmodule-2.0>=0.0
Missing library for gobject-2.0>=0.0
Missing library for pcre>=0.0
port-lib-depends-check was not happy and asked for more LIB_DEPENDS
as well:
icewm-2.0.0(x11/icewm):
Missing lib: cairo.13 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: gdk_pixbuf-2.0.3200 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: harfbuzz.15 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: pango-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: pangocairo-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: pangoft2-1.0.3801 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: rsvg-2.38 (/usr/local/bin/icewmbg) (NOT REACHABLE)
Missing lib: xml2.16 (/usr/local/bin/icewmbg) (NOT REACHABLE)
I added them all explicitly; we could reduce the number of
LIB_DEPENDS lines by playing with implicit dependencies (like
gdk_pixbuf-2.0.3200 pulling xml2.16). But as seen by this update, it's
a dangerous game to play.
I've modified your diff below.
This builds and works fine on amd64 and macppc, i've tested a number
of themes, and met no issues with standard themes. Other themes may
have a titlebar buttons issue, with the leftmost icon on the right
side being slightly mangled.
Charlène.
[0] https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- Makefile11 Nov 2020 09:51:46 - 1.76
+++ Makefile21 Dec 2020 13:54:44 -
@@ -3,23 +3,25 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.8.3
+V= 2.0.0
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
CATEGORIES=x11
-REVISION= 0
HOMEPAGE= https://ice-wm.org/
# LGPLv2 only
PERMIT_PACKAGE=Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
-WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
-WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
-WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
+WANTLIB += ${COMPILER_LIBCXX} FLAC ICE Imlib2 SM X11 Xcomposite
+WANTLIB += Xdamage Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
+WANTLIB += ao c cairo cairo-gobject expat ffi fontconfig freetype
+WANTLIB += fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m ogg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png rsvg-2
+WANTLIB += sndfile vorbis vorbisenc xcb xcb-render xcb-shm xml2
+WANTLIB += z
COMPILER= base-clang ports-gcc base-gcc
@@ -31,7 +33,15 @@ BUILD_DEPENDS= devel/gettext,-tools \
LIB_DEPENDS= audio/libao \
audio/libsndfile \
devel/fribidi \
- graphics/gdk-pixbuf-xlib
+ devel/glib2 \
+ devel/harfbuzz \
+ devel/pango \
+ devel/pcre \
+ graphics/cairo \
+ graphics/gdk-pixbuf2 \
+ graphics/imlib2 \
+ textproc/libxml,-main \
+ x11/gnome/librsvg
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/x11/icewm/distinfo,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 distinfo
--- distinfo22 Sep 2020 12:02:31 - 1.25
+++ distinfo21 Dec 2020 13:54:44 -
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.8.3.tar.lz) = N7FR+Zd6AgzefrsjQZYcuWwJVMUgn8/RFRz2kHRvf9M=
-SIZE (icewm-1.8.3.tar.lz) = 1686603
+SHA256 (icewm-2.0.0.tar.lz) = RHgXK5Nvf33PwhIL6NjxU/11WTO/mLjpjj6uUMQUk5w=
+SIZE (icewm-2.0.0.tar.lz) = 1694653
Index: pkg/PLIST
===
Re: Remove: emulators/gns3
On Wed, 9 Sep 2020 16:58:56 +0200 Rafael Sadowski wrote: > On Sat Aug 22, 2020 at 03:58:23PM +0200, Rafael Sadowski wrote: > > On Sat Aug 22, 2020 at 03:11:16PM +0200, Matthieu Herrb wrote: > > > On Sat, Aug 22, 2020 at 12:26:09PM +0200, Rafael Sadowski wrote: > > > > As mentioned here: > > > > https://marc.info/?l=openbsd-ports&m=159447072122157&w=2 > > > > > > > > Looks dead upstream and I ran into python2.7(93015) in free(): > > > > use after free 0xd64017baf00. > > > > > > > > OK to remove? > > > > > > Hi, > > > > > > FWIW, gns3 is not dead upstream. They changed domain. Last > > > release is only a couple of weeks old: > > > > > > https://www.gns3.com/community/blog/gns3-2-2-12-released > > > > > > But someone probably needs to start over to port that version... > > > (I don't have enough interest in this). > > > > > > > Thanks Matthieu for the note. > > > > Is anybody willing to update gns3? > > > Final call! I would otherwise mark it as BROKEN until someone wants to > do the work. > I was looking at the last Qt4 consumers and met that thread. I agree with marking it BROKEN unless someone is willing to do something, once Qt4 is gone. As pointed out by Matthieu, one will have to start again and it would require a least 2 new ports (see [0]) to get that update. [0] https://github.com/GNS3/gns3-server
Re: [update] games/an 0.95 -> 1.2
Ping :)
On Sat, 10 Oct 2020 14:14:20 +0200
Charlene Wendling wrote:
> Hi,
>
> Here is an update for an to 1.2. This is a rewrite with several
> bugfixes, icu support and less bloat (the library has been
> removed).
>
> I don't have much to say port-wise, changes are trivial - i took the
> opportunity to reorder the Makefile per Makefile.template since it
> doesn't affect much the diff readability. Also, i've zapped some of
> our hooks since upstream's Makefile has now friendlier targets.
>
> This has been tested on amd64, macppc (with clang and gcc there)
> successfully.
>
> Comments/feedback are welcome,
>
> Charlène.
>
Index: Makefile
===
RCS file: /cvs/ports/games/an/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:14 - 1.20
+++ Makefile25 Dec 2020 02:20:30 -
@@ -2,31 +2,32 @@
COMMENT= fast anagram generator
-V= 0.95
+V= 1.2
DISTNAME= an_${V}.orig
PKGNAME= an-${V}
CATEGORIES=games
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
-# GPL - LGPL
+# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= c
+HOMEPAGE= https://salsa.debian.org/pm/an
-WRKDIST= ${WRKDIR}/an-${V}
+WANTLIB= c icudata icui18n icuuc
+
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
+
+LIB_DEPENDS= textproc/icu4c,-main
+
+FAKE_FLAGS=DESTDIR=${WRKINST}${PREFIX}
NO_TEST= Yes
+USE_GMAKE= Yes
+
+WRKDIST= ${WRKDIR}/an-${V}
+
pre-configure:
@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
${WRKSRC}/an.6
-
-do-build:
- cd ${WRKBUILD} && \
- ${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
.include
Index: distinfo
===
RCS file: /cvs/ports/games/an/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:13:55 - 1.5
+++ distinfo25 Dec 2020 02:20:30 -
@@ -1,2 +1,2 @@
-SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
-SIZE (an_0.95.orig.tar.gz) = 47829
+SHA256 (an_1.2.orig.tar.gz) = uBqNt0zf3znmyn3XUs9HIkNdL7f7OhuXHU9PrlFC2ys=
+SIZE (an_1.2.orig.tar.gz) = 14231
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 25 Dec 2020 02:20:30 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -16,10 +16,10 @@
+ #51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+-INSTALLDIR := $(DESTDIR)/usr/games
+-MANDIR := $(DESTDIR)/usr/share/man/man6
++INSTALLDIR := $(DESTDIR)/bin
++MANDIR := $(DESTDIR)/man/man6
+
+-CC:=gcc
++CC?=gcc
+ INSTALL:=install
+
+ CFLAGS += $(shell icu-config --cflags)
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/an/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 00:46:08 - 1.3
+++ pkg/PLIST 25 Dec 2020 02:20:30 -
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
-bin/an
+@bin bin/an
@man man/man6/an.6
Re: UPDATE: SDL 2.0.14
On Sat, 26 Dec 2020 15:03:07 -0500 Brad Smith wrote: > On 12/25/2020 3:39 PM, Thomas Frohwein wrote: > > On Thu, Dec 24, 2020 at 09:48:45PM -0500, Brad Smith wrote: > >> Here is an update to SDL 2.0.14. > >> > >> Tested with a few apps. More testing and feedback welcome. > > I have a similar diff that I'm testing. A few releases ago, there > > was an issue with some reverse deps breaking during build. > > > > Brad, can you let me know what apps you tested, and if you tested > > build and/or runtime, so that I can add it into my own list of > > tests? > > mpv > qemu > ffplay > blobby > taisei > supertux > > Run time testing. I just chose a couple of random games to do some > additional run time > testing of the video and audio output. > > I noticed supertux randomly crashes in SDL_BlitCopy upon startup, but > that is not new > for this release of SDL. > Hi, Some testing report: - amd64:i've tested emulators/ppsspp and games/endless-sky without issues, using my logitech dual action - macppc: after building that update, i've built and run tested games/wesnoth and games/blobby and everything is still fine Port-wise, that looks good to me.
Re: Update devel/cmake
On Fri, 18 Dec 2020 05:46:35 +0100
Rafael Sadowski wrote:
> On Fri Dec 11, 2020 at 04:37:36PM +0100, Rafael Sadowski wrote:
> > Update CMake to the latest version 3.19.1.
> >
> > This diff is currently in an amd64 bulk build. It would be helpful
> > if other cmake-arches (mostly all) could test the diff.
> >
> > Changlog:
> >
> > https://cmake.org/cmake/help/v3.18/release/3.18.html
> > https://cmake.org/cmake/help/v3.19/release/3.19.html
> >
> > Rafael Sadowski
>
> This diff went through an amd64 bulk build without fallout. There was
> also a macppc build test by cwen.
Since then i've managed to build ~500 ports on macppc without issues.
> >
> > diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
> > index 32ea41ee10a..b8da6479471 100644
> > --- a/devel/cmake/Makefile
> > +++ b/devel/cmake/Makefile
> > @@ -4,11 +4,10 @@ DPB_PROPERTIES = parallel
> >
> > COMMENT = portable build system
> >
> > -VER = 3.17.5
> > +VER = 3.19.1
> > EPOCH =0
> > DISTNAME = cmake-${VER}
> > CATEGORIES = devel
> > -REVISION = 1
> >
> > HOMEPAGE = https://www.cmake.org/
> >
> > @@ -52,6 +51,10 @@ CONFIGURE_ENV += MAKE=${MAKE_PROGRAM}
> >
> > MAKE_FLAGS += VERBOSE=1
> >
> > +# bootstrap build
> > +CONFIGURE_ENV += MODCMAKE_PORT_BUILD=yes
> > +MAKE_ENV += MODCMAKE_PORT_BUILD=yes
> > +
> > PORTHOME = ${WRKDIR}
> >
> > SEPARATE_BUILD = Yes
> > diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
> > index 2e33c49f7f2..1e77838aa37 100644
> > --- a/devel/cmake/distinfo
> > +++ b/devel/cmake/distinfo
> > @@ -1,2 +1,2 @@
> > -SHA256 (cmake-3.17.5.tar.gz) =
> > jDCD2Y/ZPBIo1eTkDb/y3Yj097c7n6JKKThie4vCjxo= -SIZE
> > (cmake-3.17.5.tar.gz) = 9473615 +SHA256 (cmake-3.19.1.tar.gz) =
> > HSZuo6du9lDNzxbHgqMXy0p6pGFhfulB44nLSHOKOro= +SIZE
> > (cmake-3.19.1.tar.gz) = 9256956 diff --git
> > a/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake
> > b/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake
> > index c57451892a1..27eb8e21aa2 100644
> > --- a/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake
> > +++ b/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake
> > @@ -2,7 +2,7 @@ $OpenBSD:
> > patch-Modules_Compiler_GNU-Fortran_cmake,v 1.9 2020/11/23 07:33:20
> > rsa Index: Modules/Compiler/GNU-Fortran.cmake
> > --- Modules/Compiler/GNU-Fortran.cmake.orig
> > +++ Modules/Compiler/GNU-Fortran.cmake
> > -@@ -12,9 +12,11 @@ set(CMAKE_Fortran_FORMAT_FREE_FLAG
> > "-ffree-form") +@@ -17,9 +17,11 @@ endif()
> >
> > set(CMAKE_Fortran_POSTPROCESS_FLAG "-fpreprocessed")
> >
> > diff --git a/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
> > b/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake index
> > 08642e625e1..c979e4f4175 100644
> > --- a/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
> > +++ b/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake
> > @@ -2,7 +2,7 @@ $OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.15
> > 2020/11/23 07:33:20 rsadowski Index: Modules/Compiler/GNU.cmake
> > --- Modules/Compiler/GNU.cmake.orig
> > +++ Modules/Compiler/GNU.cmake
> > -@@ -53,10 +53,18 @@ macro(__compiler_gnu lang)
> > +@@ -54,10 +54,17 @@ macro(__compiler_gnu lang)
> >
> > # Initial configuration flags.
> > string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
> > @@ -21,7 +21,6 @@ Index: Modules/Compiler/GNU.cmake
> > +string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3
> > -DNDEBUG")
> > +string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2
> > -g -DNDEBUG")
> > + endif()
> > -+
> > set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " > _COMPILER>-E >
> > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE
> > "-S
> > -o ") if(NOT APPLE OR NOT CMAKE_${lang}
> > _COMPILER_VERSION VERSION_LESS 4) # work around #4462 diff --git
> > a/devel/cmake/patches/patch-Modules_FindTclStub_cmake
> > b/devel/cmake/patches/patch-Modules_FindTclStub_cmake index
> > f1904fb8550..5f5321ee78e 100644
> > --- a/devel/cmake/patches/patch-Modules_FindTclStub_cmake
> > +++ b/devel/cmake/patches/patch-Modules_FindTclStub_cmake
> > @@ -2,8 +2,13 @@ $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.7
> > 2019/08/21 05:47:40 rsadowski Ex Index: Modules/FindTclStub.cmake
> > --- Modules/FindTclStub.cmake.orig
> > +++ Modules/FindTclStub.cmake
> > -@@ -49,13 +49,21 @@ include($
> > {CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake) +@@ -47,15 +47,26 @@
> > variables were moved or removed. Changes compared to
> > + include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
> > +
> > ++set(MODTCL_VERSION $ENV{MODTCL_VERSION})
> > ++set(MODTK_VERSION $ENV{MODTK_VERSION})/MODTK_VERSION
> > ++
> > get_filename_component(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
> > get_filename_component(TCL_TCLSH_PATH_PARENT "${TCL_TCLSH_PATH}"
> > PATH) -string(REGEX REPLACE
> > @@ -28,7 +33,7 @@ Index: Modules/FindTclStub.cmake
> >
> > get_filename_component(TCL_INCLUDE_PATH_PARENT "$
> > {TCL_INCLUDE_PATH}" PATH)
> > get_filename_
Re: [update] icewm-2.0.0 (Was: [update] icewm-1.9.3)
Ping.
On Mon, 21 Dec 2020 15:11:54 +0100
Charlene Wendling wrote:
> On Sat, 19 Dec 2020 16:09:50 +0200
> Timo Myyrä wrote:
>
> > Charlene Wendling [2020-12-12, 13:37 +0100]:
> >
> > > Hi,
> > >
> > > On Sat, 05 Dec 2020 09:25:26 +0200
> > > Timo Myyrä wrote:
> > >
> > >> Hi,
> > >>
> > >> This updates icewm to latest release, works for me on amd64.
> > >>
> > >> timo
> > >
> > > I've tested it successfully on macppc and amd64. OK cwen@
> > >
>
> >
> > Icewm had new release since, here's updated diff.
> > This version changes the default image rendering library from
> > gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use
> > Imlib2.
>
> I think it's great to do it right now so we won't have any problem
> later (gdk-pixbuf-xlib has been deprecated and archived by GNOME [0]).
>
> > Works for me on amd64.
> >
> > timo
> >
>
> Looks like gdk-pixbuf-xlib used to pull some libraries that are now
> missing; in an empty chroot i get:
>
> Missing library for gio-2.0>=0.0
> Missing library for glib-2.0>=0.0
> Missing library for gmodule-2.0>=0.0
> Missing library for gobject-2.0>=0.0
> Missing library for pcre>=0.0
>
> port-lib-depends-check was not happy and asked for more LIB_DEPENDS
> as well:
>
> icewm-2.0.0(x11/icewm):
> Missing lib: cairo.13 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> Missing lib: gdk_pixbuf-2.0.3200 (/usr/local/bin/icewmbg) (NOT
> REACHABLE) Missing lib: harfbuzz.15 (/usr/local/bin/icewmbg) (NOT
> REACHABLE) Missing lib: pango-1.0.3801 (/usr/local/bin/icewmbg) (NOT
> REACHABLE) Missing lib: pangocairo-1.0.3801 (/usr/local/bin/icewmbg)
> (NOT REACHABLE) Missing lib: pangoft2-1.0.3801
> (/usr/local/bin/icewmbg) (NOT REACHABLE) Missing lib: rsvg-2.38
> (/usr/local/bin/icewmbg) (NOT REACHABLE) Missing lib: xml2.16
> (/usr/local/bin/icewmbg) (NOT REACHABLE)
>
> I added them all explicitly; we could reduce the number of
> LIB_DEPENDS lines by playing with implicit dependencies (like
> gdk_pixbuf-2.0.3200 pulling xml2.16). But as seen by this update, it's
> a dangerous game to play.
>
> I've modified your diff below.
>
> This builds and works fine on amd64 and macppc, i've tested a number
> of themes, and met no issues with standard themes. Other themes may
> have a titlebar buttons issue, with the leftmost icon on the right
> side being slightly mangled.
>
> Charlène.
>
>
> [0] https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
Index: Makefile
===
RCS file: /cvs/ports/x11/icewm/Makefile,v
retrieving revision 1.76
diff -u -p -u -p -r1.76 Makefile
--- Makefile11 Nov 2020 09:51:46 - 1.76
+++ Makefile21 Dec 2020 13:54:44 -
@@ -3,23 +3,25 @@
# unconditionally uses machine/apmvar.h and related structures/defines
ONLY_FOR_ARCHS=${APM_ARCHS}
-V= 1.8.3
+V= 2.0.0
COMMENT= small and fast window manager
DISTNAME= icewm-${V}
EXTRACT_SUFX= .tar.lz
CATEGORIES=x11
-REVISION= 0
HOMEPAGE= https://ice-wm.org/
# LGPLv2 only
PERMIT_PACKAGE=Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC ICE SM X11 Xcomposite Xdamage
-WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender ao c expat
-WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
-WANTLIB += m ogg pcre sndfile vorbis vorbisenc xcb z
+WANTLIB += ${COMPILER_LIBCXX} FLAC ICE Imlib2 SM X11 Xcomposite
+WANTLIB += Xdamage Xext Xfixes Xft Xinerama Xpm Xrandr Xrender
+WANTLIB += ao c cairo cairo-gobject expat ffi fontconfig freetype
+WANTLIB += fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 harfbuzz iconv intl lzma m ogg pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png rsvg-2
+WANTLIB += sndfile vorbis vorbisenc xcb xcb-render xcb-shm xml2
+WANTLIB += z
COMPILER= base-clang ports-gcc base-gcc
@@ -31,7 +33,15 @@ BUILD_DEPENDS= devel/gettext,-tools \
LIB_DEPENDS= audio/libao \
audio/libsndfile \
devel/fribidi \
- graphics/gdk-pixbuf-xlib
+ devel/glib2 \
+ devel/harfbuzz \
+ devel/pango \
+ devel/pcre \
+ graphics/cairo \
+ graphics/gdk-pixbuf2 \
+ graphics/imlib2 \
+ textproc/libxml,-main \
+ x11/gnome/librsvg
RUN_DEPENDS= devel/desktop-file-utils
Index: distinfo
===
RCS file: /cvs/ports/x11/icewm/dis
[update] misc/lfm 2.3 -> 3.1 (python 2->3)
Hi,
Here is an update for lfm to version 3.1. It has been rewritten
almost from scratch, here are the most important changes (see [0]):
* move from python 2 to python 3
* pyview has been removed in favour of less(1)
* many backward incompatible changes, notably ~/.lfmrc has been
deprecated in favour of ~/.config/lfmrc/...
Port-wise, despite the size of the diff, there is not much to say.
Nonetheless, data files were not installed where they should.
As such, i've brought back the 2.3 behaviour and chose to install
everything as data_files, instead of using a post-install hook. We
would have needed to patch setup.py anyway.
I met no issues while testing, but given the number of features, i
indeed did not test all of them.
I'm not used to deal with python stuff, so feedback is very welcome :)
Charlène.
[0] https://inigo.katxi.org/devel/lfm/NEWS
Index: Makefile
===
RCS file: /cvs/ports/misc/lfm/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile24 Mar 2020 15:12:39 - 1.8
+++ Makefile29 Dec 2020 10:01:42 -
@@ -2,9 +2,8 @@
COMMENT = powerful curses interface python file manager
-MODPY_EGG_VERSION =2.3
+MODPY_EGG_VERSION =3.1
DISTNAME = lfm-${MODPY_EGG_VERSION}
-REVISION= 2
CATEGORIES = misc
@@ -13,14 +12,14 @@ HOMEPAGE = https://inigo.katxi.org/deve
# GPLv3+
PERMIT_PACKAGE = Yes
-MODPY_PI = Yes
-
MODULES = lang/python
+MODPY_PI = Yes
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
NO_TEST = Yes
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/lfm.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/pyview.1 ${PREFIX}/man/man1
+post-patch:
+ sed -i 's,/usr,${LOCALBASE},g' ${WRKSRC}/lfm.1
.include
Index: distinfo
===
RCS file: /cvs/ports/misc/lfm/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:31 - 1.2
+++ distinfo29 Dec 2020 10:01:42 -
@@ -1,2 +1,2 @@
-SHA256 (lfm-2.3.tar.gz) = 6N8YjBfU1nbPQcyun2v4KqDF/zlC1arZhZkK0URslQQ=
-SIZE (lfm-2.3.tar.gz) = 119120
+SHA256 (lfm-3.1.tar.gz) = L3MaJpQNsWj5yIMM4YbYdplcSFd1coiAUva84Dd6v8o=
+SIZE (lfm-3.1.tar.gz) = 88876
Index: patches/patch-lfm___init___py
===
RCS file: patches/patch-lfm___init___py
diff -N patches/patch-lfm___init___py
--- patches/patch-lfm___init___py 17 Jul 2011 20:23:46 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-lfm___init___py,v 1.1.1.1 2011/07/17 20:23:46 sthen Exp $
-
-Change default .rar handler
-
lfm/__init__.py.orig Thu Jul 14 11:45:30 2011
-+++ lfm/__init__.pyThu Jul 14 11:46:01 2011
-@@ -46,7 +46,7 @@ sysprogs = { 'tar': 'tar',
- 'gzip': 'gzip',
- 'zip': 'zip',
- 'unzip': 'unzip',
-- 'rar': 'rar',
-+ 'rar': 'unrar',
- '7z': '7z',
- 'xz': 'xz',
- 'grep': 'grep',
Index: patches/patch-lfm_common_py
===
RCS file: patches/patch-lfm_common_py
diff -N patches/patch-lfm_common_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lfm_common_py 29 Dec 2020 10:01:43 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Change default handler for rar files
+
+Index: lfm/common.py
+--- lfm/common.py.orig
lfm/common.py
+@@ -37,7 +37,7 @@ SYSPROGS = {'tar': 'tar',
+ 'gzip': 'gzip',
+ 'zip': 'zip',
+ 'unzip': 'unzip',
+-'rar': 'rar',
++'rar': 'unrar',
+ '7z': '7z',
+ 'xz': 'xz',
+ 'lzip': 'lzip',
Index: patches/patch-lfm_compress_py
===
RCS file: /cvs/ports/misc/lfm/patches/patch-lfm_compress_py,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-lfm_compress_py
--- patches/patch-lfm_compress_py 17 Jul 2011 20:23:46 - 1.1.1.1
+++ patches/patch-lfm_compress_py 29 Dec 2020 10:01:43 -
@@ -2,14 +2,42 @@ $OpenBSD: patch-lfm_compress_py,v 1.1.1.
Incompatible GNU tar option
lfm/compress.py.orig Thu Jul 14 12:19:36 2011
-+++ lfm/compress.pyThu Jul 14 12:19:48 2011
-@@ -111,7 +111,7 @@ class PackagerTGZ(PackagerBase):
- exts = ('.tar.gz', '.tgz', '.tar.Z')
+Index: lfm/compress.py
+--- lfm/compress.py.orig
lfm/compress.py
+@@ -108,7 +108,7 @@ class PackagerTGZ(PackagerBase):
need_tar = True
- uncompress_prog = compress_prog = sysprogs['gzip']
--uncompress_cmd = uncompress_prog + ' -d \"%s\" -c | ' + sysprogs['tar'] +
' xfi -'
-+uncompress_cmd = uncompress_prog + ' -d \"%s\" -c | ' + sysprogs['tar'] +
' xf -'
- c
Re: [update] misc/lfm 2.3 -> 3.1 (python 2->3)
On Tue, 29 Dec 2020 14:05:48 +
Stuart Henderson wrote:
> On 2020/12/29 14:46, Björn Ketelaars wrote:
> > On Tue 29/12/2020 11:27, Charlene Wendling wrote:
> > > Hi,
> > >
> > > Here is an update for lfm to version 3.1. It has been rewritten
> > > almost from scratch, here are the most important changes (see
> > > [0]):
> > >
> > > * move from python 2 to python 3
> > > * pyview has been removed in favour of less(1)
> > > * many backward incompatible changes, notably ~/.lfmrc has been
> > > deprecated in favour of ~/.config/lfmrc/...
> > >
> > > Port-wise, despite the size of the diff, there is not much to say.
> > > Nonetheless, data files were not installed where they should.
> > >
> > > As such, i've brought back the 2.3 behaviour and chose to install
> > > everything as data_files, instead of using a post-install hook. We
> > > would have needed to patch setup.py anyway.
> > >
> > > I met no issues while testing, but given the number of features, i
> > > indeed did not test all of them.
> > >
> > > I'm not used to deal with python stuff, so feedback is very
> > > welcome :)
> > >
> > > Charlène.
Thanks for the feedback.
> > Builds and packages ok, however errors out upon starting:
> >
> > $ lfm
> > ERROR: Cannot copy default theme or keys file to user configuration
> > folder /home/bket/.config/lfm [Errno 2] No such file or directory:
> > '/usr/local/lib/python3.8/site-packages/lfm/etc/lfm-default.theme'
> > Quitting
> >
> > I'm guessing that
> > '/usr/local/lib/python3.8/site-packages/lfm/etc/lfm-default.theme'
> > should read '/usr/local/share/examples/lfm/lfm-default.theme'.
I mistakenly thought there were not used, but they are when no
configuration file is present. Once lfm has been run, these two files
are not used since they're dumped to $HOME/.config/lfm.
They are not shipped anymore in my diff, lfm provides
'--restore-{keys,theme,andmore}' flags anyway.
> .. or /etc/lfm/lfm-default.theme (installed from examples via @sample)
>
I should have not removed that paragraph in my first mail :) See
$WRKSRC/lfm/common.py:17. There is no configuration file hierarchy,
only $HOME/.config/lfm/ is used, as such lfm does not read its
configuration from /etc, hence no @sample seems needed.
It appears that lfm also wants docs so the help system works (press 'h'
in the main window). I've added a new patch to do so without
duplicating them; Debian does this as well, but differently because
they provide gzip'd manpages. In any case the docs are displayed
in raw restructured text format.
Testing the runtime in a clean chroot showed that error message:
ModuleNotFoundError: No module named 'pkg_resources'
So it needs MODPY_SETUPTOOLS to be defined; yet setup.py failed with:
error: option --single-version-externally-managed not recognized
I made setup.py use setuptool's install instead of distutils'
one, and sent a mail to the author about that -- hopefully kmos@
has well documented the issue in another port commit :)
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/misc/lfm/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile24 Mar 2020 15:12:39 - 1.8
+++ Makefile29 Dec 2020 20:39:28 -
@@ -2,9 +2,8 @@
COMMENT = powerful curses interface python file manager
-MODPY_EGG_VERSION =2.3
+MODPY_EGG_VERSION =3.1
DISTNAME = lfm-${MODPY_EGG_VERSION}
-REVISION= 2
CATEGORIES = misc
@@ -13,14 +12,20 @@ HOMEPAGE = https://inigo.katxi.org/deve
# GPLv3+
PERMIT_PACKAGE = Yes
+MODULES = lang/python
+
MODPY_PI = Yes
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-MODULES = lang/python
+# Actually required at runtime (pkg_resources), also see
+# patches/patch-setup_py comment
+MODPY_SETUPTOOLS = Yes
NO_TEST = Yes
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/lfm.1 ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/pyview.1 ${PREFIX}/man/man1
+# fix hardcoded paths
+pre-build:
+ sed -i 's,/usr,${LOCALBASE},g' ${WRKSRC}/lfm.1
+ ${SUBST_CMD} ${WRKSRC}/lfm/actions.py
.include
Index: distinfo
===
RCS file: /cvs/ports/misc/lfm/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:31 - 1.2
+++ distinfo29 Dec 2020 20:39:28 -
@@ -1,2 +1,2 @@
-SHA256 (lfm-2.3
Re: UPDATE: SDL 2.0.14
On Wed, 30 Dec 2020 05:30:39 -0700
Thomas Frohwein wrote:
> On Mon, Dec 28, 2020 at 04:15:45PM -0500, Brad Smith wrote:
> > On 12/28/2020 11:14 AM, Charlene Wendling wrote:
> > > On Sat, 26 Dec 2020 15:03:07 -0500
> > > Brad Smith wrote:
> > >
> > > > On 12/25/2020 3:39 PM, Thomas Frohwein wrote:
> > > > > On Thu, Dec 24, 2020 at 09:48:45PM -0500, Brad Smith wrote:
> > > > > > Here is an update to SDL 2.0.14.
> > > > > >
> > > > > > Tested with a few apps. More testing and feedback welcome.
> > > > > I have a similar diff that I'm testing. A few releases ago,
> > > > > there was an issue with some reverse deps breaking during
> > > > > build.
> > > > >
> > > > > Brad, can you let me know what apps you tested, and if you
> > > > > tested build and/or runtime, so that I can add it into my own
> > > > > list of tests?
> > > > mpv
> > > > qemu
> > > > ffplay
> > > > blobby
> > > > taisei
> > > > supertux
> > > >
> > > > Run time testing. I just chose a couple of random games to do
> > > > some additional run time
> > > > testing of the video and audio output.
> > > >
> > > > I noticed supertux randomly crashes in SDL_BlitCopy upon
> > > > startup, but that is not new
> > > > for this release of SDL.
> > > >
> > > Hi,
> > >
> > > Some testing report:
> > >
> > > - amd64:i've tested emulators/ppsspp and games/endless-sky
> > > without issues, using my logitech dual action
> > > - macppc: after building that update, i've built and run tested
> > > games/wesnoth and games/blobby and everything is
> > > still fine
> > >
> > > Port-wise, that looks good to me.
> > Thanks.
>
> Generally looking good. I did some extensive testing with Brad's diff;
> see sdl2-testing-2.0.14.txt in attachments for a table of results.
>
> Build of emulators/vbam breaks with this update. It can't find
> KMOD_GUI variable anymore; and no KMOD_META. See vbam.txt attachment.
> I got a simple diff for the vbam port below that unbreaks this.
>
> Just double-checking - did SIMD support change with clang on arm (in
> Brad's diff)?
>
> -# clang can't handle simd asm
> -.if ${MACHINE_ARCH} == "arm"
> -CONFIGURE_ARGS+= --disable-arm-simd
>
> If this is clarified, ok thfr@ for Brad's sdl2 diff.
>
> ok for vbam fix below?
Oh, we still provide vbam while there is mgba around :(
I tested your diff with SDL 2.0.14, it builds fine, ok cwen@
> Index: Makefile
> ===
> RCS file: /cvs/ports/emulators/vbam/Makefile,v
> retrieving revision 1.34
> diff -u -p -r1.34 Makefile
> --- Makefile 17 Nov 2019 00:14:36 - 1.34
> +++ Makefile 30 Dec 2020 12:23:16 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT = visualboyadvance-m
> GH_PROJECT = ${GH_ACCOUNT}
> GH_TAGNAME = v2.1.4
> PKGNAME =vbam-${GH_TAGNAME:S/v//}
> +REVISION = 0
>
> CATEGORIES = emulators
>
> Index: patches/patch-src_sdl_SDL_cpp
> ===
> RCS file: patches/patch-src_sdl_SDL_cpp
> diff -N patches/patch-src_sdl_SDL_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_sdl_SDL_cpp 30 Dec 2020 12:23:16 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Index: src/sdl/SDL.cpp
> +--- src/sdl/SDL.cpp.orig
> src/sdl/SDL.cpp
> +@@ -876,9 +876,7 @@ void sdlInitVideo()
> +
> + sdlResizeVideo();
> + }
> +-#if defined(KMOD_GUI)
> + #define KMOD_META KMOD_GUI
> +-#endif
> +
> + #define MOD_KEYS (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
> + #define MOD_NOCTRL (KMOD_SHIFT | KMOD_ALT | KMOD_META)
[macppc] Unbreak games/scummvm
Hi,
> http://build-failures.rhaalovely.net/powerpc/2020-12-15/games/scummvm.log
Classic relocation issue, i should have provided that fix earlier.
With the below diff, scummvm builds on macppc [0]. I also successfully
tested the runtime playing Beneath a Steel Sky (games/bass).
No REVISION bump is needed; this version has never been built on macppc,
and ${LDFLAGS} is empty on other archs.
OK?
Charlène.
[0] https://bin.charlenew.xyz/scummvm.log
Index: Makefile
===
RCS file: /cvs/ports/games/scummvm/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- Makefile3 Oct 2020 10:42:49 - 1.86
+++ Makefile1 Jan 2021 13:49:50 -
@@ -40,6 +40,11 @@ LIB_DEPENDS= audio/fluidsynth \
CXXFLAGS+= -mxgot
.endif
+# Fix relocation overflows
+.if ${MACHINE_ARCH} == "powerpc"
+LDFLAGS+= -Wl,--relax
+.endif
+
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--disable-alsa \
--disable-cloud \
@@ -55,7 +60,7 @@ CONFIGURE_ARGS+=--disable-alsa \
--enable-sndio \
--mandir="${LOCALBASE}/man"
CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
NO_TEST= Yes
USE_GMAKE= Yes
net/lagrange: SIGILLs on old amd64 cpus (and probably true i386)
Hi,
I've found out that we build the bundled Foundation library with SSE4.1.
There is only build time detection, and while bulk machines have
SSE4.1, some old and cheap amd64 consumer machines have not.
As such, i met an illegal instruction error while running lagrange on
my Intel Atom N450 powered eeePC [0] that does not support that
instruction set.
With the below diff, i have been able to build lagrange on a SSE4.1
capable machine and run it on the eeePC.
While here, i've looked at the i386 build log and it's built with
SSE4.1, so i think we should include i386 to the diff.
Comments and feedback are welcome,
Charlène.
[0] https://dmesgd.nycbug.org/index.cgi?do=view&id=5736
Index: Makefile
===
RCS file: /cvs/ports/net/lagrange/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile3 Jan 2021 10:48:58 - 1.6
+++ Makefile7 Jan 2021 12:57:23 -
@@ -2,6 +2,7 @@
COMMENT = SDL multi protocol navigator
VERSION = 1.0.2
+REVISION = 0
DISTNAME = lagrange-${VERSION}
@@ -31,6 +32,12 @@ LIB_DEPENDS =audio/mpg123 \
converters/libunistring \
devel/pcre \
devel/sdl2
+
+# SSE4 is detected at build time only and the bulk machines have it;
+# this fixes SIGILL at runtime on old amd64 machines
+.if ${MACHINE_ARCH:Mamd64}
+CONFIGURE_ARGS += -DTFDN_ENABLE_SSE41=No
+.endif
NO_TEST = Yes
Re: net/lagrange: SIGILLs on old amd64 cpus (and probably true i386)
On Thu, 7 Jan 2021 18:05:17 +
Stuart Henderson wrote:
> Does it need the conditional, can you just set that in CONFIGURE_ARGS
> for all archs?
It builds fine on powerpc without the conditional.
> On 2021/01/07 18:40, Charlene Wendling wrote:
> > Hi,
> >
> > I've found out that we build the bundled Foundation library with
> > SSE4.1. There is only build time detection, and while bulk machines
> > have SSE4.1, some old and cheap amd64 consumer machines have not.
> >
> > As such, i met an illegal instruction error while running lagrange
> > on my Intel Atom N450 powered eeePC [0] that does not support that
> > instruction set.
> >
> > With the below diff, i have been able to build lagrange on a SSE4.1
> > capable machine and run it on the eeePC.
> >
> > While here, i've looked at the i386 build log and it's built with
> > SSE4.1, so i think we should include i386 to the diff.
> >
> > Comments and feedback are welcome,
> >
> > Charlène.
> >
> >
> > [0] https://dmesgd.nycbug.org/index.cgi?do=view&id=5736
> >
Index: Makefile
===
RCS file: /cvs/ports/net/lagrange/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile3 Jan 2021 10:48:58 - 1.6
+++ Makefile7 Jan 2021 19:36:23 -
@@ -2,6 +2,7 @@
COMMENT = SDL multi protocol navigator
VERSION = 1.0.2
+REVISION = 0
DISTNAME = lagrange-${VERSION}
@@ -31,6 +32,9 @@ LIB_DEPENDS = audio/mpg123 \
converters/libunistring \
devel/pcre \
devel/sdl2
+
+# Don't enable SSE4.1, it fails at runtime on old amd64 machines and i386
+CONFIGURE_ARGS += -DTFDN_ENABLE_SSE41=No
NO_TEST = Yes
netsurf/browser: .desktop exec entry is wrong
Hi, $ xdg-settings set default-web-browser netsurf.desktop which: netsurf-gtk: Command not found. readlink: : No such file or directory It has been forgotten since the www/netsurf transition to gtk3. The below diff fixes the issue. OK? Charlène. Index: Makefile === RCS file: /cvs/ports/www/netsurf/browser/Makefile,v retrieving revision 1.40 diff -u -p -u -p -r1.40 Makefile --- Makefile28 May 2020 15:25:26 - 1.40 +++ Makefile10 Jan 2021 23:23:07 - @@ -4,7 +4,7 @@ COMMENT = lightweight web browser, with NETSURF_PROJECT = netsurf NETSURF_VERSION = 3.10 -REVISION = 0 +REVISION = 1 HOMEPAGE = https://www.netsurf-browser.org/ MASTER_SITES = https://download.netsurf-browser.org/netsurf/releases/source/ Index: patches/patch-frontends_gtk_res_netsurf-gtk_desktop === RCS file: patches/patch-frontends_gtk_res_netsurf-gtk_desktop diff -N patches/patch-frontends_gtk_res_netsurf-gtk_desktop --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-frontends_gtk_res_netsurf-gtk_desktop 10 Jan 2021 23:23:07 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Make the .desktop file actually call Netsurf + +Index: frontends/gtk/res/netsurf-gtk.desktop +--- frontends/gtk/res/netsurf-gtk.desktop.orig frontends/gtk/res/netsurf-gtk.desktop +@@ -57,7 +57,7 @@ GenericName[pl]=Przeglądarka WWW + GenericName[pt]=Navegador Web + GenericName[pt_BR]=Navegador Web + GenericName[sk]=Internetový prehliadač +-Exec=netsurf-gtk %u ++Exec=netsurf-gtk3 %u + Terminal=false + X-MultipleArgs=false + Type=Application
[clang+ld.bfd] Unbreak devel/fmt
Hi,
> http://build-failures.rhaalovely.net/mips64/2021-01-12/devel/fmt.log
(and the same in the current bulk for the other clang+ld.bfd arch,
macppc)
As often '-Wl,--as-needed' causes undefined reference errors with
ld.bfd. Surprisingly gcc archs are not impacted.
target_link_libraries() takes precedence over our LDFLAGS, so i could
not use them.
Sadly cmake has not meson's 'b_asneeded' out of the box, so i've added
an AS_NEEDED option, which is ON by default, bringing no change
to clang+ld.lld archs, and turn it OFF on clang+ld.bfd archs.
That also means no REVISION bump is needed (fmt has never been built on
impacted archs).
With the below diff i can build fmt and pass its tests on macppc [0].
mips64 seems to have further problems, i'm not 100% positive it would
fix the build there.
I would be happy to upstream this, but it seems they preferred an OS
centric approach which doesn't play nice with our situation.
Comments and feedback are welcome,
Charlène.
[0] https://bin.charlenew.xyz/fmt.log
Index: Makefile
===
RCS file: /cvs/ports/devel/fmt/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile2 Jan 2021 21:51:19 - 1.1.1.1
+++ Makefile19 Jan 2021 14:59:19 -
@@ -23,4 +23,11 @@ WANTLIB+=${COMPILER_LIBCXX}
CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on
+# Fix undefined references to pthread_* symbols on clang+ld.bfd archs by
+# disabling -Wl,--as-needed.
+.include
+.if !${PROPERTIES:Mlld} && ${PROPERTIES:Mclang}
+CONFIGURE_ARGS+= -DAS_NEEDED=off
+.endif
+
.include
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt19 Jan 2021 14:59:19 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Allow linking without '-Wl,--as-needed', fix the build on clang+ld.bfd archs.
+It's needed to do it like this since target_link_libraries takes preference
+over LDFLAGS.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -59,6 +59,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA
+ option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
+ option(FMT_WERROR "Halt the compilation with an error on compiler warnings."
+OFF)
++option(AS_NEEDED "Use -Wl,--as-needed for linking." ON)
+
+ # Options that control generation of various targets.
+ option(FMT_DOC "Generate the doc target." ${MASTER_PROJECT})
+@@ -233,7 +234,7 @@ endif ()
+
+ if (BUILD_SHARED_LIBS)
+ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND
+- NOT EMSCRIPTEN)
++ NOT EMSCRIPTEN AND AS_NEEDED)
+ # Fix rpmlint warning:
+ # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0
/lib/libm.so.6.
+ target_link_libraries(fmt -Wl,--as-needed)
Re: [clang+ld.bfd] Unbreak devel/fmt
On Wed, 20 Jan 2021 18:25:22 +0100 Janne Johansson wrote: > Den tis 19 jan. 2021 kl 16:16 skrev Charlene Wendling > : > > > http://build-failures.rhaalovely.net/mips64/2021-01-12/devel/fmt.log > > (and the same in the current bulk for the other clang+ld.bfd arch, > > macppc) > > > > With the below diff i can build fmt and pass its tests on macppc > > [0]. mips64 seems to have further problems, i'm not 100% positive > > it would fix the build there. > > > > make test fails one of them on mips64 > 5/15 Test #5: gtest-extra-test . Passed0.07 > sec Start 6: format-test > 6/15 Test #6: format-test ..***Failed0.80 > sec Start 7: format-impl-test > 7/15 Test #7: format-impl-test . Passed0.18 > sec Start 8: locale-test > 8/15 Test #8: locale-test .. Passed0.05 > sec Start 9: ostream-test > 9/15 Test #9: ostream-test . Passed0.06 > sec Start 10: compile-test > 10/15 Test #10: compile-test . Passed0.05 > sec Start 11: printf-test > 11/15 Test #11: printf-test .. Passed0.09 > sec Start 12: ranges-test > 12/15 Test #12: ranges-test .. Passed0.04 > sec Start 13: scan-test > 13/15 Test #13: scan-test Passed0.05 > sec Start 14: posix-mock-test > 14/15 Test #14: posix-mock-test .. Passed0.05 > sec Start 15: os-test > 15/15 Test #15: os-test .. Passed0.19 > sec > > 93% tests passed, 1 tests failed out of 15 > > Total Test time (real) = 1.99 sec > The following tests FAILED: > > 6 - format-test (Failed) > > Errors while running CTest Aw. It would be nice to share $WRKBUILD/Testing/Temporary/LastTest.log i guess. > -- > May the most significant bit of your life be positive. >
Re: [clang+ld.bfd] Unbreak devel/fmt
On Wed, 20 Jan 2021 22:24:45 +0100 Janne Johansson wrote: > Here, > > http://c66.it.su.se:8080/obsd/LastTest.log Thanks! I was watching upstream bug reports and it's not the first time they have similar issues with that test. I'm not sure if the right course of action is to undef FMT_USE_INT128 for mips64 in $WRKSRC/include/fmt/core.h. > Den ons 20 jan. 2021 kl 18:49 skrev Charlene Wendling > : > > > > On Wed, 20 Jan 2021 18:25:22 +0100 > > Janne Johansson wrote: > > > > > Den tis 19 jan. 2021 kl 16:16 skrev Charlene Wendling > > > : > > > > > http://build-failures.rhaalovely.net/mips64/2021-01-12/devel/fmt.log > > > > (and the same in the current bulk for the other clang+ld.bfd > > > > arch, macppc) > > > > > > > > With the below diff i can build fmt and pass its tests on macppc > > > > [0]. mips64 seems to have further problems, i'm not 100% > > > > positive it would fix the build there. > > > > > > > > > > make test fails one of them on mips64 > > > 5/15 Test #5: gtest-extra-test . Passed > > > 0.07 sec Start 6: format-test > > > 6/15 Test #6: format-test ..***Failed > > > 0.80 sec Start 7: format-impl-test > > > 7/15 Test #7: format-impl-test . Passed > > > 0.18 sec Start 8: locale-test > > > 8/15 Test #8: locale-test .. Passed > > > 0.05 sec Start 9: ostream-test > > > 9/15 Test #9: ostream-test . Passed > > > 0.06 sec Start 10: compile-test > > > 10/15 Test #10: compile-test . Passed > > > 0.05 sec Start 11: printf-test > > > 11/15 Test #11: printf-test .. Passed > > > 0.09 sec Start 12: ranges-test > > > 12/15 Test #12: ranges-test .. Passed > > > 0.04 sec Start 13: scan-test > > > 13/15 Test #13: scan-test Passed > > > 0.05 sec Start 14: posix-mock-test > > > 14/15 Test #14: posix-mock-test .. Passed > > > 0.05 sec Start 15: os-test > > > 15/15 Test #15: os-test .. Passed > > > 0.19 sec > > > > > > 93% tests passed, 1 tests failed out of 15 > > > > > > Total Test time (real) = 1.99 sec > > > The following tests FAILED: > > > > > > 6 - format-test (Failed) > > > > > > Errors while running CTest > > > > Aw. > > > > It would be nice to share $WRKBUILD/Testing/Temporary/LastTest.log > > i guess. > > > > > -- > > > May the most significant bit of your life be positive. > > > > > > > -- > May the most significant bit of your life be positive. >
[macppc] Fix devel/liboil runtime
Hi,
This diff is a follow up for the very recent liboil fix for powerpc64.
While trying to fix the issue on powerpc64 through macppc, which was
experiencing the same issue without using gas(1), i've found out that
our current CVS version of liboil has 18 tests failures on macppc.
The below diff removes the powerpc optimisations also on macppc,
leaving out only one test failure [1].
Note that the arm part was a wild guess from jca@ and i, but it does
not fix the build [2].
Comments and feedback are welcome,
Charlène.
[1] https://bin.charlenew.xyz/liboil.log
[2] http://build-failures.rhaalovely.net/arm/2020-11-20/devel/liboil.log
Index: Makefile
===
RCS file: /cvs/ports/devel/liboil/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile28 Apr 2020 18:38:41 - 1.24
+++ Makefile23 Jan 2021 11:26:52 -
@@ -3,7 +3,7 @@
COMMENT= library of optimized inner loops
DISTNAME= liboil-0.3.17
-REVISION= 3
+REVISION= 4
CATEGORIES=devel
MASTER_SITES= ${HOMEPAGE}/download/
@@ -18,10 +18,5 @@ WANTLIB= c m
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=--disable-glib
-
-# Workaround for invalid assembly code with clang
-.if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Marm}
-CFLAGS+= -fno-integrated-as
-.endif
.include
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 23 Jan 2021 11:26:52 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Disable all powerpc* optimisations, they're all full of gcc isms
+
+Index: configure
+--- configure.orig
configure
+@@ -11645,7 +11645,7 @@ $as_echo "#define HAVE_AMD64 1" >>confdefs.h
+
+ ;;
+ xpowerpc|xppc|xpowerpc64|xppc64)
+- HAVE_POWERPC=yes
++ HAVE_POWERPC=no
+
+ $as_echo "#define HAVE_POWERPC 1" >>confdefs.h
+
[update] security/fwbuilder 5.1 -> 6.0.0rc1
Hi,
Here is an update for fwbuilder to 6.0.0rc1.
This comes from a new upstream, that focused on moving fwbuilder to
CMake and Qt5 (instead of autotools and Qt4). There is no other
functional changes to be expected by this update (there is no proper
changelog).
HOMEPAGE is dead, and the old sourceforge page covers version 5.xx
only, so i preferred to keep the github page.
I had to work around the 'rc' versioning used, which is different from
ours. If someone has something more elegant, it would be great :)
It builds successfully on macppc and amd64. Tests report 2 failures out
of 45 units. I can't compare to 5.1, tests don't build.
Comments and feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/security/fwbuilder/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- Makefile9 Jun 2020 07:14:45 - 1.45
+++ Makefile24 Jan 2021 14:10:37 -
@@ -1,76 +1,58 @@
# $OpenBSD: Makefile,v 1.45 2020/06/09 07:14:45 jasper Exp $
COMMENT = firewall GUI
-DISTNAME = fwbuilder-5.1.0.3599
-CATEGORIES = net security
-REVISION = 8
-HOMEPAGE = http://www.fwbuilder.org/
+V =6.0.0
+# We need to have ${LOCALBASE}/share/* directories matching with our own
+# versioning, see CONFIGURE_ARGS and patches/patch-cmake_VERSION_cmake as well.
+RC = rc1
+GH_ACCOUNT = fwbuilder
+GH_PROJECT = fwbuilder
+GH_TAGNAME = v${V}-${RC}
+DISTNAME = ${GH_PROJECT}-${V}${RC}
+
+CATEGORIES = net security
# GPLv2+ mostly, some code under BSD-like
PERMIT_PACKAGE = Yes
-WANTLIB += c crypto iconv m netsnmp QtGui QtNetwork
-WANTLIB += lzma pthread ${COMPILER_LIBCXX} util xml2 xslt z
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5PrintSupport Qt5Widgets
+WANTLIB += c crypto m netsnmp util xml2 xslt z
-COMPILER = base-clang ports-gcc base-gcc
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fwbuilder/}
+MODULES = devel/cmake \
+ x11/qt5
# .orig produces too much spam in tests directories
-PATCHORIG =.ports.orig
-
-AUTOMAKE_VERSION = 1.10
-AUTOCONF_VERSION = 2.63
-AUTORECONF = sh autogen.sh
+PATCHORIG =.orig.port
-CONFIGURE_STYLE = autoreconf
+LIB_DEPENDS = net/net-snmp \
+ textproc/libxml \
+ textproc/libxslt \
+ x11/qt5/qtbase
-BUILD_DEPENDS +=devel/cppunit
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-COPTS =${DEBUG}
-
-CONFIGURE_ARGS += --with-docdir=${TRUEPREFIX}/share/doc/fwbuilder \
- --with-templatedir=${TRUEPREFIX}/share/fwbuilder \
- --with-qtdir=${MODQT_QTDIR} \
- --with-qmake=qmake4 \
- --without-distcc
-MAKE_ENV +=QMAKE=${MODQT_QTDIR}/bin/qmake \
- CXXFLAGS="${CXXFLAGS}" \
- COPTS="${COPTS}" \
- LDFLAGS="${LDFLAGS}"
-
-USE_LIBTOOL = gnu
-MODULES = x11/qt4
-DESTDIRNAME = INSTALL_ROOT
-LIB_DEPENDS = converters/libiconv \
- net/net-snmp \
- textproc/libxml \
- textproc/libxslt \
- x11/qt4
-
+# Requires itself to be installed for tests
TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
-TEST_TARGET = tests
-TEST_ENV +=COPTS="${COPTS}"
+
+CONFIGURE_ARGS +=
-DNETSNMP_INCLUDE_DIR="${LOCALBASE}/include/net-snmp/library" \
+ -DPROJECT_VERSION_EXTRA="${RC}"
+CONFIGURE_ENV += CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+
+# 2 failures:
+# instDialogInstallTest: fails because it can't catch its own background
process
+# FirewallDialogTest: the test seems broken because the dialog text changed
TEST_IS_INTERACTIVE = X11
-FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_FILE="${INSTALL_DATA}"
+# For PLIST
+SUBST_VARS += DISTNAME
+# gunzip all manpages, it's an hell to patch.
post-install:
- cd ${WRKSRC}/src/res/Icons && find . -type d -mindepth 1 -maxdepth 1 | \
- while read D; do \
- ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/$$D; \
- ${INSTALL_DATA_DIR}
${PREFIX}/share/icons/hicolor/$$D/apps; \
- done
-
- cd ${WRKSRC}/src/res/Icons && find . -name '*.png' | \
- while read F; do \
- ${INSTALL_DATA} $$F \
- ${PREFIX}/share/icons/hicolor/`dirname
$$F`/apps/`basename $$F`; \
- done
+ ln -sf /usr/bin/gunzip ${WRKDIR}/bin/gunzip
+ cd ${PREFIX}/man/man1 && gunzip *.1.gz
.include
Index: distinfo
Re: [macppc] unbreak devel/clang-tools-extra?
Hi George,
On Sun, 24 Jan 2021 16:18:54 -0500
George Koehler wrote:
> Hello ports list,
>
> We don't build devel/clang-tools-extra for macppc because,
>
> BROKEN-powerpc = no consumers on powerpc, save 25 build hours
> in bulks
>
> This reason (from cwen@ in Jul 2020) is still true; the consumers
> devel/kdevelop and devel/qt-creator don't exist on powerpc, because
> they depend on x11/qt5/qtwebengine, which is only for amd64 aarch64.
>
> If you remove the BROKEN line, then the powerpc build wastes some
> hours, then fails to link clang-tidy with "relocation truncated to
> fit" errors. I got the below diff from Brad Smith. It adds
> -Wl,--relax to fix the errors. With this diff, a 2700 MHz G5 built
> clang-tools-extra in just under 19 hours (18:43:47).
>
> Do we commit this diff?
>
Sadly it will take more than that in bulks, the bulk machines are way
slower (dual G4 1.0GHz). Similarly to guile2, if there are people using
it i think we should nonetheless.
> I would drop this diff and leave the port as is. The BROKEN reason
> is still true. If we add -Wl,--relax, we would delete -Wl,--relax
> when macppc switches from ld.bfd to ld.lld.
We miss a DPB_PROPERTIES for such a situation, but this is a very rare
one, iirc the only other one on macppc is cad/oce.
> Because I took 19 hours to build it, I feel that I should at least
> share the diff. I tried a few tools on macppc with a single C file in
> a CMake project (because cmake generates the compile_commands.json for
> these tools). clang-tidy warned of a magic number in my C, and
> clang-reorder-fields reordered my struct, but then clang-rename missed
> a spot when it renamed my struct.--George
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/clang-tools-extra/Makefile,v
> retrieving revision 1.11
> diff -u -p -r1.11 Makefile
> --- Makefile 7 Sep 2020 08:54:29 - 1.11
> +++ Makefile 24 Jan 2021 18:33:00 -
> @@ -9,7 +9,6 @@
> # patches: rm patches/patch-*lld*
>
> ONLY_FOR_ARCHS = ${LLVM_ARCHS}
> -BROKEN-powerpc = no consumers on powerpc, save 25 build hours
> in bulks
> COMMENT= Clang extra tools
>
> @@ -66,6 +65,11 @@ CONFIGURE_ARGS += -DCLANG_ENABLE_STATIC_
> -DLLVM_INCLUDE_EXAMPLES=OFF \
> -DLLVM_INCLUDE_TESTS=OFF \
> -DLLVM_INCLUDE_BENCHMARKS=OFF
> +
> +.if ${MACHINE_ARCH} == "powerpc"
> +CONFIGURE_ARGS +=-DCMAKE_EXE_LINKER_FLAGS="-Wl,--relax"
> +CONFIGURE_ARGS +=-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--relax"
> +.endif
>
> GCC_VER =8.4.0
> .if ${MACHINE_ARCH} == "amd64"
>
Re: Qt4 on diet or to hell
On Tue, 26 Jan 2021 13:01:05 + Stuart Henderson wrote: > On 2021/01/26 10:42, Antoine Jacoutot wrote: > > I'd say put it on a diet > > +1 > > > and let's cross fingers that it's ported to Qt5. > > or Qt6 by the time it happens ;) > > they are working on it, gradually. > The diet is the best compromise, it should save some time on the macppc bulk cluster nonetheless, which is great :)
x11/wmcalclock: -fno-common fix, new HOMEPAGE/MASTER_SITES
Hi,
Fix taken from Debian [0], with a patch refresh.
While here, HOMEPAGE and MASTER_SITES are not reachable, use the
dockapps archive [1]. Checksum is still the same.
OK?
Charlène.
[0]
https://sources.debian.org/patches/wmcalclock/1.25-16.1/05-fix-ftbfs.patch/
[1] https://www.dockapps.net/
Index: Makefile
===
RCS file: /cvs/ports/x11/wmcalclock/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.23
+++ Makefile29 Jan 2021 22:45:00 -
@@ -4,16 +4,16 @@ COMMENT= wm-dockapp; calendar/clock
DISTNAME= wmCalClock-1.25
PKGNAME= ${DISTNAME:L}
-REVISION= 1
+REVISION= 2
CATEGORIES=x11 x11/windowmaker
-HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE= https://www.dockapps.net/wmcalclock
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c
-MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
Index: patches/patch-Src_xutils_c
===
RCS file: patches/patch-Src_xutils_c
diff -N patches/patch-Src_xutils_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Src_xutils_c 29 Jan 2021 22:45:00 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: Src/xutils.c
+--- Src/xutils.c.orig
Src/xutils.c
+@@ -53,6 +53,11 @@ GC NormalGC;
+ XpmIcon wmgen;
+ Pixmappixmask;
+
++Display *display;
++WindowRoot;
++Windowiconwin, win;
++int screen;
++int DisplayDepth;
+
+ /*
+ * Colors for wmCalClock
Index: patches/patch-Src_xutils_h
===
RCS file: patches/patch-Src_xutils_h
diff -N patches/patch-Src_xutils_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Src_xutils_h 29 Jan 2021 22:45:00 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Fix -fno-common build failure
+
+Index: Src/xutils.h
+--- Src/xutils.h.orig
Src/xutils.h
+@@ -18,11 +18,11 @@ typedef struct {
+ /*
+ * Global variable
+ */
+-Display *display;
+-Window Root;
+-Window iconwin, win;
+-int screen;
+-int DisplayDepth;
++extern Display*display;
++extern Window Root;
++extern Window iconwin, win;
++extern intscreen;
++extern intDisplayDepth;
+
+
+
Index: patches/patch-wmCalClock_c
===
RCS file: /cvs/ports/x11/wmcalclock/patches/patch-wmCalClock_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-wmCalClock_c
--- patches/patch-wmCalClock_c 3 Jan 2001 14:05:15 - 1.1.1.1
+++ patches/patch-wmCalClock_c 29 Jan 2021 22:45:00 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-wmCalClock_c,v 1.1.1.1 2001/01/03 14:05:15 naddy Exp $
Src/wmCalClock.c.orig Fri Jul 2 23:01:35 1999
-+++ Src/wmCalClock.c Thu Dec 21 17:51:39 2000
+Index: Src/wmCalClock.c
+--- Src/wmCalClock.c.orig
Src/wmCalClock.c
@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) {
int i, n, wid, extrady, extradx;
int Year, Month, DayOfWeek, DayOfMonth, OldDayOfMonth;
@@ -37,7 +38,7 @@ $OpenBSD: patch-wmCalClock_c,v 1.1.1.1 2
HasExecute = 1;
} else if (!strcmp(argv[i], "-g")){
-@@ -999,7 +999,7 @@ void ButtonPressEvent(XButtonEvent *xev)
+@@ -999,7 +999,7 @@ void ButtonPressEvent(XButtonEvent *xev){
if (GotDoubleClick1) {
GotFirstClick1 = 0;
GotDoubleClick1 = 0;
x11/wmclockmon: -fno-common fix
Hi,
Fix taken from Gentoo [0], while here i've refreshed WANTLIB. The runtime is
good on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-plugins/wmclockmon/files/wmclockmon-0.8.1-gcc-10.patch
Index: Makefile
===
RCS file: /cvs/ports/x11/wmclockmon/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.19
+++ Makefile30 Jan 2021 13:43:31 -
@@ -5,7 +5,7 @@ BROKEN-sparc64 =ICE in change_address_1
DISTNAME= wmclockmon-0.8.1
CATEGORIES=x11 x11/windowmaker
-REVISION= 0
+REVISION= 1
HOMEPAGE= http://tnemeth.free.fr/projets/dockapps.html
@@ -17,8 +17,8 @@ PERMIT_PACKAGE= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xpm Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 intl pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pthread z
+WANTLIB += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread z
LIB_DEPENDS= devel/gettext,-runtime \
x11/gtk+2
Index: patches/patch-wmclockmon-cal_main_c
===
RCS file: patches/patch-wmclockmon-cal_main_c
diff -N patches/patch-wmclockmon-cal_main_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_main_c 30 Jan 2021 13:43:31 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/main.c
+--- wmclockmon-cal/main.c.orig
wmclockmon-cal/main.c
+@@ -15,6 +15,22 @@
+ #include "mainwindow.h"
+ #include "main.h"
+
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget *wid_h12;
++GtkWidget *wid_itm;
++GtkWidget *wid_locale;
++
++int selected_row;
++
++struct tm *timeinfos;
+
+ void Usage () {
+ printf("Usage: "PACKAGE"-cal [-h] [-v]\n"
Index: patches/patch-wmclockmon-cal_main_h
===
RCS file: patches/patch-wmclockmon-cal_main_h
diff -N patches/patch-wmclockmon-cal_main_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_main_h 30 Jan 2021 13:43:31 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/main.h
+--- wmclockmon-cal/main.h.orig
wmclockmon-cal/main.h
+@@ -9,7 +9,7 @@
+ #include
+
+
+-struct tm *timeinfos;
++extern struct tm *timeinfos;
+
+ void quit_app();
+
Index: patches/patch-wmclockmon-cal_mainwindow_h
===
RCS file: patches/patch-wmclockmon-cal_mainwindow_h
diff -N patches/patch-wmclockmon-cal_mainwindow_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-cal_mainwindow_h 30 Jan 2021 13:43:31 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-cal/mainwindow.h
+--- wmclockmon-cal/mainwindow.h.orig
wmclockmon-cal/mainwindow.h
+@@ -7,20 +7,20 @@
+
+ #include
+
+-GtkWidget *application;
+-GtkWidget *alarmlist;
+-GtkWidget *wid_backlight;
+-GtkWidget *wid_blink;
+-GtkWidget *wid_styledir;
+-GtkWidget *wid_stylename;
+-GtkWidget *wid_color;
+-GtkWidget *wid_command;
+-GtkWidget *wid_msgcmd;
+-GtkWidget *wid_h12;
+-GtkWidget *wid_itm;
+-GtkWidget *wid_locale;
++extern GtkWidget *application;
++extern GtkWidget *alarmlist;
++extern GtkWidget *wid_backlight;
++extern GtkWidget *wid_blink;
++extern GtkWidget *wid_styledir;
++extern GtkWidget *wid_stylename;
++extern GtkWidget *wid_color;
++extern GtkWidget *wid_command;
++extern GtkWidget *wid_msgcmd;
++extern GtkWidget *wid_h12;
++extern GtkWidget *wid_itm;
++extern GtkWidget *wid_locale;
+
+-int selected_row;
++extern int selected_row;
+
+ gint list_unsel_cb (GtkCList *clist,
+ gint row,
Index: patches/patch-wmclockmon-config_actions_c
===
RCS file: patches/patch-wmclockmon-config_actions_c
diff -N patches/patch-wmclockmon-config_actions_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmclockmon-config_actions_c 30 Jan 2021 13:43:31 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmclockmon-config/actions.c
+--- wmclockmon-config/actions.c.orig
wmclockmon-config/actions.c
+@@ -19,6 +19,24 @@
+ #include "edit.h"
+ #include "actions.h"
+
++GtkWidget *application;
++GtkWidget *alarmlist;
++GtkWidget *wid_backlight;
++GtkWidget *wid_blink;
++GtkWidget *wid_styledir;
++GtkWidget *wid_stylename;
++GtkWidget *wid_color;
++GtkWidget *wid_command;
++GtkWidget *wid_msgcmd;
++GtkWidget *w
sysutils/wmapm: fix with -fno-common, update HOMEPAGE and MASTER_SITES
Hi,
The fix is taken from Gentoo [0]. While here i've updated HOMEPAGE and
MASTER_SITES, refreshed WANTLIB and an existing patch.
It works fine on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch
Index: Makefile
===
RCS file: /cvs/ports/sysutils/wmapm/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:49:54 - 1.30
+++ Makefile30 Jan 2021 15:14:37 -
@@ -5,16 +5,16 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= wm-dockapp; APM/battery monitor
DISTNAME= wmapm-3.1
-REVISION = 3
+REVISION = 4
CATEGORIES=sysutils x11 x11/windowmaker
-HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE= https://www.dockapps.net/wmapm
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c xcb
+WANTLIB= X11 Xext Xpm c
-MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
Index: patches/patch-wmapm_c
===
RCS file: /cvs/ports/sysutils/wmapm/patches/patch-wmapm_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmapm_c
--- patches/patch-wmapm_c 7 Mar 2005 05:37:20 - 1.2
+++ patches/patch-wmapm_c 30 Jan 2021 15:14:37 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-wmapm_c,v 1.2 2005/03/07 05:37:20 mcbride Exp $
wmapm/wmapm.c.orig Tue Jan 11 17:37:25 2000
-+++ wmapm/wmapm.c Wed Jan 10 17:35:20 2001
+Index: wmapm/wmapm.c
+--- wmapm/wmapm.c.orig
wmapm/wmapm.c
@@ -151,12 +151,17 @@
#endif
@@ -84,20 +85,21 @@ $OpenBSD: patch-wmapm_c,v 1.2 2005/03/07
#endif
/*
-@@ -417,9 +427,10 @@ int main(int argc, char *argv[]) {
+@@ -417,10 +427,11 @@ int main(int argc, char *argv[]) {
#ifdef Linux
time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time : my_cur_info.battery_time / 60;
--#endif
--#ifdef FreeBSD
-- time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time / 60 : my_cur_info.battery_time / 3600;
+#elif defined(FreeBSD)
+ time_left = my_cur_info.battery_time / 3600;
+#elif defined(__OpenBSD__)
+ time_left = my_cur_info.battery_time;
#endif
+-#ifdef FreeBSD
+- time_left = (my_cur_info.using_minutes) ?
my_cur_info.battery_time / 60 : my_cur_info.battery_time / 3600;
+-#endif
hour_left = time_left / 60;
+ min_left = time_left % 60;
@@ -689,7 +700,7 @@ void pressEvent(XButtonEvent *xev){
copyXPMArea(21, 106, 13, 11, 46, 48);
RedrawWindow();
@@ -131,13 +133,13 @@ $OpenBSD: patch-wmapm_c,v 1.2 2005/03/07
-#endif
+#elif defined(__OpenBSD__)
+int apm_read(struct apm_power_info *temp_info) {
-+
+
+-#ifdef SunOS
+int fd;
+
+if ( (fd = open(APMDEV, O_RDONLY)) < 0){
+ return(1);
-
--#ifdef SunOS
++
+} else if ( ioctl(fd, APM_IOC_GETPOWER, temp_info) == -1 ) {
+
+close(fd);
Index: patches/patch-wmgeneral_wmgeneral_c
===
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_c 30 Jan 2021 15:14:37 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
wmgeneral/wmgeneral.c
+@@ -50,6 +50,7 @@ Window iconwin, win;
+ GCNormalGC;
+ XpmIcon wmgen;
+ Pixmappixmask;
++Display *display;
+
+ /*/
+ /* Mouse Regions */
Index: patches/patch-wmgeneral_wmgeneral_h
===
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_h 30 Jan 2021 15:14:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
wmgeneral/wmgeneral.h
+@@ -28,7 +28,7 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
++extern Display*display;
+
+ /***/
+ /* Function Prototypes */
Re: Fix games/spacezero -fno-common
On Sat, 30 Jan 2021 01:16:50 + Brian Callahan wrote: > Hi ports -- > > Attached is a patch to fix games/spacezero for -fno-common. > Upstream is long silent. Could not find other packages that had fixed > this. But the fix was easy. > > OK? > > ~Brian OK cwen@
Re: Fix textproc/halibut -fno-common
On Sat, 30 Jan 2021 05:27:53 + Brian Callahan wrote: > Hello ports -- > > Attached is a diff to fix textproc/halibut with -fno-common. > It is taken from Debian: > https://sources.debian.org/data/main/h/halibut/1.2-3/debian/patches/gcc-no-common.patch > > OK? > > ~Brian OK cwen@
Re: Fix games/cpat -fno-common
On Sat, 30 Jan 2021 05:58:40 + Brian Callahan wrote: > Hi ports -- > > Attached is a diff to fix games/cpat for -fno-common > Independent invention, but it is fairly straightforward. > > OK? > > ~Brian OK cwen@
games/typespeed: fix with -fno-common
Hi,
This fix is taken from Gentoo [0]. Built and tested on amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch
Index: Makefile
===
RCS file: /cvs/ports/games/typespeed/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.6
+++ Makefile30 Jan 2021 16:16:29 -
@@ -3,7 +3,7 @@ COMMENT = Test your typing speed and ge
DISTNAME = typespeed-0.6.5
CATEGORIES = games
-REVISION = 3
+REVISION = 4
HOMEPAGE = http://typespeed.sourceforge.net/
Index: patches/patch-src_file_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_file_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_file_c
--- patches/patch-src_file_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_file_c30 Jan 2021 16:16:29 -
@@ -1,10 +1,22 @@
$OpenBSD: patch-src_file_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Don't check if the userconf exists, inconditionally create
-the userdir in ~/.typespeed and the user scorefile.
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Don't check if the userconf exists, inconditionally create
+ the userdir in ~/.typespeed and the user scorefile.
src/file.c.origWed Aug 13 17:08:09 2008
-+++ src/file.c Fri Jan 22 15:21:45 2016
+Index: src/file.c
+--- src/file.c.orig
src/file.c
+@@ -142,6 +142,9 @@ extern int hfd;
+ extern char *rankki[11];
+ extern char *typorank[12];
+ extern char *usedwordfile;
++extern struct rules rules;
++struct rawdatawords;
++struct optopt;
+
+ char ruledir[MAXPATHLEN];
+ char worddir[MAXPATHLEN];
@@ -1125,7 +1125,7 @@ void
readconfig(void)
{
Index: patches/patch-src_menu_c
===
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_menu_c30 Jan 2021 16:16:29 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/menu.c
+--- src/menu.c.orig
src/menu.c
+@@ -76,6 +76,9 @@ void tellstory(void);
+
+ extern int misses;
+ extern char *rankki[11];
++extern struct stats now;
++extern struct rules rules;
++extern struct opt opt;
+
+ struct positions {
+ int rank;
Index: patches/patch-src_misc_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_misc_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_misc_c
--- patches/patch-src_misc_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_misc_c30 Jan 2021 16:16:29 -
@@ -1,9 +1,19 @@
$OpenBSD: patch-src_misc_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-use arc4random()
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Use arc4random()
src/misc.c.origFri Jan 22 14:58:04 2016
-+++ src/misc.c Fri Jan 22 14:58:24 2016
+Index: src/misc.c
+--- src/misc.c.orig
src/misc.c
+@@ -75,6 +75,7 @@ char *xstrdup(char *);
+ void xstrncpy(char *, char *, size_t);
+
+ extern char *progname;
++extern struct opt opt;
+
+ static int graph = 0;
+
@@ -224,7 +224,7 @@ r(int range)
#ifdef WIN32
return (int)(rand() % range);
Index: patches/patch-src_network_c
===
RCS file: patches/patch-src_network_c
diff -N patches/patch-src_network_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_network_c 30 Jan 2021 16:16:29 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/network.c
+--- src/network.c.orig
src/network.c
+@@ -116,6 +116,7 @@ void setnoblock(void);
+ void writenum(char *, uint32_t);
+
+ extern FILE *netlogfile;
++extern struct opt opt;
+
+ static int ds = -1;
+ static int ss = -1;
Index: patches/patch-src_typespeed_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_typespeed_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_typespeed_c
--- patches/patch-src_typespeed_c 22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_typespeed_c 30 Jan 2021 16:16:29 -
@@ -1,10 +1,30 @@
$OpenBSD: patch-src_typespeed_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Disable the code opening the systemwide highscore file
-and dropping privileges, since we're removing the setgid bit
+Hunk #1: Fix -fno-common build failure
+Hunk #2: Disable the code opening the systemwide highscore file
+ and dropping privileges, since we're removing the setgid bit
src/typespeed.c.orig Fri Jan 22 14
games/xinvaders: fix with -fno-common
I took this from FreeBSD [0], the runtime is fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/9bd2b3e4
Index: Makefile
===
RCS file: /cvs/ports/games/xinvaders/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile14 Jul 2019 00:39:37 - 1.35
+++ Makefile30 Jan 2021 16:32:23 -
@@ -3,7 +3,7 @@
COMMENT= shoot them nasty little bugs
DISTNAME= xinvaders-2.1.1
-REVISION= 2
+REVISION= 3
CATEGORIES=games
PERMIT_PACKAGE=Yes
Index: patches/patch-vaders_h
===
RCS file: /cvs/ports/games/xinvaders/patches/patch-vaders_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-vaders_h
--- patches/patch-vaders_h 27 Aug 2015 15:00:32 - 1.2
+++ patches/patch-vaders_h 30 Jan 2021 16:32:23 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-vaders_h,v 1.2 2015/08/27 15:00:32 naddy Exp $
vaders.h.orig Mon Sep 11 00:32:40 2000
-+++ vaders.h Tue Aug 25 21:28:01 2015
+Index: vaders.h
+--- vaders.h.orig
vaders.h
@@ -90,15 +90,82 @@ typedef struct _VadersRec {
@@ -86,7 +87,7 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
ext int level;
ext Display *dpy;
-@@ -111,30 +178,17 @@ ext int basesleft;
+@@ -111,54 +178,31 @@ ext int basesleft;
/* Base info: */
@@ -97,7 +98,8 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
-ext Pixel basepixel;
-ext Pixel buildingpixel;
- ext Boolean basedestroyed;/* TRUE if the base is non-existant */
+-ext Boolean basedestroyed;/* TRUE if the base is non-existant */
++extern Boolean basedestroyed; /* TRUE if the base is non-existant */
/* Vader info: */
@@ -116,8 +118,12 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
- /* moving spacers. */
ext int spacerappear; /* same, but for the interval between
appearances */
- ext Boolean spacer_shown; /* Currnet_Spacer is something */
-@@ -144,21 +198,11 @@ ext int spacer_counter; /* number of cycles to
create
+-ext Boolean spacer_shown; /* Currnet_Spacer is something */
+-ext int spacer_counter; /* number of cycles to create a spacer
*/
++extern Boolean spacer_shown; /* Currnet_Spacer is something */
++extern int spacer_counter;/* number of cycles to create a spacer
*/
+
+ /* Shot info. */
ext XtIntervalId shottimerid;
ext XtIntervalId vshottimerid;
@@ -129,8 +135,10 @@ $OpenBSD: patch-vaders_h,v 1.2 2015/08/2
- /* once. */
-ext int maxvshots;/* How many shots are allowed to exist at */
- /* once. */
- ext int numshots; /* how many shots (from the base) there are
right now. */
- ext int numvshots;/* how many shots (from vaders) there are right
now. */
+-ext int numshots; /* how many shots (from the base) there are
right now. */
+-ext int numvshots;/* how many shots (from vaders) there are right
now. */
++extern int numshots; /* how many shots (from the base) there are
right now. */
++extern int numvshots; /* how many shots (from vaders) there are right
now. */
/* Score info */
games/xblast: fix with -fno-common
I took this from FreeBSD [0]. It builds and works fine on amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/52377c76
Index: Makefile
===
RCS file: /cvs/ports/games/xblast/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.30
+++ Makefile30 Jan 2021 16:56:00 -
@@ -3,7 +3,7 @@
COMMENT= graphical multi-player real-time strategy game for X11
DISTNAME= xblast-2.10.4
-REVISION= 3
+REVISION= 4
DIST_SUBDIR= xblast
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
images-2005-01-06${EXTRACT_SUFX} \
Index: patches/patch-cfg_control_h
===
RCS file: patches/patch-cfg_control_h
diff -N patches/patch-cfg_control_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-cfg_control_h 30 Jan 2021 16:56:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: cfg_control.h
+--- cfg_control.h.orig
cfg_control.h
+@@ -29,7 +29,7 @@
+ #define NUM_KEYB_CONTROLS 2
+
+ /* constant assignment of control to event type */
+-const XBEventCode keyEventType[NUM_KEYB_CONTROLS];
++extern const XBEventCode keyEventType[NUM_KEYB_CONTROLS];
+
+ /* ingame controls for editing*/
+ typedef struct
Index: patches/patch-network_h
===
RCS file: patches/patch-network_h
diff -N patches/patch-network_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-network_h 30 Jan 2021 16:56:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: network.h
+--- network.h.orig
network.h
+@@ -105,7 +105,7 @@ typedef enum
+ #define TEAM_UNDEF 252
+
+ /* team color assignment */
+-const XBColor teamColors[NUM_XBTS];
++extern const XBColor teamColors[NUM_XBTS];
+
+ /* results of game config receive/create */
+ typedef enum
[update, fix] games/xmj 1.0 -> 1.16 (-fno-common)
Hi,
On top of failing with `-fno-common', xmj does not work at all, here on
my amd64 machine:
$ doas pkg_add xmj
$ xmj
Segmentation Fault
So, here is an update for the 20 years old xmj 1.0, to 2020's 1.16. There
are major upstream changes, notably they dropped Imake (yay!), and
xmj is now gtk+2 based.
Port changes:
- Update license marker, refresh WANTLIB (ports-lib-depends-check is happy)
- Use up to date HOMEPAGE and MASTER_SITES (found out thanks to Macports
and repology)
- Requires gmake. The Makefile, for a reason i can't explain, is not
able to properly use path separators, so i forced them at definition
time, which is easier to deal with that in the different install
targets.
- Remove some hardcoded stuff (DESTDIR, CC, and -g flag), add our own
default CFLAGS.
- Install the manpages
Note that this new version does not need fixes for clang 11.
Testing:
- It builds fine on macppc (vanilla clang) and amd64 (modified with
naddy's patch)
- The runtime is great on these 2 platforms. I tried networked games
without issues.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/xmj/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:46:27 - 1.25
+++ Makefile30 Jan 2021 19:24:33 -
@@ -2,22 +2,33 @@
COMMENT= Mahjongg game for X11
-DISTNAME= xmj
-PKGNAME= xmj-1.0
-REVISION = 3
+DISTNAME= mj-1.16-src
+PKGNAME= x${DISTNAME:S/-src$//}
+
CATEGORIES=games
-# BSD
+HOMEPAGE= https://mahjong.julianbradfield.org/
+
+# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xau Xdmcp Xext c xcb
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+MASTER_SITES= ${HOMEPAGE}/Source/
+
+LIB_DEPENDS= x11/gtk+2
+
+MAKE_ENV+= CC="${CC}" EXTRA_CFLAGS="${CFLAGS}"
+FAKE_FLAGS+= DESTDIR="${WRKINST}${PREFIX}"
+
+USE_GMAKE= Yes
-CONFIGURE_STYLE=imake noman
NO_TEST= Yes
-pre-configure:
- @perl -pi -e 's,_height=,_height ,g;' \
- -e 's,_width=,_width ,g' $i \
- ${WRKSRC}/tiles/c*
+INSTALL_TARGET=install install.man
.include
Index: distinfo
===
RCS file: /cvs/ports/games/xmj/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:04 - 1.4
+++ distinfo30 Jan 2021 19:24:33 -
@@ -1,2 +1,2 @@
-SHA256 (xmj.tar.gz) = EGcUMVIKBYSp3BJHqnYPM988WHP7G7IVgN//NK7xhyg=
-SIZE (xmj.tar.gz) = 52255
+SHA256 (mj-1.16-src.tar.gz) = wl6YSPSfcGNeXjugy1l5nlvBSalfeGYhuZaWtmeHop0=
+SIZE (mj-1.16-src.tar.gz) = 403981
Index: patches/patch-Imakefile
===
RCS file: patches/patch-Imakefile
diff -N patches/patch-Imakefile
--- patches/patch-Imakefile 27 Oct 2007 13:32:05 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/27 13:32:05 ajacoutot Exp $
Imakefile.orig Fri May 5 16:46:04 1989
-+++ Imakefile Sat Oct 27 15:15:14 2007
-@@ -4,4 +4,4 @@ LOCAL_LIBRARIES = $(XLIB)
-OBJS = bicons.o cicons.o cicons1.o cicons2.o cicons3.o cicons4.o \
- cicons5.o event.o icons.o mj.o nicons.o
-
--ComplexProgramTarget(xmj)
-+ComplexProgramTargetNoMan(xmj)
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 30 Jan 2021 19:24:33 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+
+Don't hardcode CC and PREFIX, ensure path separators are properly used,
+and don't build with -g
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -52,10 +52,10 @@ TILESETPATH=NULL
+ # (Don't bother with this on Windows; I don't have an install target
+ # for Windows.)
+ # The binaries go into $(DESTDIR)$(BINDIR)
+-DESTDIR = /usr/local/
+-BINDIR = bin
++DESTDIR ?= /usr/local/
++BINDIR = /bin
+ # The man pages go into $(DESTDIR)$(MANDIR)
+-MANDIR = man/man1
++MANDIR = /man/man1
+ # and the appropriate suffix is 1
+ MANSUFFIX = 1
+
+@@ -72,7 +72,7 @@ MGW=/home/jcb/MinGW
+ # makefile was made by stripping out most of an imake-generated file.
+
+ # It's best to use gcc if you can.
+-CC = gcc
++CC ?= cc
+
+ # C debugging and optimization flags.
+ # In development, we turn on all reasonable warnings.
+@@ -85,8 +85,6 @@ CC = gcc
+ # just leave optimization switched off.
+ ifdef Warnings
+ CDEBUGFLAGS = -g -Wall -W -Wstrict-prototypes -Wmissing-prototypes
+-else
+-CDEBUGFLAGS = -g
+ endif
+ # The -Wconversion flag
[update/fix] graphics/mtpaint 3.40 -> 3.50 (-fno-common)
Hi,
Here is an update for mtpaint to 3.50.
Upstream re-enabled -fcommon with clang11 and gcc10 in this version, but
since the compiler version is checked, it's still failing with a patched
`-fno-common' patched clang-10. I have been advised by naddy to
explicitly use `-fcommon' until clang-11 becomes our default compiler.
While here, the spacing was inconsistent around '=', so i fixed this
as well, since it did not hinder much the diff readability.
It has been built and (lightly) tested on amd64 (patched clang) and
macppc (vanilla clang).
OK?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/graphics/mtpaint/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile12 Jul 2019 20:47:04 - 1.5
+++ Makefile30 Jan 2021 23:20:43 -
@@ -2,9 +2,8 @@
COMMENT = simple GTK+2 raster painting program
-DISTNAME = mtpaint-3.40
+DISTNAME = mtpaint-3.50
EXTRACT_SUFX = .tar.bz2
-REVISION = 2
CATEGORIES = graphics
@@ -16,8 +15,9 @@ PERMIT_PACKAGE = Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-x11-2.0 intl jasper jpeg lcms2 m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread tiff z
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz intl jasper jpeg lcms2
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread
+WANTLIB += tiff z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=mtpaint/}
@@ -30,11 +30,15 @@ LIB_DEPENDS = devel/gettext,-runtime \
RUN_DEPENDS = devel/desktop-file-utils
USE_GMAKE =Yes
-CONFIGURE_STYLE = simple
-CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
-lcms2 intl man thread cflags \
---mandir=${TRUEPREFIX}/man
-
-NO_TEST= Yes
+CONFIGURE_STYLE = simple
+CONFIGURE_ARGS = nogif jpeg jasper staticft tiff lcms \
+ lcms2 intl man thread cflags \
+ --mandir=${TRUEPREFIX}/man
+
+NO_TEST = Yes
+
+# Remove after clang update to LLVM11. Meanwhile it avoids false positives with
+# a patched clang-10 (mtpaint uses that flag only with clang-11 and gcc-10)
+CFLAGS += -fcommon
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/mtpaint/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo25 Apr 2016 13:22:00 - 1.1.1.1
+++ distinfo30 Jan 2021 23:20:43 -
@@ -1,2 +1,2 @@
-SHA256 (mtpaint-3.40.tar.bz2) = 7zIdK0BIOce5Cb31KD6yKjf73TW0zJ44DdxABXPXyJA=
-SIZE (mtpaint-3.40.tar.bz2) = 600857
+SHA256 (mtpaint-3.50.tar.bz2) = aVzqEMQoqPEi7Vm+7l/6Sdzcuo2IpHkOrzxk/Xxz1qw=
+SIZE (mtpaint-3.50.tar.bz2) = 800134
Re: security/libsrtp -fno-common
On Sun, 31 Jan 2021 16:38:02 +1100
Jonathan Gray wrote:
> https://github.com/cisco/libsrtp/commit/716a73862b387a2107f37398c0fb7d9a754c0ccd.patch
>
> /tmp/libsrtp2.so.1.0 --> /usr/local/lib/libsrtp2.so.2.0
> Dynamic export changes:
> removed:
> bit_string
>
Tested on amd64 and macppc (vanilla clang there). It needs itself to be
installed for tests to run, i've tweaked your diff to do so.
OK cwen@
Index: Makefile
===
RCS file: /cvs/ports/security/libsrtp/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile3 Feb 2020 20:40:40 - 1.12
+++ Makefile31 Jan 2021 11:53:22 -
@@ -1,18 +1,21 @@
# $OpenBSD: Makefile,v 1.12 2020/02/03 20:40:40 sthen Exp $
-SHARED_LIBS += srtp2 1.0 # 0.0
+SHARED_LIBS += srtp2 2.0 # 0.0
COMMENT= secure RTP library
GH_ACCOUNT=cisco
GH_PROJECT=libsrtp
GH_TAGNAME=v2.3.0
-REVISION= 0
+REVISION= 1
CATEGORIES=security telephony
# BSD
PERMIT_PACKAGE=Yes
+
+# Requires itself to be installed for tests
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
CONFIGURE_STYLE= gnu
Index: patches/patch-crypto_math_datatypes_c
===
RCS file: patches/patch-crypto_math_datatypes_c
diff -N patches/patch-crypto_math_datatypes_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-crypto_math_datatypes_c 31 Jan 2021 11:53:22 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix building with gcc-10
+716a73862b387a2107f37398c0fb7d9a754c0ccd
+
+Index: crypto/math/datatypes.c
+--- crypto/math/datatypes.c.orig
crypto/math/datatypes.c
+@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet)
+
+ /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */
+
+-char bit_string[MAX_PRINT_STRING_LEN];
++static char bit_string[MAX_PRINT_STRING_LEN];
+
+ uint8_t srtp_nibble_to_hex_char(uint8_t nibble)
+ {
Index: patches/patch-test_util_c
===
RCS file: patches/patch-test_util_c
diff -N patches/patch-test_util_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_util_c 31 Jan 2021 11:53:22 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix building with gcc-10
+716a73862b387a2107f37398c0fb7d9a754c0ccd
+
+Index: test/util.c
+--- test/util.c.orig
test/util.c
+@@ -49,7 +49,7 @@
+ #include
+
+ /* include space for null terminator */
+-char bit_string[MAX_PRINT_STRING_LEN + 1];
++static char bit_string[MAX_PRINT_STRING_LEN + 1];
+
+ static inline int hex_char_to_nibble(uint8_t c)
+ {
Re: security/libsrtp -fno-common
On Sun, 31 Jan 2021 12:03:39 + Stuart Henderson wrote: > On 2021/01/31 12:58, Charlene Wendling wrote: > > On Sun, 31 Jan 2021 16:38:02 +1100 > > Jonathan Gray wrote: > > > > > https://github.com/cisco/libsrtp/commit/716a73862b387a2107f37398c0fb7d9a754c0ccd.patch > > > > > > /tmp/libsrtp2.so.1.0 --> /usr/local/lib/libsrtp2.so.2.0 > > > Dynamic export changes: > > > removed: > > > bit_string > > > > > Deps still work, OK with me. > > > Tested on amd64 and macppc (vanilla clang there). It needs itself > > to be installed for tests to run, i've tweaked your diff to do so. > > Can you paste a log please, I don't see that? Huh, weird. I have attached the log. > $ ls /var/db/pkg/*srtp* > ls: /var/db/pkg/*srtp*: No such file or directory > > ... > > ===> Regression tests for libsrtp-2.3.0p1 > Build done. Please run 'gmake runtest' to run self tests. > running libsrtp2 test applications... > crypto/test/cipher_driver -v >/dev/null > crypto/test/kernel_driver -v >/dev/null > test/test_srtp >/dev/null > test/rdbx_driver -v >/dev/null > test/srtp_driver -v >/dev/null > test/roc_driver -v >/dev/null > test/replay_driver -v >/dev/null > test/dtls_srtp_driver >/dev/null > cd > test; /usr/obj/ports/libsrtp-2.3.0/libsrtp-2.3.0/test/rtpw_test.sh > -w /usr/obj/ports/libsrtp-2.3.0/libsrtp-2.3.0/test/words.txt > >/dev/null libsrtp2 test applications passed. gmake -C crypto runtest > >gmake[1]: Entering directory > >'/usr/obj/ports/libsrtp-2.3.0/libsrtp-2.3.0/crypto' > test/env # print out information on the build environment > CPU set to little-endian(WORDS_BIGENDIAN == 0) > CPU set to CISC (CPU_CISC == 1) > using native 64-bit type(NO_64_BIT_MATH == 0) > running crypto test applications... > test `test/aes_calc 000102030405060708090a0b0c0d0e0f > 00112233445566778899aabbccddeeff` = 69c4e0d86a7b0430d8cdb78070b4c55a > test `test/aes_calc > 000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f > 00112233445566778899aabbccddeeff` = 8ea2b7ca516745bfeafc49904b496089 > test/cipher_driver -v >/dev/null test/datatypes_driver -v >/dev/null > test/stat_driver >/dev/null test/sha1_driver -v >/dev/null > test/kernel_driver -v >/dev/null crypto test applications passed. > gmake[1]: Leaving directory > '/usr/obj/ports/libsrtp-2.3.0/libsrtp-2.3.0/crypto' > libsrtp.log Description: Binary data
games/ace: -fno-common fix
Hi,
This fix has been taken from FreeBSD [0]. check_sym reports no dynamic
change. This has been built and tested successfully on macppc and amd64.
OK?
Charlène.
[0] https://github.com/freebsd/freebsd-ports/commit/53cdc659
Index: Makefile
===
RCS file: /cvs/ports/games/ace/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile2 Oct 2019 21:11:08 - 1.5
+++ Makefile31 Jan 2021 12:18:00 -
@@ -3,7 +3,7 @@
COMMENT = solitaire games
DISTNAME = ace-1.4
-REVISION = 1
+REVISION = 2
SHARED_LIBS += cards 0.0 # 1.0
Index: patches/patch-lib_table_c
===
RCS file: patches/patch-lib_table_c
diff -N patches/patch-lib_table_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_table_c 31 Jan 2021 12:18:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: lib/table.c
+--- lib/table.c.orig
lib/table.c
+@@ -57,7 +57,7 @@ static int ex=0, ey=0, ew=0, eh=0;
+ static int graphics_disabled = 1;
+
+ OptionDesc *app_options;
+-OptionDesc *xwin_options;
++extern OptionDesc *xwin_options;
+ static OptionDesc *options[5];
+
+ static OptionDesc ace_options[] = {
Re: security/libsrtp -fno-common
On Sun, 31 Jan 2021 12:52:54 + Stuart Henderson wrote: > On 2021/01/31 13:15, Charlene Wendling wrote: > > On Sun, 31 Jan 2021 12:03:39 + > > Stuart Henderson wrote: > > > > > On 2021/01/31 12:58, Charlene Wendling wrote: > > > > On Sun, 31 Jan 2021 16:38:02 +1100 > > > > Jonathan Gray wrote: > > > > > > > > > https://github.com/cisco/libsrtp/commit/716a73862b387a2107f37398c0fb7d9a754c0ccd.patch > > > > > > > > > > /tmp/libsrtp2.so.1.0 --> /usr/local/lib/libsrtp2.so.2.0 > > > > > Dynamic export changes: > > > > > removed: > > > > > bit_string > > > > > > > > > > > Deps still work, OK with me. > > > > > > > Tested on amd64 and macppc (vanilla clang there). It needs > > > > itself to be installed for tests to run, i've tweaked your diff > > > > to do so. > > > > > > Can you paste a log please, I don't see that? > > > > > > Huh, weird. I have attached the log. > > Very odd. Yours is linking libsrtp2.so.2.0 right after "ar cr > libsrtp2.a ..." so the .so is present when the test programs are > compiled/linked so they pick it up. I can't find a way to replicate > that. Mine doesn't link libsrtp2.so.2.0 until after the tests have > built so they pick up the static lib. > > (not that this is related to the patch) > Sorry for the noise, it appears that MAKE_JOBS>1 is responsible for this.
Re: games/ace: -fno-common fix
On Mon, 1 Feb 2021 00:38:19 +1100
Jonathan Gray wrote:
> On Sun, Jan 31, 2021 at 01:30:19PM +0100, Charlene Wendling wrote:
> > Hi,
> >
> > This fix has been taken from FreeBSD [0]. check_sym reports no
> > dynamic change. This has been built and tested successfully on
> > macppc and amd64.
> >
> > OK?
>
> Is a revision bump strictly needed for this?
As stated in the porting guide: « Anything that affects the binary
package implies a bump. This includes HOMEPAGE, MAINTAINER or
description changes, changes to patches or build flags. »
There are exceptions to this, but when in doubt, it's better to bump.
If you extract the p1 ace package and compare it to p2, you get the
following, showing we should bump revision (if someone has an easier
way to do this, i would be happy to try out):
$ diff -u ace.{orig,new}/+CONTENTS | awk '/^.@(sha|lib|bin|name)/ || /^.[a-z]/'
-@name ace-1.4p1
+@name ace-1.4p2
@bin bin/canfield
@sha FxJ+4ebeIYT29VAoweyphGjWSGQjSsHHEc4HlQ8ykHY=
@bin bin/freecell
@sha ieFkiDSBc2StI2uWXy+5viHg7mvbmLrUK6HJJZ4YWho=
@bin bin/golf
@sha 6A/XiMiKxLFpOBLWl1yYD8k5b2nh93aG/j3T5OWIxE8=
@bin bin/mastermind
@sha V080t6kHmhU64KWGM4LEgfSGcZ8vRW550CVDT1yoG/U=
@bin bin/merlin
@sha 29PgmSv41RETlKjuTXqU3HtO170AIAFYmOftXX9Q3Sw=
@bin bin/minesweeper
@sha b0fyUOEbbdQMvvxmdkdyzlf07bkxNA0/nAi9yQ3hIyE=
@bin bin/pegged
@sha xwBzJCT2ViSVcMZCAtCWgc2cOvPU3ERjMERB+sFkcIc=
@bin bin/penguins
@sha c05np8yPse2w039vvzCoC3ggjsL1ONg2HO+MRoBnLpk=
@bin bin/solitaire
@sha vcTyoA0fhyGxSATvK54rDQk81eS8yuv6pi5WSGvoLOU=
@bin bin/spider
@sha +8qcljp6IZl8o4aFoB6ArnkxIG9d/BkNu0NCiNmgbSQ=
@bin bin/taipedit
-@sha VtXInNZJp3vcqOyRAQVEOZOFIZN+tgfGKV6XTOsuZb4=
+@sha mLXyO3hRYNcIjDrDuYcV4s//rI/mcKv1noFSJKqmL+g=
@bin bin/taipei
-@sha /RCvEK3MYqLA9nfrlMZ+vAvytAhHXy1ua0GlyUbPT24=
+@sha CJg34MSvzRNUzp6ND1cNqGQW4RWSW5JBWl2U5Uc/ND4=
@bin bin/thornq
@sha xGPdJRHJWWlbfazQQnNfuQ1tPlF34tAOOIQqcGEz3II=
lib/libcards.a
-@sha AZ9WtPI/9OEQZFbUxGH074A/L87sXmuBQ+JUuVvrPUQ=
+@sha ZW6cmJaV0GzmvHSKb9d0QJXovsKtoOzMMtCmP1ZhGTI=
lib/libcards.la
@sha KhETIzRiigcLGRlsXwVP42LzPFWmUkX/oADVC3zRO5s=
@lib lib/libcards.so.0.0
-@sha hcmlxe2+4tg08anjTxpXzj6yqZ1cAxODVgMOPrLbup4=
+@sha Fk+bcQ5+DEtXH5hCmj+a3D21FNbBeR3uDkY9EKqojUc=
> ok jsg@
>
> >
> > Charlène.
> >
> >
> > [0] https://github.com/freebsd/freebsd-ports/commit/53cdc659
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/games/ace/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -u -p -r1.5 Makefile
> > --- Makefile2 Oct 2019 21:11:08 - 1.5
> > +++ Makefile31 Jan 2021 12:18:00 -
> > @@ -3,7 +3,7 @@
> > COMMENT = solitaire games
> >
> > DISTNAME = ace-1.4
> > -REVISION = 1
> > +REVISION = 2
> >
> > SHARED_LIBS += cards 0.0 # 1.0
> >
> > Index: patches/patch-lib_table_c
> > ===
> > RCS file: patches/patch-lib_table_c
> > diff -N patches/patch-lib_table_c
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ patches/patch-lib_table_c 31 Jan 2021 12:18:00 -
> > @@ -0,0 +1,16 @@
> > +$OpenBSD$
> > +
> > +Fix the build with -fno-common
> > +
> > +Index: lib/table.c
> > +--- lib/table.c.orig
> > lib/table.c
> > +@@ -57,7 +57,7 @@ static int ex=0, ey=0, ew=0, eh=0;
> > + static int graphics_disabled = 1;
> > +
> > + OptionDesc *app_options;
> > +-OptionDesc *xwin_options;
> > ++extern OptionDesc *xwin_options;
> > + static OptionDesc *options[5];
> > +
> > + static OptionDesc ace_options[] = {
> >
> >
>
net/ncftp: update with -fno-common
Hi, The fix has been taken from FreeBSD [0]. With that i can build and run ncftp without issues on amd64. While here, i moved HOMEPAGE to https. OK? Charlène. [0] https://github.com/freebsd/freebsd-ports/commit/3f1dcac7 Index: Makefile === RCS file: /cvs/ports/net/ncftp/Makefile,v retrieving revision 1.47 diff -u -p -u -p -r1.47 Makefile --- Makefile10 Mar 2020 03:31:45 - 1.47 +++ Makefile31 Jan 2021 21:07:48 - @@ -4,8 +4,8 @@ COMMENT=FTP client with advanced user i DISTNAME= ncftp-3.2.6 CATEGORIES=net -HOMEPAGE= http://www.ncftp.com/ncftp/ -REVISION= 1 +HOMEPAGE= https://www.ncftp.com/ncftp/ +REVISION= 2 # Artistic PERMIT_PACKAGE=Yes Index: patches/patch-sh_util_gpshare_c === RCS file: patches/patch-sh_util_gpshare_c diff -N patches/patch-sh_util_gpshare_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-sh_util_gpshare_c 31 Jan 2021 21:07:48 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix -fno-common build failure. + +Index: sh_util/gpshare.c +--- sh_util/gpshare.c.orig sh_util/gpshare.c +@@ -28,7 +28,7 @@ + + static int gIsAtty1 = 1, gIsAtty2 = 1; + extern int gLoadedBm, gBookmarkMatchMode; +-Bookmark gBm; ++extern Bookmark gBm; + + double + FileSize(double size, const char **uStr0, double *uMult0)
misc/deco: -fno-common fix
Hi, This fix has been taken once again from FreeBSD [0]. This builds and works fine on amd64. OK? Charlène. [0] https://github.com/freebsd/freebsd-ports/commit/4b6803fe Index: Makefile === RCS file: /cvs/ports/misc/deco/Makefile,v retrieving revision 1.27 diff -u -p -u -p -r1.27 Makefile --- Makefile26 Jan 2020 11:14:32 - 1.27 +++ Makefile31 Jan 2021 21:39:05 - @@ -4,7 +4,7 @@ COMMENT=Demos Commander, a free Norton DISTNAME= deco383 PKGNAME= deco-3.8.3 -REVISION= 1 +REVISION= 2 CATEGORIES=misc MASTER_SITES= https://distfiles.sigtrap.nl/ EXTRACT_SUFX= .tgz Index: patches/patch-env_h === RCS file: patches/patch-env_h diff -N patches/patch-env_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-env_h 31 Jan 2021 21:39:05 - @@ -0,0 +1,13 @@ +$OpenBSD$ + +Fix -fno-common build failure. + +Index: env.h +--- env.h.orig env.h +@@ -1,4 +1,4 @@ +-char **EnvVector; ++static char **EnvVector; + void EnvInit (char **env); + char *EnvGet (char *name); + void EnvPut (char *name, char *value); Index: patches/patch-scr_c === RCS file: /cvs/ports/misc/deco/patches/patch-scr_c,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-scr_c --- patches/patch-scr_c 21 Mar 2002 09:59:48 - 1.1 +++ patches/patch-scr_c 31 Jan 2021 21:39:05 - @@ -1,6 +1,19 @@ $OpenBSD: patch-scr_c,v 1.1 2002/03/21 09:59:48 form Exp $ scr.c.orig Tue Dec 29 22:57:11 1998 -+++ scr.c Thu Mar 21 15:31:17 2002 + +Hunk #1: Fix -fno-common build failure. + +Index: scr.c +--- scr.c.orig scr.c +@@ -148,7 +148,7 @@ WINDOW VScreen; + int BlackWhite = 0; + int ColorMode = 1; + int GraphMode = 1; +-int TtyUpperCase = 0; ++extern int TtyUpperCase; + + static WINDOW curscr; + static scrool, rscrool; @@ -167,7 +167,7 @@ static char *KS, *KE; static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS, Index: patches/patch-tty_c === RCS file: patches/patch-tty_c diff -N patches/patch-tty_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-tty_c 31 Jan 2021 21:39:05 - @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix -fno-common build failure. + +Index: tty.c +--- tty.c.orig tty.c +@@ -82,7 +82,7 @@ static struct ltchars oldchars, newchars; + # define OXTABS TAB3 + #endif + +-int TtyUpperCase; ++int TtyUpperCase = 0; + + #define NOCHAR 0 +
Re: Use -fcommon with or remove security/siphon
On Mon, 1 Feb 2021 02:34:53 +0100
Klemens Nanni wrote:
> Upstream still ships the tarball, that's it,
> "primary distsite and homepage have gone away" in 2002 as per CVS log.
>
> The only TCP port I've been able to detect (after producing traffing
> on a variety of them) is SSH -- and that only worked after enabling
> IPv4.
>
> Siphon does not seem to support/detect IPv6 at all and it's OS
> fingerprints are extremely old; with Gentoo we're the only ones still
> packaging it according to Repology.
>
> I tend to simply remove it (ports tree house keeping), but here's a
> diff to "fix" the port in case anyone actually finds it useful.
>
> OK either for removal or the diff?
OK cwen@ to remove.
> ---
> Set "-fcommon" for twelve duplicate symbols.
>
> Regen patch and add "@bin" PLIST marker while here.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/siphon/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 12 Jul 2019 20:49:36 - 1.16
> +++ Makefile 1 Feb 2021 01:13:10 -
> @@ -4,7 +4,7 @@ COMMENT= passive network mapping tool
>
> DISTNAME=siphon-v.666
> PKGNAME= siphon-0.666
> -REVISION=0
> +REVISION=1
> CATEGORIES= security net
>
> # BSD-style
> @@ -22,6 +22,9 @@ MAKE_FLAGS= CC="${CC}" \
> MAKE_ENV=SYSCONFDIR="${SYSCONFDIR}"
>
> NO_TEST= Yes
> +
> +# twelve duplicate symbols
> +CFLAGS +=-fcommon
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/siphon ${PREFIX}/bin
> Index: patches/patch-log_c
> ===
> RCS file: /cvs/ports/security/siphon/patches/patch-log_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-log_c
> --- patches/patch-log_c 16 Jun 2001 14:56:26 -
> 1.1.1.1 +++ patches/patch-log_c 1 Feb 2021 01:12:32 -
> @@ -1,7 +1,8 @@
> $OpenBSD: patch-log_c,v 1.1.1.1 2001/06/16 14:56:26 lebel Exp $
> log.c.orig Fri Jun 15 18:36:47 2001
> -+++ log.cFri Jun 15 18:36:55 2001
> -@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int
> +Index: log.c
> +--- log.c.orig
> log.c
> +@@ -137,7 +137,7 @@ char *oslookup(int window, int ttl, int df)
> FILE *osprints;
> static char line[80], *oswin, *osttl, *osdf, *os, hexed[10];
> static int check = 0;
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/siphon/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 24 Sep 2004 09:37:39 - 1.4
> +++ pkg/PLIST 1 Feb 2021 01:13:24 -
> @@ -1,5 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.4 2004/09/24 09:37:39 espie Exp $
> -bin/siphon
> +@bin bin/siphon
> share/doc/siphon/
> share/doc/siphon/LICENSE
> share/doc/siphon/README
>
[update] devel/libdockapp 0.4 -> 0.7.3 (1/4)
Hi,
Here is an update for libdockapp to 0.7.3. This is needed to update
some dockapps (i've already a diff for x11/wmitime) concerned by
-fno-common and that now uses this lib.
The major highlight is that the include file for changed. All
consumers are impacted and no updates for them in this regard has been
provided, so there will be follow up diffs.
Port-wise:
- symbols have been removed, bump major
- install fonts (a first for me, i took example from comms/x3270)
- move HOMEPAGE and MASTER_SITES to dockapps.net
This has been tested on amd64 and macppc successfully.
Comments and feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/devel/libdockapp/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:44:37 - 1.25
+++ Makefile1 Feb 2021 01:44:40 -
@@ -2,21 +2,24 @@
COMMENT= dockapp-making standard library for Window Maker
-DISTNAME= libdockapp-0.4.0
-REVISION= 5
-SHARED_LIBS= dockapp 1.0 # .1.0
+DISTNAME= libdockapp-0.7.3
+SHARED_LIBS= dockapp 2.0 # .1.0
CATEGORIES=devel
+HOMEPAGE= https://www.dockapps.net/libdockapp/
+
# BSD
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xau Xdmcp Xext Xpm xcb
-MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+WANTLIB= X11 Xext Xpm xcb
+
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
SEPARATE_BUILD=Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static \
+ --with-fontdir=${PREFIX}/share/fonts/libdockapps
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
Index: distinfo
===
RCS file: /cvs/ports/devel/libdockapp/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:13:15 - 1.4
+++ distinfo1 Feb 2021 01:44:40 -
@@ -1,2 +1,2 @@
-SHA256 (libdockapp-0.4.0.tar.gz) = /X7Prvw8z2VCyKhmo3C85NUey4AozYmLCCNpgfiwzGU=
-SIZE (libdockapp-0.4.0.tar.gz) = 108566
+SHA256 (libdockapp-0.7.3.tar.gz) = FtmS9oTfzbGeNoKCLUlfRzYV+6bp4vp6EGMHvHZ7OJw=
+SIZE (libdockapp-0.7.3.tar.gz) = 387507
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/ports/devel/libdockapp/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 2 Jan 2006 18:15:53 - 1.1
+++ patches/patch-src_Makefile_in 1 Feb 2021 01:44:40 -
@@ -1,12 +1,13 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2006/01/02 18:15:53 bernd Exp $
src/Makefile.in.orig Mon Jan 2 18:19:24 2006
-+++ src/Makefile.inMon Jan 2 18:19:44 2006
-@@ -79,7 +79,7 @@ AUTOMAKE_OPTIONS = no-dependencies
-
+Index: src/Makefile.in
+--- src/Makefile.in.orig
src/Makefile.in
+@@ -335,7 +335,7 @@ xpm_CFLAGS = @xpm_CFLAGS@
+ xpm_LIBS = @xpm_LIBS@
+ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libdockapp.la
-
--libdockapp_la_LDFLAGS = -version-info 1:0:0 @X_LIBS@
-+libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION) @X_LIBS@
-
- include_HEADERS = dockapp.h
-
+-libdockapp_la_LDFLAGS = -version-info 3:1:0
++libdockapp_la_LDFLAGS = $(LIBdockapp_LTVERSION)
+ otherincludedir = $(includedir)/libdockapp
+ otherinclude_HEADERS = dockapp.h \
+ wmgeneral.h \
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libdockapp/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:41 - 1.3
+++ pkg/PLIST 1 Feb 2021 01:44:40 -
@@ -1,7 +1,26 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:41 naddy Exp $
-include/dockapp.h
-lib/libdockapp.a
+include/libdockapp/
+include/libdockapp/dockapp.h
+include/libdockapp/list.h
+include/libdockapp/misc.h
+include/libdockapp/wmgeneral.h
+@static-lib lib/libdockapp.a
lib/libdockapp.la
@lib lib/libdockapp.so.${LIBdockapp_VERSION}
+lib/pkgconfig/dockapp.pc
share/doc/libdockapp/
share/doc/libdockapp/COPYING
+share/doc/libdockapp/README
+share/doc/libdockapp/basic/
+share/doc/libdockapp/basic/Makefile
+share/doc/libdockapp/basic/README
+share/doc/libdockapp/basic/ball_red.xpm
+share/doc/libdockapp/basic/basic.c
+share/doc/libdockapp/rectangles/
+share/doc/libdockapp/rectangles/Makefile
+share/doc/libdockapp/rectangles/rectangles.c
+share/fonts/
+@fontdir share/fonts/libdockapps/
+share/fonts/libdockapps/fonts.dir
+share/fonts/libdockapps/luxel-ascii-06x09.pcf.gz
+share/fonts/libdockapps/seg7-ascii-05x07.pcf.gz
net/wmnetload: fix with the new devel/libdockapp (2/4)
This has been tested on amd64 and macppc. To potential testers, if
you're not using windowmaker, you'll need to use the '-w' option.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/net/wmnetload/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:48:52 - 1.15
+++ Makefile1 Feb 2021 01:31:12 -
@@ -3,7 +3,7 @@
COMMENT= wm-dockapp; simple network interface monitoring tool
DISTNAME= wmnetload-1.3
-REVISION= 4
+REVISION= 5
CATEGORIES=net x11 x11/windowmaker
HOMEPAGE= http://freshmeat.net/projects/wmnetload
@@ -14,7 +14,7 @@ WANTLIB= X11 Xext Xpm c m dockapp
MASTER_SITES= ftp://truffula.com/pub/
-LIB_DEPENDS= devel/libdockapp
+LIB_DEPENDS= devel/libdockapp>=0.7.3
SEPARATE_BUILD=Yes
CONFIGURE_STYLE= gnu
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/wmnetload/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 7 Dec 2015 14:58:54 - 1.2
+++ patches/patch-configure 1 Feb 2021 01:31:12 -
@@ -1,6 +1,10 @@
$OpenBSD: patch-configure,v 1.2 2015/12/07 14:58:54 jasper Exp $
configure.orig Sun Feb 23 10:08:00 2003
-+++ configure Mon Dec 7 14:35:10 2015
+
+Hunk #2, 3: fix the build with libdockapp>=0.7
+
+Index: configure
+--- configure.orig
configure
@@ -3052,6 +3052,9 @@ case $host_os in
OS=freebsd
LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib"
@@ -11,3 +15,21 @@ $OpenBSD: patch-configure,v 1.2 2015/12/
*)
echo ""
echo "Sorry, $host_os is not supported yet."
+@@ -4713,7 +4716,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include
++#include
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -4748,7 +4751,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include
++#include
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
Index: patches/patch-src_wmnetload_c
===
RCS file: patches/patch-src_wmnetload_c
diff -N patches/patch-src_wmnetload_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_wmnetload_c 1 Feb 2021 01:31:12 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+Hunk #1: Unbreak with libdockapp>=0.7
+Hunk #2: fix text display that was blank
+
+Index: src/wmnetload.c
+--- src/wmnetload.c.orig
src/wmnetload.c
+@@ -37,7 +37,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include
+ #endif
+@@ -1051,7 +1051,7 @@ static void
+ setshape(void)
+ {
+ Pixmap mask, pixmap;
+- unsigned int h, w;
++ unsigned short h, w;
+
+ if (DAMakePixmapFromData(backlight_off_xpm, &pixmap, &mask, &h, &w)) {
+ DASetShape(mask);
x11/wmdate: fix with the new devel/libdockapp (3/4)
This has been tested successfully on macppc and amd64. If you don't use windowmaker, you'll need to use the '-w' option. A vintage patch got refreshed while here. Comments/feedback are welcome, Charlène. Index: Makefile === RCS file: /cvs/ports/x11/wmdate/Makefile,v retrieving revision 1.23 diff -u -p -u -p -r1.23 Makefile --- Makefile12 Jul 2019 20:51:24 - 1.23 +++ Makefile1 Feb 2021 01:27:06 - @@ -3,7 +3,7 @@ COMMENT= wm-dockapp; shows the current date DISTNAME= wmdate-0.7 -REVISION= 3 +REVISION= 4 CATEGORIES=x11 x11/windowmaker # BSD @@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes WANTLIB= X11 Xau Xdmcp Xext Xpm c dockapp -LIB_DEPENDS= devel/libdockapp +LIB_DEPENDS= devel/libdockapp>=0.7.3 NO_TEST= Yes CONFIGURE_STYLE= imake noman Index: patches/patch-Imakefile === RCS file: /cvs/ports/x11/wmdate/patches/patch-Imakefile,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Imakefile --- patches/patch-Imakefile 16 Jan 2001 22:10:15 - 1.1.1.1 +++ patches/patch-Imakefile 1 Feb 2021 01:27:06 - @@ -1,6 +1,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $ Imakefile.orig Mon May 17 22:36:35 1999 -+++ Imakefile Tue Jan 16 16:41:43 2001 +Index: Imakefile +--- Imakefile.orig Imakefile @@ -89,8 +89,7 @@ XCOMM MASTERXPM = xpm/$(MASTER_XPM).xpm @@ -11,7 +12,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001 -L. \ -ldockapp \ -lXpm -lXext -lX11 -@@ -132,7 +131,7 @@ XCOMM -- +@@ -132,7 +131,7 @@ XCOMM --- XCOMM Create Makefile XCOMM --- Index: patches/patch-wmdate_c === RCS file: /cvs/ports/x11/wmdate/patches/patch-wmdate_c,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-wmdate_c --- patches/patch-wmdate_c 16 Jan 2001 22:10:16 - 1.1.1.1 +++ patches/patch-wmdate_c 1 Feb 2021 01:27:06 - @@ -1,9 +1,25 @@ $OpenBSD: patch-wmdate_c,v 1.1.1.1 2001/01/16 22:10:16 naddy Exp $ wmdate.c.orig Mon May 17 22:25:23 1999 -+++ wmdate.c Tue Jan 16 16:35:36 2001 -@@ -95,7 +95,7 @@ main (int argc, char *argv[]) + +Hunk #1: fix with libdockapp>=0.7 + +Index: wmdate.c +--- wmdate.c.orig wmdate.c +@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S + #include + #include + +-#include ++#include + #include "config.h" + #include "geometry.h" + +@@ -93,9 +93,9 @@ main (int argc, char *argv[]) +Pixmap disp; /* Pixmap that is actually displayed */ +unsigned long fore_pix, back_pix; int old_day; -unsigned int w=183, h=84; +- unsigned int w=183, h=84; ++ unsigned short w=183, h=84; - DAParseArguments(argc, argv, options, 4, DESCRIPTION, VERSION); + DAParseArguments(argc, argv, options, 3, DESCRIPTION, VERSION);
Re: graphics/tumble -fno-common
On Mon, 1 Feb 2021 17:28:43 +1100 Jonathan Gray wrote: > no newer release or upstream fix I've successfully build and run tested this diff on amd64. OK cwen@ > Index: Makefile > === > RCS file: /cvs/ports/graphics/tumble/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 25 Apr 2020 14:02:14 - 1.1.1.1 > +++ Makefile 1 Feb 2021 06:03:42 - > @@ -8,6 +8,7 @@ COMMENT = convert pictures into pdf book > GH_PROJECT = tumble > GH_ACCOUNT = brouhaha > GH_TAGNAME = v0.36 > +REVISION = 0 > > CATEGORIES = graphics textproc > > Index: patches/patch-semantics_c > === > RCS file: patches/patch-semantics_c > diff -N patches/patch-semantics_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-semantics_c 1 Feb 2021 06:03:42 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +fix -fno-common build > + > +Index: semantics.c > +--- semantics.c.orig > semantics.c > +@@ -119,7 +119,7 @@ typedef struct output_page_t > + #endif > + > + > +-FILE *yyin; > ++extern FILE *yyin; > + int line; /* line number in spec file */ > + > + int bookmark_level; > Index: patches/patch-tumble_input_h > === > RCS file: patches/patch-tumble_input_h > diff -N patches/patch-tumble_input_h > --- /dev/null 1 Jan 1970 00:00:00 - > +++ patches/patch-tumble_input_h 1 Feb 2021 06:03:42 - > @@ -0,0 +1,13 @@ > +$OpenBSD$ > + > +fix -fno-common build > + > +Index: tumble_input.h > +--- tumble_input.h.orig > tumble_input.h > +@@ -71,4 +71,4 @@ void init_jpeg_handler (void); > + void init_pbm_handler (void); > + void init_png_handler (void); > + > +-input_handler_t blank_handler; > ++extern input_handler_t blank_handler; >
Re: [Update] www/p5-Dancer2 : Update to 0.300005
On Tue, 2 Feb 2021 09:12:42 + wen heping wrote: > Hi, ports@: > > Here is a patch for www/p5-Dancer2: > i) Update to 0.35 > ii) Add p5-Test-CPAN-Meta as TEST_DEPENDS, also it is required > by an author test. > It build well and pass all tests on amd64-6.8 system. > > 4 ports depends on it, all build well and pass all tests with > this patch. > > wen OK cwen@
Re: [Update] textproc/p5-Lingua-Stem : Update to 2.31
On Tue, 2 Feb 2021 09:26:53 +
wen heping wrote:
> Hi, ports@:
>
> Here is a patch for textproc/p5-Lingua-Stem:
> i) Update to 2.31
> ii) Add devel/p5-Test-Distribution to TEST_DEPENDS and
> add TEST_POD_COVERAGE=1 to MAKE_ENV
>
>It build well and pass all tests on amd64-6.8 system.
>Only one port depends on it: textproc/p5-Lingua-EN-Tagger, it
> build well and pass all tests with this patch.
>
>
> wen
OK cwen@, but with some changes:
- drop BUILD_DEPENDS = RUN_DEPENDS
- add TEST_POD=1, otherwise it won't pull the proper test depends for
pod testing
- add version check for some depends, as stated in the meta files
- spacing and casing tweaks
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-Lingua-Stem/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile3 Jul 2020 21:45:47 - 1.14
+++ Makefile2 Feb 2021 13:05:16 -
@@ -4,25 +4,26 @@ COMMENT= stemming of words
MODULES= cpan
PKG_ARCH= *
-DISTNAME= Lingua-Stem-0.84
+DISTNAME= Lingua-Stem-2.31
CATEGORIES=textproc
-REVISION= 0
-# perl
+# Perl
PERMIT_PACKAGE=Yes
-CONFIGURE_STYLE=modbuild
+CONFIGURE_STYLE= modbuild
-BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= textproc/p5-Lingua-PT-Stemmer \
- textproc/p5-Lingua-Stem-Fr \
+ textproc/p5-Lingua-Stem-Fr>=0.02 \
textproc/p5-Lingua-Stem-It \
textproc/p5-Lingua-Stem-Ru \
- textproc/p5-Lingua-Stem-Snowball-Da \
+ textproc/p5-Lingua-Stem-Snowball-Da>=1.01 \
textproc/p5-Lingua-Stem-Snowball-No \
textproc/p5-Lingua-Stem-Snowball-Se \
textproc/p5-Text-German
+TEST_DEPENDS= devel/p5-Test-Distribution
MODCPAN_EXAMPLES= Yes
+
+MAKE_ENV +=TEST_POD_COVERAGE=1 TEST_POD=1
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-Lingua-Stem/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:15:24 - 1.5
+++ distinfo2 Feb 2021 13:05:16 -
@@ -1,2 +1,2 @@
-SHA256 (Lingua-Stem-0.84.tar.gz) = j/VLbhOuloAEXThjanvz241D1lslZ6hrpfQwa6uAW4k=
-SIZE (Lingua-Stem-0.84.tar.gz) = 1358061
+SHA256 (Lingua-Stem-2.31.tar.gz) = qhqZMrZCflmCU+YajM0NBMxVn66dWNh3TCAncItjAmQ=
+SIZE (Lingua-Stem-2.31.tar.gz) = 1354267
Re: UPDATE: devel/boehm-gc 8.0.4
On Tue, 2 Feb 2021 18:40:50 -0500 (EST) k...@intricatesoftware.com wrote: > Update to 8.0.4 with the following additional changes: > - Use mmap via the configure argument instead of hard-coding it. > - Define USE_MMAP_ANON for all OpenBSD arch to match upstream > code conventions. > - Remove unused ELF_CLASS define for OpenBSD. > - Remove old HAVE_DL_ITERATE_PHDR workaround for OpenBSD. > - Don't use old GC_find_limit_openbsd() which is only needed for > uthreads. > > I've tested this on i386, amd64, sparc64 and aarch64 using the > port's regress tests and by using w3m. Note that on aarch64 the > current boehm-gc port isn't stable and w3m will crash it pretty > easily. This update has not fixed that (aarch64 is still unstable > but the regress tests pass). > > Additional testing on mips, powerpc, etc. would be appreciated. I tested on macppc: - all 17 tests are passing - w3m's runtime is still fine Charlène.
[update] x11/wmitime 0.3 -> 0.5 (-fno-common fix)
The below diff updates wmitime to 0.5. This dockapp now uses
libdockapp, so there is no further patch for -fno-common needed.
Port-wise:
- provide .desktop file, manpage and HOMEPAGE
- drop wmgeneral patch since it's dealt with by libdockapp
- add build flags for iconv, it has been forgotten by upstream
Testing:
This builds and works fine on macppc and amd64.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/x11/wmitime/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.19
+++ Makefile1 Feb 2021 13:36:07 -
@@ -2,25 +2,33 @@
COMMENT= wm-dockapp; shows the date, time, and Internet time
-DISTNAME= wmitime-0.3
-REVISION= 2
+DISTNAME= wmitime-0.5
CATEGORIES=x11 x11/windowmaker
+HOMEPAGE= https://www.dockapps.net/wmitime
+
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c m
-MASTER_SITES= http://dockapps.org/files/22/29/ \
- http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
+WANTLIB += X11 Xext Xpm c dockapp iconv m
+
+MASTER_SITES= https://www.dockapps.net/download/
-MAKE_FLAGS=CC="${CC}"
+RUN_DEPENDS= devel/desktop-file-utils
+LIB_DEPENDS= converters/libiconv \
+ devel/libdockapp>=0.7.3
+
+MAKE_FLAGS=CC="${CC}" PREFIX="${PREFIX}" \
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
NO_TEST= Yes
-WRKDIST= ${WRKDIR}/wmitime
-WRKSRC=${WRKDIST}/wmitime
+CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
+
+WRKDIST= ${WRKDIR}/dockapps-26db447
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
+#do-install:
+# ${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/wmitime/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 - 1.4
+++ distinfo1 Feb 2021 13:36:07 -
@@ -1,2 +1,2 @@
-SHA256 (wmitime-0.3.tar.gz) = /OxEG6wYOsL7u/nVd8Lqr5ueApKmBBJW5aQoanbN3GE=
-SIZE (wmitime-0.3.tar.gz) = 21442
+SHA256 (wmitime-0.5.tar.gz) = oYPiCNi6v5fopA4356WoseE3HKVH14lvMU+AhRb0Xm0=
+SIZE (wmitime-0.5.tar.gz) = 15099
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/wmitime/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 9 Mar 2001 14:29:58 - 1.2
+++ patches/patch-Makefile 1 Feb 2021 13:36:07 -
@@ -1,26 +1,27 @@
-$OpenBSD: patch-Makefile,v 1.2 2001/03/09 14:29:58 wilfried Exp $
wmitime/Makefile.orig Mon Mar 29 05:51:39 1999
-+++ wmitime/Makefile Thu Mar 8 13:17:14 2001
-@@ -1,7 +1,6 @@
- #LANG = fr
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS = -lXpm -lXext -lX11 -lm
--FLAGS = -O2
- OBJS =wmitime.o \
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
-@@ -9,12 +8,12 @@ OBJS = wmitime.o \
-
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -1,19 +1,18 @@
+-LIBS = -lXpm -lXext -lX11 -lm -ldockapp
+-CFLAGS = -O2 -Wall
++LIBS = -lXpm -lXext -lX11 -lm -ldockapp -liconv
+ OBJS = wmitime.o
+ INSTALL = install
+-PREFIX = /usr/local
++PREFIX ?= /usr/local
+ BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/share/man/man1
++MANDIR = $(PREFIX)/man/man1
+ DESKTOPDIR = $(PREFIX)/share/applications
.c.o:
-- cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-+ ${CC} -I${X11BASE}/include ${CFLAGS} -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
--wmtime: $(OBJS)
-- cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-+wmitime: $(OBJS)
-+ ${CC} ${CFLAGS} -o $@ $(OBJS) $(LIBDIR) $(LIBS)
+ wmitime: $(OBJS)
+- $(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
-all:: wmtime
+all:: wmitime
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h 3 May 2017 19:18:27 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:18:27 jca Exp $
wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
x11/wmweather: -fno-common fix
I took this fix from Debian [0]. It builds and works fine on amd64 and
macppc.
OK?
Charlène.
[0]
https://sources.debian.org/patches/wmweather/2.4.7-3/957956_gcc10.diff/
Index: Makefile
===
RCS file: /cvs/ports/x11/wmweather/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.30
+++ Makefile1 Feb 2021 13:55:54 -
@@ -3,6 +3,7 @@
COMMENT= wm-dockapp; weather monitor
DISTNAME= wmweather-2.4.7
+REVISION= 0
CATEGORIES=x11 x11/windowmaker
HOMEPAGE= http://people.debian.org/~godisch/wmweather/
Index: patches/patch-src_wmgeneral_c
===
RCS file: patches/patch-src_wmgeneral_c
diff -N patches/patch-src_wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_wmgeneral_c 1 Feb 2021 13:55:54 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/wmgeneral.c
+--- src/wmgeneral.c.orig
src/wmgeneral.c
+@@ -85,6 +85,7 @@ Window iconwin, win;
+ GCNormalGC;
+ XpmIcon wmgen;
+ Pixmappixmask;
++Display *display;
+
+ /*/
+ /* Mouse Regions */
Index: patches/patch-src_wmgeneral_h
===
RCS file: patches/patch-src_wmgeneral_h
diff -N patches/patch-src_wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_wmgeneral_h 1 Feb 2021 13:55:54 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/wmgeneral.h
+--- src/wmgeneral.h.orig
src/wmgeneral.h
+@@ -36,7 +36,7 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
++extern Display*display;
+
+ /***/
+ /* Function Prototypes */
x11/wmglobe: -fno-common fix
There are 20+ duplicate symbols, and no patches around. I'm proposing
to use `-fcommon'. While here move dead HOMEPAGE and MASTER_SITES to
dockapps.net.
It has been tested successfully on macppc and amd64.
OK?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/astro/wmglobe/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile12 Jul 2019 20:43:31 - 1.32
+++ Makefile1 Feb 2021 14:10:29 -
@@ -3,17 +3,17 @@
COMMENT= wm-dockapp; displays the earth on an icon
DISTNAME= wmglobe-1.3
-REVISION= 6
+REVISION= 7
CATEGORIES=astro x11 x11/windowmaker
-HOMEPAGE= http://hamete.org/static/wmg/
+HOMEPAGE= https://www.dockapps.net/wmglobe
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c m z jpeg tiff png gif wraster
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://www.dockapps.net/download/
LIB_DEPENDS= graphics/jpeg \
graphics/tiff \
@@ -23,5 +23,8 @@ LIB_DEPENDS= graphics/jpeg \
MAKE_ENV= CC="${CC}"
NO_TEST= Yes
+
+# 20+ duplicate symbols
+CFLAGS+= -fcommon
.include
[update] astro/wmmoonclock 1.27 -> 1.30 (-fno-common fix)
The below diff updates wmmoonclock to 1.30. This fixes the `-fno-common'
issue out of the box. Note that it uses a configure script instead of a
Makefile.
Port-wise:
- drop the whole Makefile patch, flags are good out of the box, and
the new build system uses pkg-config, so everything is in place
- provide a .desktop file
- keep the legacy binary name, upstream provides an all lower cased
binary, but a camel cased manpage
- move HOMEPAGE and MASTER_SITES to dockapps.net
Testing:
It has been build and run tested on amd64 and macppc successfully.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/astro/wmmoonclock/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile26 Jan 2020 11:14:29 - 1.34
+++ Makefile1 Feb 2021 14:47:55 -
@@ -2,22 +2,26 @@
COMMENT= wm-dockapp; shows the moon phase
-DISTNAME= wmMoonClock-1.27
-PKGNAME= ${DISTNAME:L}
-REVISION= 5
+DISTNAME= wmmoonclock-1.30
CATEGORIES=astro x11 x11/windowmaker
+HOMEPAGE= https://www.dockapps.net/wmmoonclock
+
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c m
-MASTER_SITES= https://distfiles.sigtrap.nl/
+MASTER_SITES= https://www.dockapps.net/download/
+
+RUN_DEPENDS= devel/desktop-file-utils
-MAKE_ENV= CC="${CC}"
+CONFIGURE_STYLE= gnu
NO_TEST= Yes
-WRKSRC=${WRKDIST}/Src
+# Keep the legacy binary name (and match with the manpage name)
+post-install:
+ cd ${PREFIX}/bin && mv wmmoonclock wmMoonClock
.include
Index: distinfo
===
RCS file: /cvs/ports/astro/wmmoonclock/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo4 Apr 2013 16:06:27 - 1.4
+++ distinfo1 Feb 2021 14:47:55 -
@@ -1,2 +1,2 @@
-SHA256 (wmMoonClock-1.27.tar.gz) = Q50zCjDuHLCE4FEuiU9eGi6YaXRaInT72aVoMsFSfHc=
-SIZE (wmMoonClock-1.27.tar.gz) = 155197
+SHA256 (wmmoonclock-1.30.tar.gz) = i6fc6xDOP3eEgDUwOd5HQEU3rzUJLJQa5O4Ifp49Q6A=
+SIZE (wmmoonclock-1.30.tar.gz) = 238171
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 18 Dec 2007 10:39:47 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
Src/Makefile.orig Tue Mar 23 03:20:32 1999
-+++ Src/Makefile Tue Dec 18 10:16:26 2007
-@@ -1,8 +1,5 @@
--CC = gcc
--CFLAGS = -O2
--INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CFLAGS += -I${X11BASE}/include
-+LIBDIR = -L${X11BASE}/lib
-
- # for Linux
- LIBS = -lXpm -lX11 -lXext
-@@ -13,16 +10,11 @@ LIBS = -lXpm -lX11 -lXext
- OBJS = wmMoonClock.o CalcEphem.o Moon.o MoonRise.o \
- xutils.o
-
--
--.c.o:
-- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
--
--
- all: wmMoonClock.o wmMoonClock
-
- wmMoonClock.o: wmMoonClock_master.xpm wmMoonClock_mask.xbm CalcEphem.h
- wmMoonClock: $(OBJS)
-- $(CC) $(COPTS) $(SYSTEM) -lm -o wmMoonClock $^ $(INCDIR) $(LIBDIR)
$(LIBS)
-+ $(CC) $(COPTS) $(SYSTEM) -o wmMoonClock $(OBJS) $(INCDIR) $(LIBDIR)
$(LIBS) -lm
-
- clean:
- for i in $(OBJS) ; do \
-@@ -31,6 +23,6 @@ clean:
- rm -f wmMoonClock
-
- install:: wmMoonClock
-- install -s -m 0755 wmMoonClock $(DESTDIR)/bin
-- install-m 0644 wmMoonClock.1 $(DESTDIR)/man/man1
-+ $(BSD_INSTALL_PROGRAM) wmMoonClock $(PREFIX)/bin
-+ $(BSD_INSTALL_MAN) wmMoonClock.1 $(PREFIX)/man/man1
-
Index: patches/patch-wmMoonClock_c
===
RCS file: /cvs/ports/astro/wmmoonclock/patches/patch-wmMoonClock_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmMoonClock_c
--- patches/patch-wmMoonClock_c 18 Dec 2007 10:39:47 - 1.2
+++ patches/patch-wmMoonClock_c 1 Feb 2021 14:47:55 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-wmMoonClock_c,v 1.2 2007/12/18 10:39:47 ajacoutot Exp $
Src/wmMoonClock.c.orig Mon Jun 7 16:27:18 1999
-+++ Src/wmMoonClock.c Tue Dec 18 10:16:26 2007
-@@ -162,7 +162,7 @@ int main(int argc, char *argv[]) {
- int i, n, k, j, ImageNumber;
- int Year, Month, DayOfWeek, DayOfMonth;
- int Hours, Mins, Secs, OldSecs, digit, xoff, xsize;
+Index: src/wmMoonClock.c
+--- src/wmMoonClock.c.orig
src/wmMoonClock.c
+@@ -157,7 +157,7 @@ int main(int argc, char *argv[]) {
+ struct tm *GMTTime, *LocalTime;
+ XEventevent;
+ int i, n, j, ImageNumber, Year, Month, D
[update] x11/wmtz 0.7 -> 0.7.20150816 (-fno-common fix)
Here is an update for wmtz. dockapps.net provides an old version, i
preferred to use what they have in their git head, which is already
provided by Gentoo, because this new version uses libdockapp, this
avoids duplicating patches in wmgeneral.
Port-wise:
- FIX_EXTRACT_PERMISSIONS is not needed anymore
- their install target is still not good, so keep our own
Testing:
It builds and runs fine on amd64 and macppc with the provided sample
configuration file.
Comments/feedback are welcome,
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/x11/wmtz/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:51:24 - 1.24
+++ Makefile1 Feb 2021 13:24:26 -
@@ -2,22 +2,28 @@
COMMENT= wm-dockapp; displays the time in different time zones
-DISTNAME= wmtz-0.7
-REVISION= 3
+DISTNAME= wmtz-0.7_p20150816
+PKGNAME= ${DISTNAME:S/_p/./}
+
CATEGORIES=x11 x11/windowmaker
-FIX_EXTRACT_PERMISSIONS=Yes
HOMEPAGE= http://www.dockapps.net/wmtz
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c m
+WANTLIB= X11 Xext Xpm c dockapp m
+
+# dockapps.net only provides an old tarball without libdockapp support.
+MASTER_SITES= http://distfiles.gentoo.org/distfiles/
-MASTER_SITES= http://www.dockapps.net/download/
+LIB_DEPENDS= devel/libdockapp>=0.7.3
-MAKE_FLAGS=CC="${CC}"
+MAKE_ENV+= CC="${CC}" LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
NO_TEST= Yes
+
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib
WRKSRC=${WRKDIST}/wmtz
Index: distinfo
===
RCS file: /cvs/ports/x11/wmtz/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 - 1.4
+++ distinfo1 Feb 2021 13:24:26 -
@@ -1,2 +1,2 @@
-SHA256 (wmtz-0.7.tar.gz) = ywnmSpgjs9px5ULXzGbmy9ATWAm+4eVl0YrNzwVlgjo=
-SIZE (wmtz-0.7.tar.gz) = 26350
+SHA256 (wmtz-0.7_p20150816.tar.gz) =
Dvi7e3qRLm8vLOiOblv4CAzNlUv2JYikNTKzQzK6Lls=
+SIZE (wmtz-0.7_p20150816.tar.gz) = 19310
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h 3 May 2017 19:29:45 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/03 19:29:45 jca Exp $
wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
- #endif
-
Index: patches/patch-wmtz_Makefile
===
RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmtz_Makefile
--- patches/patch-wmtz_Makefile 15 Jun 2001 09:59:34 - 1.2
+++ patches/patch-wmtz_Makefile 1 Feb 2021 13:24:26 -
@@ -1,26 +1,23 @@
$OpenBSD: patch-wmtz_Makefile,v 1.2 2001/06/15 09:59:34 wilfried Exp $
wmtz/Makefile.orig Sun Mar 11 14:57:59 2001
-+++ wmtz/Makefile Fri Jun 15 11:49:09 2001
-@@ -1,8 +1,5 @@
+Index: wmtz/Makefile
+--- wmtz/Makefile.orig
wmtz/Makefile
+@@ -1,15 +1,11 @@
-CC = gcc
-LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS = -lXpm -lXext -lX11 -lm
+ LIBS = -lXpm -lXext -lX11 -lm -ldockapp
-FLAGS = -O2
-DESTDIR = /usr/local
- OBJS =wmtz.o \
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
-@@ -10,10 +7,10 @@ OBJS = wmtz.o \
-
+-OBJS =wmtz.o
++OBJS= wmtz.o
.c.o:
- $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
-+ $(CC) -I${X11BASE}/include ${CFLAGS} -c $< -o $@
++ $(CC) $(CFLAGS) -c $< -o $@
wmtz: $(OBJS)
- $(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
-+ $(CC) ${CFLAGS} -o $@ ${OBJS} $(LIBDIR) $(LIBS)
++ $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
all:: wmtz
Index: patches/patch-wmtz_wmtz_c
===
RCS file: /cvs/ports/x11/wmtz/patches/patch-wmtz_wmtz_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-wmtz_wmtz_c
--- patches/patch-wmtz_wmtz_c 22 May 2010 15:15:52 - 1.3
+++ patches/patch-wmtz_wmtz_c 1 Feb 2021 13:24:26 -
@@ -1,38 +1,22 @@
$OpenBSD: patch-wmtz_wmtz_c,v 1.3 2010/05/22 15:15:52 espie Exp $
wmtz/wmtz.c.orig Mon Apr 16 21:26:34 2001
-+++ wmtz/wmtz.cSat May 22 17:15:07 2010
-@@ -51,8 +51,7 @@
+Index: wmtz/wmtz.c
games/wmtictactoe: -fno-common fix
Hi,
FreeBSD has been creative while fixing it [0]. This fixes the build
with -fno-common. Runtime has been tested successfully on amd64 and
macppc.
I've found the hard way that it requires permissions fixing while
issueing update-patches, and, while here, let's move upstream to
dockapps.net and refresh WANTLIB. The distfile checksum did not change.
OK?
Charlène.
[0]
https://svnweb.freebsd.org/ports/head/games/wmtictactoe/Makefile?view=markup&pathrev=549081#l22
Index: Makefile
===
RCS file: /cvs/ports/games/wmtictactoe/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.19
+++ Makefile4 Feb 2021 16:59:00 -
@@ -4,12 +4,18 @@ COMMENT= wm-dockapp; TicTacToe game
DISTNAME= wmtictactoe-1.1-1
PKGNAME= wmtictactoe-1.1.1
-REVISION = 2
+REVISION= 3
+FIX_EXTRACT_PERMISSIONS= Yes
+
CATEGORIES=games x11 x11/windowmaker
+HOMEPAGE= https://www.dockapps.net/wmtictactoe
+
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c xcb
+WANTLIB= X11 Xext Xpm c
+
+MASTER_SITES= https://www.dockapps.net/download/
NO_TEST= Yes
Index: patches/patch-wmgeneral_wmgeneral_c
===
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_c 4 Feb 2021 16:59:00 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
wmgeneral/wmgeneral.c
+@@ -65,6 +65,8 @@ char *Geometry = "";
+ GCNormalGC;
+ XpmIcon wmgen;
+ Pixmappixmask;
++Display *display;
++Window Root, iconwin, win;
+
+ /*/
+ /* Mouse Regions */
Index: patches/patch-wmgeneral_wmgeneral_h
===
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_h 4 Feb 2021 16:59:00 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
wmgeneral/wmgeneral.h
+@@ -36,8 +36,8 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
+-Window Root, iconwin, win;
++extern Display*display;
++extern Window Root, iconwin, win;
+
+
+ /***/
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/wmtictactoe/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 9 Feb 2001 13:02:38 - 1.1.1.1
+++ pkg/PLIST 4 Feb 2021 16:59:00 -
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/02/09 13:02:38 wilfried Exp $
-bin/wmtictactoe
+@bin bin/wmtictactoe
[update] x11/wmtime 1.0 -> 1.4 (-fno-common fix)
Here is an update for wmtime to 0.4. The main change is that it uses
libdockapp now.
Port-wise:
- drop wmgeneral stuff (it's in libdockapp)
- remove the upstream Makefile patch, explaining that ours expanded
- once again, i had to add libconv flags
Testing:
This builds and works fine on macppc and amd64.
OK?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/x11/wmtime/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 21:02:30 - 1.19
+++ Makefile4 Feb 2021 19:38:09 -
@@ -2,23 +2,32 @@
COMMENT= time/date applet for WindowMaker
-DISTNAME= wmtime-1.0b2
-REVISION= 2
+DISTNAME= wmtime-1.4
CATEGORIES=x11 x11/windowmaker
+HOMEPAGE= https://www.dockapps.net/wmtime
+
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xext Xpm c m
+WANTLIB += X11 Xext Xpm c dockapp iconv m
-MASTER_SITES= http://mirror2.unixfreunde.de/ \
- http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
+MASTER_SITES= https://www.dockapps.net/download/
-MAKE_FLAGS=CC="${CC}"
+LIB_DEPENDS= converters/libiconv \
+ devel/libdockapp>=0.7.3
-WRKDIST=${WRKDIR}/wmtime.app
-WRKSRC=${WRKDIST}/wmtime
+MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+ MANDIR="${PREFIX}/man/man1"
NO_TEST= Yes
+
+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
+
+LDFLAGS+= -L${X11BASE}/lib -L${LOCALBASE}/lib -liconv
+
+WRKDIST= ${WRKDIR}/dockapps-7d1ef92
+
+ALL_TARGET+= wmtime
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/wmtime/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:16:04 - 1.4
+++ distinfo4 Feb 2021 19:38:09 -
@@ -1,2 +1,2 @@
-SHA256 (wmtime-1.0b2.tar.gz) = +6R8IM7ej5d73TzB5Rs+1su1Tx1oAi2Q+cSnDBVynZY=
-SIZE (wmtime-1.0b2.tar.gz) = 20680
+SHA256 (wmtime-1.4.tar.gz) = lY/qJBAAlJ755JK950FQlVLdw6mbSyhd2e7XkDVTQ5Y=
+SIZE (wmtime-1.4.tar.gz) = 19045
Index: patches/patch-wmgeneral_list_h
===
RCS file: patches/patch-wmgeneral_list_h
diff -N patches/patch-wmgeneral_list_h
--- patches/patch-wmgeneral_list_h 5 May 2017 13:48:23 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-wmgeneral_list_h,v 1.1 2017/05/05 13:48:23 jca Exp $
-
-Index: wmgeneral/list.h
wmgeneral/list.h.orig
-+++ wmgeneral/list.h
-@@ -29,9 +29,7 @@ Boston, MA 02111-1307, USA. */
- #ifndef __LIST_H_
- #define __LIST_H_
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
-+#if 1
- # define INLINE
- #endif
-
Index: patches/patch-wmtime_Makefile
===
RCS file: patches/patch-wmtime_Makefile
diff -N patches/patch-wmtime_Makefile
--- patches/patch-wmtime_Makefile 26 Dec 2000 18:22:14 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-wmtime_Makefile,v 1.1.1.1 2000/12/26 18:22:14 naddy Exp $
wmtime/Makefile.orig Tue May 19 23:04:53 1998
-+++ wmtime/MakefileTue Dec 26 19:02:32 2000
-@@ -1,18 +1,23 @@
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
- LIBS = -lXpm -lXext -lX11 -lm
- OBJS =wmtime.o \
- ../wmgeneral/wmgeneral.o \
- ../wmgeneral/misc.o \
- ../wmgeneral/list.o
-
-+all: wmtime
-+
- .c.o:
-- cc -c -O2 -Wall $< -o $*.o
-+ $(CC) $(CFLAGS) -I$(X11BASE)/include -c $< -o $@
-
- wmtime: $(OBJS)
-- cc -o wmtime $^ $(LIBDIR) $(LIBS)
-+ $(CC) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
-
- clean::
- for i in $(OBJS) ; do \
- rm $$i; \
- done
- rm wmtime
-+
-+install:
-+ ${BSD_INSTALL_PROGRAM} wmtime ${PREFIX}/bin
Index: patches/patch-wmtime_wmtime_c
===
RCS file: /cvs/ports/x11/wmtime/patches/patch-wmtime_wmtime_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-wmtime_wmtime_c
--- patches/patch-wmtime_wmtime_c 5 May 2017 13:47:35 - 1.2
+++ patches/patch-wmtime_wmtime_c 4 Feb 2021 19:38:09 -
@@ -1,26 +1,15 @@
$OpenBSD: patch-wmtime_wmtime_c,v 1.2 2017/05/05 13:47:35 jca Exp $
-Index: wmtime/wmtime.c
wmtime/wmtime.c.orig
-+++ wmtime/wmtime.c
-@@ -98,7 +98,7 @@ void printversion(void);
- void wmtime_routine(int, char **);
- void get_lang();
+Index: wmtime.c
+--- wmtime.c.orig
wmtime.c
+@@ -282,8 +282,8 @@ void wmtime_routine(int argc, char **argv) {
--void main(int argc, char *argv[]) {
-+int main(int argc, char *argv[]) {
-
- int i;
-
-@@ -187,9 +187,9 @@ void wmtime_routine(int argc, char **argv) {
struct tm *time_struct;
audio/wmmp3: -fno-common fix (and more)
The below diff:
- moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
reachable. The distfile checksum is the same.
- removes an hardcoded path to madplay; we could move to mpg123 but i
did not want to include a breaking change
- fixes missing includes spotted by clang
- fixes the build with -fno-common (from Gentoo [0])
It builds and works fine on macppc and amd64.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 - 1.24
+++ Makefile4 Feb 2021 21:02:24 -
@@ -3,17 +3,17 @@
COMMENT= wm-dockapp; front end for an mp3 player
DISTNAME= wmmp3-0.12
-REVISION= 4
+REVISION= 5
CATEGORIES=audio x11 x11/windowmaker
-HOMEPAGE= http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE= https://www.dockapps.net/wmmp3
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://www.dockapps.net/download/
RUN_DEPENDS= audio/madplay
@@ -23,6 +23,9 @@ CONFIGURE_STYLE= gnu
SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
SUBST_VARS+= SAMPLE_DIR
+
+post-patch:
+ @${SUBST_CMD} ${WRKSRC}/main.c
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 - 1.2
+++ patches/patch-main_c4 Feb 2021 21:02:24 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
main.c
@@ -125,7 +125,7 @@ void loadconfig()
errno = 0;
/* set defualts in case anything fails */
-set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
set_mp3ext(".mp3");
set_playlistext(".m3u");
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
return option_entered;
}
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 21:02:24 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
main.h
+@@ -14,6 +14,7 @@
+
+ #define __MAIN_H__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h 4 Feb 2021 21:02:24 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
mpg123ctl.h
+@@ -14,6 +14,7 @@
+
+ #define __MPG123CTL__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c 4 Feb 2021 21:02:24 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
wmgeneral.c
+@@ -58,6 +58,11 @@
+ /* X11 Variables */
+ /*/
+
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h 4 Feb 2021 21:02:24 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.h
+--- wmgeneral.h.orig
wmgeneral.h
+@@ -41,10 +41,10 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmIcon wmfont;
++extern Display *display;
++extern Window Root, iconwin, win;
++extern XpmIcon wmgen;
++extern XpmIcon wmfont;
+
+ /***/
+ /* Function Prototypes */
Re: audio/wmmp3: -fno-common fix (and more)
On Thu, 4 Feb 2021 22:07:08 +0100
Charlene Wendling wrote:
>
> The below diff:
>
> - moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
> reachable. The distfile checksum is the same.
> - removes an hardcoded path to madplay; we could move to mpg123 but i
> did not want to include a breaking change
> - fixes missing includes spotted by clang
> - fixes the build with -fno-common (from Gentoo [0])
>
> It builds and works fine on macppc and amd64.
>
> OK?
>
> Charlène.
>
>
> [0]
> https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
SUBST_CMD should be run in pre-configure, not in post-patch
Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 - 1.24
+++ Makefile4 Feb 2021 22:02:43 -
@@ -3,17 +3,17 @@
COMMENT= wm-dockapp; front end for an mp3 player
DISTNAME= wmmp3-0.12
-REVISION= 4
+REVISION= 5
CATEGORIES=audio x11 x11/windowmaker
-HOMEPAGE= http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE= https://www.dockapps.net/wmmp3
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://www.dockapps.net/download/
RUN_DEPENDS= audio/madplay
@@ -23,6 +23,9 @@ CONFIGURE_STYLE= gnu
SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
SUBST_VARS+= SAMPLE_DIR
+
+pre_configure:
+ @${SUBST_CMD} ${WRKSRC}/main.c
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 - 1.2
+++ patches/patch-main_c4 Feb 2021 22:02:43 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
main.c
@@ -125,7 +125,7 @@ void loadconfig()
errno = 0;
/* set defualts in case anything fails */
-set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
set_mp3ext(".mp3");
set_playlistext(".m3u");
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
return option_entered;
}
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 22:02:43 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
main.h
+@@ -14,6 +14,7 @@
+
+ #define __MAIN_H__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h 4 Feb 2021 22:02:43 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
mpg123ctl.h
+@@ -14,6 +14,7 @@
+
+ #define __MPG123CTL__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c 4 Feb 2021 22:02:43 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
wmgeneral.c
+@@ -58,6 +58,11 @@
+ /* X11 Variables */
+ /*/
+
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h 4 Feb 2021 22:02:43 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.h
+--- wmgeneral.h.orig
wmgeneral.h
+@@ -41,10 +41,10 @@ typedef struct {
+ /* Global variable */
+ /***/
+
+-Display *display;
+-Window Root, iconwin, win;
+-XpmIcon wmgen;
+-XpmI
Re: audio/wmmp3: -fno-common fix (and more)
On Thu, 4 Feb 2021 23:05:05 +0100
Charlene Wendling wrote:
> On Thu, 4 Feb 2021 22:07:08 +0100
> Charlene Wendling wrote:
>
> >
> > The below diff:
> >
> > - moves HOMEPAGE and MASTER_SITES to dockapps.net, since it was not
> > reachable. The distfile checksum is the same.
> > - removes an hardcoded path to madplay; we could move to mpg123 but
> > i did not want to include a breaking change
> > - fixes missing includes spotted by clang
> > - fixes the build with -fno-common (from Gentoo [0])
> >
> > It builds and works fine on macppc and amd64.
> >
> > OK?
> >
> > Charlène.
> >
> >
> > [0]
> > https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-plugins/wmmp3/files/wmmp3-0.12-fno-common.patch
>
> SUBST_CMD should be run in pre-configure, not in post-patch.
Typoed pre-configure, sorry for the noise.
Index: Makefile
===
RCS file: /cvs/ports/audio/wmmp3/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile12 Jul 2019 20:43:42 - 1.24
+++ Makefile4 Feb 2021 22:22:47 -
@@ -3,17 +3,17 @@
COMMENT= wm-dockapp; front end for an mp3 player
DISTNAME= wmmp3-0.12
-REVISION= 4
+REVISION= 5
CATEGORIES=audio x11 x11/windowmaker
-HOMEPAGE= http://www.dotfiles.com/software/wmmp3/
+HOMEPAGE= https://www.dockapps.net/wmmp3
# GPL
PERMIT_PACKAGE=Yes
WANTLIB= X11 Xext Xpm c
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= https://www.dockapps.net/download/
RUN_DEPENDS= audio/madplay
@@ -23,6 +23,9 @@ CONFIGURE_STYLE= gnu
SAMPLE_DIR=${PREFIX}/share/examples/wmmp3
SUBST_VARS+= SAMPLE_DIR
+
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/main.c
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
Index: patches/patch-main_c
===
RCS file: /cvs/ports/audio/wmmp3/patches/patch-main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-main_c
--- patches/patch-main_c4 Aug 2003 13:31:28 - 1.2
+++ patches/patch-main_c4 Feb 2021 22:22:47 -
@@ -1,16 +1,17 @@
$OpenBSD: patch-main_c,v 1.2 2003/08/04 13:31:28 wilfried Exp $
main.c.orig2000-04-03 02:11:46.0 +0200
-+++ main.c 2003-08-04 15:05:48.0 +0200
+Index: main.c
+--- main.c.orig
main.c
@@ -125,7 +125,7 @@ void loadconfig()
errno = 0;
/* set defualts in case anything fails */
-set_mpg123("/usr/local/bin/mpg123");
-+set_mpg123("/usr/local/bin/madplay");
++set_mpg123("${LOCALBASE}/bin/madplay");
set_mp3ext(".mp3");
set_playlistext(".m3u");
-@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[]
+@@ -230,7 +230,7 @@ int check_options(int argc, char *argv[])
return option_entered;
}
Index: patches/patch-main_h
===
RCS file: patches/patch-main_h
diff -N patches/patch-main_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_h4 Feb 2021 22:22:47 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: main.h
+--- main.h.orig
main.h
+@@ -14,6 +14,7 @@
+
+ #define __MAIN_H__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-mpg123ctl_h
===
RCS file: patches/patch-mpg123ctl_h
diff -N patches/patch-mpg123ctl_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpg123ctl_h 4 Feb 2021 22:22:47 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing include
+
+Index: mpg123ctl.h
+--- mpg123ctl.h.orig
mpg123ctl.h
+@@ -14,6 +14,7 @@
+
+ #define __MPG123CTL__
+
++#include
+ #include
+ #include
+ #include
Index: patches/patch-wmgeneral_c
===
RCS file: patches/patch-wmgeneral_c
diff -N patches/patch-wmgeneral_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_c 4 Feb 2021 22:22:47 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral.c
+--- wmgeneral.c.orig
wmgeneral.c
+@@ -58,6 +58,11 @@
+ /* X11 Variables */
+ /*/
+
++Display *display;
++Window Root, iconwin, win;
++XpmIcon wmgen;
++XpmIcon wmfont;
++
+ int screen;
+ int x_fd;
+ int d_depth;
Index: patches/patch-wmgeneral_h
===
RCS file: patches/patch-wmgeneral_h
diff -N patches/patch-wmgeneral_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_h 4 Feb 2021 22:22:47 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+Fix the build with -f
[update] sysutils/wmcube 0.98 -> 1.0.2 (+ -fno-common fix)
This is an update for wmcube, to 1.0.2. This adds color schemes, smooth fonts, more logos, a manual page and various fixes. Port-wise: - Move to dockapps.net, HOMEPAGE is not reachable - Fix an hardcoded path to logo files (introduced in 1.0.0, so our current package is not affected) - Remove the Makefile patch, and override things with MAKE_FLAGS. That also allows us to simplify the port, since we won't have to fix MSDOS line endings, and that's why i've attached the diff - Due to the previous change, don't use upstream's install target, avoiding further patching - Drop the wmgeneral/list.h patch. Upstream "fixed" that in 1.0.2 - Fix the build with -fno-common Testing: It has been built and tested on macppc and amd64 without issues. OK? Charlène. wmcube.diff Description: Binary data
Re: [update, fix] games/xmj 1.0 -> 1.16 (-fno-common)
On Sat, 30 Jan 2021 20:40:58 +0100
Charlene Wendling wrote:
> Hi,
>
> On top of failing with `-fno-common', xmj does not work at all, here
> on my amd64 machine:
>
> $ doas pkg_add xmj
> $ xmj
> Segmentation Fault
>
> So, here is an update for the 20 years old xmj 1.0, to 2020's 1.16.
> There are major upstream changes, notably they dropped Imake (yay!),
> and xmj is now gtk+2 based. This fixes the -fno-common failure ootb.
>
> Port changes:
>
> - Update license marker, refresh WANTLIB (ports-lib-depends-check is
> happy)
> - Use up to date HOMEPAGE and MASTER_SITES (found out thanks to
> Macports and repology)
> - Requires gmake.
> - Install the manpages
>
>
> Testing:
>
> - It builds fine on macppc (vanilla clang) and amd64 (modified with
> naddy's patch)
> - The runtime is great on these 2 platforms. I tried networked games
> without issues.
>
> Comments/feedback are welcome,
>
> Charlène.
^ edited; i was looking at my backlog and took into account what sthen
told me about MAKE_FLAGS, making the diff way smaller :)
I accidentally built xmj with gcc and met the infamous "C99 styled
declarations in for loops" error, so it will require gnu99 on base-gcc
archs. This still builds and works fine with clang on macppc and amd64,
with that flag, so i have not brought bsd.port.arch.mk.
Index: Makefile
===
RCS file: /cvs/ports/games/xmj/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile12 Jul 2019 20:46:27 - 1.25
+++ Makefile5 Feb 2021 01:50:14 -
@@ -2,22 +2,37 @@
COMMENT= Mahjongg game for X11
-DISTNAME= xmj
-PKGNAME= xmj-1.0
-REVISION = 3
+DISTNAME= mj-1.16-src
+PKGNAME= x${DISTNAME:S/-src$//}
+
CATEGORIES=games
-# BSD
+HOMEPAGE= https://mahjong.julianbradfield.org/
+
+# GPLv2
PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xau Xdmcp Xext c xcb
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+MASTER_SITES= ${HOMEPAGE}/Source/
+
+LIB_DEPENDS= x11/gtk+2
+
+MAKE_FLAGS+= CC="${CC}" EXTRA_CFLAGS="${CFLAGS}" CDEBUGFLAGS=
+# The final '/' matters
+FAKE_FLAGS+= DESTDIR="${WRKINST}${PREFIX}/"
+
+USE_GMAKE= Yes
-CONFIGURE_STYLE=imake noman
NO_TEST= Yes
-pre-configure:
- @perl -pi -e 's,_height=,_height ,g;' \
- -e 's,_width=,_width ,g' $i \
- ${WRKSRC}/tiles/c*
+# base-gcc fix for "c99 initial declarations in for loops" error
+CFLAGS+= -std=gnu99
+
+INSTALL_TARGET=install install.man
.include
Index: distinfo
===
RCS file: /cvs/ports/games/xmj/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:04 - 1.4
+++ distinfo5 Feb 2021 01:50:14 -
@@ -1,2 +1,2 @@
-SHA256 (xmj.tar.gz) = EGcUMVIKBYSp3BJHqnYPM988WHP7G7IVgN//NK7xhyg=
-SIZE (xmj.tar.gz) = 52255
+SHA256 (mj-1.16-src.tar.gz) = wl6YSPSfcGNeXjugy1l5nlvBSalfeGYhuZaWtmeHop0=
+SIZE (mj-1.16-src.tar.gz) = 403981
Index: patches/patch-Imakefile
===
RCS file: patches/patch-Imakefile
diff -N patches/patch-Imakefile
--- patches/patch-Imakefile 27 Oct 2007 13:32:05 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/27 13:32:05 ajacoutot Exp $
Imakefile.orig Fri May 5 16:46:04 1989
-+++ Imakefile Sat Oct 27 15:15:14 2007
-@@ -4,4 +4,4 @@ LOCAL_LIBRARIES = $(XLIB)
-OBJS = bicons.o cicons.o cicons1.o cicons2.o cicons3.o cicons4.o \
- cicons5.o event.o icons.o mj.o nicons.o
-
--ComplexProgramTarget(xmj)
-+ComplexProgramTargetNoMan(xmj)
Index: patches/patch-event_c
===
RCS file: patches/patch-event_c
diff -N patches/patch-event_c
--- patches/patch-event_c 19 Apr 2017 22:02:45 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-event_c,v 1.1 2017/04/19 22:02:45 espie Exp $
event.c.orig Thu Apr 20 00:00:59 2017
-+++ event.cThu Apr 20 00:01:22 2017
-@@ -599,6 +599,7 @@ void board_num_proc()
- place_tiles(FALSE);
- }
-
-+void
- msg_event_proc(event)
- XEvent *event;
- {
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/xmj/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 7 Apr 2002 01:54:4
Re: Fix games/jumpnbump -fno-common
Hi, On Sat, 30 Jan 2021 00:02:22 + Brian Callahan wrote: > Hello ports -- > > Attached is a fix for games/jumpnbump for -fno-common. > Taken from upstream (no new release since this commit): > https://gitlab.com/LibreGames/jumpnbump/-/commit/b72b70a4233776bdaa6a683c89af2becefd53bd6.diff > > Left off the Makefile portion, since it is a no-op for us. > > OK? OK cwen@ > ~Brian
Re: [update] games/an 0.95 -> 1.2
Ping; with a new diff though, to avoid patches.
On Fri, 25 Dec 2020 03:21:08 +0100
Charlene Wendling wrote:
> Ping :)
>
> On Sat, 10 Oct 2020 14:14:20 +0200
> Charlene Wendling wrote:
>
> > Hi,
> >
> > Here is an update for an to 1.2. This is a rewrite with several
> > bugfixes, icu support and less bloat (the library has been
> > removed).
> >
> > I don't have much to say port-wise, changes are trivial - i took the
> > opportunity to reorder the Makefile per Makefile.template since it
> > doesn't affect much the diff readability. Also, i've zapped some of
> > our hooks since upstream's Makefile has now friendlier targets.
> >
> > This has been tested on amd64, macppc (with clang and gcc there)
> > successfully.
> >
> > Comments/feedback are welcome,
> >
> > Charlène.
> >
Index: Makefile
===
RCS file: /cvs/ports/games/an/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:14 - 1.20
+++ Makefile5 Feb 2021 19:21:06 -
@@ -2,31 +2,36 @@
COMMENT= fast anagram generator
-V= 0.95
+V= 1.2
DISTNAME= an_${V}.orig
PKGNAME= an-${V}
CATEGORIES=games
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
-# GPL - LGPL
+# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= c
+HOMEPAGE= https://salsa.debian.org/pm/an
-WRKDIST= ${WRKDIR}/an-${V}
+WANTLIB= c icudata icui18n icuuc
+
+MASTER_SITES= ${MASTER_SITE_DEBIAN:=main/a/an/}
+
+LIB_DEPENDS= textproc/icu4c,-main
+
+MAKE_FLAGS+= CC="${CC}" CFLAGS="${CFLAGS}"
+# Overriding DESTDIR is not enough, their Makefile subdirectories
+# don't respect our files hierarchy
+FAKE_FLAGS+= MANDIR="${FROOT}/man/man6" INSTALLDIR="${FROOT}/bin"
NO_TEST= Yes
+USE_GMAKE= Yes
+
+WRKDIST= ${WRKDIR}/an-${V}
+FROOT= ${WRKINST}${PREFIX}
+
pre-configure:
@perl -pi -e 's,/usr/dict/words,/usr/share/dict/words,g' \
${WRKSRC}/an.6
-
-do-build:
- cd ${WRKBUILD} && \
- ${CC} ${CFLAGS} an.c gan_qsort.c -o an ${LDFLAGS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/an ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKBUILD}/an.6 ${PREFIX}/man/man6
.include
Index: distinfo
===
RCS file: /cvs/ports/games/an/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo18 Jan 2015 03:13:55 - 1.5
+++ distinfo5 Feb 2021 19:21:06 -
@@ -1,2 +1,2 @@
-SHA256 (an_0.95.orig.tar.gz) = ESZt0eNHWU2Y+N/R4UHYtPvgZ3UlQtDpPEIsR4n5KVw=
-SIZE (an_0.95.orig.tar.gz) = 47829
+SHA256 (an_1.2.orig.tar.gz) = uBqNt0zf3znmyn3XUs9HIkNdL7f7OhuXHU9PrlFC2ys=
+SIZE (an_1.2.orig.tar.gz) = 14231
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/an/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 00:46:08 - 1.3
+++ pkg/PLIST 5 Feb 2021 19:21:06 -
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:08 espie Exp $
-bin/an
+@bin bin/an
@man man/man6/an.6
[update] x11/oroborus 2.0.12 -> 2.0.20 (-fno-common fix)
The below diff updates oroborus to 2.0.20. While HOMEPAGE is dead
(redirects to some VR stuff), Debian takes care of this WM, so
it's not totally dead. There are some window focus fixes and more
themes have been added, except from that, it's mostly maintenance stuff.
Port wise:
- Update license marker
- Take Gentoo's -fno-common fix [0]
- Fix a missing include
- Make spacing a bit more consistent. Given that at that point,
most of the Makefile was rewritten, i ordered things according
to Makefile.template.
- Also, while the distfile uses '_' as version separator, the
extracted root folder has '-' instead, so i had to use WRKDIST.
It builds fine and has been lightly tested on amd64 and macppc.
Comments and feedback are welcome,
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-wm/oroborus/files/oroborus-2.0.20-fno-common.patch
Index: Makefile
===
RCS file: /cvs/ports/x11/oroborus/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:51:18 - 1.10
+++ Makefile5 Feb 2021 23:01:27 -
@@ -1,21 +1,26 @@
# $OpenBSD: Makefile,v 1.10 2019/07/12 20:51:18 sthen Exp $
-COMMENT= minimalistic X11 window manager
+COMMENT = minimalistic X11 window manager
-CATEGORIES=x11
-DISTNAME= oroborus-2.0.12
-DISTFILES= oroborus_2.0.12-1.tar.gz
-REVISION= 0
-MASTER_SITES= http://www.mguillaud.net/ports/oroborus/ \
- http://matt.peterson.org/FreeBSD/ports/
-HOMEPAGE= http://www.oroborus.org/
-
-# GPL
-PERMIT_PACKAGE=Yes
-WANTLIB= ICE SM X11 Xext Xpm c
-
-CONFIGURE_STYLE=gnu
-USE_GMAKE= Yes
-SEPARATE_BUILD= Yes
+DISTNAME = oroborus_2.0.20
+PKGNAME = ${DISTNAME:S/_/-/}
+
+CATEGORIES = x11
+
+# GPLv2
+PERMIT_PACKAGE = Yes
+
+WANTLIB += ICE SM X11 Xext Xpm c
+
+MASTER_SITES = ${MASTER_SITE_DEBIAN:=main/o/oroborus/} \
+ https://distfiles.gentoo.org/distfiles/
+
+SEPARATE_BUILD = Yes
+
+USE_GMAKE =Yes
+
+CONFIGURE_STYLE = gnu
+
+WRKDIST = ${WRKDIR}/${PKGNAME}
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/oroborus/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:15:59 - 1.4
+++ distinfo5 Feb 2021 23:01:27 -
@@ -1,2 +1,2 @@
-SHA256 (oroborus_2.0.12-1.tar.gz) =
da6P0CzvF4e5o0iPudlw/iAyjbpb6pvLBy1ZgmRe8LE=
-SIZE (oroborus_2.0.12-1.tar.gz) = 236581
+SHA256 (oroborus_2.0.20.tar.gz) = UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=
+SIZE (oroborus_2.0.20.tar.gz) = 335099
Index: patches/patch-src_hints_c
===
RCS file: patches/patch-src_hints_c
diff -N patches/patch-src_hints_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_hints_c 5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/hints.c
+--- src/hints.c.orig
src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer,
+ win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
+ gnome_panel_desktop_area;
+ Atom net_atoms[NET_ATOM_COUNT];
+-Display *dpy;
++extern Display *dpy;
+
+ void
+ initHints (Display * d)
Index: patches/patch-src_keyboard_c
===
RCS file: patches/patch-src_keyboard_c
diff -N patches/patch-src_keyboard_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_c5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/keyboard.c
+--- src/keyboard.c.orig
src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include
+ #endif
+
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
Index: patches/patch-src_keyboard_h
===
RCS file: patches/patch-src_keyboard_h
diff -N patches/patch-src_keyboard_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_h5 Feb 2021 23:01:27 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: src/keyboard.h
+--- src/keyboard.h.orig
src/keyboard.h
+@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
+ void ungrabKeys (Display *, Window);
+ void init_keyboard (Display * dpy);
+
+-int NumLockMask, CapsLockMask, ScrollLockMask;
++extern int NumLockMask, CapsLockMask, ScrollLockMask;
+
+ #endif /* __KEYBOARD_H */
+
Index: patches/patch-src_oroborus_c
===
RCS file: patches/patch-src_oroborus_c
diff -N patches/patch-src_oroborus_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_oroborus_c5 Feb 2021 23:01:27 -
@@ -0,0 +1
x11/skippy: fix with -fno-common
Hi,
The below diff allows building skippy with -fno-common. While here:
- MASTER_SITES and HOMEPAGE are 404'd, drop them
- refresh WANTLIB
- don't hardcode PREFIX, don't build with -g
- add -fno-common fix, from Gentoo [0] (and add a missing RCS tag)
This has been built and tested on amd64 and macppc.
OK?
Charlène.
[0]
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch
Index: Makefile
===
RCS file: /cvs/ports/x11/skippy/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile12 Jul 2019 20:51:21 - 1.21
+++ Makefile6 Feb 2021 10:46:16 -
@@ -3,24 +3,21 @@
COMMENT= full-screen X11 task-switcher like Apple's Expose
DISTNAME= skippy-0.5.0
-REVISION= 8
+REVISION= 9
CATEGORIES=x11
-MASTER_SITES= http://thegraveyard.org/files/
EXTRACT_SUFX= .tar.bz2
-HOMEPAGE= http://thegraveyard.org/skippy.php
-
# X11
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
-WANTLIB= X11 Xau Xdmcp Xext Xft Xinerama Xrender c expat fontconfig \
- freetype m z xcb Imlib2
+WANTLIB+= Imlib2 X11 Xext Xft Xinerama c m
+LIB_DEPENDS= graphics/imlib2
-NO_TEST= Yes
+FAKE_FLAGS+= PREFIX="${PREFIX}"
-LIB_DEPENDS= graphics/imlib2
+NO_TEST= Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/skippy
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/skippy/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 22 Jul 2005 19:32:17 - 1.2
+++ patches/patch-Makefile 6 Feb 2021 10:46:16 -
@@ -1,15 +1,19 @@
$OpenBSD: patch-Makefile,v 1.2 2005/07/22 19:32:17 fgsch Exp $
Makefile.orig Wed May 19 18:23:50 2004
-+++ Makefile Wed Jul 13 16:34:00 2005
-@@ -1,7 +1,7 @@
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -1,9 +1,9 @@
PREFIX = /usr/local
BINDIR = ${PREFIX}/bin
-X11PREFIX = /usr/X11R6
+X11PREFIX = ${X11BASE}
- CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft
--cflags` -g -pedantic -Wall
+-CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft
--cflags` -g -pedantic -Wall
++CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft
--cflags` -pedantic -Wall
LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config
xft --libs`
+
+ # Comment these out to disable Xinerama support
@@ -17,11 +17,15 @@ EXESUFFIX =
SOURCES = skippy.c wm.c dlist.c mainwin.c clientwin.c layout.c focus.c
config.c tooltip.c
Index: patches/patch-wm_c
===
RCS file: /cvs/ports/x11/skippy/patches/patch-wm_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-wm_c
--- patches/patch-wm_c 3 Jan 2009 23:02:57 - 1.3
+++ patches/patch-wm_c 6 Feb 2021 10:46:16 -
@@ -1,6 +1,59 @@
wm.c.orig Wed May 19 23:23:49 2004
-+++ wm.c Sat Jan 3 23:56:53 2009
-@@ -258,7 +258,7 @@ wm_get_stack(Display *dpy)
+$OpenBSD$
+
+Hunk #1: fix the build with -fno-common
+
+Index: wm.c
+--- wm.c.orig
wm.c
+@@ -43,7 +43,47 @@
+ #define WIN_STATE_FIXED_POSITION (1<<8) /*window is fixed in position even*/
+ #define WIN_STATE_ARRANGE_IGNORE (1<<9) /*ignore for auto arranging*/
+
++Atom
++ /* Generic atoms */
++ XA_WM_STATE,
++ WM_CLIENT_LEADER,
++ XA_UTF8_STRING,
+
++ /* Root pixmap / wallpaper atoms */
++ _XROOTPMAP_ID,
++ ESETROOT_PMAP_ID,
++
++ /* NetWM atoms */
++ _NET_SUPPORTING_WM_CHECK,
++ _NET_SUPPORTED,
++ _NET_NUMBER_OF_DESKTOPS,
++ _NET_CLIENT_LIST,
++ _NET_CLIENT_LIST_STACKING,
++ _NET_CURRENT_DESKTOP,
++ _NET_WM_DESKTOP,
++ _NET_WM_STATE,
++ _NET_WM_STATE_HIDDEN,
++ _NET_WM_STATE_SKIP_TASKBAR,
++ _NET_WM_STATE_SKIP_PAGER,
++ _NET_WM_STATE_FULLSCREEN,
++ _NET_WM_STATE_SHADED,
++ _NET_WM_STATE_ABOVE,
++ _NET_WM_STATE_STICKY,
++ _NET_WM_WINDOW_TYPE,
++ _NET_WM_WINDOW_TYPE_DESKTOP,
++ _NET_WM_WINDOW_TYPE_DOCK,
++ _NET_WM_VISIBLE_NAME,
++ _NET_WM_NAME,
++
++ /* Old gnome atoms */
++ _WIN_SUPPORTING_WM_CHECK,
++ _WIN_WORKSPACE,
++ _WIN_WORKSPACE_COUNT,
++ _WIN_PROTOCOLS,
++ _WIN_CLIENT_LIST,
++ _WIN_STATE,
++ _WIN_HINTS;
++
+ static int WM_PERSONALITY = WM_PERSONALITY_NETWM,
+NETWM_HAS_FULLSCREEN = 0,
+IGNORE_SKIP_TASKBAR = 0;
+@@ -258,7 +298,7 @@ wm_get_stack(Display *dpy)
return 0;
for(i = 0; i < items_read; i++)
@@ -9,7 +62,7 @@
XFree(data);
-@@ -293,10 +293,10 @@ wm_get_root_pmap(Display *d
Re: powerpc bulk build report
On Wed, 3 Feb 2021 23:12:13 -0700 (MST) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Mon Jan 18 10:28:09 MST 2021 > Finished: Wed Feb 3 23:11:47 MST 2021 > Duration: 16 Days 12 hours 44 minutes > > Built using OpenBSD 6.8-current (GENERIC) #830: Sun Jan 17 08:10:13 > MST 2021 Some comments: > http://build-failures.rhaalovely.net/powerpc/2021-01-18/games/valyriatear.log It won't be built anymore on BE_ARCHS until upstream fix their code. > http://build-failures.rhaalovely.net/powerpc/2021-01-18/x11/e17/elementary.log It has been removed from CVS. > http://build-failures.rhaalovely.net/powerpc/2021-01-18/net/ntopng.log > http://build-failures.rhaalovely.net/powerpc/2021-01-18/net/pmacct,postgresql.log It's a temporary failure due to a desync between the kernel used and the ports tree, see https://github.com/openbsd/src/commit/ff78d6edd They'll be back once the next bulk is finished.
Re: x11/skippy: fix with -fno-common
On Sun, 7 Feb 2021 16:39:49 +0100 Christian Weisgerber wrote: > Charlene Wendling: > > > The below diff allows building skippy with -fno-common. While here: > > > > - MASTER_SITES and HOMEPAGE are 404'd, drop them > > - refresh WANTLIB > > - don't hardcode PREFIX, don't build with -g > > - add -fno-common fix, from Gentoo [0] (and add a missing RCS tag) > > Hmm, a port without MASTER_SITES? I guess there are precedence > cases. When i previously worked on some dockapps i've found out there were, actually there are a few more: $ echo 'select count(*) from ports where master_sites is null ' \ 'and fullpkgpath not like "meta/%";' | sqlite3 /usr/local/share/sqlports 60 > ok naddy@ > > There is a fork on GitHub, but the last activity was in 2015. > https://github.com/richardgv/skippy-xd > > -- > Christian "naddy" Weisgerber > na...@mips.inka.de
Re: games/typespeed: fix with -fno-common
Ping.
On Sat, 30 Jan 2021 17:20:44 +0100
Charlene Wendling wrote:
> Hi,
>
> This fix is taken from Gentoo [0]. Built and tested on amd64.
>
> OK?
>
> Charlène.
>
>
> [0]
> https://gitweb.gentoo.org/repo/gentoo.git/tree/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch
Index: Makefile
===
RCS file: /cvs/ports/games/typespeed/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile12 Jul 2019 20:46:26 - 1.6
+++ Makefile30 Jan 2021 16:16:29 -
@@ -3,7 +3,7 @@ COMMENT = Test your typing speed and ge
DISTNAME = typespeed-0.6.5
CATEGORIES = games
-REVISION = 3
+REVISION = 4
HOMEPAGE = http://typespeed.sourceforge.net/
Index: patches/patch-src_file_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_file_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_file_c
--- patches/patch-src_file_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_file_c30 Jan 2021 16:16:29 -
@@ -1,10 +1,22 @@
$OpenBSD: patch-src_file_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Don't check if the userconf exists, inconditionally create
-the userdir in ~/.typespeed and the user scorefile.
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Don't check if the userconf exists, inconditionally create
+ the userdir in ~/.typespeed and the user scorefile.
src/file.c.origWed Aug 13 17:08:09 2008
-+++ src/file.c Fri Jan 22 15:21:45 2016
+Index: src/file.c
+--- src/file.c.orig
src/file.c
+@@ -142,6 +142,9 @@ extern int hfd;
+ extern char *rankki[11];
+ extern char *typorank[12];
+ extern char *usedwordfile;
++extern struct rules rules;
++struct rawdatawords;
++struct optopt;
+
+ char ruledir[MAXPATHLEN];
+ char worddir[MAXPATHLEN];
@@ -1125,7 +1125,7 @@ void
readconfig(void)
{
Index: patches/patch-src_menu_c
===
RCS file: patches/patch-src_menu_c
diff -N patches/patch-src_menu_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_menu_c30 Jan 2021 16:16:29 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/menu.c
+--- src/menu.c.orig
src/menu.c
+@@ -76,6 +76,9 @@ void tellstory(void);
+
+ extern int misses;
+ extern char *rankki[11];
++extern struct stats now;
++extern struct rules rules;
++extern struct opt opt;
+
+ struct positions {
+ int rank;
Index: patches/patch-src_misc_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_misc_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_misc_c
--- patches/patch-src_misc_c22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_misc_c30 Jan 2021 16:16:29 -
@@ -1,9 +1,19 @@
$OpenBSD: patch-src_misc_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-use arc4random()
+Hunk #1: Fix -fno-common build failure.
+Hunk #2: Use arc4random()
src/misc.c.origFri Jan 22 14:58:04 2016
-+++ src/misc.c Fri Jan 22 14:58:24 2016
+Index: src/misc.c
+--- src/misc.c.orig
src/misc.c
+@@ -75,6 +75,7 @@ char *xstrdup(char *);
+ void xstrncpy(char *, char *, size_t);
+
+ extern char *progname;
++extern struct opt opt;
+
+ static int graph = 0;
+
@@ -224,7 +224,7 @@ r(int range)
#ifdef WIN32
return (int)(rand() % range);
Index: patches/patch-src_network_c
===
RCS file: patches/patch-src_network_c
diff -N patches/patch-src_network_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_network_c 30 Jan 2021 16:16:29 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: src/network.c
+--- src/network.c.orig
src/network.c
+@@ -116,6 +116,7 @@ void setnoblock(void);
+ void writenum(char *, uint32_t);
+
+ extern FILE *netlogfile;
++extern struct opt opt;
+
+ static int ds = -1;
+ static int ss = -1;
Index: patches/patch-src_typespeed_c
===
RCS file: /cvs/ports/games/typespeed/patches/patch-src_typespeed_c,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_typespeed_c
--- patches/patch-src_typespeed_c 22 Jan 2016 15:24:30 - 1.1.1.1
+++ patches/patch-src_typespeed_c 30 Jan 2021 16:16:29 -
@@ -1,10 +1,30 @@
$OpenBSD: patch-src_typespeed_c,v 1.1.1.1 2016/01/22 15:24:30 landry Exp $
-Disable the code opening the systemwide highscore file
-and dropping privileges, since we're removing the setgid bit
+Hunk #1: Fix -fno-common build failure
+Hunk #2: Disable the code opening the
Re: games/typespeed: fix with -fno-common
On Mon, 8 Feb 2021 16:54:24 + Stuart Henderson wrote: > On 2021/02/07 23:57, Charlene Wendling wrote: > > Ping. > > > > On Sat, 30 Jan 2021 17:20:44 +0100 > > Charlene Wendling wrote: > > > > > Hi, > > > > > > This fix is taken from Gentoo [0]. Built and tested on amd64. > > > > > > OK? > > > > > > Charlène. > > > > > > > > > [0] > > > https://gitweb.gentoo.org/repo/gentoo.git/tree/games-misc/typespeed/files/typespeed-0.6.5-use-extern.patch > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/games/typespeed/Makefile,v > > retrieving revision 1.6 > > diff -u -p -u -p -r1.6 Makefile > > --- Makefile12 Jul 2019 20:46:26 - 1.6 > > +++ Makefile30 Jan 2021 16:16:29 - > > @@ -3,7 +3,7 @@ COMMENT = Test your typing speed and > > ge > > OK. > > Would you mind fixing up COMMENT while there please? (new blank line > before, s/T/t/) I don't know how i haven't spotted it! I did so.
[macppc, all archs] net/echoping wants libm
Hi,
I've spotted that echoping's build is broken in the current macppc bulk:
> util.o: In function `tvstddev':
> util.c:(.text+0x6f4): undefined reference to `sqrt'
I thought it was a ld.bfd issue but...
Very surprisingly, i tried to reproduce on amd64 with USE_LLD=No to no
avail, and the sparc64 bulk reports no failures. I can't compare with
mips64 because no bulk is run currently.
The autoconf stuff really detects the need for`-lm' as seen in
config.log: 'ac_cv_lib_m_sqrt=yes', but is not used anywhere at all.
In fact, FreeBSD met the issue before us [0]; we need the `-lm' LDFLAG.
While here, i removed a trailing whitespace in DESCR that portcheck
found.
Then it builds fine on macppc [1], and still does on amd64. I tested
examples provided by the manpage without issues (there is no regression
tests).
Comments/feedback are welcome,
Charlène.
[0] https://svnweb.freebsd.org/ports?view=revision&revision=368948
[1] https://bin.charlenew.xyz/echoping.log
Index: Makefile
===
RCS file: /cvs/ports/net/echoping/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile1 Feb 2021 19:47:08 - 1.15
+++ Makefile9 Feb 2021 23:50:36 -
@@ -5,7 +5,7 @@ COMMENT=test performance of remote TCP/
VER= 6_0_2
DISTNAME= echoping-RELEASE_${VER}
PKGNAME= echoping-${VER:S/_/./g}
-REVISION= 0
+REVISION= 1
CATEGORIES=net
MASTER_SITES=
https://framagit.org/bortzmeyer/echoping/-/archive/RELEASE_${VER}/
@@ -36,6 +36,10 @@ CONFIGURE_ARGS+= --enable-plugin="dns ra
--enable-smtp \
--enable-tos \
--without-libidn
+
+# Requires libm (uses sqrt(3)), detected by autoconf but not used anywhere else
+# in the build configuration
+CONFIGURE_ENV+=LDFLAGS="${LDFLAGS} -lm"
WRKDIST= ${WRKDIR}/${DISTNAME}/SRC
Index: pkg/DESCR
===
RCS file: /cvs/ports/net/echoping/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 DESCR
--- pkg/DESCR 1 Feb 2021 18:10:44 - 1.3
+++ pkg/DESCR 9 Feb 2021 23:50:36 -
@@ -1,3 +1,3 @@
-"echoping" is a small program to test (approximately) performance of a
+"echoping" is a small program to test (approximately) performance of a
remote host by sending it packets using various protocols (TCP/UDP echo,
HTTP/HTTPS and some others).
Re: [update] sysutils/wmcube 0.98 -> 1.0.2 (+ -fno-common fix)
Ping. On Fri, 5 Feb 2021 00:46:13 +0100 Charlene Wendling wrote: > > This is an update for wmcube, to 1.0.2. This adds color schemes, > smooth fonts, more logos, a manual page and various fixes. > > Port-wise: > > - Move to dockapps.net, HOMEPAGE is not reachable > - Fix an hardcoded path to logo files (introduced in 1.0.0, > so our current package is not affected) > - Remove the Makefile patch, and override things with MAKE_FLAGS. That > also allows us to simplify the port, since we won't have to fix > MSDOS line endings, and that's why i've attached the diff > - Due to the previous change, don't use upstream's install target, > avoiding further patching > - Drop the wmgeneral/list.h patch. Upstream "fixed" that in 1.0.2 > - Fix the build with -fno-common > > Testing: > > It has been built and tested on macppc and amd64 without issues. > > OK? > > Charlène. wmcube.diff Description: Binary data
Re: powerpc bulk build report
Hi, On Sun, 21 Feb 2021 13:29:53 -0700 (MST) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Thu Feb 4 17:42:22 MST 2021 > Finished: Sun Feb 21 13:29:25 MST 2021 > Duration: 16 Days 19 hours 47 minutes > http://build-failures.rhaalovely.net/powerpc/2021-02-04/graphics/openvdb.log This new port won't be built on powerpc, see https://marc.info/?l=openbsd-ports-cvs&m=161387035817473&w=2 > http://build-failures.rhaalovely.net/powerpc/2021-02-04/shells/ksh93.log Marked BROKEN, as seen on powerpc64.
Re: x11/agar update + -fno-common fix
Hi,
On Tue, 23 Feb 2021 02:28:47 -0700
"Anthony J. Bentley" wrote:
> Hi,
>
> Here's an update to agar-1.6.0 and agartest-1.6.0.
>
> The update is actually still broken with -fno-common, but it's only
> one variable so it was easy enough to fix for real.
>
> There was a lot of weird churn in this update. For instance, there's
> no point in enabling iconv because it will unfixably break the build.
> The end result seems to work though, as demonstrated by running the
> tests in agartest.
>
> ok?
OK cwen@, but an extra patch is needed to make agar built on powerpc.
The 'rlwimi' powerpc instruction wants a 32-bit integer to work with.
It was already present in the 1.5.0 patches but in a different place.
Index: Makefile.inc
===
RCS file: /cvs/ports/x11/agar/Makefile.inc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile.inc
--- Makefile.inc9 Nov 2020 21:48:25 - 1.4
+++ Makefile.inc27 Feb 2021 08:51:04 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.4 2020/11/09 21:48:25 cwen Exp $
-V ?= 1.5.0
+V ?= 1.6.0
DISTNAME ?=agar-$V
CATEGORIES ?= x11
@@ -10,7 +10,7 @@ HOMEPAGE ?= https://libagar.org/
# BSD
PERMIT_PACKAGE ?= Yes
-MASTER_SITES ?=http://stable.hypertriton.com/agar/
+MASTER_SITES ?=https://stable.hypertriton.com/agar/
CONFIGURE_STYLE ?= simple
Index: agar/Makefile
===
RCS file: /cvs/ports/x11/agar/agar/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- agar/Makefile 1 Aug 2020 18:47:33 - 1.7
+++ agar/Makefile 27 Feb 2021 08:51:04 -
@@ -3,31 +3,30 @@
COMMENT = cross-platform widget toolkit
PKGNAME = agar-$V
-REVISION = 4
-SHARED_LIBS += ag_au 0.0 # 5.0
-SHARED_LIBS += ag_core 0.0 # 5.0
-SHARED_LIBS += ag_dev0.0 # 5.0
-SHARED_LIBS += ag_gui0.0 # 5.0
-SHARED_LIBS += ag_math 0.0 # 5.0
-SHARED_LIBS += ag_vg 0.0 # 5.0
-
-WANTLIB += GL SDL X11 X11-xcb Xdamage Xext Xfixes Xinerama Xxf86vm
-WANTLIB += db drm expat fontconfig freetype glapi iconv jpeg m
-WANTLIB += png pthread sndio usbhid xcb xcb-dri2
-WANTLIB += xcb-glx z
+SHARED_LIBS += ag_au 0.1 # 5.0
+SHARED_LIBS += ag_core 1.0 # 5.0
+SHARED_LIBS += ag_gui1.0 # 5.0
+SHARED_LIBS += ag_map0.0 # 5.0
+SHARED_LIBS += ag_math 1.0 # 5.0
+SHARED_LIBS += ag_net0.0 # 5.0
+SHARED_LIBS += ag_sg 0.0 # 5.0
+SHARED_LIBS += ag_sk 0.0 # 5.0
+SHARED_LIBS += ag_vg 1.0 # 5.0
LIB_DEPENDS = audio/libsndfile \
audio/portaudio-svn \
- converters/libiconv \
- databases/db/v4 \
devel/sdl \
graphics/jpeg \
graphics/png
-CONFIGURE_ARGS += --with-gl=${X11BASE} \
+CONFIGURE_ARGS += --enable-au \
+ --enable-map \
+ --with-gl=${X11BASE} \
--with-x=${X11BASE} \
--with-portaudio=${LOCALBASE} \
--with-sndfile=${LOCALBASE}
+
+MAKE_FLAGS = PKGCONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
.include
Index: agar/distinfo
===
RCS file: /cvs/ports/x11/agar/agar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- agar/distinfo 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/distinfo 27 Feb 2021 08:51:04 -
@@ -1,2 +1,2 @@
-SHA256 (agar-1.5.0.tar.gz) = gjQt7TQsV4FBmEvv6TGPPTdhduX0J64yePiYXyZmPAA=
-SIZE (agar-1.5.0.tar.gz) = 2427644
+SHA256 (agar-1.6.0.tar.gz) = dQAC8LNo+1guRWlqjfxT+0X1U2eSp/BSDNzCC0iMni4=
+SIZE (agar-1.6.0.tar.gz) = 22133371
Index: agar/patches/patch-Makefile
===
RCS file: /cvs/ports/x11/agar/agar/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- agar/patches/patch-Makefile 10 Oct 2016 09:33:17 - 1.1.1.1
+++ agar/patches/patch-Makefile 27 Feb 2021 08:51:04 -
@@ -1,15 +1,17 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2016/10/10 09:33:17 bentley Exp $
Makefile.orig Mon Aug 24 03:08:39 2015
-+++ Makefile Mon Aug 24 03:08:48 2015
-@@ -83,9 +83,9 @@ install-config:
- ${SUDO} ${INSTALL_PROG} $$PROG ${DESTDIR}${BINDIR}; \
- done
- @echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"
-- @${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal
-+ @${SUDO} ${INSTAL
Re: WIP UPDATE: games/openttd
Hi, On Sun, 28 Feb 2021 23:09:24 -0700 "Anthony J. Bentley" wrote: > Hi, > > Here's an update to openttd-1.11.0-beta2. > > Upstream claims new OpenGL support, faster video, and 60fps. > > The build system has been switched to CMake. This led to the GTK icons > and .desktop file not being installed, a bug upstream claims will be > fixed before release; see: > https://github.com/OpenTTD/OpenTTD/issues/8613 > https://github.com/OpenTTD/OpenTTD/issues/8778 > > The endian patch no longer applies and seems to have been refactored > although the original pull request was merged. I'd appreciate a > test on PowerPC to make sure this is still correct. I've built and tested that update on macppc, colors are still correct.
[BE_ARCHS] Unbreak games/egoboo
Hi !
> http://build-failures.rhaalovely.net/sparc64/2021-03-21/games/egoboo.log
> http://build-failures.rhaalovely.net/powerpc/2021-02-22/games/egoboo.log
> http://build-failures.rhaalovely.net/mips64/2021-03-21/games/egoboo.log
There is a typo in the big endian code there. It's 'SDL_Swap32'.
With the below diff, it builds and works fine on macppc, colors are
not off. I added a safety revision bump as well.
Comments/feedback are welcome,
Charlène.
[0] https://wiki.libsdl.org/SDL_Swap32
Index: Makefile
===
RCS file: /cvs/ports/games/egoboo/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile8 Mar 2021 18:20:14 - 1.11
+++ Makefile26 Mar 2021 16:03:56 -
@@ -3,6 +3,7 @@
COMMENT = dungeon-crawling action-RPG adventure
DISTNAME = egoboo-2.8.1
+REVISION = 0
CATEGORIES = games
HOMEPAGE = http://egoboo.sourceforge.net
@@ -21,7 +22,8 @@ LIB_DEPENDS = devel/sdl-image \
FIX_CRLF_FILES = src/Makefile src/enet/Makefile src/game/Makefile \
src/game/extensions/ogl_texture.c \
src/game/game.c \
- src/game/platform/file_linux.c
+ src/game/platform/file_linux.c \
+ src/game/md2.c
USE_GMAKE =Yes
WRKSRC = ${WRKDIST}/src
Index: patches/patch-src_game_md2_c
===
RCS file: patches/patch-src_game_md2_c
diff -N patches/patch-src_game_md2_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_game_md2_c26 Mar 2021 16:03:56 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build on BE_ARCHS.
+
+Index: src/game/md2.c
+--- src/game/md2.c.orig
src/game/md2.c
+@@ -511,7 +511,7 @@ MD2_Model_t* md2_load( const char * szFilename, MD2_Mo
+ int i;
+ for ( i = 0; i < cmd->command_count; i++ )
+ {
+-cmd->data[i].index = SDL_swap32( cmd->data[i].s );
++cmd->data[i].index = SDL_Swap32( cmd->data[i].s );
+ cmd->data[i].s = ENDIAN_FLOAT( cmd->data[i].s );
+ cmd->data[i].t = ENDIAN_FLOAT( cmd->data[i].t );
+ };
[macppc / lld] Unbreak japanese/kanjipad
Hi,
Kanjipad is broken in the current macppc bulk:
> https://bin.charlenew.xyz/kanjipad.log
macppc does not inline sqrt(3) so it actually uses libm, unlike
other archs [0]. I don't know why this has not happened before.
The below diff adds the necessary `-lm' linker flag to allow kanjipad
to be built with lld on macppc [1]. While here i've refreshed WANTLIB.
The runtime is fine on macppc and amd64.
OK?
Charlène.
[0] https://marc.info/?l=openbsd-ports&m=161299356616167&w=2
[1] https://bin.charlenew.xyz/kanjipad_fixed.log
Index: Makefile
===
RCS file: /cvs/ports/japanese/kanjipad/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 21:02:22 - 1.20
+++ Makefile26 Aug 2021 15:20:48 -
@@ -3,7 +3,7 @@
COMMENT= Japanese handwriting recognition
DISTNAME= kanjipad-2.0.0
-REVISION= 7
+REVISION= 8
CATEGORIES=japanese
HOMEPAGE= https://fishsoup.net/software/kanjipad/
@@ -16,13 +16,18 @@ MASTER_SITES= https://fishsoup.net/softw
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += z
+WANTLIB += gtk-x11-2.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+# Needed for architectures not inlining sqrt(3), like powerpc
+WANTLIB += m
LIB_DEPENDS= devel/gettext,-runtime \
x11/gtk+2
-MAKE_FLAGS=OPTIMIZE='${CFLAGS}' PREFIX=${PREFIX}
+MAKE_FLAGS=OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" PREFIX="${PREFIX}"
+
+LDFLAGS+= -lm
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kanjipad
[macppc / lld] Unbreak sysutils/gdmap
Hi,
> https://bin.charlenew.xyz/gdmap-0.8.1p5.log
Once again, macppc needs the `-lm' linker flag.
With the below diff i can build gdmap [0] on macppc. While here, i've
refreshed WANTLIB.
The runtime has been tested successfully on macppc and amd64.
Comments/feedback are welcome,
Charlène.
[0] https://bin.charlenew.xyz/gdmap_fixed.log
Index: Makefile
===
RCS file: /cvs/ports/sysutils/gdmap/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.9
+++ Makefile27 Aug 2021 15:14:19 -
@@ -3,17 +3,18 @@
COMMENT = graphical disk map
DISTNAME = gdmap-0.8.1
CATEGORIES = sysutils x11
-REVISION = 5
+REVISION = 6
HOMEPAGE = http://gdmap.sourceforge.net/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread xml2 z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread xml2 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gdmap/}
@@ -29,6 +30,6 @@ CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.61
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib -lm"
.include
Re: [macppc / lld] Unbreak sysutils/gdmap
On Fri, 27 Aug 2021 15:18:14 +
Charlene Wendling wrote:
> Hi,
>
> > https://bin.charlenew.xyz/gdmap-0.8.1p5.log
>
> Once again, macppc needs the `-lm' linker flag.
>
> With the below diff i can build gdmap [0] on macppc. While here, i've
> refreshed WANTLIB.
>
> The runtime has been tested successfully on macppc and amd64.
>
> Comments/feedback are welcome,
>
> Charlène.
>
>
> [0] https://bin.charlenew.xyz/gdmap_fixed.log
>
It's better with a comment :)
Index: Makefile
===
RCS file: /cvs/ports/sysutils/gdmap/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:49:43 - 1.9
+++ Makefile27 Aug 2021 16:21:30 -
@@ -3,17 +3,18 @@
COMMENT = graphical disk map
DISTNAME = gdmap-0.8.1
CATEGORIES = sysutils x11
-REVISION = 5
+REVISION = 6
HOMEPAGE = http://gdmap.sourceforge.net/
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0 iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread xml2 z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread xml2 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gdmap/}
@@ -29,6 +30,9 @@ CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.61
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+
+# Needed for architectures not inlining sqrt(3), like powerpc
+LDFLAGS += -lm
.include
[macppc / lld] Unbreak games/corewars
Hi,
Corewars' build failed in the current macppc bulk:
> https://bin.charlenew.xyz/corewars.fail.log
Once again the `-lm' linker flag is needed on macppc. The below diff
allows me to build and run corewars on macppc [0], with no regression on
amd64.
While here, i've added a missing tab for CONFIGURE_STYLE.
OK?
Charlène.
[0] https://bin.charlenew.xyz/corewars.fixed.log
Index: Makefile
===
RCS file: /cvs/ports/games/corewars/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile28 Feb 2021 06:13:34 - 1.29
+++ Makefile4 Sep 2021 14:48:39 -
@@ -3,7 +3,7 @@
COMMENT= computer simulation game
DISTNAME= corewars-0.9.13
-REVISION= 10
+REVISION= 11
CATEGORIES=games x11
@@ -23,7 +23,10 @@ LIB_DEPENDS= x11/gtk+2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corewars/}
AUTOCONF_VERSION= 2.59
-CONFIGURE_STYLE=autoconf
+CONFIGURE_STYLE= autoconf
+
+# Needed for architectures not inlining sqrt(3), like powerpc
+CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -lm"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/corewars
Re: [macppc / lld] devel/gmp text relocation
On Thu, 9 Sep 2021 16:15:53 +0200 Christian Weisgerber wrote: > George Koehler: > > > WRKSRC/mpn/asm-defs.m4:1054, > > > > ifelse(`PIC_ALWAYS',`yes',`define(`PIC')') > > > > Notice that `PIC_ALWAYS' is in quotes, so the macro PIC_ALWAYS is > > not expanded. This faulty check compares the literal string > > "PIC_ALWAYS" with the literal string "yes"; these strings never > > match, so this faulty check never defines PIC. I don't fix this > > faulty check, because it might affect other archs. > > It appears that check is only used on powerpc*. The only place I > can find that defines PIC_ALWAYS is in GMP_ASM_POWERPC_PIC_ALWAYS, > which is indeed only called on powerpc*. > > So the fix might be as simple as repairing that ifelse? Well, this fixes devel/xtensa-lx106-elf/gdb : https://bin.charlenew.xyz/xtensa-lx106-elf-gdb-8.2.1p0.log > -- > Christian "naddy" Weisgerber > na...@mips.inka.de >
Re: powerpc bulk build report
Hi, This is the first bulk done with LLD as the default linker. Please test your favorite packages and report issues if you have some :) On Thu, 9 Sep 2021 08:56:52 -0600 (MDT) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Sat Aug 21 14:27:57 MDT 2021 > Finished: Thu Sep 9 08:56:41 MDT 2021 > Duration: 18 Days 18 hours 29 minutes It looks like LLD is making bulks a bit faster (actually macppc-1 was down for 2 days, hence the extra delay) > Built using OpenBSD 7.0-beta (GENERIC) #926: Fri Aug 20 18:11:14 MDT > 2021 > > Built 9517 packages > [...] > > Critical path missing pkgs: > http://build-failures.rhaalovely.net/powerpc/2021-08-21/summary.log > > Build failures: 10 > http://build-failures.rhaalovely.net/powerpc/2021-08-21/devel/xtensa-lx106-elf/gdb.log gkoehler@ is already providing a diff for libgmp: https://marc.info/?l=openbsd-ports&m=163116370903235&w=2 > http://build-failures.rhaalovely.net/powerpc/2021-08-21/mail/rspamd,hyperscan.log rspamd is not built on 32 bit archs for now. > http://build-failures.rhaalovely.net/powerpc/2021-08-21/misc/open62541,ns0_full.log This one was already present during the previous bulk, but no report has been sent, it's not due to LLD.
Re: powerpc bulk build report
Hi, On Thu, 9 Sep 2021 22:27:27 +0200 Alexander Bluhm wrote: > On Thu, Sep 09, 2021 at 08:56:52AM -0600, c...@openbsd.org wrote: > > http://build-failures.rhaalovely.net/powerpc/2021-08-21/misc/open62541,ns0_full.log > > /usr/obj/ports/open62541-1.0.6-ns0_full/bin/cc ... > namespace0_generated.c Segmentation fault (core dumped) > ninja: build stopped: subcommand failed. > > The compiler needs a lot of stack memory. The ulimit -s should be > raised to 8 GB. Feel free to skip the ns0_full flavor on small > memory architectures. I was going to _very_ sloppily mark the flavor NOT_FOR_ARCHS, until sthen noticed that 8 GB of stack memory is a bit too much. I found out after some research that i was using an old login.conf, and definitely have said no to sysmerge at one point. Sigh. Using the latest login.conf, where the stacksize is raised to 8MB by default for pbuild, fixes the build at home, it should be fine on the bulk machines as well. Thanks for your feedback :) Charlène. > bluhm >
Re: NEW: games/vvvvvv - a retro platformer with gravity-reversal puzzle mechanics
Hi,
> There is an existing port draft by bcallah@ and cwen@ in openbsd-wip
> [2]. I've graciously adopted the patches to the bundled physfs for
> big endian compatibility and to use ~/.local/share/VV/ for the
> assets file data.zip.
Actually, that patch may not be needed, because VV does not support
big endian archs [0], as i've found out later. Yet i've built your port
on macppc, and indeed colors are off, most sprites are not displayed, so
i think it needs a 'NOT_FOR_ARCHS=${BE_ARCHS}' at least.
> Some comments on where I diverge from the version in openbsd-wip:
> [...]
> - Compiles with std=c++98, so looks to me like base-gcc can be
> included in COMPILER...
Due to [0], it won't be built on sparc64, the last GCC arch
we build packages for, so i think the COMPILER line can safely be
removed.
> [...]
Charlène.
[0] https://github.com/TerryCavanagh/VV/pull/461
Re: NEW: games/vvvvvv - a retro platformer with gravity-reversal puzzle mechanics
On Mon, 4 Oct 2021 23:55:06 -0600
Thomas Frohwein wrote:
> On Mon, Oct 04, 2021 at 07:32:56PM +0000, Charlene Wendling wrote:
> > Hi,
> >
> >
> > > There is an existing port draft by bcallah@ and cwen@ in
> > > openbsd-wip [2]. I've graciously adopted the patches to the
> > > bundled physfs for big endian compatibility and to use
> > > ~/.local/share/VV/ for the assets file data.zip.
> >
> > Actually, that patch may not be needed, because VV does not
> > support big endian archs [0], as i've found out later. Yet i've
> > built your port on macppc, and indeed colors are off, most sprites
> > are not displayed, so i think it needs a 'NOT_FOR_ARCHS=$
> > {BE_ARCHS}' at least.
> >
> > > Some comments on where I diverge from the version in openbsd-wip:
> > > [...]
> > > - Compiles with std=c++98, so looks to me like base-gcc can be
> > > included in COMPILER...
> >
> > Due to [0], it won't be built on sparc64, the last GCC arch
> > we build packages for, so i think the COMPILER line can safely be
> > removed.
> >
> > > [...]
> >
> > Charlène.
> >
> > [0] https://github.com/TerryCavanagh/VV/pull/461
> >
>
> Thanks, that makes sense. I added the NOT_FOR_ARCHS and removed the
> patch.
>
> I left the COMPILER line with the comment as it's C++, in case that
> will be relevant in the future. I think if there's a decision at some
> point that this isn't needed with sparc64 in NOT_FOR_ARCHS, it can be
> addressed then IMO. (Comments welcome on what direction this topic is
> going...)
>
> I've added an updated tarball; I tested it again with the free assets
> and still works. ok?
OK cwen@ port-wise; it would be nice if someone is OK with the
licensing terms though.
Re: powerpc bulk build report
It's not done yet ;) One of the machines lost some nfs mounts, i'm restarting the bulk atm ;) On Fri, 15 Oct 2021 09:13:44 -0600 (MDT) c...@openbsd.org wrote: > Bulk build on macppc-0.ports.openbsd.org > > Started : Tue Sep 28 01:49:06 MDT 2021 > Finished: Fri Oct 15 09:12:08 MDT 2021 > Duration: 17 Days 7 hours 23 minutes > > Built using OpenBSD 7.0 (GENERIC) #939: Mon Sep 27 18:51:05 MDT 2021 >
Re: can't start games/supertux
Hi all,
On Thu, 4 Apr 2019 21:40:47 -0400
George Koehler wrote:
> To OpenBSD ports list,
>
> I can't start OpenBSD's amd64 snapshot package of supertux-0.6.0p0.
> Are other people getting the same error? I get
>
> opa$ supertux2
> [FATAL]
> /usr/obj/ports/supertux-0.6.0/SuperTux-v0.6.0-Source/src/supertux/main.c
> pp:601 Unexpected exception: boost::filesystem::status: Permission
> denied:
> "/usr /obj/ports/supertux-0.6.0/SuperTux-v0.6.0-Source/data/credits.stxt"
> opa$ ls -ld /usr/obj drwxrwx--- 2 build wobj 512 Nov 20
> 19:58 /usr/obj
>
> I see how patch-src_supertux_main_cpp adds ${PREFIX}, but don't see
> how ${PREFIX} gets expanded. One might need to add a pre-configure
> target like in some other ports:
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/src/supertux/main.cpp
>
> I went to my amd64 vm to check whether the amd64 snapshot package
> gives the ${PREFIX} error, but I got the /usr/obj error. (I connected
> to my vm with ssh -Y; there's no accelerated OpenGL, so supertux would
> run slow if it did start.) Now I don't know whether we need a
> pre-configure target.
Thanks for reporting, i've the same issue on my amd64 machine.
Here is a diff that fixes it on amd64, i can't test on macppc
at the moment as it's building x11/qt4.
Charlène.
> [1]
> http://build-failures.rhaalovely.net//powerpc/2019-03-04/games/supertux.log
>
> --
> George Koehler
>
Index: Makefile
===
RCS file: /cvs/ports/games/supertux/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile28 Feb 2019 17:42:53 - 1.19
+++ Makefile5 Apr 2019 13:50:47 -
@@ -5,7 +5,7 @@ COMMENT = jump 'n' run game
V =0.6.0
DISTNAME = SuperTux-v${V}-Source
PKGNAME = supertux-$V
-REVISION = 0
+REVISION = 1
CATEGORIES = games
@@ -44,5 +44,8 @@ NO_TEST = Yes
post-extract:
perl -i -pe 's/\r$$//' ${WRKDIST}/external/squirrel/CMakeLists.txt
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/src/supertux/main.cpp
.include
[ports-gcc-8] Unbreak databases/strigi
Hi ports,
I'm testing my final x11/qt4 gcc-8 fix diff against x11/kde4/marble,
and during the build databases/strigi failed with:
luceneindexreader.cpp:325:37: error: no matching function for call to
'make_pair(std::__cxx11::string,
std::__cxx11::string&)'
It occurs because std::make_pair syntax changed since C++11, and again
for C++14 (the latter being the gcc-8's default C++ standard used) [0].
We simply need to remove the conditional that limited the use of C++03
to base-clang archs to fix this.
It builds without issues on macppc/gcc-8 [1], and allows building
kde4-libs.
Charlène.
[0] https://en.cppreference.com/w/cpp/utility/pair/make_pair
[1] http://0x0.st/zZSY.txt
Index: Makefile
===
RCS file: /cvs/ports/databases/strigi/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile20 Feb 2019 11:22:26 - 1.28
+++ Makefile7 Apr 2019 10:02:26 -
@@ -2,7 +2,7 @@
COMMENT = document indexer
DISTNAME = strigi-0.7.8
-REVISION = 0
+REVISION = 1
CATEGORIES = databases devel textproc sysutils
HOMEPAGE = https://www.vandenoever.info/software/strigi/
@@ -46,9 +46,7 @@ CONFIGURE_ARGS = -DENABLE_LOG4CXX=No
# Depends on Java
CONFIGURE_ARGS += -DENABLE_REGENERATEXSD=No
-.include
-.if ${PROPERTIES:Mclang}
-CXXFLAGS += --std=c++03
-.endif
+# Doesn't build with C++14
+CXXFLAGS +=--std=c++03
.include
[ports-gcc-8] Unbreak x11/qt4
Hi ports,
It's already well-known - x11/qt4 won't build with gcc-8's C++14 default
standard.
The diff i'm proposing here mostly comes from Debian [1] [2], and
simply consists to make gcc-8 pose as gcc-4.
While here, i've moved HOMEPAGE to https and made portcheck(1) happy by
removing trailing whitespaces.
Testing:
- macppc: It worked well [3] with gcc-8 and gcc-4.9. As i did it 3
months ago, i've tested again the whole thing with gcc-8, and it
has built x11/kde4/marble without issues.
- amd64: It builds fine as well.
Comments/feedback are welcome!
Charlène.
[1]
https://sources.debian.org/patches/qt4-x11/4:4.8.7+dfsg-17/qt-everywhere-opensource-src-4.8.7-gcc6.patch/
[2]
https://sources.debian.org/patches/qt4-x11/4:4.8.7+dfsg-17/fix-build-icu59.patch/
[3]
https://bsd.network/@julianaito/101462113728207696
Index: Makefile
===
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile26 Nov 2018 16:41:20 - 1.156
+++ Makefile7 Apr 2019 20:59:51 -
@@ -25,14 +25,14 @@ PKGNAME-main = qt4-${PKGVERSION}
PKGNAME-debug =qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main =18
-REVISION-mysql = 5
-REVISION-postgresql = 5
-REVISION-sqlite2 = 5
-REVISION-tds = 5
-REVISION-debug = 2
-REVISION-examples =6
-REVISION-html =2
+REVISION-main =19
+REVISION-mysql = 6
+REVISION-postgresql = 6
+REVISION-sqlite2 = 6
+REVISION-tds = 6
+REVISION-debug = 3
+REVISION-examples =7
+REVISION-html =3
# XXX qmake include parser is bogus
DPB_PROPERTIES = parallelnojunk
@@ -67,7 +67,7 @@ DISTNAME =qt-everywhere-opensource-src-
CATEGORIES = x11
MASTER_SITES = https://download.qt.io/archive/qt/4.8/${VERSION}/
-HOMEPAGE = http://www.qt.io/
+HOMEPAGE = https://www.qt.io/
MAINTAINER = Marc Espie
@@ -248,6 +248,8 @@ DESTDIRNAME = INSTALL_ROOT
CONFIGURE_ARGS += -platform openbsd-clang
.else
CONFIGURE_ARGS += -platform openbsd-g++4
+# Using gcc 4.9 default standard with gcc>=6.
+CXXFLAGS +=-std=gnu++98
.endif
pre-patch:
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/qt4/patches/patch-configure,v
retrieving revision 1.27
diff -u -p -r1.27 patch-configure
--- patches/patch-configure 3 Jun 2015 07:28:01 - 1.27
+++ patches/patch-configure 7 Apr 2019 20:59:51 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-configure,v 1.27 2015/06/03 07:28:01 dcoppa Exp $
configure.orig Thu May 7 16:14:56 2015
-+++ configure Sun May 31 13:28:28 2015
+Index: configure
+--- configure.orig
configure
@@ -918,7 +918,7 @@ CFG_SILENT=no
CFG_GRAPHICS_SYSTEM=default
CFG_RUNTIME_SYSTEM=
@@ -37,3 +38,21 @@ $OpenBSD: patch-configure,v 1.27 2015/06
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move
qmake's qconfig.h to qconfig.h.qmake
[ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old"
"$OLD_QCONFIG_H" #put back qconfig.h
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
+@@ -7734,7 +7734,7 @@ case "$XPLATFORM" in
+ *-g++*)
+ # Check gcc's version
+ case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
+- 5*|4*|3.4*)
++ 8*|6*|5*|4*|3.4*)
+ ;;
+ 3.3*)
+ canBuildWebKit="no"
+@@ -8050,7 +8050,7 @@ g++*)
+ 3.*)
+ COMPILER_VERSION="3.*"
+ ;;
+-5*|4.*)
++8*|6*|5*|4.*)
+ COMPILER_VERSION="4"
+ ;;
+ *)
Index: patches/patch-src_corelib_tools_tools_pri
===
RCS file: patches/patch-src_corelib_tools_tools_pri
diff -N patches/patch-src_corelib_tools_tools_pri
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_corelib_tools_tools_pri 7 Apr 2019 20:59:51 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+ICU >= 59 requires C++11 for its header files.
+Qt can't be compiled with -std=c++11 as a whole, so only enable
+it for qlocale_icu.cpp.
+Index: src/corelib/tools/tools.pri
+--- src/corelib/tools/tools.pri.orig
src/corelib/tools/tools.pri
+@@ -102,7 +102,14 @@ contains(QT_CONFIG, zlib):include($$PWD/../../3rdparty
+ else:include($$PWD/../../3rdparty/zlib_dependency.pri)
+
+ contains(QT_CONFIG,icu) {
+-SOURCES += tools/qlocale_icu.cpp
++cpp11.name = cpp11
++cpp11.input = SOURCES_CPP11
++cpp11.dependency_type = TYPE_C
++cpp11.variable_out = OBJECTS
++cpp11.output =
${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
++cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c
${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++QMAKE_EXTRA_COMPILERS += cpp11
++
[ports-gcc-8 arm ppc] Unbreak games/spacehulk
Hi ports,
(This is for post-unlock.)
spacehulk breaks during the build with ports-gcc-8:
smtp.cpp:291:1: error: narrowing conversion of '-1' from 'int' to
'char' inside { } [-Wnarrowing]
On powerpc and arm, char is unsigned by default, so it breaks.
There is a bit of mystery on why it works with gcc-4.9, it seems
that gcc-8 is better at finding narrowing errors.
That diff fixes the issue and has been tested on amd64 and indeed
powerpc. While here, i've cleaned up the spacing in the Makefile.
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/spacehulk/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile2 Mar 2019 20:00:27 - 1.20
+++ Makefile10 Apr 2019 13:28:07 -
@@ -4,7 +4,7 @@ COMMENT=total conversion of the Space H
DISTNAME= spacehulk-1.5-beta1
PKGNAME= spacehulk-1.5beta1
-REVISION = 10
+REVISION= 11
CATEGORIES=games x11
HOMEPAGE= http://r.vinot.free.fr/spacehulk/
@@ -18,18 +18,18 @@ WANTLIB += c drm expat fontconfig freety
WANTLIB += png16 xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
WANTLIB += xcb-xfixes xshmfence z
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER= base-clang ports-gcc base-gcc
-MASTER_SITES= ${HOMEPAGE}
+MASTER_SITES= ${HOMEPAGE}
-MODULES= x11/qt3
+MODULES= x11/qt3
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --with-qt-includes=${MODQT_INCDIR} \
- --with-qt-libraries=${MODQT_LIBDIR}
-CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS=--with-qt-includes=${MODQT_INCDIR} \
+ --with-qt-libraries=${MODQT_LIBDIR}
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
+ CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
-USE_GMAKE= Yes
+USE_GMAKE= Yes
.include
Index: patches/patch-src_smtp_cpp
===
RCS file: patches/patch-src_smtp_cpp
diff -N patches/patch-src_smtp_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_smtp_cpp 10 Apr 2019 13:28:07 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+powerpc and arm have unsigned char by default, fix:
+error: narrowing conversion of '-1' from 'int' to 'char' inside { }
+
+Index: src/smtp.cpp
+--- src/smtp.cpp.orig
src/smtp.cpp
+@@ -279,7 +279,7 @@ void Smtp::receivedAuth(QString &responseLine)
+ static const char base64char[65] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+-static const char base64val[128] = {
++static const signed char base64val[128] = {
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
[ports-gcc-8] Unbreak net/toxcore
(this is also for post-unlock) > http://build-failures.rhaalovely.net/powerpc/last/net/toxcore.log This port uses base-gcc, that doesn't recognise "-Wno-c99-extensions". Once COMPILER set, it builds properly with ports-gcc-8. It may also fix the build with ports-gcc-4.9. Any comment? Charlène. Index: Makefile === RCS file: /cvs/ports/net/toxcore/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile9 Aug 2018 23:25:58 - 1.3 +++ Makefile13 Apr 2019 22:42:49 - @@ -3,7 +3,7 @@ COMMENT = Tox client library V =0.2.3 -REVISION = 0 +REVISION = 1 DISTNAME = toxcore-$V GH_ACCOUNT = TokTok @@ -27,6 +27,9 @@ LIB_DEPENDS = audio/opus \ devel/libconfig \ multimedia/libvpx \ security/libsodium + +# "-Wno-c99-extensions" isn't recognized by base-gcc +COMPILER = base-clang ports-gcc NO_TEST = Yes
[ports-gcc-8] meta/gnome fixes and report
Hi ports,
(obviously for post unlock)
After having built meta/{xfce,lxqt,mate} flawlessly on my powerbook, it
was time to see how far meta/gnome would go with ports-gcc-8.
It requires only COMPILER fixes. In a future GNOME update, maybe we
should set a global COMPILER in gnome.port.mk, like qt5.port.mk has.
Currently it uses base compilers by default.
Here is a pretty raw report taken from my notes.
Fixed ports (there is a diff at the end for them):
> x11/gnome/mutter
"cc1: error: -Werror=maybe-uninitialized: No option
-Wmaybe-uninitialized"
The option is too recent for base-gcc, changed COMPILER. May also
work with ports-gcc-4.9 (it's supported there).
> x11/gnome/usage
> x11/gnome/bijiben
"error: 'for' loop initial declaration used outside C99 mode"
Requires modern C support or fixing the code. Changed COMPILER.
ports-gcc-4.9 would need -std=c99.
I don't know what we should do with ports-gcc-4.9 possible
fixes post-unlock, that diff clearly targets ports-gcc-8.
Broken ports (only "new" breakages):
> x11/gnome/builder
"ERROR: Problem encountered: libgit2 was not compiled with"
"-DTHREADSAFE:BOOL=ON"
There may be a reason it wasn't compiled with it. I haven't
looked at the issue yet, but any info is welcome.
> x11/gnome/shell
> x11/gnome/shell-extensions
"Unable to allocate memory: std::bad_alloc"
Probably hit by arch limits, changed COMPILER without success
Comments are welcome :)
Charlène.
Index: mutter/Makefile
===
RCS file: /cvs/ports/x11/gnome/mutter/Makefile,v
retrieving revision 1.90
diff -u -p -r1.90 Makefile
--- mutter/Makefile 20 Jan 2019 04:55:56 - 1.90
+++ mutter/Makefile 13 Apr 2019 15:57:06 -
@@ -4,7 +4,7 @@ COMMENT=window and compositing manager
GNOME_PROJECT= mutter
GNOME_VERSION= 3.30.2
-REVISION= 1
+REVISION= 2
API_SUFFIX=-3
SUBST_VARS=API_SUFFIX
@@ -44,6 +44,8 @@ BUILD_DEPENDS=devel/gsettings-desktop-
RUN_DEPENDS= devel/gsettings-desktop-schemas>=3.16.0 \
x11/gnome/zenity
+
+COMPILER= base-clang ports-gcc
CONFIGURE_STYLE= gnu
Index: usage/Makefile
===
RCS file: /cvs/ports/x11/gnome/usage/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- usage/Makefile 1 Jan 2019 16:56:11 - 1.5
+++ usage/Makefile 13 Apr 2019 15:57:06 -
@@ -4,6 +4,7 @@ COMMENT=system resources status
GNOME_PROJECT= gnome-usage
GNOME_VERSION= 3.30.0
+REVISION= 0
CATEGORIES=sysutils
@@ -21,5 +22,8 @@ MODGNOME_TOOLS= desktop-file-utils gtk-
LIB_DEPENDS= devel/libgtop2 \
x11/gtk+3
+
+# C99 won't work with base-gcc
+COMPILER= base-clang ports-gcc
.include
Index: bijiben/Makefile
===
RCS file: /cvs/ports/x11/gnome/bijiben/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- bijiben/Makefile21 Feb 2019 17:08:50 - 1.57
+++ bijiben/Makefile13 Apr 2019 15:57:06 -
@@ -4,7 +4,7 @@ COMMENT=simple note editor
GNOME_PROJECT= bijiben
GNOME_VERSION= 3.30.3
-REVISION= 0
+REVISION= 1
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@@ -25,6 +25,8 @@ LIB_DEPENDS= databases/evolution-data-s
# needs xdg-email
RUN_DEPENDS += devel/xdg-utils
+
+COMPILER = base-clang ports-gcc
MODGNOME_TOOLS=desktop-file-utils gtk-update-icon-cache \
shared-mime-info yelp
[ports-gcc-8] Unbreak lang/erlang/*
Erlang (all versions) doesn't package with ports-gcc-8, because:
- WxWidgets is built with headers made for ports-gcc-8, with
C++14 as the standard C++ version.
- Erlang requires WxWidgets but uses base-gcc, and during
configuration, it indeed outputs in $WRKSRC/lib/wx/config.log:
"/usr/local/include/wx-3.0/wx/strvararg.h:25:27: error:"
"type_traits: No such file or directory"
AFAIK base-gcc wants
- Meanwhile, it just builds without Wx, the issue appears when
packaging, because the Wx related files are not present.
It should have been easy if CHOSEN_COMPILER wasn't "irrelevant",
and if we were able to define it, but it would break the build on
clang archs.
What i'm proposing here is to bypass CHOSEN_COMPILER for !clang
arches. It unbreaks the packaging and ensures that WANTLIB is
proper, calling egcc/++ directly seems a bit too rough though.
It has been tested against Erlang 16 and 18, as my partial bulk
is still ongoing, i don't have resources to try them all.
Charlène.
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/erlang/Makefile.inc,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile.inc
--- Makefile.inc2 Jun 2018 14:03:24 - 1.17
+++ Makefile.inc14 Apr 2019 22:19:51 -
@@ -40,6 +40,18 @@ CFLAGS +=-fno-pie
LDFLAGS += -nopie
.endif
+# Unbreak wx libs. WxWidgets is built with ports-gcc-8, clashing
+# with base-gcc-4.2 used to build Erlang because of different C++
+# headers used. We can't set COMPILER in a short, don't repeat
+# yourself way because COMPILER is "irrelevant" (see 18/Makefile
+# for example), so doing it here.
+.if ! ${PROPERTIES:Mclang}
+MODULES += gcc4
+COMPILER_LIBCXX = ${LIBECXX}
+CC = ${LOCALBASE}/bin/egcc
+CXX = ${LOCALBASE}/bin/eg++
+.endif
+
USE_GMAKE= Yes
MAKE_ENV +=DESTDIR=$(DESTDIR)
Index: 16/Makefile
===
RCS file: /cvs/ports/lang/erlang/16/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- 16/Makefile 2 Jan 2019 12:44:07 - 1.23
+++ 16/Makefile 14 Apr 2019 22:19:51 -
@@ -13,8 +13,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-16b.03
PKGNAME-wx=erlang-wx-16b.03
-REVISION-main= 16
-REVISION-wx= 4
+REVISION-main= 17
+REVISION-wx= 5
VERSION_SPEC= >=16v0,<17v0
PKGSPEC-main= erlang-${VERSION_SPEC}
Index: 17/Makefile
===
RCS file: /cvs/ports/lang/erlang/17/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- 17/Makefile 2 Jan 2019 12:44:07 - 1.23
+++ 17/Makefile 14 Apr 2019 22:19:51 -
@@ -13,8 +13,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx=erlang-wx-$V
-REVISION-main= 12
-REVISION-wx= 4
+REVISION-main= 13
+REVISION-wx= 5
VERSION_SPEC= >=17v0,<18v0
PKGSPEC-main= erlang-${VERSION_SPEC}
Index: 18/Makefile
===
RCS file: /cvs/ports/lang/erlang/18/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- 18/Makefile 2 Jan 2019 12:44:07 - 1.20
+++ 18/Makefile 14 Apr 2019 22:19:51 -
@@ -12,7 +12,8 @@ DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx=erlang-wx-$V
-REVISION-wx= 0
+REVISION-main= 0
+REVISION-wx= 1
VERSION_SPEC= >=18v0,<19v0
PKGSPEC-main= erlang-${VERSION_SPEC}
Index: 19/Makefile
===
RCS file: /cvs/ports/lang/erlang/19/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 19/Makefile 2 Jan 2019 12:44:07 - 1.13
+++ 19/Makefile 14 Apr 2019 22:19:51 -
@@ -13,8 +13,8 @@ PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx=erlang-wx-$V
-REVISION-main= 5
-REVISION-wx= 2
+REVISION-main= 6
+REVISION-wx= 3
VERSION_SPEC= >=19v0,<20v0
PKGSPEC-main= erlang-${VERSION_SPEC}
Index: 21/Makefile
===
RCS file: /cvs/ports/lang/erlang/21/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- 21/Makefile 2 Jan 2019 12:44:07 - 1.2
+++ 21/Makefile 14 Apr 2019 22:19:51 -
@@ -7,7 +7,8 @@ COMMENT-wx= WxWidgets bindings for Erlan
V= 21.2
MAJ_V= 21
-REVISION= 0
+REVISION= 1
+REVISION-wx= 0
EPOCH= 0
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
[ports-gcc-8] Unbreak net/synergy
Hi ports,
Synergy's build is broken with ports-gcc-8 simply because it cannot be
built with C++14, it uses nullptr as it used to be before C++11:
>lib/common/common.h:141:18: error: 'NULL' was not declared in this
>scope
Using C++03 like clang already does in this port fixes the build on
macppc with ports-gcc-8.
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/net/synergy/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile24 Oct 2018 14:28:09 - 1.34
+++ Makefile15 Apr 2019 11:03:53 -
@@ -5,7 +5,7 @@ COMMENT=mouse and keyboard sharing uti
VERSION= 1.7.6
DISTNAME= synergy-${VERSION}
CATEGORIES=net x11
-REVISION= 0
+REVISION= 1
GH_ACCOUNT=symless
GH_PROJECT=synergy-core
@@ -27,10 +27,7 @@ MODULES= devel/cmake
NO_TEST= Yes
-.include
-.if ${PROPERTIES:Mclang}
CXXFLAGS +=-std=c++03
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/synergy[cds] ${PREFIX}/bin/
[ports-gcc-8 macppc / arm] Fix net/psi
> base64/base64.cpp:65:2: error: narrowing conversion of '-1' from
> "'int' to 'char' inside { } [-Wnarrowing]"
Really gcc-8 is better at finding narrowing errors. It looks like
clang hasn't spotted it as it packages on aarch64. It's similar to the
games/spacehulk issue i had earlier.
I've fixed the code, and moved HOMEPAGE to https while here. It works
fine on macppc.
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/net/psi/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile21 Jan 2019 20:55:38 - 1.31
+++ Makefile15 Apr 2019 14:19:18 -
@@ -3,10 +3,10 @@
COMMENT= multiplatform Jabber client
DISTNAME= psi-0.15
-REVISION= 10
+REVISION= 11
CATEGORIES=net
-HOMEPAGE= http://psi-im.org/
+HOMEPAGE= https://psi-im.org/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
Index: patches/patch-iris_src_xmpp_base64_base64_cpp
===
RCS file: patches/patch-iris_src_xmpp_base64_base64_cpp
diff -N patches/patch-iris_src_xmpp_base64_base64_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-iris_src_xmpp_base64_base64_cpp 15 Apr 2019 14:19:18
-
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+ppc, arm: char is unsigned by default, fix narrowing on these platforms
+
+Index: iris/src/xmpp/base64/base64.cpp
+--- iris/src/xmpp/base64/base64.cpp.orig
iris/src/xmpp/base64/base64.cpp
+@@ -45,7 +45,7 @@ QByteArray Base64::decode(const QString& input)
+ // 64 specifies eof
+ // everything else specifies data
+
+- char tbl[] = {
++ signed char tbl[] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
[ports-gcc-8] Unbreak net/{lib,r}torrent
Take 2, as i've already worked on it when ports-gcc-6 was out.
> error: struct std::tr1::array has no member
> named fill
There is already a set of patches to fix these issues. It was limited
to clang so far, i removed this limitation. I've also removed the
sparc64 workarounds as they are not needed anymore nowadays [0],
it uses ports-gcc.
This allows building libtorrent and rtorrent on macppc with ports-gcc-8.
I'm not sure it would work with ports-gcc-4.9 and will wait until
gcc-8 becomes officially the new ports-gcc to commit it if i
have no feedback on this.
Charlène.
[0] https://github.com/rakshasa/rtorrent/issues/28#issuecomment-3754215
Index: Makefile
===
RCS file: /cvs/ports/net/rtorrent/Makefile,v
retrieving revision 1.63
diff -u -p -r1.63 Makefile
--- Makefile24 Oct 2018 14:28:09 - 1.63
+++ Makefile15 Apr 2019 14:02:19 -
@@ -3,7 +3,7 @@
COMMENT= ncurses BitTorrent client based on libTorrent
DISTNAME= rtorrent-0.9.6
-REVISION= 5
+REVISION= 6
EPOCH= 0
CATEGORIES=net
@@ -21,13 +21,6 @@ COMPILER = base-clang ports-gcc base-gc
MASTER_SITES= https://rtorrent.net/downloads/
-MODULES= gcc4
-
-# SIGBUS during startup on sparc64 when built using gcc 4.2.1
-# https://github.com/rakshasa/rtorrent/issues/28
-MODGCC4_ARCHS= sparc64
-MODGCC4_LANGS= c++
-
BUILD_DEPENDS= devel/cppunit
LIB_DEPENDS= net/libtorrent>=0.13.4 \
net/curl
@@ -37,18 +30,17 @@ AUTOCONF_VERSION= 2.69
CONFIGURE_ENV += LDFLAGS=-pthread
CONFIGURE_ARGS=--disable-debug
+CXXFLAGS +=-std=c++11
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtorrent
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rtorrent
${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc \
${PREFIX}/share/examples/rtorrent/rtorrent.rc
-.include
-.if ${PROPERTIES:Mclang}
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,
Index: Makefile
===
RCS file: /cvs/ports/net/libtorrent/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile11 Jan 2019 18:04:21 - 1.57
+++ Makefile15 Apr 2019 14:02:05 -
@@ -10,7 +10,7 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
DISTNAME= libtorrent-0.13.6
EPOCH= 0
-REVISION= 5
+REVISION= 6
SHARED_LIBS += torrent 22.1# .18.0
CATEGORIES=net devel
@@ -37,14 +37,12 @@ CONFIGURE_ARGS= --enable-static \
--disable-mincore \
--disable-debug
-.include
-.if ${PROPERTIES:Mclang}
+CXXFLAGS +=-std=c++11
+# some patches involve the tr1 stuff
+PATCH_LIST = patch-* clangpatch-*
+
# this patches *only* files containing tr1 to no longer refer to tr1
# we do it pre-patch, because autoconf passes right after us
pre-patch:
find ${WRKDIST} -type f|xargs fgrep -lw tr1|xargs sed -i.bak -e
's,
Re: [ports-gcc-8] Unbreak net/{lib,r}torrent
On Mon, 15 Apr 2019 15:52:28 +0100
Stuart Henderson wrote:
> On 2019/04/15 16:48, Charlene Wendling wrote:
> >
> > Take 2, as i've already worked on it when ports-gcc-6 was out.
> >
> > > error: struct std::tr1::array has no member
> > > named fill
> >
> > There is already a set of patches to fix these issues. It was
> > limited to clang so far, i removed this limitation. I've also
> > removed the sparc64 workarounds as they are not needed anymore
> > nowadays [0], it uses ports-gcc.
>
> > -.if ${PROPERTIES:Mclang}
> > +CXXFLAGS +=-std=c++11
> > +# some patches involve the tr1 stuff
> > +PATCH_LIST = patch-* clangpatch-*
> > +
>
> As this is now unconditional, please merge the clangpatch-* files into
> the main patch-* and get rid of PATCH_LIST.
Thanks! It makes sense indeed. I'm attaching the updated diffs.
I've tested again, it builds and i have been able to download an ISO
with it on macppc and amd64.
Charlène.
rtorrent.diff
Description: Binary data
libtorrent.diff
Description: Binary data
Re: FIX: sysutils/bfs build on some archs
On Mon, 15 Apr 2019 22:37:59 +0200 Landry Breuil wrote: > On Mon, Apr 15, 2019 at 03:48:26PM -0400, Brian Callahan wrote: > > Hi ports -- > > > > bfs I discovered might not build on all archs. We need to be > > explicit with the BFS_HAS_SYS_ACL preprocessor variable. We don't > > have a /usr/include/sys/acl.h, so set it to 0 to not try to pick it > > up. > > > > Noticed when building bfs on hppa. > > > Will probably fix macppc too :) > > posix1e.c:27:22: error: sys/acl.h: No such file or directory > Yup :) It builds fine on macppc and amd64 here. I tried some features without any problems. OK cwen@
Re: [ports-gcc-8] Unbreak lang/erlang/*
On Mon, 15 Apr 2019 15:39:56 +0100 Stuart Henderson wrote: > On 2019/04/15 13:34, Stuart Henderson wrote: > > There are two approaches - > > > > - either we can just get rid of the mechanism completely (it isn't > > used consistently; compare 19/pkg/PLIST-main with the others). > > Upside: simple. Downside: bigger PLIST diffs between Erlang updates. > > > > - or we can rename the variables used (prefix with E_ or something), > > either just COMPILER to reduce PLIST churn, or all of them. > > > > I'm leaning towards the first one. Builds ongoing ... > > > > I went for the second in the end to reduce infrastructure changes. > > Awesome, your diff allowed to build all Erlang versions on macppc/ports-gcc-8 without issues :) Thanks again! OK cwen@
[macppc/ports-gcc-8 arm] Fix games/dungeon-crawl
Hi ports,
> http://build-failures.rhaalovely.net/aarch64/2019-04-12/games/dungeon-crawl.log
The code doesn't take account of archs where char is unsigned by
default. This also occurs with ports-gcc-8 on macppc.
I've quick fixed the "faulty" code, it builds on macppc, i played a bit
without issues.
Any comment?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/games/dungeon-crawl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile25 Nov 2018 21:06:38 - 1.12
+++ Makefile16 Apr 2019 12:39:31 -
@@ -9,7 +9,7 @@ DISTNAME= dc400b26-src
EXTRACT_SUFX= .tbz2
V= 4.0.0b26
PKGNAME= dungeon-crawl-$V
-REVISION = 4
+REVISION = 5
BUILD_DEPENDS+=archivers/bzip2
Index: patches/patch-source_direct_cc
===
RCS file: patches/patch-source_direct_cc
diff -N patches/patch-source_direct_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-source_direct_cc 16 Apr 2019 12:39:31 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+ppc, arm: fix the build where char is unsigned by default
+
+Index: source/direct.cc
+--- source/direct.cc.orig
source/direct.cc
+@@ -44,8 +44,8 @@
+
+ // x and y offsets in the following order:
+ // SW, S, SE, W, E, NW, N, NE
+-static const char xcomp[9] = { -1, 0, 1, -1, 0, 1, -1, 0, 1 };
+-static const char ycomp[9] = { 1, 1, 1, 0, 0, 0, -1, -1, -1 };
++static const signed char xcomp[9] = { -1, 0, 1, -1, 0, 1, -1, 0, 1 };
++static const signed char ycomp[9] = { 1, 1, 1, 0, 0, 0, -1, -1, -1 };
+ static const char dirchars[19] = { "b1j2n3h4.5l6y7k8u9" };
+ static const char DOSidiocy[10] = { "OPQKSMGHI" };
+ static const char *aim_prompt = "Aim (move cursor or -/+/=, change mode with
CTRL-F, select with . or >)";
Index: patches/patch-source_mon-util_h
===
RCS file: patches/patch-source_mon-util_h
diff -N patches/patch-source_mon-util_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-source_mon-util_h 16 Apr 2019 12:39:31 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+ppc, arm: fix build where char is unsigned by default
+
+Index: source/mon-util.h
+--- source/mon-util.h.orig
source/mon-util.h
+@@ -115,7 +115,7 @@ struct monsterentry
+
+ unsigned short charclass PACKED; //
+
+-char holiness PACKED; // -1=holy,0=normal,1=undead,2=very very evil
++signed char holiness PACKED; // -1=holy,0=normal,1=undead,2=very
very evil
+
+ short resist_magic PACKED; // (positive is ??)
+ // max damage in a turn is total of these four?
+@@ -144,7 +144,7 @@ struct monsterentry
+ // 0=no zombie, 1=small zombie (z) 107, 2=_BIG_ zombie (Z) 108
+ char zombie_size PACKED;
+ // 0-12: see above, -1=random one of (0-7)
+-char shouts PACKED;
++signed char shouts PACKED;
+ // AI things?
+ char intel PACKED; // 0=none, 1=worst...4=best
+
[macppc/ports-gcc-8 arm] Fix graphics/freeimage
> http://build-failures.rhaalovely.net/aarch64/2019-04-12/graphics/freeimage.log
It's broken as well with ports-gcc-8 on macppc.
Again it's a narrowing issue on unsigned-char-by-default archs.
Once fixed, it builds fine on macppc, and is still good on amd64.
Any comments?
Charlène.
Index: Makefile
===
RCS file: /cvs/ports/graphics/freeimage/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile19 Nov 2018 18:46:16 - 1.13
+++ Makefile16 Apr 2019 15:23:20 -
@@ -4,7 +4,7 @@ COMMENT=c++ library for common image f
DISTNAME= FreeImage3152
PKGNAME= freeimage-3.15.2
-REVISION = 6
+REVISION= 7
CATEGORIES=graphics
SHARED_LIBS+= freeimage 2.0
Index: patches/patch-Source_LibRawLite_internal_dcraw_common_cpp
===
RCS file:
/cvs/ports/graphics/freeimage/patches/patch-Source_LibRawLite_internal_dcraw_common_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Source_LibRawLite_internal_dcraw_common_cpp
--- patches/patch-Source_LibRawLite_internal_dcraw_common_cpp 7 Apr 2018
09:07:59 - 1.1
+++ patches/patch-Source_LibRawLite_internal_dcraw_common_cpp 16 Apr 2019
15:23:20 -
@@ -1,10 +1,21 @@
$OpenBSD: patch-Source_LibRawLite_internal_dcraw_common_cpp,v 1.1 2018/04/07
09:07:59 rsadowski Exp $
-fix clang 6.0 build
+Hunk #1: fix the build when char is unsigned by default (ppc, arm)
+
+fix clang>=6 build
Index: Source/LibRawLite/internal/dcraw_common.cpp
--- Source/LibRawLite/internal/dcraw_common.cpp.orig
+++ Source/LibRawLite/internal/dcraw_common.cpp
+@@ -2368,7 +2368,7 @@ void CLASS quicktake_100_load_raw()
+
+ void CLASS kodak_radc_load_raw()
+ {
+- static const char src[] = {
++ static const signed char src[] = {
+ 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
+ 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
+ 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
@@ -3917,7 +3917,7 @@ void CLASS lin_interpolate()
*/
void CLASS vng_interpolate()
Re: devel/libuv: Enable on hppa (touches most archs)
Hi, On Mon, 15 Apr 2019 15:08:50 -0400 Brian Callahan wrote: > Hi ports -- > Tests on sparc64 and macppc and mips64* would be nice as a layer of > safety. > > OK for libuv? > > ~Brian > > [0] https://gcc.gnu.org/wiki/Atomic/GCCMM > As you know i'm running that diff on macppc/ports-gcc-8.3. I have: - built libuv: it works fine - rebuilt cmake: it works fine as well - built some ports with it that requires cmake like devel/libnipper without issues (i don't know if it's relevant in that case). In any case i'll report problems that may arise from that change, as i'm still going on checking for possible gcc-8.3 regressions on macppc, but so far so good :) Charlène.
