CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2020/07/12 23:05:00 Modified files: x11/xzoom : Makefile distinfo x11/xzoom/pkg : DESCR Log message: Update xzoomt to 0.4 and bring support for 15, 16, 24 and 32 bpp displays. Use hand-rolled distfile instead of patch set. Tweak DESCR while here. Tweaks, comments and OK naddy@
Re: [update] graphics/makehuman to 1.2.0a
On Sun Jul 12, 2020 at 12:24:36PM -, Dimitri Karamazov wrote:
> On additional testing and looking at info dumped onto terminal,
> I came across msg's like "cannot find compiled *.npz".
> I've added the targets I missed and also replaced version to be
> in sync with upstream.
>
> Rendered enough humans to make a village! For any testers out there,
> use `makehuman --noshaders` incase the viewport in messed up.
>
> Reference:
> https://github.com/makehumancommunity/makehuman/issues/46
>
> OK?
Works fine here.
Why did you change pre to beta? I would suggest to change
PKGNAME=makehuman-1.2.0beta2 into DISTNAME=makehuman-1.2.0pre20200710.
First of all, we do not need to set PKGNAME, but DISTNAME. I think
pre+COMMIT-DATE is the better pattern. This way we can easily update the
port even if it takes longer upstream.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 10 Nov 2019 12:43:08 - 1.30
> +++ Makefile 12 Jul 2020 11:49:04 -
> @@ -2,37 +2,47 @@
>
> COMMENT= parametrical modeling of 3D humanoid characters
>
> +PKGNAME= makehuman-1.2.0beta2
DISTNAME= makehuman-1.2.0pre20200710
> +
> GH_ACCOUNT= makehumancommunity
> GH_PROJECT= makehuman
> -GH_TAGNAME= 1.1.1
> +GH_TAGNAME= 1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
>
> CATEGORIES= graphics
>
> HOMEPAGE=http://www.makehumancommunity.org/
>
> -# GPLv2 / MIT
> +MAINTAINER= Dimitri Karamazov
> +
> +# AGPLv3
> PERMIT_PACKAGE= Yes
>
> MODULES= lang/python
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> -MODPY_BUILDDEP= No
> -
> -NO_BUILD=Yes
> NO_TEST= Yes
>
> RUN_DEPENDS= devel/desktop-file-utils \
> - graphics/py-opengl \
> - math/py-numpy \
> - x11/py-qt4
> + graphics/py-opengl${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
> + x11/py-qt5${MODPY_FLAVOR}
> +
> +do-build:
> + cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
> +.for TARGET in models proxies targets
> + cd ${WRKSRC}/makehuman && ${MODPY_BIN} compile_${TARGET}.py
> +.endfor
>
> do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
> + ${PREFIX}/share/pixmaps
> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> ${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
> ${FILESDIR}/MakeHuman.desktop.in \
> ${PREFIX}/share/applications/MakeHuman.desktop
> ${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
> ${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
> - cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
> - chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
> + cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/makehuman/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 10 Nov 2019 12:43:08 - 1.5
> +++ distinfo 12 Jul 2020 11:49:04 -
> @@ -1,2 +1,2 @@
> -SHA256 (makehuman-1.1.1.tar.gz) =
> XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
> -SIZE (makehuman-1.1.1.tar.gz) = 45828428
> +SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
> VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
> +SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
> +++ pkg/PLIST 12 Jul 2020 11:49:05 -
> @@ -1,13 +1,39 @@
> -@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
> +@comment $OpenBSD: PLIST,v$
> bin/makehuman
> share/applications/MakeHuman.desktop
> share/makehuman/
> +${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
> +share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
> share/makehuman/apps/
> +${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
> +share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/07/12 20:13:28 Modified files: fonts/unifont : Makefile distinfo Log message: Minor release update to unifont-13.0.3 from last week. Changelog can be found here: https://unifoundry.com/unifont/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2020/07/12 18:08:10 Modified files: mail/isync : Makefile distinfo mail/isync/patches: patch-src_drv_imap_c patch-src_main_c Removed files: mail/isync/patches: patch-src_socket_c Log message: Update to isync 1.3.2 also tested by bket and Caspar Schutijser
Re: NEW: games/oshu - rhythm game
Hi Paul --
On Friday, July 10, 2020 11:26 AM, Paul Valencia wrote:
> Hi ports,
>
> This is a new port for oshu which is a clone of osu! rhythm game.
> Currently it only supports playing the beatmaps of osu's Standard
> mode and you need to download them from internet (added some
> instructions about that in pkg README).
>
> Pass port-lib-depends-check and portcheck. Build on amd64 and arm64
> and only tested on amd64 with some beatmaps.
Thanks for the port. Attached is a tweaked version with the following:
* Improved COMMENT.
* It appears that upstream does not make any tarballs with their
releases, so switch to the GH_* variables. Has the benefit of taking
care of DISTNAME, PKGNAME, HOMEPAGE, and WRKDIST for you, so those
pieces were able to be removed.
* License marker is a little more explicit now with GPLv3 only.
* Put a comment (C++14) explaining the COMPILER line.
* Simplify LIB_DEPENDS.
* Use CONFIGURE_ARGS instead of a patch to deal with needing to add
-L${LOCALBASE}/lib in LDFLAGS.
* Add a patch to fix a -Wformat warning from clang.
* Fix some typos in pkg/README and hopefully make things a little bit
clearer. I didn't really understand what you meant by Standard until I
downloaded a beatmap that didn't work with oshu. I was able to follow
your directions to download a beatmap, unzip it, and play.
And I learned that I am very very bad at these types of games:
brilliant
// Tokoyami Towa
Normal
By Hinsvar
_ _ _ _
Score:
54 good
391 miss
So I think I will stick with other genres for the time being, but it
was fun to try out oshu.
~Brian
oshu.tgz
Description: application/compressed-tar
Re: Firefox and MIME
On Sat, Jul 04, 2020 at 10:55:35PM +0200, Landry Breuil wrote: Hello Landry, > I've looked a bit at this, and its a bit more complicated than expected, as > spawning xdg-open to find the configured mime handler also calls the > same codepath, that now uses /bin/sh (in > https://gitlab.gnome.org/GNOME/glib/blob/master/gio/gdesktopappinfo.c#L2695) > > So my idea it to avoid relying on all the glib > g_app_info_launch_something that end up calling > g_desktop_app_info_launch_uris() (which would require adding /bin/sh to > unveil.main), and instead fix all the 3 callers for g_app_info_launch* > (ie https://searchfox.org/mozilla-central/search?q=g_app_info_launch=) > to do a (simpler?) thing: > - in nsGIOService::GetAppForMimeType(), instead of calling xdg-open to > find the handler (which wouldnt work anymore since > https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1362) get the > mimetype handler via g_app_info_get_default_for_type() (at that point, i > think that works since /usr/local/share is unveiled, all .desktop files > are available), check that it exists in the PATH via > g_find_program_in_path() (ie it's properly unveiled), if not issue a > loud g_warning on stderr. > > - in all the g_app_info_launch* callers (ie mainly > nsGIOMimeApp::LaunchWithURI(), but also sometimes > nsGIOService::ShowURIForInput(), havent found which codepath leads to > which), replace the call by: > - if we have an URI, find its mimetype via g_content_type_guess() and > get the corresponding handler via g_app_info_get_default_for_type() > - find the handler executable via g_app_info_get_executable() > - call it via g_spawn_async() (using G_SPAWN_SEARCH_PATH will look it up in > the > path) > > here, with those handlers added to unveil.main: > /usr/local/bin/mupdf rx > /usr/local/bin/xarchive rx > /usr/local/bin/xarchiver rx > /usr/local/bin/mplayer rx > /usr/local/bin/parole rx > > clicking on a pdf or tar.gz or zip or flv link directly opens (after > downloading it to /tmp/mozilla_landry0/) the corresponding file in its > default handler configured via xdg-mime. > > $xdg-mime query default application/x-compressed-tar > xarchive.desktop > $xdg-mime query default video/mp4 > org.xfce.Parole.desktop > $xdg-mime query default application/pdf > mupdf.desktop > > Not sure that's the right way to handle this, nor if it causes other > issues i havent thought about but it works for me using 79.0b3. > > To test, drop the attached patch in > /usr/ports/www/mozilla-firefox/patches/patch-toolkit_system_gnome_nsGIOService_cpp > and use G_MESSAGES_DEBUG=all firefox if you want to see the g_debug() > msgs. I don't seem able to get this to work (at least with 78.0.2 in ports). When I click on (say) a PDF, I get the "what should Firefox do with this file" dialogue box rather than opening with xdg-mime. If I try browsing the file system then, even with mupdf added to unveil.main, it doesn't seem to "see" the mupdf binary, so I can't select it (but I can select Bulk Rename, Firefox, or Thunderbird?!). Either way, it doesn't seem to be firing up xdg-mime. This seems to happen with my existing FF profile and with an entirely new profile. I suspect I'm doing something very stupid here, so please feel free to point me in the right direction! Laurie
Re: [MAINTAINER UPDATE] www/sblg to 0.5.9
On Sun, 12 Jul 2020 12:00:54 -0700 Bryan Vyhmeister wrote: > On Wed, Jul 08, 2020 at 12:16:36PM -0700, Bryan Vyhmeister wrote: > > This is another simple maintainer update of sblg from 0.5.8 to > > 0.5.9. The changes included in this release are: > > > > sblg 0.5.9: "Extensive portability work. Internally switches to > > pkg-config(1) for detecting dependency locations. Now builds and > > installs properly on most popular UNIX systems." > > > > I did testing on amd64 with no issues. It should work fine > > everywhere. If someone could ok and commit, that would be great. > > Thank you. > > Anyone willing to ok and commit? > > Bryan It's committed - Thanks. > Index: www/sblg/Makefile > === > RCS file: /cvs/ports/www/sblg/Makefile,v > retrieving revision 1.27 > diff -u -p -r1.27 Makefile > --- www/sblg/Makefile 3 Nov 2019 19:56:42 - 1.27 > +++ www/sblg/Makefile 8 Jul 2020 19:11:52 - > @@ -2,7 +2,7 @@ > > COMMENT =simple off-line blog utility > > -DISTNAME = sblg-0.5.8 > +DISTNAME = sblg-0.5.9 > CATEGORIES = www > > HOMEPAGE = https://kristaps.bsd.lv/sblg/ > Index: www/sblg/distinfo > === > RCS file: /cvs/ports/www/sblg/distinfo,v > retrieving revision 1.25 > diff -u -p -r1.25 distinfo > --- www/sblg/distinfo 3 Nov 2019 19:56:42 - 1.25 > +++ www/sblg/distinfo 8 Jul 2020 19:11:52 - > @@ -1,2 +1,2 @@ > -SHA256 (sblg-0.5.8.tar.gz) = > Gy8xCfN1DN749+OFlTJ5wE6EuJMyjj1zrOVPN23bjsg= -SIZE > (sblg-0.5.8.tar.gz) = 1448005 +SHA256 (sblg-0.5.9.tar.gz) = > 5TiVzJgUzy+o9fnnvmuPBg8kKgSGMDcT1N56psK6hVE= +SIZE > (sblg-0.5.9.tar.gz) = 1456016 >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mgloc...@cvs.openbsd.org2020/07/12 14:40:44 Modified files: www/sblg : Makefile distinfo Log message: Update to sblg-0.5.9 - From MAINTAINER.
Re: [MAINTAINER UPDATE] www/sblg to 0.5.9
On Wed, Jul 08, 2020 at 12:16:36PM -0700, Bryan Vyhmeister wrote: > This is another simple maintainer update of sblg from 0.5.8 to 0.5.9. > The changes included in this release are: > > sblg 0.5.9: "Extensive portability work. Internally switches to > pkg-config(1) for detecting dependency locations. Now builds and > installs properly on most popular UNIX systems." > > I did testing on amd64 with no issues. It should work fine everywhere. > If someone could ok and commit, that would be great. Thank you. Anyone willing to ok and commit? Bryan Index: www/sblg/Makefile === RCS file: /cvs/ports/www/sblg/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- www/sblg/Makefile 3 Nov 2019 19:56:42 - 1.27 +++ www/sblg/Makefile 8 Jul 2020 19:11:52 - @@ -2,7 +2,7 @@ COMMENT = simple off-line blog utility -DISTNAME = sblg-0.5.8 +DISTNAME = sblg-0.5.9 CATEGORIES = www HOMEPAGE = https://kristaps.bsd.lv/sblg/ Index: www/sblg/distinfo === RCS file: /cvs/ports/www/sblg/distinfo,v retrieving revision 1.25 diff -u -p -r1.25 distinfo --- www/sblg/distinfo 3 Nov 2019 19:56:42 - 1.25 +++ www/sblg/distinfo 8 Jul 2020 19:11:52 - @@ -1,2 +1,2 @@ -SHA256 (sblg-0.5.8.tar.gz) = Gy8xCfN1DN749+OFlTJ5wE6EuJMyjj1zrOVPN23bjsg= -SIZE (sblg-0.5.8.tar.gz) = 1448005 +SHA256 (sblg-0.5.9.tar.gz) = 5TiVzJgUzy+o9fnnvmuPBg8kKgSGMDcT1N56psK6hVE= +SIZE (sblg-0.5.9.tar.gz) = 1456016
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2020/07/12 12:06:49 Modified files: lang/flang : Makefile.inc lang/flang/flang: Makefile distinfo lang/flang/flang/patches: patch-CMakeLists_txt patch-lib_scutil_CMakeLists_txt patch-lib_scutil_pgnewfil_c patch-runtime_flang_CMakeLists_txt patch-runtime_flang_async_c patch-runtime_flang_stime3f_c patch-runtime_flangrti_CMakeLists_txt patch-runtime_flangrti_aarch64-Linux_dumpregs_c patch-runtime_flangrti_dumpregs_h patch-runtime_flangrti_iostdinit_c patch-runtime_flangrti_mpmalloc_c patch-runtime_flangrti_trace_lin_c patch-runtime_flangrti_x86_64-Linux_dumpregs_c patch-tools_flang2_CMakeLists_txt patch-tools_flang2_flang2exe_CMakeLists_txt lang/flang/flang/pkg: PLIST lang/flang/libpgmath: Makefile distinfo lang/flang/libpgmath/patches: patch-CMakeLists_txt patch-lib_CMakeLists_txt patch-lib_common_CMakeLists_txt patch-lib_common_dispatch_c patch-lib_common_exp_fma3_CMakeLists_txt patch-lib_common_fltfenv_c patch-lib_common_log_fma3_CMakeLists_txt patch-lib_common_pgstdinit_h patch-lib_common_pow_fma3_CMakeLists_txt patch-lib_common_powi_CMakeLists_txt patch-lib_x86_64_CMakeLists_txt patch-lib_x86_64_fast_CMakeLists_txt patch-lib_x86_64_libm_inlines_amd_h patch-test_lit_site_cfg_in lang/flang/libpgmath/pkg: PLIST Log message: Update flang to its latest code. Upstream now considers this the Classic Flang compiler in contrast to the new Flang compiler, formerly known as f18, that has recently been upstreamed into LLVM.
Re: [update] graphics/makehuman to 1.2.0a
Those are described in the man page for make. @ stops make from echoing the
command line before running it - this can be annoying when trying to figure
out breakage.
--
Sent from a phone, apologies for poor formatting.
On 12 July 2020 10:30:25 "Dimitri Karamazov" wrote:
On Sun, July 12, 2020 9:05 am, Antoine Jacoutot wrote:
If you're point to '@cp', I don't know why I did it. I've seen it in other
ports?
But I'd like to know it's purpose, I will revert it if you want.
Its purpose is to hide the command, as I wrote.
Usually if you don't know the purpose of something, it's safer not to use
it ;-)
You should drop it imho for consistency with the rest of the do-install target.
--
Antoine
Reverted a impulsive change '@cp' with input from Antoine.
I suppose it is to hide the output? Can you post a reference
regarding this modifiers i.e @,:S,:N, etc?
Index: Makefile
===
RCS file: /cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile10 Nov 2019 12:43:08 - 1.30
+++ Makefile12 Jul 2020 09:13:10 -
@@ -2,37 +2,43 @@
COMMENT=parametrical modeling of 3D humanoid characters
+PKGNAME= makehuman-1.2.0pre
+
GH_ACCOUNT= makehumancommunity
GH_PROJECT= makehuman
-GH_TAGNAME=1.1.1
+GH_TAGNAME=1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
CATEGORIES= graphics
HOMEPAGE= http://www.makehumancommunity.org/
-# GPLv2 / MIT
+MAINTAINER=Dimitri Karamazov
+
+# AGPLv3
PERMIT_PACKAGE= Yes
MODULES=lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-MODPY_BUILDDEP=No
-
-NO_BUILD= Yes
NO_TEST=Yes
RUN_DEPENDS=devel/desktop-file-utils \
- graphics/py-opengl \
- math/py-numpy \
- x11/py-qt4
+ graphics/py-opengl${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+do-build:
+ cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
+ ${PREFIX}/share/pixmaps
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
${FILESDIR}/MakeHuman.desktop.in \
${PREFIX}/share/applications/MakeHuman.desktop
${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
- cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
- chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
+ cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/makehuman/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 12:43:08 - 1.5
+++ distinfo12 Jul 2020 09:13:10 -
@@ -1,2 +1,2 @@
-SHA256 (makehuman-1.1.1.tar.gz) = XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
-SIZE (makehuman-1.1.1.tar.gz) = 45828428
+SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
+SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
+++ pkg/PLIST 12 Jul 2020 09:13:11 -
@@ -1,13 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v$
bin/makehuman
share/applications/MakeHuman.desktop
share/makehuman/
+${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
+share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/
+${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
+share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
Re: update net/py-nbxmpp to 1.0.1
A new version of py-nbxmpp has been released since I've sent my last
message.
Important to note that this update breaks current version of gajim but
I've already provided a diff for updating it to the current version.
I'm very sorry Pierre-Emmanuel Andre for not CCing you earlier, please
also take a look at the gajim diff I've sent.
Any comments or OK?
Index: Makefile
===
RCS file: /cvs/ports/net/py-nbxmpp/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- Makefile 3 Jul 2020 21:13:01 - 1.8
+++ Makefile 12 Jul 2020 12:18:24 -
@@ -2,11 +2,10 @@
COMMENT = Python XMPP and Jabber implementation
-MODPY_EGG_VERSION = 0.6.10
+MODPY_EGG_VERSION = 1.0.1
DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = net devel
-REVISION = 0
HOMEPAGE = https://python-nbxmpp.gajim.org/
@@ -18,9 +17,10 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_PYPI:=n/nbxmpp/}
MODULES = lang/python
+MODPY_SETUPTOOLS = Yes
NO_TEST = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
.include
Index: distinfo
===
RCS file: /cvs/ports/net/py-nbxmpp/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo 16 Jun 2019 06:00:57 - 1.6
+++ distinfo 12 Jul 2020 12:18:46 -
@@ -1,2 +1,2 @@
-SHA256 (nbxmpp-0.6.10.tar.gz) = zXNBd3fkhH/djQ2Wx8r8YGlS7b0rnVKipyuyqqBNCO8=
-SIZE (nbxmpp-0.6.10.tar.gz) = 1516456
+SHA256 (nbxmpp-1.0.1.tar.gz) = ymDJvRUn++rDBd+QxnDxHy/nnxME2tHvoDFfdISjTUM=
+SIZE (nbxmpp-1.0.1.tar.gz) = 127504
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/py-nbxmpp/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -r1.4 PLIST
--- pkg/PLIST 30 Jan 2019 17:05:36 - 1.4
+++ pkg/PLIST 12 Jul 2020 12:19:11 -
@@ -1,38 +1,152 @@
@comment $OpenBSD: PLIST,v 1.4 2019/01/30 17:05:36 feinerer Exp $
+@pkgpath net/py-nbxmpp
lib/python${MODPY_VERSION}/site-packages/nbxmpp/
-lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/nbxmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/nbxmpp/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth_nb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}bosh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}addresses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}c14n.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client_nb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher_nb.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}features_nb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}const.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}idlequeue.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}old_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}proxy_connectors.${MODPY_PYC_MAGIC_TAG}pyc
Re: [update] graphics/makehuman to 1.2.0a
On additional testing and looking at info dumped onto terminal,
I came across msg's like "cannot find compiled *.npz".
I've added the targets I missed and also replaced version to be
in sync with upstream.
Rendered enough humans to make a village! For any testers out there,
use `makehuman --noshaders` incase the viewport in messed up.
Reference:
https://github.com/makehumancommunity/makehuman/issues/46
OK?
Index: Makefile
===
RCS file: /cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile10 Nov 2019 12:43:08 - 1.30
+++ Makefile12 Jul 2020 11:49:04 -
@@ -2,37 +2,47 @@
COMMENT= parametrical modeling of 3D humanoid characters
+PKGNAME= makehuman-1.2.0beta2
+
GH_ACCOUNT=makehumancommunity
GH_PROJECT=makehuman
-GH_TAGNAME=1.1.1
+GH_TAGNAME=1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
CATEGORIES=graphics
HOMEPAGE= http://www.makehumancommunity.org/
-# GPLv2 / MIT
+MAINTAINER=Dimitri Karamazov
+
+# AGPLv3
PERMIT_PACKAGE=Yes
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-MODPY_BUILDDEP=No
-
-NO_BUILD= Yes
NO_TEST= Yes
RUN_DEPENDS= devel/desktop-file-utils \
- graphics/py-opengl \
- math/py-numpy \
- x11/py-qt4
+ graphics/py-opengl${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+
+do-build:
+ cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
+.for TARGET in models proxies targets
+ cd ${WRKSRC}/makehuman && ${MODPY_BIN} compile_${TARGET}.py
+.endfor
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
+ ${PREFIX}/share/pixmaps
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
${FILESDIR}/MakeHuman.desktop.in \
${PREFIX}/share/applications/MakeHuman.desktop
${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
- cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
- chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
+ cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/makehuman/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 12:43:08 - 1.5
+++ distinfo12 Jul 2020 11:49:04 -
@@ -1,2 +1,2 @@
-SHA256 (makehuman-1.1.1.tar.gz) = XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
-SIZE (makehuman-1.1.1.tar.gz) = 45828428
+SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
+SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
+++ pkg/PLIST 12 Jul 2020 11:49:05 -
@@ -1,13 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v$
bin/makehuman
share/applications/MakeHuman.desktop
share/makehuman/
+${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
+share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/
+${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
+share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}humanmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}metadataengine.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}warpmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}which.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/autoskinblender.py
share/makehuman/apps/catmull_clark_subdivision.py
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2020/07/12 09:27:40 Modified files: converters/bdf2sfd: Makefile distinfo Log message: Update bdf2sfd to 1.1.3.
Re: [update] mail/mu-1.4.10
Stefan Hagen wrote:
> I've driven this a little further with sed in the Makefile instead of
> patching the placeholder in. This way no patch is necessary at all.
>
> I like it much better and I've seen similiar approaches in other ports.
>
> > Still has utf8 in README, but I really don't think upstream upgrade
> > notes belong there at all.
>
> I removed the README.
>
> I also removed the manpage patch as this has been fixed upstream in 1.4.10.
>
> Ok now? More suggestions?
>
> Tested on amd64 and sparc64.
>
> Best Regards,
> Stefan
That was a bit too fast. I forgot to include the optimization fix from Todd.
It's in now...
Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- mail/mu/Makefile24 Jan 2020 10:36:41 -1.19
+++ mail/mu/Makefile12 Jul 2020 14:49:24 -
@@ -2,8 +2,15 @@
COMMENT=maildir indexer and searcher with emacs frontend
-DISTNAME=mu-1.2.0
-REVISION=0
+V=1.4.10
+GUILE_V=2.2
+
+DISTNAME=mu-$V
+
+FLAVORS=guile
+FLAVOR ?=
+
+SHARED_LIBS=guile-mu0.0
CATEGORIES=mail
HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
@@ -13,12 +20,12 @@ MAINTAINER=Stefan Hagen https://github.com/djcb/mu/releases/download/1.2/
+MASTER_SITES=https://github.com/djcb/mu/releases/download/${V}/
EXTRACT_SUFX=.tar.xz
BUILD_DEPENDS=emacs->=24:editors/emacs
@@ -37,9 +44,21 @@ AUTOMAKE_VERSION=1.15
CONFIGURE_STYLE=autoreconf
CONFIGURE_ARGS=--disable-gtk \
---disable-webkit \
---disable-guile
+--disable-webkit
+
+.if ${FLAVOR} == "guile"
+WANTLIB +=guile-2.2 gc ltdl gmp
+LIB_DEPENDS +=lang/guile2
+.else
+CONFIGURE_ARGS +=--disable-guile
+.endif
USE_GMAKE=Yes
+
+SEPARATE_BUILD=Yes
+
+pre-configure:
+sed -e 's/exec guile/exec guile${GUILE_V}/' -i \
+${WRKDIST}/guile/*/*.scm
.include
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- mail/mu/distinfo21 Jul 2019 00:10:04 -1.7
+++ mail/mu/distinfo12 Jul 2020 14:49:24 -
@@ -1,2 +1,2 @@
-SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
-SIZE (mu-1.2.0.tar.xz) = 844192
+SHA256 (mu-1.4.10.tar.xz) = RnXxSkO0hT4Uo+CJIFF4fRuC30jqG9Q3UXKJNnbNfm0=
+SIZE (mu-1.4.10.tar.xz) = 873328
Index: mail/mu/patches/patch-configure_ac
===
RCS file: mail/mu/patches/patch-configure_ac
diff -N mail/mu/patches/patch-configure_ac
--- /dev/null1 Jan 1970 00:00:00 -
+++ mail/mu/patches/patch-configure_ac12 Jul 2020 14:49:24 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+Look for guile-snarf as guile-snarf2.2
+(lang/guile2 installs it that way)
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -230,7 +230,7 @@ AS_IF([test "x$enable_guile" != "xno"],[
+ GUILE_FLAGS
+ AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
+ AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
+-AC_SUBST(GUILE_SNARF, [guile-snarf])
++AC_SUBST(GUILE_SNARF, [guile-snarf2.2])
+ guile_version=$($PKG_CONFIG guile-2.2 --modversion)
+ ])
+ ])
Index: mail/mu/patches/patch-lib_parser_utils_cc
===
RCS file: /cvs/ports/mail/mu/patches/patch-lib_parser_utils_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_parser_utils_cc
--- mail/mu/patches/patch-lib_parser_utils_cc26 Jul 2019 06:41:59 -
1.1
+++ mail/mu/patches/patch-lib_parser_utils_cc12 Jul 2020 14:49:24 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_parser_utils_cc,v 1.1 2019/07/26 06:41:59 pvk Exp $
-Bring g_vasprintf into scope
-Index: lib/parser/utils.cc
lib/parser/utils.cc.orig
-+++ lib/parser/utils.cc
-@@ -17,7 +17,7 @@
- ** 02110-1301, USA.
- */
-
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE_EXTENDED 1
- #include
-
- #define GNU_SOURCE
Index: mail/mu/patches/patch-lib_utils_mu-str_h
===
RCS file: mail/mu/patches/patch-lib_utils_mu-str_h
diff -N mail/mu/patches/patch-lib_utils_mu-str_h
--- /dev/null1 Jan 1970 00:00:00 -
+++ mail/mu/patches/patch-lib_utils_mu-str_h12 Jul 2020 14:49:24 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+Prevent the compiler from incorrectly optimizing mu_str_size()
+Index: lib/utils/mu-str.h
+--- lib/utils/mu-str.h.orig
lib/utils/mu-str.h
+@@ -48,7 +48,7 @@ G_BEGIN_DECLS
+ * @return a string representation of the size; see above
+ * for what to do with it
+ */
+-const char* mu_str_size_s (size_t s) G_GNUC_CONST;
++const char* mu_str_size_s (size_t s);
+ char* mu_str_size(size_t s) G_GNUC_WARN_UNUSED_RESULT;
+
+
Index:
Re: [update] mail/mu-1.4.10
Stuart Henderson wrote:
> > For convenience, here is a patch that applies sthen@'s suggestions.
I've driven this a little further with sed in the Makefile instead of
patching the placeholder in. This way no patch is necessary at all.
I like it much better and I've seen similiar approaches in other ports.
> Still has utf8 in README, but I really don't think upstream upgrade
> notes belong there at all.
I removed the README.
I also removed the manpage patch as this has been fixed upstream in 1.4.10.
Ok now? More suggestions?
Tested on amd64 and sparc64.
Best Regards,
Stefan
Index: mail/mu/Makefile
===
RCS file: /cvs/ports/mail/mu/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- mail/mu/Makefile24 Jan 2020 10:36:41 -1.19
+++ mail/mu/Makefile11 Jul 2020 14:15:30 -
@@ -2,8 +2,15 @@
COMMENT=maildir indexer and searcher with emacs frontend
-DISTNAME=mu-1.2.0
-REVISION=0
+V=1.4.10
+GUILE_V=2.2
+
+DISTNAME=mu-$V
+
+FLAVORS=guile
+FLAVOR ?=
+
+SHARED_LIBS=guile-mu0.0
CATEGORIES=mail
HOMEPAGE=http://www.djcbsoftware.nl/code/mu/
@@ -13,12 +20,12 @@ MAINTAINER=Stefan Hagen https://github.com/djcb/mu/releases/download/1.2/
+MASTER_SITES=https://github.com/djcb/mu/releases/download/${V}/
EXTRACT_SUFX=.tar.xz
BUILD_DEPENDS=emacs->=24:editors/emacs
@@ -37,9 +44,21 @@ AUTOMAKE_VERSION=1.15
CONFIGURE_STYLE=autoreconf
CONFIGURE_ARGS=--disable-gtk \
---disable-webkit \
---disable-guile
+--disable-webkit
+
+.if ${FLAVOR} == "guile"
+WANTLIB +=guile-2.2 gc ltdl gmp
+LIB_DEPENDS +=lang/guile2
+.else
+CONFIGURE_ARGS +=--disable-guile
+.endif
USE_GMAKE=Yes
+
+SEPARATE_BUILD=Yes
+
+pre-configure:
+sed -e 's/exec guile/exec guile${GUILE_V}/' -i \
+${WRKDIST}/guile/*/*.scm
.include
Index: mail/mu/distinfo
===
RCS file: /cvs/ports/mail/mu/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- mail/mu/distinfo21 Jul 2019 00:10:04 -1.7
+++ mail/mu/distinfo11 Jul 2020 14:15:30 -
@@ -1,2 +1,2 @@
-SHA256 (mu-1.2.0.tar.xz) = 9jTH8kTcaET/cdw8PhiT5I4ZPKqeDnR+umFjCXdfBTo=
-SIZE (mu-1.2.0.tar.xz) = 844192
+SHA256 (mu-1.4.10.tar.xz) = RnXxSkO0hT4Uo+CJIFF4fRuC30jqG9Q3UXKJNnbNfm0=
+SIZE (mu-1.4.10.tar.xz) = 873328
Index: mail/mu/patches/patch-configure_ac
===
RCS file: mail/mu/patches/patch-configure_ac
diff -N mail/mu/patches/patch-configure_ac
--- /dev/null1 Jan 1970 00:00:00 -
+++ mail/mu/patches/patch-configure_ac11 Jul 2020 14:15:30 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+Look for guile-snarf as guile-snarf2.2
+(lang/guile2 installs it that way)
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -230,7 +230,7 @@ AS_IF([test "x$enable_guile" != "xno"],[
+ GUILE_FLAGS
+ AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
+ AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
+-AC_SUBST(GUILE_SNARF, [guile-snarf])
++AC_SUBST(GUILE_SNARF, [guile-snarf2.2])
+ guile_version=$($PKG_CONFIG guile-2.2 --modversion)
+ ])
+ ])
Index: mail/mu/patches/patch-lib_parser_utils_cc
===
RCS file: mail/mu/patches/patch-lib_parser_utils_cc
diff -N mail/mu/patches/patch-lib_parser_utils_cc
--- mail/mu/patches/patch-lib_parser_utils_cc26 Jul 2019 06:41:59 -
1.1
+++ /dev/null1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-lib_parser_utils_cc,v 1.1 2019/07/26 06:41:59 pvk Exp $
-Bring g_vasprintf into scope
-Index: lib/parser/utils.cc
lib/parser/utils.cc.orig
-+++ lib/parser/utils.cc
-@@ -17,7 +17,7 @@
- ** 02110-1301, USA.
- */
-
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE_EXTENDED 1
- #include
-
- #define GNU_SOURCE
Index: mail/mu/patches/patch-lib_utils_mu-str_c
===
RCS file: mail/mu/patches/patch-lib_utils_mu-str_c
diff -N mail/mu/patches/patch-lib_utils_mu-str_c
--- /dev/null1 Jan 1970 00:00:00 -
+++ mail/mu/patches/patch-lib_utils_mu-str_c11 Jul 2020 14:15:30 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+make this function compile correctly under clang
+Index: lib/utils/mu-str.c
+--- lib/utils/mu-str.c.orig
lib/utils/mu-str.c
+@@ -49,7 +49,7 @@ mu_str_size_s (size_t s)
+ char*
+ mu_str_size (size_t s)
+ {
+-return g_strdup (mu_str_size_s(s));
++return g_format_size_for_display ((goffset)s);
+ }
+
+
Index: mail/mu/patches/patch-lib_utils_mu-utils_cc
===
RCS file: mail/mu/patches/patch-lib_utils_mu-utils_cc
diff -N mail/mu/patches/patch-lib_utils_mu-utils_cc
--- /dev/null1 Jan 1970 00:00:00 -
+++
Re: [update] graphics/makehuman to 1.2.0a
On Sun, July 12, 2020 9:05 am, Antoine Jacoutot wrote:
>> If you're point to '@cp', I don't know why I did it. I've seen it in other
>> ports?
>> But I'd like to know it's purpose, I will revert it if you want.
>>
>
> Its purpose is to hide the command, as I wrote.
> Usually if you don't know the purpose of something, it's safer not to use it
> ;-)
> You should drop it imho for consistency with the rest of the do-install
> target.
>
>
> --
> Antoine
Reverted a impulsive change '@cp' with input from Antoine.
I suppose it is to hide the output? Can you post a reference
regarding this modifiers i.e @,:S,:N, etc?
Index: Makefile
===
RCS file: /cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile10 Nov 2019 12:43:08 - 1.30
+++ Makefile12 Jul 2020 09:13:10 -
@@ -2,37 +2,43 @@
COMMENT= parametrical modeling of 3D humanoid characters
+PKGNAME= makehuman-1.2.0pre
+
GH_ACCOUNT=makehumancommunity
GH_PROJECT=makehuman
-GH_TAGNAME=1.1.1
+GH_TAGNAME=1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
CATEGORIES=graphics
HOMEPAGE= http://www.makehumancommunity.org/
-# GPLv2 / MIT
+MAINTAINER=Dimitri Karamazov
+
+# AGPLv3
PERMIT_PACKAGE=Yes
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-MODPY_BUILDDEP=No
-
-NO_BUILD= Yes
NO_TEST= Yes
RUN_DEPENDS= devel/desktop-file-utils \
- graphics/py-opengl \
- math/py-numpy \
- x11/py-qt4
+ graphics/py-opengl${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+do-build:
+ cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
+ ${PREFIX}/share/pixmaps
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
${FILESDIR}/MakeHuman.desktop.in \
${PREFIX}/share/applications/MakeHuman.desktop
${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
- cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
- chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
+ cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/makehuman/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 12:43:08 - 1.5
+++ distinfo12 Jul 2020 09:13:10 -
@@ -1,2 +1,2 @@
-SHA256 (makehuman-1.1.1.tar.gz) = XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
-SIZE (makehuman-1.1.1.tar.gz) = 45828428
+SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
+SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
+++ pkg/PLIST 12 Jul 2020 09:13:11 -
@@ -1,13 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v$
bin/makehuman
share/applications/MakeHuman.desktop
share/makehuman/
+${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
+share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/
+${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
+share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}humanmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}metadataengine.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}warpmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}which.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/07/12 07:08:12 Modified files: devel/kf5 : Makefile Log message: Add a link to the tier-docs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/07/12 06:15:53 Modified files: audio/audacious: Makefile.inc audio/audacious/player: Makefile distinfo audio/audacious/plugins: Makefile distinfo audio/audacious/plugins/patches: patch-configure meta/audacious : Makefile Removed files: audio/audacious/plugins/patches: patch-src_cdaudio_cdaudio-ng_cc Log message: Update to audacious-4.0.5
Re: [update] graphics/makehuman to 1.2.0a
On Sun, July 12, 2020 7:29 am, Antoine Jacoutot wrote:
> On Sat, Jul 11, 2020 at 06:44:36PM -, Dimitri Karamazov wrote:
>
>> Hey, I hope you don't mind, but I'd like to take Maintainer since
>> no one wants it. Only port worth saving among the list imao. I'll keep in
>> touch with the upstream.
>>
>>
>> This is an Prelease test build, so I marked it as alpha in version.
>> Build and run-tested by making a monster in a T-pose with clubfoot.
>>
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
>> retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile 10 Nov
>> 2019 12:43:08 - 1.30
>> +++ Makefile 11 Jul 2020 18:28:47 -
>> @@ -2,37 +2,43 @@
>>
>>
>> COMMENT= parametrical modeling of 3D humanoid characters
>>
>>
>> +PKGNAME=makehuman-1.2.0a
>> +
>> GH_ACCOUNT= makehumancommunity
>> GH_PROJECT= makehuman
>> -GH_TAGNAME= 1.1.1
>> +GH_TAGNAME= 1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
>>
>>
>> CATEGORIES= graphics
>>
>>
>> HOMEPAGE=http://www.makehumancommunity.org/
>>
>>
>> -# GPLv2 / MIT
>> +MAINTAINER= Dimitri Karamazov
>> +
>> +# AGPLv3
>> PERMIT_PACKAGE= Yes
>>
>>
>> MODULES= lang/python
>> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>>
>>
>> -MODPY_BUILDDEP= No
>> -
>> -NO_BUILD= Yes
>> NO_TEST= Yes
>>
>>
>> RUN_DEPENDS= devel/desktop-file-utils \
>> -graphics/py-opengl \
>> -math/py-numpy \
>> -x11/py-qt4
>> +graphics/py-opengl${MODPY_FLAVOR} \
>> +math/py-numpy${MODPY_FLAVOR} \
>> +x11/py-qt5${MODPY_FLAVOR}
>>
>>
>> +do-build:
>> +cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
>> do-install:
>> +${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
>> +${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
>> +${PREFIX}/share/pixmaps
>> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
>> ${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
>> ${FILESDIR}/MakeHuman.desktop.in \
>> ${PREFIX}/share/applications/MakeHuman.desktop
>> ${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
>> ${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
>> -cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
>> -chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
>> +@cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
>>
>
> Why hiding this command?
>
>
You mean the chown command? Because it does nothing.
${PREFIX}/share/makehuman/makehuman which is a binary already retains the
proper own:grp
which the chown attempts to do. So I deemed it unnecessary.
Now it would be different if it was meant for the entire
${PREFIX}/share/makehuman dir,
which the command explicitly is not. I'm ignorant of any need to do so for
share dirs.
If you're point to '@cp', I don't know why I did it. I've seen it in other
ports?
But I'd like to know it's purpose, I will revert it if you want.
Re: [update] graphics/makehuman to 1.2.0a
1. Change the extra suffix to 'pre' since it is more accurate.
2. Dealt with the text wrap and attached the diff just in case.
3. Corrected pkg/PLIST.
Index: Makefile
===
RCS file: /cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile10 Nov 2019 12:43:08 - 1.30
+++ Makefile12 Jul 2020 07:22:53 -
@@ -2,37 +2,43 @@
COMMENT= parametrical modeling of 3D humanoid characters
+PKGNAME= makehuman-1.2.0pre
+
GH_ACCOUNT=makehumancommunity
GH_PROJECT=makehuman
-GH_TAGNAME=1.1.1
+GH_TAGNAME=1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
CATEGORIES=graphics
HOMEPAGE= http://www.makehumancommunity.org/
-# GPLv2 / MIT
+MAINTAINER=Dimitri Karamazov
+
+# AGPLv3
PERMIT_PACKAGE=Yes
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
-MODPY_BUILDDEP=No
-
-NO_BUILD= Yes
NO_TEST= Yes
RUN_DEPENDS= devel/desktop-file-utils \
- graphics/py-opengl \
- math/py-numpy \
- x11/py-qt4
+ graphics/py-opengl${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ x11/py-qt5${MODPY_FLAVOR}
+do-build:
+ cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
+ ${PREFIX}/share/pixmaps
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
${FILESDIR}/MakeHuman.desktop.in \
${PREFIX}/share/applications/MakeHuman.desktop
${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
- cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
- chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
+ @cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
.include
Index: distinfo
===
RCS file: /cvs/ports/graphics/makehuman/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 12:43:08 - 1.5
+++ distinfo12 Jul 2020 07:22:53 -
@@ -1,2 +1,2 @@
-SHA256 (makehuman-1.1.1.tar.gz) = XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
-SIZE (makehuman-1.1.1.tar.gz) = 45828428
+SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
+SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
+++ pkg/PLIST 12 Jul 2020 07:22:54 -
@@ -1,13 +1,39 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v$
bin/makehuman
share/applications/MakeHuman.desktop
share/makehuman/
+${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
+share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/
+${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
+share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}humanmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}metadataengine.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}warpmodifier.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/${MODPY_PYCACHE}which.${MODPY_PYC_MAGIC_TAG}pyc
share/makehuman/apps/autoskinblender.py
share/makehuman/apps/catmull_clark_subdivision.py
share/makehuman/apps/compat.py
share/makehuman/apps/devtests.py
share/makehuman/apps/gui/
+${MODPY_COMMENT}share/makehuman/apps/gui/${MODPY_PYCACHE}/
+share/makehuman/apps/gui/${MODPY_PYCACHE}guiexport.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/gui/${MODPY_PYCACHE}guifiles.${MODPY_PYC_MAGIC_TAG}pyc
+share/makehuman/apps/gui/${MODPY_PYCACHE}guiload.${MODPY_PYC_MAGIC_TAG}pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2020/07/12 05:23:10 Modified files: geo/py-supermercado: Makefile distinfo Log message: Update py-supermercado to 0.1.1.
Re: [update] graphics/makehuman to 1.2.0a
On Sun, Jul 12, 2020 at 08:04:35AM -, Dimitri Karamazov wrote:
> On Sun, July 12, 2020 7:29 am, Antoine Jacoutot wrote:
> > On Sat, Jul 11, 2020 at 06:44:36PM -, Dimitri Karamazov wrote:
> >
> >> Hey, I hope you don't mind, but I'd like to take Maintainer since
> >> no one wants it. Only port worth saving among the list imao. I'll keep in
> >> touch with the upstream.
> >>
> >>
> >> This is an Prelease test build, so I marked it as alpha in version.
> >> Build and run-tested by making a monster in a T-pose with clubfoot.
> >>
> >>
> >> Index: Makefile
> >> ===
> >> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
> >> retrieving revision 1.30 diff -u -p -r1.30 Makefile --- Makefile 10 Nov
> >> 2019 12:43:08 - 1.30
> >> +++ Makefile 11 Jul 2020 18:28:47 -
> >> @@ -2,37 +2,43 @@
> >>
> >>
> >> COMMENT= parametrical modeling of 3D humanoid characters
> >>
> >>
> >> +PKGNAME= makehuman-1.2.0a
> >> +
> >> GH_ACCOUNT=makehumancommunity
> >> GH_PROJECT=makehuman
> >> -GH_TAGNAME= 1.1.1
> >> +GH_TAGNAME= 1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
> >>
> >>
> >> CATEGORIES=graphics
> >>
> >>
> >> HOMEPAGE= http://www.makehumancommunity.org/
> >>
> >>
> >> -# GPLv2 / MIT
> >> +MAINTAINER= Dimitri Karamazov
> >> +
> >> +# AGPLv3
> >> PERMIT_PACKAGE=Yes
> >>
> >>
> >> MODULES= lang/python
> >> +MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
> >>
> >>
> >> -MODPY_BUILDDEP= No
> >> -
> >> -NO_BUILD= Yes
> >> NO_TEST= Yes
> >>
> >>
> >> RUN_DEPENDS= devel/desktop-file-utils \
> >> - graphics/py-opengl \
> >> - math/py-numpy \
> >> - x11/py-qt4
> >> + graphics/py-opengl${MODPY_FLAVOR} \
> >> + math/py-numpy${MODPY_FLAVOR} \
> >> + x11/py-qt5${MODPY_FLAVOR}
> >>
> >>
> >> +do-build:
> >> + cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
> >> do-install:
> >> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> >> + ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
> >> + ${PREFIX}/share/pixmaps
> >> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> >> ${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
> >> ${FILESDIR}/MakeHuman.desktop.in \
> >> ${PREFIX}/share/applications/MakeHuman.desktop
> >> ${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
> >> ${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
> >> - cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
> >> - chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
> >> + @cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
> >>
> >
> > Why hiding this command?
> >
> >
> You mean the chown command? Because it does nothing.
No, I don't mean the chown command :-)
> ${PREFIX}/share/makehuman/makehuman which is a binary already retains the
> proper own:grp
> which the chown attempts to do. So I deemed it unnecessary.
> Now it would be different if it was meant for the entire
> ${PREFIX}/share/makehuman dir,
> which the command explicitly is not. I'm ignorant of any need to do so for
> share dirs.
>
> If you're point to '@cp', I don't know why I did it. I've seen it in other
> ports?
> But I'd like to know it's purpose, I will revert it if you want.
Its purpose is to hide the command, as I wrote.
Usually if you don't know the purpose of something, it's safer not to use it ;-)
You should drop it imho for consistency with the rest of the do-install target.
--
Antoine
Re: Remove emulators/gambatte
On Wed Jun 10, 2020 at 07:44:41PM -0600, Anthony J. Bentley wrote: > Hi Rafael, > > Rafael Sadowski writes: > > Does it make sense to delete this Qt4 Boy Color emulator? I see > > alternatives in the ports tree and I would like to see less Qt4 > > consumers. [...] > > > > Keep or remove? > > I see where you're coming from. Gambatte is an important emulator, even > among its competitors, and we should keep it. But I admit that I never > use the Qt frontend. I personally wouldn't be averse to removing that, > as long as we keep the SDL frontend around. Is anyone willing to do this? > > > Last upstream update from "2014-09-28". sourceforge status > > beta. > > The SourceForge project is dead, but the original developer provides > periodic bursts of activity on GitHub--no formal releases and no > sign of a Qt5 frontend though (and never merged my pull request to > switch away from scons, sigh). > > -- > Anthony J. Bentley >
Re: NEW: math/cddlib
On Sun, July 12, 2020 12:19 am, Daniel Dickman wrote: > > > On Thu, 9 Jul 2020, deserter...@danwin1210.me wrote: > > >> The C-library cddlib is a C implementation of the *Double Description >> Method* >> of Motzkin et al. for generating all vertices (i.e. extreme points) and >> extreme rays of a general convex polyhedron in R^d given by a system of >> linear inequalities. >> >> The program can be used for the reverse operation (i.e. convex hull >> computation). This means that one can move back and forth between an >> inequality representation and a generator (i.e. vertex and ray) >> representation of a polyhedron with cddlib. Also, cddlib can solve a >> linear programming problem, i.e. a problem of maximizing and minimizing >> a linear function over P. >> >> Any comments? I got some interesting ports if someone takes this in. >> >> > > ok daniel@ to import so long as the license marker is changed to: > > "# GPLv2+" > > Reattached with proper license marker. Ok? cddlib.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2020/07/12 01:59:48 Modified files: infrastructure/mk: arch-defines.mk Log message: Add support for powerpc64. ok naddy@, jsg@
Re: terminus-font: add OpenType .otb to support pango
Awesome, thanks Christopher! I can't get my hands on a box to test this on today, but looks good! Dani ‐‐‐ Original Message ‐‐‐ On Friday, July 10, 2020 10:05 PM, Christopher Zimmermann wrote: > Hi, > > since pango dropped support for .pcf fonts we need to start shipping > .otb fonts for pango/harfbuzz. > > OK? > > Christopher > > > > > http://gmerlin.de > OpenPGP: http://gmerlin.de/christopher.pub > CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/07/12 01:33:24 Modified files: devel/pycharm : Makefile distinfo devel/pycharm/pkg: PLIST Log message: Update pycharm to 2020.1.3 >From Lucas Raab (Maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/07/12 01:29:18 Modified files: devel/intellij : Makefile distinfo Log message: Update intellij to 2020.1.3 >From Lucas Raab (Maintainer)
Re: [update] graphics/makehuman to 1.2.0a
On Sat, Jul 11, 2020 at 06:44:36PM -, Dimitri Karamazov wrote:
> Hey, I hope you don't mind, but I'd like to take Maintainer since
> no one wants it. Only port worth saving among the list imao.
> I'll keep in touch with the upstream.
>
> This is an Prelease test build, so I marked it as alpha in version.
> Build and run-tested by making a monster in a T-pose with clubfoot.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 10 Nov 2019 12:43:08 - 1.30
> +++ Makefile 11 Jul 2020 18:28:47 -
> @@ -2,37 +2,43 @@
>
> COMMENT= parametrical modeling of 3D humanoid characters
>
> +PKGNAME= makehuman-1.2.0a
> +
> GH_ACCOUNT= makehumancommunity
> GH_PROJECT= makehuman
> -GH_TAGNAME= 1.1.1
> +GH_TAGNAME= 1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
>
> CATEGORIES= graphics
>
> HOMEPAGE=http://www.makehumancommunity.org/
>
> -# GPLv2 / MIT
> +MAINTAINER= Dimitri Karamazov
> +
> +# AGPLv3
> PERMIT_PACKAGE= Yes
>
> MODULES= lang/python
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> -MODPY_BUILDDEP= No
> -
> -NO_BUILD=Yes
> NO_TEST= Yes
>
> RUN_DEPENDS= devel/desktop-file-utils \
> - graphics/py-opengl \
> - math/py-numpy \
> - x11/py-qt4
> + graphics/py-opengl${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
> + x11/py-qt5${MODPY_FLAVOR}
>
> +do-build:
> + cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
> do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
> + ${PREFIX}/share/pixmaps
> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> ${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
> ${FILESDIR}/MakeHuman.desktop.in \
> ${PREFIX}/share/applications/MakeHuman.desktop
> ${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
> ${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
> - cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
> - chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
> + @cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
Why hiding this command?
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/makehuman/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 10 Nov 2019 12:43:08 - 1.5
> +++ distinfo 11 Jul 2020 18:28:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (makehuman-1.1.1.tar.gz) =
> XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
> -SIZE (makehuman-1.1.1.tar.gz) = 45828428
> +SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
> VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
> +SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
> +++ pkg/PLIST 11 Jul 2020 18:28:49 -
> @@ -1,13 +1,39 @@
> -@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
> +@comment $OpenBSD: PLIST,v$
> bin/makehuman
> share/applications/MakeHuman.desktop
> share/makehuman/
> +${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
> +share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
> share/makehuman/apps/
> +${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
> +share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}humanmodifier.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}metadataengine.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}warpmodifier.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}which.${MODPY_PYC_MAGIC_TAG}pyc
> share/makehuman/apps/autoskinblender.py
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/07/12 01:18:03 Modified files: net/profanity : Makefile distinfo Log message: Update profanity to 0.9.5 Init diff from 3un0s, tweaked diff from maintainer Lucas.
Re: update games/jag 0.3.7
On Mon Jul 06, 2020 at 07:39:38PM -0700, Nam Nguyen wrote: > Nam Nguyen writes: > > > Stefan Sperling writes: > >> > >> Considering that Debian will likely want to see this resolved as well, and > >> that you are planning to update the port, couldn't we set PERMIT_PACKAGE=no > >> until the situation is cleared up? > >> > >> We have ports in much worse licensing situations that do the same (look at > >> sysutils/firmware/ulpt for example...) > > > > This sounds like a good solution. > > > > Here is a diff updating games/jag to 0.3.7, released on May 8, 2020. I > > attached it because patches that were removed have DOS line endings. New > > patches use post-extract to delete DOS line endings. > > New diff attached that deletes trailing whitespace in cvs header and > additionally sets PERMIT_DISTFILES to no as suggested by stsp@ and > sthen@. > > > > > Changelog: https://gitlab.com/coringao/jag/-/blob/0.3.7/CHANGELOG > > > > This diff: > > - Sets PERMIT_PACKAGE to no as suggested by stsp@ and sthen@. Themes are > > restrictively licensed so do not build package until it is cleared up. > > https://gitlab.com/coringao/jag/-/issues/1 > > - Moves to new upstream that Debian uses. Old upstream has stopped > > development. > > https://tracker.debian.org/pkg/jag > > - Moves HOMEPAGE and MASTER_SITES to new upstream to address thfr@'s > > bug report about defunct HOMEPAGE in the README > > https://gitlab.com/coringao/jag/-/issues/2 > > - Moves to qt5 which was supported since version 0.3.3 > > - Builds jag-editor in addition to jag. jag-editor is a level editor. > > - Many patched files were moved into src > > - Delete DOS-line endings in post-extract, as pulled from print/scribus. > > - README lists Qt5 Xml as a requirement, but `make > > port-lib-depends-check' reports this as an extra WANTLIB. > > Extra: Qt5Xml.3 > > I chose to not include Qt5Xml in WANTLIB. > > > > I played jag and changed languages. I tested jag-editor by building a > > level pack and was able to play my level. > > > > Feedback and tests are welcome. > Simple game play test works out-of-box, OK rsadowski@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/07/12 01:02:35 Modified files: net/nextcloudclient: Makefile distinfo net/nextcloudclient/patches: patch-CMakeLists_txt patch-src_gui_CMakeLists_txt patch-src_gui_application_cpp patch-src_libsync_networkjobs_cpp net/nextcloudclient/pkg: PLIST Log message: Update nextcloudclient to 2.6.5 Changelog: https://github.com/nextcloud/desktop/releases/tag/v2.6.5 Update diff from Adriano Barbosa (maintainer). Thanks
Re: [update] graphics/makehuman to 1.2.0a
On Sat Jul 11, 2020 at 06:44:36PM -, Dimitri Karamazov wrote:
> Hey, I hope you don't mind, but I'd like to take Maintainer since
> no one wants it. Only port worth saving among the list imao.
> I'll keep in touch with the upstream.
>
> This is an Prelease test build, so I marked it as alpha in version.
> Build and run-tested by making a monster in a T-pose with clubfoot.
Thanks Dimitri, see comments below
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 10 Nov 2019 12:43:08 - 1.30
> +++ Makefile 11 Jul 2020 18:28:47 -
> @@ -2,37 +2,43 @@
>
> COMMENT= parametrical modeling of 3D humanoid characters
>
> +PKGNAME= makehuman-1.2.0a
makehuman-1.2.0alpha1 (PACKAGES-SPECS(7))?
> +
> GH_ACCOUNT= makehumancommunity
> GH_PROJECT= makehuman
> -GH_TAGNAME= 1.1.1
> +GH_TAGNAME= 1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a
>
> CATEGORIES= graphics
>
> HOMEPAGE=http://www.makehumancommunity.org/
>
> -# GPLv2 / MIT
> +MAINTAINER= Dimitri Karamazov
> +
> +# AGPLv3
> PERMIT_PACKAGE= Yes
>
> MODULES= lang/python
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
>
> -MODPY_BUILDDEP= No
> -
> -NO_BUILD=Yes
> NO_TEST= Yes
>
> RUN_DEPENDS= devel/desktop-file-utils \
> - graphics/py-opengl \
> - math/py-numpy \
> - x11/py-qt4
> + graphics/py-opengl${MODPY_FLAVOR} \
> + math/py-numpy${MODPY_FLAVOR} \
> + x11/py-qt5${MODPY_FLAVOR}
>
> +do-build:
> + cd ${WRKSRC}/makehuman && ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py .
> do-install:
> + ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
> + ${INSTALL_DATA} ${WRKSRC}/makehuman/icons/makehuman.png \
> + ${PREFIX}/share/pixmaps
> ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> ${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
> ${FILESDIR}/MakeHuman.desktop.in \
> ${PREFIX}/share/applications/MakeHuman.desktop
> ${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
> ${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
> - cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
> - chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
> + @cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/makehuman/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 10 Nov 2019 12:43:08 - 1.5
> +++ distinfo 11 Jul 2020 18:28:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (makehuman-1.1.1.tar.gz) =
> XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
patch: malformed patch at line 78:
XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
> -SIZE (makehuman-1.1.1.tar.gz) = 45828428
> +SHA256 (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) =
> VQdoltUaK+FwL3HEH79FOIn8wzEqpPWQPDvskadOspc=
> +SIZE (makehuman-1c6a4147eeec0f1f07f73904f33ebd4e8ef0065a.tar.gz) = 45406756
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/makehuman/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 10 Nov 2019 12:43:08 - 1.4
> +++ pkg/PLIST 11 Jul 2020 18:28:49 -
> @@ -1,13 +1,39 @@
> -@comment $OpenBSD: PLIST,v 1.4 2019/11/10 12:43:08 ajacoutot Exp $
> +@comment $OpenBSD: PLIST,v$
> bin/makehuman
> share/applications/MakeHuman.desktop
> share/makehuman/
> +${MODPY_COMMENT}share/makehuman/${MODPY_PYCACHE}/
> +share/makehuman/${MODPY_PYCACHE}compile_models.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_proxies.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}compile_targets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}create_pylint_log.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}download_assets_git.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/${MODPY_PYCACHE}makehuman.${MODPY_PYC_MAGIC_TAG}pyc
> share/makehuman/apps/
> +${MODPY_COMMENT}share/makehuman/apps/${MODPY_PYCACHE}/
> +share/makehuman/apps/${MODPY_PYCACHE}autoskinblender.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}catmull_clark_subdivision.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}devtests.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}human.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}humanmodifier.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}metadataengine.${MODPY_PYC_MAGIC_TAG}pyc
> +share/makehuman/apps/${MODPY_PYCACHE}warpmodifier.${MODPY_PYC_MAGIC_TAG}pyc
>
Rework multimedia/phonon multimedia/phonon-backend
This work is important to me and it would be nice if someone could review
it briefly. I have completely rebuilt our phonon ports infra structure.
- Merge multimedia/phonon-qt5 into multimedia/phonon and remove the
phonon MODULE.
- Update all phonon ports to the latest version.
- Regen all consumer WANTLIB's and bump them.
- Remove infrastructure/bin/portcheck bits.
Tested in a whole 6.6->current upgrade process and also on -current
only.
Test case 1 "6.6->current")
pkg_add upgrade
Obsolete package: phonon-vlc-0.10.3 (no longer maintained upstream)
Obsolete package: phonon-gstreamer-icons-4.9.1-qt5 (no longer maintained
upstream)
Obsolete package: phonon-gstreamer-4.9.1 (no longer maintained upstream)
Couldn't find updates for phonon-4.10.3 phonon-gstreamer-4.9.1
phonon-gstreamer-icons-4.9.1-qt5 phonon-qt5-4.10.3 phonon-qt5-gstreamer-4.9.1
phonon-vlc-0.10.3
Q:
This is correct for phonon-4.10.3 (Qt4 NOT phonon-qt5-4.10.3)? Do I see it
right that the user must first delete the obsolete packages? If I do this,
everything works clean.
Test case 2 "-current")
$ pkg_info|grep phonon
phonon-gstreamer-icons-4.9.1-qt5 GStreamer-based Phonon backend icons
phonon-qt5-4.10.3p0 multimedia layer for Qt5/KDE5
phonon-qt5-gstreamer-4.9.1 GStreamer-based Phonon backend
phonon-qt5-vlc-0.10.3 VLC-based Phonon backend
$ TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all doas pkg_add -u
phonon-qt5-4.10.3p0->phonon-4.11.1 forward dependencies:
| Dependency of phonon-qt5-vlc-0.10.3 on phonon-qt5->=4.10.1 doesn't match
| Dependency of phonon-qt5-gstreamer-4.9.1 on phonon-qt5->=4.10.1 doesn't match
Merging phonon-qt5-vlc-0.10.3->phonon-backend-vlc-0.11.1 (ok)
Merging phonon-qt5-gstreamer-4.9.1->phonon-backend-gstreamer-4.10.0 (ok)
phonon-gstreamer-icons-4.9.1-qt5+phonon-qt5-4.10.3p0+phonon-qt5-gstreamer-4.9.1+phonon-qt5-vlc-0.10.3->phonon-4.11.1+phonon-backend-gstreamer-4.10.0+phonon-backend-vlc-0.11.1:
ok
Running tags: ok
$ pkg_info|grep phonon
phonon-4.11.1 multimedia layer for Qt5/KDE5
phonon-backend-gstreamer-4.10.0 GStreamer-based Phonon backend
phonon-backend-vlc-0.11.1 VLC-based Phonon backend
Feedback, Comments? OK?
If no one considered it, I would commit it next weekend.
Rafael Sadowski
diff --git a/devel/kf5/khtml/Makefile b/devel/kf5/khtml/Makefile
index 75d58fdfa25..55e89b7ef4e 100644
--- a/devel/kf5/khtml/Makefile
+++ b/devel/kf5/khtml/Makefile
@@ -2,6 +2,7 @@
COMMENT = original KDE HTML rendering engine
DISTNAME = khtml-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5KHtml5.0
@@ -13,10 +14,8 @@ WANTLIB += KF5KIOWidgets KF5Notifications KF5Parts KF5Service
WANTLIB += KF5SonnetCore KF5SonnetUi KF5TextWidgets KF5Wallet
WANTLIB += KF5WidgetsAddons KF5WindowSystem KF5XmlGui Qt5Concurrent
WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport Qt5Widgets
-WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext gif jpeg m phonon4qt5experimental
-WANTLIB += png z
-
-MODULES = multimedia/phonon
+WANTLIB += Qt5X11Extras Qt5Xml SM X11 Xext gif jpeg m phonon4qt5
+WANTLIB += phonon4qt5experimental png z
BUILD_DEPENDS =devel/gettext,-tools
@@ -38,7 +37,8 @@ LIB_DEPENDS = devel/kf5/karchive>=${MODKF5_VERSION} \
graphics/giflib \
graphics/jpeg \
graphics/png \
- x11/qt5/qtx11extras
+ x11/qt5/qtx11extras \
+ multimedia/phonon
IS_PORTING_AID = Yes
diff --git a/devel/kf5/knotifyconfig/Makefile b/devel/kf5/knotifyconfig/Makefile
index 93b8cd31103..929c9b9fc50 100644
--- a/devel/kf5/knotifyconfig/Makefile
+++ b/devel/kf5/knotifyconfig/Makefile
@@ -2,15 +2,14 @@
COMMENT = KDE configuration dialog for desktop notifications
DISTNAME = knotifyconfig-${VERSION}
+REVISION = 0
SHARED_LIBS = KF5NotifyConfig 5.0
WANTLIB += ${COMPILER_LIBCXX} KF5Completion KF5ConfigCore KF5CoreAddons
WANTLIB += KF5I18n KF5JobWidgets KF5KIOCore KF5KIOWidgets KF5Service
WANTLIB += KF5WidgetsAddons Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
-WANTLIB += Qt5Network Qt5Widgets m
-
-MODULES = multimedia/phonon
+WANTLIB += Qt5Network Qt5Widgets m phonon4qt5
BUILD_DEPENDS =devel/gettext,-tools \
devel/kf5/kconfigwidgets>=${MODKF5_VERSION} \
@@ -24,10 +23,10 @@ LIB_DEPENDS =
devel/kf5/kcompletion>=${MODKF5_VERSION} \
devel/kf5/kio>=${MODKF5_VERSION} \
devel/kf5/kjobwidgets>=${MODKF5_VERSION} \
devel/kf5/kservice>=${MODKF5_VERSION} \
- devel/kf5/kwidgetsaddons>=${MODKF5_VERSION}
+ devel/kf5/kwidgetsaddons>=${MODKF5_VERSION} \
+ multimedia/phonon
CONFIGURE_ARGS += -DBUILD_TESTING=ON \
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=ON \
-
-DPhonon4Qt5_INCLUDE_DIR="${LOCALBASE}/include/phonon4qt5/"
+
