CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2024/04/17 12:05:14 Modified files: x11/st : Makefile distinfo Log message: update to 0.9.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2024/04/17 11:54:04 Modified files: x11/tabbed : Makefile distinfo x11/tabbed/patches: patch-Makefile patch-config_def_h x11/tabbed/pkg : PLIST Removed files: x11/tabbed/patches: patch-config_mk Log message: update to 0.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2024/04/17 11:10:13 Modified files: mail/opensmtpd-filters/spamassassin: Makefile distinfo Removed files: mail/opensmtpd-filters/spamassassin/patches: patch-filter-spamassassin_go Log message: update to 0.8 drop no longer needed patch
Re: productivity/khal: Update to 0.11.2
> On 5. Dec 2023, at 13:14, Stuart Henderson wrote:
>
> On 2023/12/05 03:08, wen heping wrote:
>> Hi, all:
>>
>>Here is a patch for productivity/khal:
>>i) Update to 0.11.2
>>ii) Add some missing TEST_DEPENDS
>>
>> It build and run well on amd64-current system.
>> In all 300+ tests there are 29 tests failed.
>> No other ports depend on it.
>
> vdirsyncer is a RUN_DEPENDS so it doesn't need listing again in
> TEST_DEPENDS
I’m OK with the diff minus the vdirsyncer in TEST_DEPENDS.
> can you show your test log? I only get 4 failed so maybe there are
> some other deps we can add.
There were always a few tests failing in the past,
but things tend to work fine anyways.
>> Index: productivity/khal/Makefile
>> ===
>> RCS file: /cvs/ports/productivity/khal/Makefile,v
>> retrieving revision 1.20
>> diff -u -p -r1.20 Makefile
>> --- productivity/khal/Makefile 13 Nov 2022 20:31:00 - 1.20
>> +++ productivity/khal/Makefile 5 Dec 2023 03:03:27 -
>> @@ -1,8 +1,7 @@
>> COMMENT =standards based terminal calendar
>>
>> -MODPY_EGG_VERSION = 0.10.4
>> +MODPY_EGG_VERSION = 0.11.2
>> DISTNAME = khal-${MODPY_EGG_VERSION}
>> -REVISION = 2
>>
>> CATEGORIES = productivity
>>
>> @@ -31,7 +30,9 @@ RUN_DEPENDS = devel/py-atomicwrites${MO
>> devel/py-urwid${MODPY_FLAVOR} \
>> devel/py-xdg${MODPY_FLAVOR} \
>> productivity/vdirsyncer
>> -TEST_DEPENDS = devel/py-freezegun${MODPY_FLAVOR} \
>> -devel/py-test-cov${MODPY_FLAVOR}
>> +TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
>> +devel/py-freezegun${MODPY_FLAVOR} \
>> +productivity/vdirsyncer \
>> +sysutils/py-packaging${MODPY_FLAVOR}
>>
>> .include
>> Index: productivity/khal/distinfo
>> ===
>> RCS file: /cvs/ports/productivity/khal/distinfo,v
>> retrieving revision 1.8
>> diff -u -p -r1.8 distinfo
>> --- productivity/khal/distinfo 15 Sep 2021 20:06:12 - 1.8
>> +++ productivity/khal/distinfo 5 Dec 2023 03:03:27 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (khal-0.10.4.tar.gz) = P9uYCpphwCBteoKxb3e0CKTzQaK4ZrnJ/PamQYUNEp8=
>> -SIZE (khal-0.10.4.tar.gz) = 185736
>> +SHA256 (khal-0.11.2.tar.gz) = j7jYk3HlPiI1lToHZeQbl+F0hIpojWN2hHdXbQP4mbo=
>> +SIZE (khal-0.11.2.tar.gz) = 196986
>> Index: productivity/khal/pkg/PLIST
>> ===
>> RCS file: /cvs/ports/productivity/khal/pkg/PLIST,v
>> retrieving revision 1.6
>> diff -u -p -r1.6 PLIST
>> --- productivity/khal/pkg/PLIST 13 Nov 2022 20:31:00 - 1.6
>> +++ productivity/khal/pkg/PLIST 5 Dec 2023 03:03:27 -
>> @@ -24,6 +24,8 @@ lib/python${MODPY_VERSION}/site-packages
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}configwizard.${MODPY_PYC_MAGIC_TAG}pyc
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}controllers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}controllers.${MODPY_PYC_MAGIC_TAG}pyc
>> +lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}custom_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>> +lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}custom_types.${MODPY_PYC_MAGIC_TAG}pyc
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>> lib/python${MODPY_VERSION}/site-packages/khal/${MODPY_PYCACHE}icalendar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
>> @@ -40,6 +42,7 @@ lib/python${MODPY_VERSION}/site-packages
>> lib/python${MODPY_VERSION}/site-packages/khal/cli.py
>> lib/python${MODPY_VERSION}/site-packages/khal/configwizard.py
>> lib/python${MODPY_VERSION}/site-packages/khal/controllers.py
>> +lib/python${MODPY_VERSION}/site-packages/khal/custom_types.py
>> lib/python${MODPY_VERSION}/site-packages/khal/exceptions.py
>> lib/python${MODPY_VERSION}/site-packages/khal/icalendar.py
>> lib/python${MODPY_VERSION}/site-packages/khal/khalendar/
>
Re: x11/st xresources flavor?
> On 18. Jul 2023, at 10:31, Sebastien Marie wrote:
>
> On Mon, Jul 17, 2023 at 11:25:37PM -0600, Ashlen wrote:
>> Hello,
>> I am reaching out to discuss the possibility of adding an xresources
>> flavor to x11/st. In my opinion, this addition would greatly enhance the
>> functionality of the program by allowing it to read colors and a font
>> from the .Xresources file.
>>
>> Personally, I find it beneficial to set Solarized colors in my
>> .Xresources file as it helps reduce eye strain. By incorporating this
>> flavor, it would simplify the process of setting up my development
>> environment after a fresh OpenBSD installation.
>>
>> I've attached a diff for your review. I'd greatly appreciate it if you
>> could take a look and let me know if it meets the necessary
>> requirements.
>
> My personal point of vue would be to have only one alternate flavour:
>
> - no flavor : plain st
> - "enhanced" flavor : st + scrollback + xresources
Yes, I agree with that.
> I think that xresources is interesting as it permits to somehow configure st
> without having to recompile it (which defeat the fact to have it in ports
> tree).
>
> What are others opinions ?
Personally, I don’t really like the xresources patch, but if wanted by others
I would be fine with adding it.
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/x11/st/Makefile,v
>> retrieving revision 1.26
>> diff -u -p -r1.26 Makefile
>> --- Makefile 12 Jan 2023 21:00:13 - 1.26
>> +++ Makefile 18 Jul 2023 05:17:24 -
>> @@ -2,7 +2,12 @@ COMMENT=simple X terminal
>>
>> V= 0.9
>> DISTNAME=st-${V}
>> -SUPDISTFILES= st-scrollback-0.8.5.diff:0
>> +
>> +PATCH_SCROLLBACK= st-scrollback-0.8.5.diff:0
>> +PATCH_XRESOURCES= st-xresources-20230320-45a15676.diff:1
>> +SUPDISTFILES= ${PATCH_SCROLLBACK} \
>> +${PATCH_XRESOURCES}
>> +
>> REVISION=0
>>
>> CATEGORIES= x11
>> @@ -19,6 +24,7 @@ WANTLIB= X11 Xft c fontconfig freetype
>>
>> MASTER_SITES=https://dl.suckless.org/st/
>> MASTER_SITES0= https://st.suckless.org/patches/scrollback/
>> +MASTER_SITES1= https://st.suckless.org/patches/xresources/
>>
>> MAKE_ENV=LDFLAGS="${LDFLAGS}" \
>> X11INC=${X11BASE}/include \
>> @@ -26,12 +32,17 @@ MAKE_ENV=LDFLAGS="${LDFLAGS}" \
>>
>> NO_TEST= Yes
>>
>> -FLAVORS=scrollback
>> +FLAVORS=scrollback xresources
>> FLAVOR?=
>>
>> .if ${FLAVOR:Mscrollback}
>> -PATCHFILES= ${SUPDISTFILES}
>> +PATCHFILES+=${PATCH_SCROLLBACK}
>> .endif
>> +
>> +.if ${FLAVOR:Mxresources}
>> +PATCHFILES+=${PATCH_XRESOURCES}
>> +.endif
>> +
>> PATCH_DIST_STRIP=-p1
>>
>> do-install:
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/x11/st/distinfo,v
>> retrieving revision 1.17
>> diff -u -p -r1.17 distinfo
>> --- distinfo 12 Jan 2023 21:00:13 - 1.17
>> +++ distinfo 18 Jul 2023 05:17:24 -
>> @@ -1,4 +1,6 @@
>> SHA256 (st-0.9.tar.gz) = 82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=
>> SHA256 (st-scrollback-0.8.5.diff) =
>> 3H9SI7JvyBPZHUrjW9qlTWMCTK6fGK/Zs1lLozmd+lU=
>> +SHA256 (st-xresources-20230320-45a15676.diff) =
>> /ETVhdSM8d+wD7MMTixM+RmLd/VakfaO974mpcdXBKg=
>> SIZE (st-0.9.tar.gz) = 48171
>> SIZE (st-scrollback-0.8.5.diff) = 8914
>> +SIZE (st-xresources-20230320-45a15676.diff) = 4853
>> Index: pkg/DESCR
>> ===
>> RCS file: /cvs/ports/x11/st/pkg/DESCR,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 DESCR
>> --- pkg/DESCR12 Jan 2023 21:00:14 - 1.2
>> +++ pkg/DESCR18 Jul 2023 05:17:24 -
>> @@ -3,3 +3,4 @@ st is a simple virtual terminal emulator
>> Flavour:
>> scrollback - allows scrolling through terminal output with
>> shift+pgup/pgdn
>> +xresources - configure st through Xresources
>
>
> --
> Sebastien Marie
>
Re: scrollback flavour for x11/st?
> Am 11.01.2023 um 14:41 schrieb Stuart Henderson :
>
> I'd quite like to have a package for st built with scrollback support.
>
> Here's a diff adding it as a flavour to the x11/st port, is it ok to
> add it there?
Fine with me.
> I understand if there are concerns about the patch getting in the way
> of updates; I stuck to the basic patch rather than stacking others from
> https://st.suckless.org/patches/scrollback/ on top to reduce the risk
> of this and I'm hopeful that it's a common enough patch (and not too
> complex) that it will either be fixed quickly or easy to adapt, but
> if that still seems too much then I could write a separate port for
> it instead.
I would prefer a port of scroll instead:
https://tools.suckless.org/scroll/
as this seems to be the suckless choice:
https://lists.suckless.org/dev/1703/31256.html
> Sync WANTLIB while there.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile12 Oct 2022 18:06:29 -1.25
> +++ Makefile11 Jan 2023 13:38:40 -
> @@ -2,6 +2,8 @@ COMMENT=simple X terminal
>
> V=0.9
> DISTNAME=st-${V}
> +SUPDISTFILES=st-scrollback-0.8.5.diff:0
> +REVISION= 0
>
> CATEGORIES=x11
>
> @@ -13,15 +15,24 @@ MAINTAINER=Joerg Jung PERMIT_PACKAGE=Yes
>
> # uses pledge()
> -WANTLIB=X11 Xft c fontconfig freetype m util z
> +WANTLIB=X11 Xft c fontconfig freetype m util
>
> MASTER_SITES=https://dl.suckless.org/st/
> +MASTER_SITES0=https://st.suckless.org/patches/scrollback/
>
> MAKE_ENV=LDFLAGS="${LDFLAGS}" \
>X11INC=${X11BASE}/include \
>X11LIB=${X11BASE}/lib
>
> NO_TEST=Yes
> +
> +FLAVORS=scrollback
> +FLAVOR?=
> +
> +.if ${FLAVOR:Mscrollback}
> +PATCHFILES=${SUPDISTFILES}
> +.endif
> +PATCH_DIST_STRIP=-p1
>
> do-install:
>${INSTALL_PROGRAM} ${WRKBUILD}/st ${PREFIX}/bin/
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- distinfo12 Oct 2022 18:06:29 -1.16
> +++ distinfo11 Jan 2023 13:38:40 -
> @@ -1,2 +1,4 @@
> SHA256 (st-0.9.tar.gz) = 82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc=
> +SHA256 (st-scrollback-0.8.5.diff) =
> 3H9SI7JvyBPZHUrjW9qlTWMCTK6fGK/Zs1lLozmd+lU=
> SIZE (st-0.9.tar.gz) = 48171
> +SIZE (st-scrollback-0.8.5.diff) = 8914
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/x11/st/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR23 Sep 2011 14:41:31 -1.1.1.1
> +++ pkg/DESCR11 Jan 2023 13:38:40 -
> @@ -1 +1,5 @@
> st is a simple virtual terminal emulator for X which sucks less.
> +
> +Flavour:
> +scrollback - allows scrolling through terminal output with
> +shift+pgup/pgdn
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/10/14 12:29:36 Modified files: textproc/cloc : Makefile distinfo Log message: update to cloc 1.94
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/10/13 12:15:36 Modified files: x11/dwm: Makefile distinfo x11/dwm/patches: patch-config_def_h patch-config_mk Log message: update to dwm 6.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/10/13 12:10:31 Modified files: x11/dmenu : Makefile distinfo x11/dmenu/patches: patch-config_mk Log message: update to dmenu 5.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/10/12 12:12:55 Modified files: net/sic: Makefile distinfo net/sic/patches: patch-Makefile patch-sic_c Removed files: net/sic/patches: patch-config_mk patch-util_c Log message: update to sic 1.3 remove no longer needed patches
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/10/12 12:06:30 Modified files: x11/st : Makefile distinfo x11/st/patches : patch-config_mk Log message: update to st 0.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/05/10 13:06:23 Modified files: x11/dmenu : Makefile distinfo Log message: update to dmenu-5.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/05/10 13:05:56 Modified files: x11/dwm: Makefile distinfo x11/dwm/patches: patch-config_def_h patch-config_mk Log message: update to dwm-6.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/01/01 11:57:24 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: net/climm : Makefile distinfo net/climm/patches: patch-doc_Makefile_in patch-include_util_str_h patch-m4_libotr_m4 patch-src_io_io_socks5_c patch-src_util_otr_c patch-src_util_str_c net/climm/pkg : DESCR PLIST Log message: remove net/climm, as it is barely useable these days: - ICQ login does not work since they switched OSCAR->WIM protocol - XMPP login segfaults, alternative cli clients are available in ports - no homepage, no upstream, last release from 2010 ok jca and pascal (maintainer), back in september already
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/12/27 12:20:53 Modified files: www/surf : Makefile Log message: add missed wantlibs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/12/27 11:56:32 Modified files: www/surf : Makefile distinfo www/surf/patches: patch-Makefile patch-config_def_h patch-config_mk www/surf/pkg : PLIST Added files: www/surf/patches: patch-surf_c Log message: update to surf-2.1 with help from crystal kolipe
Re: Update www/surf to 2.1
On Wed, Dec 22, 2021 at 04:33:11PM +0100, Joerg Jung wrote:
> > Am 20.12.2021 um 20:02 schrieb Crystal Kolipe :
> >
> > Surf 2.1 was released seven months ago, but we still have 2.0 in ports.
>
> Thanks, I’ll take care soon.
>
> > Patch attached.
> >
Your diff had multiple issues, i.e. not needed REVISION, missing PLIST
update etc. and it did not compile (for me) at all.
Please find below a better one for testing, which seems to work fine.
OKs?
Regards,
Joerg
Index: Makefile
===
RCS file: /cvs/ports/www/surf/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:51:06 - 1.26
+++ Makefile22 Dec 2021 22:21:35 -
@@ -2,10 +2,9 @@
COMMENT = simple webbrowser based on webkit/gtk+
-DISTNAME = surf-2.0
+DISTNAME = surf-2.1
CATEGORIES = www
HOMEPAGE = http://surf.suckless.org/
-REVISION = 1
MAINTAINER=Joerg Jung
Index: distinfo
===
RCS file: /cvs/ports/www/surf/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo26 May 2017 20:37:56 - 1.7
+++ distinfo22 Dec 2021 22:21:35 -
@@ -1,2 +1,2 @@
-SHA256 (surf-2.0.tar.gz) = +u5MemLDj8l5Hv8a0GeHw8myt58ziAaCf1FSp7xUlR0=
-SIZE (surf-2.0.tar.gz) = 19056
+SHA256 (surf-2.1.tar.gz) = cuWCkguiWmRiA+k8LSMx2H8DA3ooiU1sfpmvAO4EMlc=
+SIZE (surf-2.1.tar.gz) = 22555
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/www/surf/patches/patch-Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile
--- patches/patch-Makefile 23 Dec 2015 20:40:03 - 1.1
+++ patches/patch-Makefile 22 Dec 2021 22:21:35 -
@@ -1,44 +1,30 @@
$OpenBSD: patch-Makefile,v 1.1 2015/12/23 20:40:03 jung Exp $
Makefile.orig Sat Dec 19 20:52:53 2015
-+++ Makefile Sat Dec 19 20:55:19 2015
-@@ -15,8 +15,7 @@ options:
- @echo "CC = ${CC}"
-
- .c.o:
-- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ ${CC} -c ${CFLAGS} $<
-
- ${OBJ}: config.h config.mk
-
-@@ -25,8 +24,7 @@ config.h:
- @cp config.def.h $@
-
- surf: ${OBJ}
-- @echo CC -o $@
-- @${CC} -o $@ surf.o ${LDFLAGS}
-+ ${CC} -o $@ surf.o ${LDFLAGS}
-
- clean:
- @echo cleaning
-@@ -43,14 +41,12 @@ dist: clean
- @rm -rf surf-${VERSION}
+Index: Makefile
+--- Makefile.orig
Makefile
+@@ -53,17 +53,14 @@ dist: distclean
+ rm -rf surf-$(VERSION)
install: all
-- @echo installing executable file to ${DESTDIR}${PREFIX}/bin
-- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f surf ${DESTDIR}${PREFIX}/bin
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/surf
-- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-- @sed "s/VERSION/${VERSION}/g" < surf.1 >
${DESTDIR}${MANPREFIX}/man1/surf.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
+- mkdir -p $(DESTDIR)$(PREFIX)/bin
+- cp -f surf $(DESTDIR)$(PREFIX)/bin
+- chmod 755 $(DESTDIR)$(PREFIX)/bin/surf
+- mkdir -p $(DESTDIR)$(LIBDIR)
+- cp -f $(WLIB) $(DESTDIR)$(LIBDIR)
+- for wlib in $(WLIB); do \
+- chmod 644 $(DESTDIR)$(LIBDIR)/$$wlib; \
+- done
+- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
+- sed "s/VERSION/$(VERSION)/g" < surf.1 >
$(DESTDIR)$(MANPREFIX)/man1/surf.1
+- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/surf.1
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} surf ${DESTDIR}${PREFIX}/bin
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LIBDIR)
++ ${BSD_INSTALL_DATA} $(WLIB) $(DESTDIR)$(LIBDIR)
+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
+ sed "s/VERSION/${VERSION}/g" < surf.1 > surf.1.tmp
+ mv surf.1.tmp surf.1
+ ${BSD_INSTALL_MAN} surf.1 ${DESTDIR}${MANPREFIX}/man1
uninstall:
- @echo removing executable file from ${DESTDIR}${PREFIX}/bin
+ rm -f $(DESTDIR)$(PREFIX)/bin/surf
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/www/surf/patches/patch-config_def_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-config_def_h
--- patches/patch-config_def_h 26 May 2017 20:37:56 - 1.5
+++ patches/patch-config_def_h 22 Dec 2021 22:21:35 -
@@ -2,21 +2,12 @@ $OpenBSD: patch-config_def_h,v 1.5 2017/
Index: config.def.h
--- config.def.h.orig
+++ config.def.h
-@@ -30,7 +30,7 @@ static Parameter defconfig[ParameterLast] = {
- SETB(SiteQuirks, 1),
- SETB(SpellChecking, 0),
- SETV(SpellLanguages, ((char *[]){ "en_US", NULL })),
-- SETB(StrictSSL, 0),
-+ SETB(StrictSSL, 1),
- SETB(Styl
Re: Update www/surf to 2.1
> Am 20.12.2021 um 20:02 schrieb Crystal Kolipe : > > Surf 2.1 was released seven months ago, but we still have 2.0 in ports. Thanks, I’ll take care soon. > Patch attached. >
Re: x11/slim is unmaintained and broken, drop it?
> On 30. Nov 2021, at 09:27, Landry Breuil wrote: > Le Mon, Nov 29, 2021 at 05:32:42PM +0100, Joerg Jung a écrit : >> >>> On 29. Nov 2021, at 09:39, Landry Breuil wrote: >>> Le Mon, Nov 29, 2021 at 07:02:20AM +, Yifei Zhan a écrit : >>>> x11/slim is a login session manager that once installed and enabled, >>>> takes over xenodm and handles user login. It has been unmaintained since >>>> 2013 and it no longer works as of now (it doesn't care about .xsession >>>> and I got redirected to the login screen once the correct password is >>>> entered.) >>> >>> cf https://marc.info/?l=openbsd-ports=161376817621120=2 which got >>> zero testing. >>> >>> guess i'll remove it unless someone speaks up. >> >> I use it (on 6.9) and it always just worked for me. >> But I’m fine with having it removed due to dead upstream. > > Your call, you can also test the update i posted, and become maintainer > :) nah... It’s dead Jim. ok jung@ for removal.
Re: x11/slim is unmaintained and broken, drop it?
> On 29. Nov 2021, at 09:39, Landry Breuil wrote: > Le Mon, Nov 29, 2021 at 07:02:20AM +, Yifei Zhan a écrit : >> x11/slim is a login session manager that once installed and enabled, >> takes over xenodm and handles user login. It has been unmaintained since >> 2013 and it no longer works as of now (it doesn't care about .xsession >> and I got redirected to the login screen once the correct password is >> entered.) > > cf https://marc.info/?l=openbsd-ports=161376817621120=2 which got > zero testing. > > guess i'll remove it unless someone speaks up. I use it (on 6.9) and it always just worked for me. But I’m fine with having it removed due to dead upstream.
Re: Only important updates now
> On 20. Sep 2021, at 01:42, Theo de Raadt wrote: > Christian Weisgerber wrote: > >> This includes the list of remaining ports with %n warnings: >> >> editors/cooledit >> mail/exim >> misc/brltty >> net/climm > > climm s_sprintf() is a work of art, like an ochre cave painting of a stick > animal with a stick poking through it. :) I suggest to move climm to the attic, as it is barely useable these days: - ICQ login does not work since they switched OSCAR->WIM protocol - XMPP login segfaults for me and other clients are available in ports - no homepage, no upstream, last release from 2010 Similar story for net/ysmv7 and net/vicq.
Re: khal update 0.10.2 to 0.10.4
On Wed, Sep 15, 2021 at 08:24:10AM +0200, Remi Locherer wrote:
> On Mon, Sep 13, 2021 at 07:24:39PM +0200, Marcus MERIGHI wrote:
> >
> > This updates khal from 0.10.2 to 0.10.4.
> >
> > Only quickly tested, but running with from now on.
> > (The "CHANGE for tab" helps a lot...)
> >
> > Changes:
> >
> > https://github.com/pimutils/khal/releases/tag/v0.10.4
> > DROPPED support for Python 3.5
> > CHANGE ikhal: tab (and shift tab) jump from the events back to the calendar
> > NEW Add symbol for events with at least one alarm
> > FIX URL can now be set/updated from ikhal
> > FIX Imported events without an end or duration will now last one day if
> > DTSTART is a date (as per RFC) or one hour if it is a datetime.
> >
> > https://github.com/pimutils/khal/releases/tag/v0.10.3
> > DROPPED support for Python 3.4
> > FIX khal interactive now accepts -a/-d options (as documented)
> > FIX Strip whitespace when loading displayname and color files
> > FIX Warn when loading events with a recurrence that finishes before it
> > starts
> > FIX Warn when loading events with a recurrence that never occurs
> > FIX Alarms without descriptions no longer crash ikhal
> > FIX Display all-day events at the top of the day in ikhal
> > FIX Keybindings in empty search results no longer crash ikhal
> > NEW Possibility to add a blank line before day in khal with
> > blank_line_before_day option
> > FIX new keybinding in search no longer crash ikhal
> > NEW Improved sorting of events. Sort by DTSTART, DTEND then SUMMARY.
> > NEW Add url input and {url} template option
> >
> > Marcus
>
> Works fine for me.
> 4 tests fail. They are related to different localized UTF-8 outputs.
> The tests have special cases for FreeBSD and NetBSD. I would say
> this is nothing that stops updating our port.
>
> ok remi
Committed, without the blank line in distinfo.
Thanks to both of you!
Regards,
Joerg
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/productivity/khal/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -u -r1.15 Makefile
> > --- Makefile23 Feb 2021 19:39:37 - 1.15
> > +++ Makefile13 Sep 2021 17:16:54 -
> > @@ -2,7 +2,7 @@
> >
> > COMMENT = standards based terminal calendar
> >
> > -MODPY_EGG_VERSION =0.10.2
> > +MODPY_EGG_VERSION =0.10.4
> > DISTNAME = khal-${MODPY_EGG_VERSION}
> >
> > CATEGORIES = productivity
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/productivity/khal/distinfo,v
> > retrieving revision 1.7
> > diff -u -p -u -r1.7 distinfo
> > --- distinfo19 Oct 2020 13:01:10 - 1.7
> > +++ distinfo13 Sep 2021 17:16:54 -
> > @@ -1,2 +1,3 @@
> > -SHA256 (khal-0.10.2.tar.gz) = SU8hXD0ct6H411a0QICdJVvSDik3+YvQtdROQtTLEIc=
> > -SIZE (khal-0.10.2.tar.gz) = 182534
> > +SHA256 (khal-0.10.4.tar.gz) = P9uYCpphwCBteoKxb3e0CKTzQaK4ZrnJ/PamQYUNEp8=
> > +SIZE (khal-0.10.4.tar.gz) = 185736
> > +
> >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/09/15 14:06:12 Modified files: productivity/khal: Makefile distinfo Log message: update to khal-0.10.4 from marcus merighi ok remi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/08/03 15:20:38 Modified files: x11/dstat : Makefile distinfo Log message: update to dstat-0.8
Re: update: textproc/cloc 1.86 -> 1.90
On Fri, Jul 30, 2021 at 01:26:28AM +, Yifei Zhan wrote:
> Hi,
>
> This is an update to cloc 1.90, which fixes some minor bugs and adds
> support for more languages. I also updated the MASTER_SITES link to the
> new syntax and added a missing TESTDEP. All included tests except one
> related to git submodule are successful which is expected since we are
> using tarball instead of git clone.
Committed, thanks!
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/cloc/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -r1.16 Makefile
> --- Makefile 14 Jun 2021 23:57:16 - 1.16
> +++ Makefile 30 Jul 2021 01:14:37 -
> @@ -2,9 +2,8 @@
>
> COMMENT= count lines of code
>
> -V= 1.86
> +V= 1.90
> DISTNAME=cloc-${V}
> -REVISION=0
>
> CATEGORIES= textproc devel
>
> @@ -15,15 +14,19 @@ MAINTAINER= Joerg Jung # GPLv2+
> PERMIT_PACKAGE= Yes
>
> -MASTER_SITES=
> https://github.com/AlDanial/cloc/releases/download/${V}/
> +MASTER_SITES=
> https://github.com/AlDanial/cloc/releases/download/v${V}/
>
> NO_BUILD=Yes
> PKG_ARCH=*
>
> RUN_DEPENDS= devel/p5-Algorithm-Diff \
> devel/p5-Parallel-ForkManager \
> - textproc/p5-Regexp-Common
> + textproc/p5-Regexp-Common \
> + security/p5-Digest-Perl-MD5
> +
> BUILD_DEPENDS+= ${RUN_DEPENDS}
> +
> +TEST_DEPENDS+= archivers/unzip
>
> FAKE_FLAGS= prefix="${PREFIX}" \
> man_prefix="${PREFIX}" \
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/cloc/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -r1.11 distinfo
> --- distinfo 1 Jun 2020 21:24:48 - 1.11
> +++ distinfo 30 Jul 2021 01:15:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (cloc-1.86.tar.gz) = Z7flCgOwKQMULiA4DHcWvbUwYRMtXg353kpjiycSZ+M=
> -SIZE (cloc-1.86.tar.gz) = 554097
> +SHA256 (cloc-1.90.tar.gz) = FSUCph1LrkpAagWgG/UkibMQ7APb2MZF0LsFH6Rxfds=
> +SIZE (cloc-1.90.tar.gz) = 614306
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/08/02 13:27:30 Modified files: textproc/cloc : Makefile distinfo Log message: update to cloc 1.90 from Yifei Zhan
Re: textproc/cloc installs an empty man page
> Am 11.06.2021 um 22:13 schrieb Stuart Henderson :
>
> On 2021/06/11 21:59, Omar Polo wrote:
>> Klemens Nanni writes:
On Fri, Jun 11, 2021 at 08:32:18PM +0200, Omar Polo wrote:
> textproc/cloc' pod2man.mk fails to generate a manpage because the date
> command fails. Don't know why it doesn't stop the build, but the
> following seems to fix it.
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/textproc/cloc/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile1 Jun 2020 21:24:48 -1.15
> +++ Makefile11 Jun 2021 18:22:49 -
> @@ -4,6 +4,7 @@ COMMENT=count lines of code
> V=1.86
> DISTNAME=cloc-${V}
> +REVISION=0
> CATEGORIES=textproc devel
> Index: patches/patch-Unix_pod2man_mk
> ===
> RCS file: patches/patch-Unix_pod2man_mk
> diff -N patches/patch-Unix_pod2man_mk
> --- /dev/null1 Jan 1970 00:00:00 -
> +++ patches/patch-Unix_pod2man_mk11 Jun 2021 18:23:27 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: Unix/pod2man.mk
> +--- Unix/pod2man.mk.orig
> Unix/pod2man.mk
> +@@ -40,7 +40,7 @@ PACKAGE?= package
> + # Optional variables to set
> + MANSECT?= 1
> + PODCENTER?= User Commands
> +-PODDATE?= $$(date --utc --date="@$${SOURCE_DATE_EPOCH:-$$(date
> +%s)}" "+%Y-%m-%d")
> ++PODDATE?= $$(date -ujf "%s" "$${SOURCE_DATE_EPOCH:-$$(date
> +%s)}" "+%Y-%m-%d")
>>> SOURCE_DATE_EPOCH is not set, neither by cloc WRKSRC or our Makefile,
>>> so the "today" default, e.g. "2021-06-11" kicks in.
>>> That means that manual page and therefore the package content changes
>>> every day; wouldn't it be wiser to amend FAKE_FLAGS with this?
>>> PODDATE=
>>> No need for a patch fixing what's already flawed (in our build
>>> environment), imho.
>> Yep, it seems way better :)
>> Index: Makefile
>> ===
>> RCS file: /home/cvs/ports/textproc/cloc/Makefile,v
>> retrieving revision 1.15
>> diff -u -p -r1.15 Makefile
>> --- Makefile1 Jun 2020 21:24:48 -1.15
>> +++ Makefile11 Jun 2021 19:56:40 -
>> @@ -4,6 +4,7 @@ COMMENT=count lines of code
>> V=1.86
>> DISTNAME=cloc-${V}
>> +REVISION=0
>> CATEGORIES=textproc devel
>> @@ -25,7 +26,8 @@ RUN_DEPENDS=devel/p5-Algorithm-Diff \
>> BUILD_DEPENDS+=${RUN_DEPENDS}
>> FAKE_FLAGS=prefix="${PREFIX}" \
>> -man_prefix="${PREFIX}"
>> +man_prefix="${PREFIX}" \
>> +PODDATE=2020-05-19
>> USE_GMAKE=Yes
>
> How about automating the datestamp?
I like that. ok jung@
Note, port needs an update anyways, as
there is a newer cloc release available.
But maybe we should try adding a fix upstream,
like done for OS X here:
https://github.com/AlDanial/cloc/commit/32d0a28f44fc8687fd5dbfc94e9b197cc68b7f60
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/cloc/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile1 Jun 2020 21:24:48 -1.15
> +++ Makefile11 Jun 2021 20:11:30 -
> @@ -4,6 +4,7 @@ COMMENT=count lines of code
>
> V=1.86
> DISTNAME=cloc-${V}
> +REVISION=0
>
> CATEGORIES=textproc devel
>
> @@ -25,7 +26,8 @@ RUN_DEPENDS=devel/p5-Algorithm-Diff \
> BUILD_DEPENDS+=${RUN_DEPENDS}
>
> FAKE_FLAGS=prefix="${PREFIX}" \
> -man_prefix="${PREFIX}"
> +man_prefix="${PREFIX}" \
> +PODDATE=`stat -t %Y-%m-%d -f %Sm ${WRKSRC}/cloc`
>
> USE_GMAKE=Yes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/10/24 14:01:23 Modified files: x11/dmenu : Makefile distinfo Log message: update to dmenu 5.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/06/01 15:24:48 Modified files: textproc/cloc : Makefile distinfo Log message: update to cloc-1.86
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/06/01 14:37:14 Modified files: x11/dmenu : Makefile Log message: take over baton from kn and add myself as maintainer "feel free to go ahead" kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/06/01 14:35:35 Modified files: x11/dwm: Makefile Log message: take over baton from kn and add myself as maintainer "feel free to go ahead" kn
Re: x11/dmenu: drop fonts/terminus-font from RUN_DEPENDS
> Am 31.05.2020 um 15:49 schrieb Klemens Nanni : > On Sun, May 31, 2020 at 01:39:30PM +, Lucas wrote: >> FTR, I originally removed the patch for config.def.h completely in >> dmenu as I didn't see much point in introducing a patch just for >> changing some colors, which can be changed with parameters and seem >> quite randomly chosen (they don't match CSS for OpenBSD site, which I >> think is the only official thing that can be considered as some sort of >> colorscheme). > Let's do one thing at a time, if others later decide to change colors > they can do so, I'd like to fix the fonts due the implied dependencies, > all else I'd like to leave the any future porter/MAINTAINER. This topic comes up every few months for either of the suckless ports, see archives. Developers (e.g. tedu and myself), who are actively using dwm have stated that they prefer to keep color patches (across suckless ports) instead of following the randomly changing upstream colors - think of it as principal of least surprise after upgrades. IMHO this includes keeping Terminus, despite upstream dropped it long time ago already. So, I’m not in favor of the proposed patch, but would not object, if you insist on moving on this way. Either way, I can take care of maintaining DWM. Thanks, Regards, Joerg (jung@)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/19 15:44:29 Modified files: x11/dstat : Makefile distinfo Removed files: x11/dstat/patches: patch-Makefile patch-dstat_1 patch-dstat_c Log message: update to 0.7 release which switches volume reading to sndio so patches are no longer needed
Re: opensmtpd-extras -main & python 2.7
> Am 18.04.2020 um 22:54 schrieb Klemens Nanni : > On Sat, Apr 18, 2020 at 10:21:29PM +0200, Giovanni Bechis wrote: >> diff to 6.7.1 with kn@ fix. >> ok ? > Looks good to me. Any plans to use Python 3 in the near future? No, I don’t think so. These python utils were written long time ago by Gilles, AFAIK mostly as proof of concept and seem rarely used. More likely, we will just disable them in the port in future.
Re: opensmtpd-extras -main & python 2.7
> Am 18.04.2020 um 22:22 schrieb Giovanni Bechis :
> On Sat, Apr 18, 2020 at 01:38:20AM +0200, Klemens Nanni wrote:
>>> On Sat, Apr 18, 2020 at 01:34:47AM +0200, Joerg Jung wrote:
>>> thanks, but please hold-off for a second, as giovanni is already going
>>> to commit a diff to upgrade to latest release 6.7.0 better he merges
>>> the line then into his diff instead of the revision bumps, I believe ...
>> Go ahead with whatever seems fit; I don't use this port, just wanted to
>> help out florian.
>>
> diff to 6.7.1 with kn@ fix.
> ok ?
ok jung@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile26 Dec 2019 11:19:28 -1.32
> +++ Makefile18 Apr 2020 20:19:21 -
> @@ -6,14 +6,13 @@ COMMENT-pgsql=postgresql based smtpd t
> COMMENT-python=extras with python bindings for smtpd
> COMMENT-redis=redis based smtpd table support
>
> -V=6.6.0
> +V=6.7.1
> DISTNAME=opensmtpd-extras-${V}
> PKGNAME-main=${DISTNAME}
> PKGNAME-mysql=opensmtpd-extras-mysql-${V}
> PKGNAME-pgsql=opensmtpd-extras-pgsql-${V}
> PKGNAME-python=opensmtpd-extras-python-${V}
> PKGNAME-redis=opensmtpd-extras-redis-${V}
> -REVISION=2
> EPOCH=0
>
> CATEGORIES=mail
> @@ -36,9 +35,8 @@ WANTLIB-redis=c crypto event ssl hired
>
> MASTER_SITES=${HOMEPAGE}archives/
>
> -WRKSRC=${WRKDIR}/OpenSMTPD-extras-${V}
> -
> MODULES=lang/python
> +MODPY_RUNDEP=no
>
> LIB_DEPENDS-main=databases/sqlite3
> LIB_DEPENDS-mysql=databases/mariadb,-main
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/opensmtpd-extras/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo22 Dec 2019 12:19:20 -1.17
> +++ distinfo18 Apr 2020 20:19:21 -
> @@ -1,2 +1,2 @@
> -SHA256 (opensmtpd-extras-6.6.0.tar.gz) =
> EmsCNgLouyIr8kVDoFbuClSDQ9yG0YRmn/nYLfyh+98=
> -SIZE (opensmtpd-extras-6.6.0.tar.gz) = 124234
> +SHA256 (opensmtpd-extras-6.7.1.tar.gz) =
> +EOFVZqLs2ay/iXYsfeMEI8HzBWZI1AXFWnXvcLpNaw=
> +SIZE (opensmtpd-extras-6.7.1.tar.gz) = 548792
Re: opensmtpd-extras -main & python 2.7
On Sat, Apr 18, 2020 at 12:48:30AM +0200, Klemens Nanni wrote:
> On Sat, Apr 18, 2020 at 12:30:43AM +0200, Joerg Jung wrote:
> > Yes, the others should not need it.
> This should do it, then. Picking REVISIONs because all packages except
> -python change, but one could also go for the easier REVISION=3 to bump
> all packages.
>
> Port-wise this makes nothing but -python (already has explicit LIB- and
> RUN_DEPENDS) depend on python.
thanks, but please hold-off for a second, as giovanni is already going
to commit a diff to upgrade to latest release 6.7.0 better he merges
the line then into his diff instead of the revision bumps, I believe ...
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-extras/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile 26 Dec 2019 11:19:28 - 1.32
> +++ Makefile 17 Apr 2020 21:20:24 -
> @@ -13,7 +13,11 @@ PKGNAME-mysql= opensmtpd-extras-mysql-$
> PKGNAME-pgsql= opensmtpd-extras-pgsql-${V}
> PKGNAME-python= opensmtpd-extras-python-${V}
> PKGNAME-redis= opensmtpd-extras-redis-${V}
> -REVISION=2
> +REVISION-main= 3
> +REVISION-mysql= 3
> +REVISION-pgsql= 3
> +REVISION-python= 2
> +REVISION-redis= 3
> EPOCH= 0
>
> CATEGORIES= mail
> @@ -39,6 +43,7 @@ MASTER_SITES= ${HOMEPAGE}archives/
> WRKSRC= ${WRKDIR}/OpenSMTPD-extras-${V}
>
> MODULES= lang/python
> +MODPY_RUNDEP = No
>
> LIB_DEPENDS-main=databases/sqlite3
> LIB_DEPENDS-mysql= databases/mariadb,-main
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/04/17 17:28:30 Modified files: mail/opensmtpd-filters/spamassassin: Makefile distinfo Log message: update to 0.7 to follow filter protocol bump
Re: opensmtpd-extras -main & python 2.7
On Fri, Apr 17, 2020 at 11:16:46PM +0200, Klemens Nanni wrote: > On Fri, Apr 17, 2020 at 10:42:55PM +0200, Florian Obser wrote: > > $ cat /var/db/pkg/python-2.7.17p1/+REQUIRED_BY > > opensmtpd-extras-6.6.0p2v0 > > > > Note that this is not the -python flavour. > > > > I stared at the ports makefile and can't figure this out. > This port uses the lang/python MODULE, so BUILD- and RUN_DEPENDS are set > automatically for all packages unless disabled with MODPY_*DEPENDS=No. > > You probably want to disable it by default and only add the python > dependency to the -python package (in case the other packages really do > not need it). Yes, the others should not need it.
Re: x11/dstat: use sndio instead of the raw /dev/mixer device
On Sat, Apr 11, 2020 at 09:17:48AM +0200, Alexandre Ratchov wrote: > > The diff below mostly replaces kernel mixer(4) ioctls with the > corresponding sioctl_open(3) calls. > > There's no mute control on all setups, so I've changed dstat to not > fail if output.mute is missing, just display the current volume. > > As for the other volume status ports, this makes dstat use the default > sndio device (instead of the first one), and shows by default sndiod > soft volume control, present regardless the hardware used. > > OK? > > As discussed in private this diff did not work and needs some polishing. However, you came up with another diff later which works fine and should be good enough to have it applied. Feel free to move on with that.
Re: [NEW] mail/aerc
On Mon, Feb 10, 2020 at 09:10:15AM -0700, Aaron Bieber wrote:
> On Sat, 01 Feb 2020 at 03:29:25 -0500, Raymond E. Pasco wrote:
> > - I used a modified distfile provided by abieber with a vendor directory,
> > which is necessary due to the large number of go package dependencies.
> >
> > - The custom version of go-libvterm used by aerc upstream includes an
> > (unmodified) bundled copy of libvterm itself, which causes issues with
> > the build. I instead link against devel/libvterm.
> >
> > - One filter script shipped with aerc (to display HTML email) depends on
> > socksify (provided by security/dante) and www/w3m. I did not include these
> > as RUN_DEPENDS because this is an optional script disabled by default,
> > but I'm not sure whether this approach is correct.
> >
> > - cgo in go 1.13 (but not go 1.14) considers ~ an invalid path character,
> > but the top-level package name here (and therefore WRKSRC) contains an ~.
> > I remedied this by moving the vendor directory contents up to the level
> > of the MODGO_WORKSPACE. This workaround shouldn't be necessary when go
> > 1.14 is released.
> >
> > - aerc can be built with notmuch support, but notmuch isn't in ports (yet?),
> > so I didn't bother with this.
>
> It looks good to me. I'd like to pass in MODGO_FLAGS so we can have verbose
> info when DEBUG is set. Something like:
> MAKE_ENV += GOFLAGS="${MODGO_FLAGS}"
>
> But it seems the "-p ${MAKE_JOBS}" bit from go.port.mk isn't getting parsed
> properly in this case.
>
> Anyway, if that bit can be sorted out, OK abieber@ for import!
ok jung@ as well (convinced by sthen's args earlier in this thread)
Re: [UPDATE] net/gdnsd to 2.4.3 (Fixes CVE-2019-13952)
> On 8. Nov 2019, at 12:43, Stuart Henderson wrote: > On 2019/11/08 11:46, Frederic Cambus wrote: >> >> Here is a diff to update gdnsd to 2.4.3. This fixes CVE-2019-13952. >> >> While there, switch MASTER_SITES to HTTPS. > > OK. > > I looked at updating to 3.x earlier but then I read "The TL;DR here is > that gdnsd doesn't manage its own OS security or privileges anymore. It > just runs and assumes the environment was already secured by the init > system or script, and assumes it can bind port 53" and put it in the > "too-hard basket”. Actually, I found some time to look into this and I got recent version 3.x compiling and working with a few patches. But the removed privileges are indeed an issue… How are we supposed to handle such ports in general? I guess with the raise of systemd there will be more such types of “daemons" coming. For the user environment, I believe rc script can already start things as daemon_user=“_gdnsd”. But since we have no authbind, CAP_NET_BIND_SERVICE (Linux), or mac_portacl (FreeBSD) the actual port binding will be a problem. What are our options here? Maybe just suggest in pkg README to add a “transparent" PF rule to redirect port 53 -> 5353 (with an example)? Use some other kind of user-space tcp proxy in front, e.g. net/balance? Any other ideas? Thanks, Regards, Joerg ps: the author seems upset about his own choices here and even apologises, see (last paragraph): https://github.com/gdnsd/gdnsd/blob/master/VERSION3.md
Re: [NEW] mail/aerc
On Sat, Feb 01, 2020 at 03:29:25AM -0500, Raymond E. Pasco wrote: > - I used a modified distfile provided by abieber with a vendor directory, > which is necessary due to the large number of go package dependencies. IMHO, bundling things defeats the purpose of ports/package system. What do you do if a dependency got a security update? Grep all distfiles if bundled somewhere and re-roll and depend on abieber (no offense!) to handle that? How about adding the dependencies as own ports instead? We do the same for python, perl, etc. I know, this is a lot of work, may be portgen can be tricked into handling go first... > - The custom version of go-libvterm used by aerc upstream includes an > (unmodified) bundled copy of libvterm itself, which causes issues with > the build. I instead link against devel/libvterm. What issues? However, using the existing port makes sense, but why have you still bundled it? > - One filter script shipped with aerc (to display HTML email) depends on > socksify (provided by security/dante) and www/w3m. I did not include these > as RUN_DEPENDS because this is an optional script disabled by default, > but I'm not sure whether this approach is correct. I suggest to add a note to package readme. > - cgo in go 1.13 (but not go 1.14) considers ~ an invalid path character, > but the top-level package name here (and therefore WRKSRC) contains an ~. > I remedied this by moving the vendor directory contents up to the level > of the MODGO_WORKSPACE. This workaround shouldn't be necessary when go > 1.14 is released. Weird. > - aerc can be built with notmuch support, but notmuch isn't in ports (yet?), > so I didn't bother with this. There were some submissions for notmuch in the past, but afaik never imported. Other than that, I tested your port and it works for me. Would be nice to have this imported. Thanks, Regards, Joerg
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/02/01 13:44:16 Modified files: www/kcaldav: Makefile www/kcaldav/patches: patch-Makefile www/kcaldav/pkg: PLIST Log message: disable LOGFILE reverting back to earlier port versions behaviour and avoid silent HTTP 505 error responses in initial setups (e.g. following README) with hint and testing from mikolaj kucharski maintainer timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/01/30 14:13:23 Modified files: x11/sct: Makefile distinfo Log message: update to 0.5 release
kcaldav logfile http 505
Hi, following the package README from kcaldav in a -current vanilla setup just results in silent error responses (HTTP 505), as reported earlier already [1]. I belive this happens because of LOGFILE define pointing to chroot /var/www/logs/kcaldav-system.log, but httpd user/slowcgi has no write access there by default, so the LOGFILE will not be created and kcgi/kcaldav just fails. Multiple options to resolve this: 1. Tell users in README to do something like doas touch /var/www/logs/kcaldav-system.log doas chown www /var/www/logs/kcaldav-system.log 2. Add a PLIST entry to auto-create /var/www/logs/kcaldav-system.log with the correct rights 3. Disable the LOGFILE completely (reverting back to earlier port versions behaviour), leaving normal stderr logging ending up in configured web servers error.log Attached is a diff for option 3. OK? Thanks, Regards, Joerg [1] https://marc.info/?l=openbsd-ports=155082287919154=2 Index: www/kcaldav//Makefile === RCS file: /cvs/ports/www/kcaldav/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- www/kcaldav//Makefile 17 Nov 2019 09:28:23 - 1.16 +++ www/kcaldav//Makefile 24 Jan 2020 18:50:42 - @@ -3,6 +3,7 @@ COMMENT = a simple, safe, and minimal CalDAV server DISTNAME = kcaldav-0.1.11 +REVISION = 0 CATEGORIES = www HOMEPAGE = https://kristaps.bsd.lv/kcaldav/ Index: www/kcaldav//patches/patch-Makefile === RCS file: /cvs/ports/www/kcaldav/patches/patch-Makefile,v retrieving revision 1.5 diff -u -p -r1.5 patch-Makefile --- www/kcaldav//patches/patch-Makefile 17 Nov 2019 09:28:23 - 1.5 +++ www/kcaldav//patches/patch-Makefile 24 Jan 2020 18:50:42 - @@ -14,3 +14,12 @@ Index: Makefile # File-system directory where "installwww" installs. # You probably aren't going to use that! +@@ -150,7 +150,7 @@ VERSION = 0.1.11 + CFLAGS+= -DCALDIR=\"$(CALDIR)\" + CFLAGS+= -DHTDOCS=\"$(HTDOCS)\" + CFLAGS+= -DVERSION=\"$(VERSION)\" +-CFLAGS+= -DLOGFILE=\"$(LOGFILE)\" ++#CFLAGS += -DLOGFILE=\"$(LOGFILE)\" + BHTMLS = collection.html \ + home.html + DOTFLAGS = -h "BGCOLOR=\"red\"" \
new: opensmtpd clamav filter
Hi, after the previous thread back in November has gone sideways, here is another attempt. Please find attached a port for opensmtpd filter-clamav. Please, only port-wise comments. OKs? Thanks, Regards, Joerg clamav.tar.gz Description: application/tar-gz
Re: Dovecot version mismatch
> On 17. Dec 2019, at 15:05, SyYExroNZ wrote: > > Correct. I didn't pay attention. Excuse me. > > El 17/12/2019 14:01, Brad Smith escribió: >> If you upgrade you have to restart Dovecot. You will see that if the >> master process is left running throughout the upgrade. >>> OpenBSD 6.6 i386 >>> dovecot-2.3.9.2v0 >>> /var/log/maillog: >>> dovecot: auth: Fatal: Dovecot version mismatch: Master is v2.3.7.2, auth >>> is v2.3.9.2 (if you don't care, set version_ignore=yes) I wonder if there is any way to teach pkg (tools) to restart daemon, in case of daemon being enabled and running at update time, e.g. with some @exec line or something like: sudo rcctl ls started | grep -q “^dovecot" && rcctl restart dovecot
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/12/16 14:32:02 Modified files: mail/opensmtpd-filters/spamassassin: Makefile distinfo Log message: update to 0.6 to cope with filter protocol changes ok giovanni
Re: new: opensmtpd clamav filter
> On 13. Nov 2019, at 16:59, Ingo Schwarze wrote: > > Strictly speaking, martijn@ is right. Thanks for the elaborations and clarification. I will adjust that with the next release. >> is just not very readable and multiple arguments have always >> non-optional predecessors anyways. > > Absolutely not. That is clearly not true, see the examples above. I think we misunderstood here. I meant plain simple arguments and not -options or key=value pairs. You can not distinguish between plain arbitrary string arguments which can have any value without respecting the order, so an predecessor is necessary (non-optional) in my example for the limit: filter-clamav “value1" is “value1" the limit or the address? By design it is defined to be the address, because first argument. Second argument is limit and limit can never be without (even empty “") first address argument predecessor, because the string values are not distinguishable from each other, except through argument position. That might be poor design, in particular with more arguments and depending on the argument intentions. But this is very simple to implement (in most languages) and I don’t plan to add any further arguments anyways. In fact, I’m thinking of getting rid of the second argument by setting a reasonable default limit ;) > Admittedly, this is a fringe issue for a port and shouldn't > hinder importing. Yes, I really not expected to defend my choice of language or the 120 lines of code in a review here, before importing ;) >> But I'm not a manpage syntax expert, >> maybe Ingo or jmc can chime in and correct me to be wrong here. > > At your service. ;-) Thanks!!!
Re: new: opensmtpd clamav filter
On Tue, Nov 12, 2019 at 11:13:36PM -0700, Theo de Raadt wrote: > I'll add my voice to this. > > The powerful vendors writing new languages must expand their breath, > or face the consequences that some software is not going to get written > in their languages. Better is very much muted by unportable. I agree with that, but believe this discussion has gone a bit sideways and does not belong to ports@ > > I do however dislike the trend that every single filters in ports not > > written by me is in go. 2 out of 3 devs decided to write some of their filters in Go, I would not call that a "trend" yet. > > At first I thought this was to display the > > flexibility of the smtpd-api (I even recollect it was said, but I can't > > find the mail which states so). Showing the flexibility of the API is/was not my goal. > > But it's restricting to OpenBSD users > > not running on amd64, arm, or i386. > > Just yesterday there was someone who couldn't run a filter on sparc64 > > because it was written in go[0]. I know, I've seen and read that thread. > > If we as OpenBSD community value > > portability over architectures these tools should be written in a > > language that's just as portable. While I mostly agree to that, the decision which language I choose to write and maintain my tools in is still: _mine_. Back in Dec 2018, when I wrote and released my first tiny filter, I've chosen Go for good and valid reasons. I will not start to defend my decision nor Go here, since this is not my first preferred native main language and I also dislike it's restrictions. But let me just add: I strongly believe into choose the right tools/language for the jobs and the Goroutines just fit very well into the async programming model of the filters API. > > If you want to demonstrate the flexibility of the API write it in I didn't wrote my filters for PoC of API or to test flexibility or something, but for real world usage. In fact I run my filters on some high traffic mail servers. > > something new like ruby, C++, or even PHP or awk for all I care. > > If you care about portability please use one of these (although > > PHP is currently not supported on HPPA). Personally, I won't run a filter in Ruby or PHP on a high traffic mail server. I needed something simple, small, fast, and compiled. Also, I have not seen a large mail server running on a sparc for years. > > Maybe you could give libopensmtpd a go (pun intended). I reckon > > it's not hard to use. I looked into it, but IMHO it's over-engineered containing way too much code for simple and tiny filter tasks. While I like the approach to make everything as re-usable and generic as possible, it is not always the best choice. cloc tells me 3300 lines of code just for the library and another 230 lines for filter-dnsbl. In contrast my own filter-dnsbl(.go) has just 120 lines and even has support for whitelists (like DNSWL.org). Your library also seems to be written for OpenBSD only, and does not seem to be _portable_ to Linux or other (you see the irony eeh?). In contrast again: my own filters do also work with OpenSMTPD-portable, which I personally consider important. > > Also the manpage is incorrect. It states [address] [limit], while > > if you want to limit the address is non-optional (from reading the > > code). So this should be [address [limit]]. I don't think that this is incorrect, but a rather common idiom found in other man pages as well, because: foo [bar [baz [bat [ban [address [limit]] is just not very readable and multiple arguments have always non-optional predecessors anyways. But I'm not a manpage syntax expert, maybe Ingo or jmc can chime in and correct me to be wrong here. > > Also I don't like this syntax, because it gets confusing if the > > amount of arguments grows (not saying it will happen here, just > > bad practice). I'd rather see this as [-s address] [-l limit]. You can choose whatever syntax you like in your own filters. In fact multiple OpenBSD base tools use this syntax, think of all the *ctl commands like relayctl. Please, can we get back to the actual port, anyone tested it? OK to import? > > On 11/13/19 1:32 AM, Joerg Jung wrote: > > > Hi, > > > > > > please find attached a port for opensmtpd filter-clamav. > > > > > > Comments, OKs? > > > > > > Thanks, > > > Regards, > > > Joerg > > > > >
new: opensmtpd clamav filter
Hi, please find attached a port for opensmtpd filter-clamav. Comments, OKs? Thanks, Regards, Joerg clamav.tgz Description: application/tar-gz
Re: [UPDATE] net/gdnsd to 2.4.3 (Fixes CVE-2019-13952)
> On 8. Nov 2019, at 11:46, Frederic Cambus wrote:
>
> Hi ports@,
>
> Here is a diff to update gdnsd to 2.4.3. This fixes CVE-2019-13952.
>
> While there, switch MASTER_SITES to HTTPS.
>
> Comments? OK?
ok jung@
RUN_DEPENDS should be updated from GeoIP -> libmaxminddb
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/gdnsd/Makefile,v
> retrieving revision 1.22
> diff -u -p -r1.22 Makefile
> --- Makefile 12 Jul 2019 20:48:26 - 1.22
> +++ Makefile 7 Nov 2019 22:04:09 -
> @@ -2,13 +2,13 @@
>
> COMMENT= geographically-aware, authoritative-only DNS server
>
> -V= 2.4.0
> +V= 2.4.3
> DISTNAME= gdnsd-$V
> EXTRACT_SUFX= .tar.xz
>
> CATEGORIES= net
>
> -HOMEPAGE=http://gdnsd.org/
> +HOMEPAGE=https://gdnsd.org/
>
> MAINTAINER= Joerg Jung
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/gdnsd/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 12 Jul 2018 16:31:10 - 1.4
> +++ distinfo 7 Nov 2019 22:04:09 -
> @@ -1,2 +1,2 @@
> -SHA256 (gdnsd-2.4.0.tar.xz) = PVbMuycFTcFVg52U3xNtdgrDYavoaKpqjD2/yeRku5k=
> -SIZE (gdnsd-2.4.0.tar.xz) = 641820
> +SHA256 (gdnsd-2.4.3.tar.xz) = I318pId2027zSaFd2kpYEGze8uvgRzqwXfmW31NueBc=
> +SIZE (gdnsd-2.4.3.tar.xz) = 641580
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/gdnsd/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Jun 2016 16:15:58 - 1.3
> +++ pkg/PLIST 7 Nov 2019 22:04:09 -
> @@ -2,6 +2,9 @@
> @newgroup _gdnsd:743
> @newuser _gdnsd:743:_gdnsd:daemon:gdns user:/var/empty:/sbin/nologin
> @extraunexec rm -f ${SYSCONFDIR}/gdnsd/* ${SYSCONFDIR}/gdnsd/zones/*
> +@sample ${SYSCONFDIR}/gdnsd/
> +@sample ${SYSCONFDIR}/gdnsd/zones/
> +@rcscript ${RCDIR}/gdnsd
> @bin bin/gdnsd_geoip_test
> include/gdnsd/
> include/gdnsd/alloc.h
> @@ -63,6 +66,3 @@ share/doc/gdnsd/NEWS
> share/doc/gdnsd/README.md
> share/doc/gdnsd/gdnsd_manual.txt
> @sample ${VARBASE}/gdnsd/
> -@sample ${SYSCONFDIR}/gdnsd/
> -@sample ${SYSCONFDIR}/gdnsd/zones/
> -@rcscript ${RCDIR}/gdnsd
Re: NEW: mail/opensmtpd-filters/spamassassin
> On 2. Oct 2019, at 08:38, Giovanni Bechis wrote: > > simple port for Apache SpamAssassin opensmtpd filter by Joerg Jung. > Comments ? Ok ? Thanks for taking care! Obviously, OK jung@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/03/18 04:49:05 Modified files: productivity/khal: Makefile distinfo productivity/khal/pkg: PLIST Log message: update to 0.9.10 and switch back to pypi from Kurt Mosiejczuk with tweaks from kn ok kn bentley
Re: Update: devel/py-icalendar 4.0.0 -> 4.0.3
On Sat, Mar 16, 2019 at 02:33:45PM -0400, Kurt Mosiejczuk wrote: > On Mon, Mar 04, 2019 at 10:53:49PM -0500, Kurt Mosiejczuk wrote: > > A fairly straightforward update. Slight changes to the PLIST including a > > bin/icalendar. First time when I've had that. On the advice of pamela@ > > I grabbed the post-install for loop construction from py-gunicorn. > > Overkill for one file, but it will just work if the package adds any > > more in the future. > > > For the previous version we failed one test, all tests pass for 4.0.3. > > > Only consumer seems to be khal and its tests pass and fail exactly the > > same number of tests as before. > > ping Committed, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/03/18 04:38:40 Modified files: devel/py-icalendar: Makefile distinfo devel/py-icalendar/pkg: PLIST Log message: update to 4.0.3 from Kurt Mosiejczuk
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/03/05 12:35:08 Modified files: x11/dwm: Makefile x11/dwm/patches: patch-config_def_h Log message: adjust color scheme to fix focus border and keep look and feel of previous releases input from tedu and charlene ok kn
Re: no focus borders in dwm 6.2
On Mon, Mar 04, 2019 at 08:39:48PM +0100, Klemens Nanni wrote:
> On Sun, Mar 03, 2019 at 09:33:58PM +0100, Charlene Wendling wrote:
> > Because of the new colorscheme algo (decoupled colors), it seems that
> > it needs more contrast for "active" elements, and there is too much
> > gray in our colorscheme.
> Yes, currently the colors are the same so there's no contrast at all.
>
> > I'm proposing here a diff that changes to a more appropriate color
> > for active elements and blends decently with the grayish theme as
> > a PoC... or we may just switch to default values.
> That works, but I also prefer dropping our local patches and stick with
> upstream defaults; same thing with x11/dmenu.
>
> If users want to change a bit, they have to recompile themselves anyway,
> so that won't bite those who care (and customize by now already).
>
> Feedback? Objections? OK?
In the past the argument for keeping the customized grayish color scheme
was to provide a unified experience across the suckless tools dwm, dmenu,
st, and tabbed in OpenBSD. They all use the same hex codes providing a
similar look
I'm fine with dropping the gray scheme and using defaults instead, but
then it should be dropped from the other tools (demnu + tabbed + st) as
well.
Instead of dropping, I would prefer the slight tweak below to dwm which
combines Charlene's hex suggestion with a SchemeSel tweak to makes it
look more like in the previous releases.
But I'm really fine with either way - just let's be consistent across
these tools.
Index: patches/patch-config_def_h
===
RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
retrieving revision 1.14
diff -u -p -r1.14 patch-config_def_h
--- patches/patch-config_def_h 12 Feb 2019 17:05:03 - 1.14
+++ patches/patch-config_def_h 4 Mar 2019 20:29:31 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-config_def_h,v 1.14 2019
Index: config.def.h
--- config.def.h.orig
+++ config.def.h
-@@ -5,13 +5,13 @@ static const unsigned int borderpx = 1;/* bor
+@@ -5,17 +5,17 @@ static const unsigned int borderpx = 1;/* bor
static const unsigned int snap = 32; /* snap pixel */
static const int showbar= 1;/* 0 means no bar */
static const int topbar = 1;/* 0 means bottom bar */
@@ -19,10 +19,15 @@ Index: config.def.h
+static const char col_gray2[] = "#404040";
+static const char col_gray3[] = "#c0c0c0";
+static const char col_gray4[] = "#f0f0f0";
-+static const char col_cyan[]= "#404040";
++static const char col_cyan[]= "#a0a0aa";
static const char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+- [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeSel] = { col_gray4, col_gray2, col_cyan },
+ };
+
+ /* tagging */
@@ -29,6 +29,9 @@ static const Rule rules[] = {
/* class instancetitle tags mask isfloating
monitor */
{ "Gimp", NULL, NULL, 0,1, -1 },
Re: no focus borders in dwm 6.2
On Sun, Mar 03, 2019 at 09:33:58PM +0100, Charlene Wendling wrote:
> On Sun, 3 Mar 2019 20:03:31 +0100
> Charlene Wendling wrote:
>
> > On Sun, 03 Mar 2019 13:37:25 -0500
> > Ted Unangst wrote:
> >
> > > After updating to dwm 6.2, it appears that the blue border around
> > > the focused window is gone. There's no way indication which window
> > > is focused, which is kinda annoying. Was this an intentional change?
> > >
> >
> > I was surprised because it works here [1], but i use a custom
> > colorscheme, and this "fixes" the issue. Not sure you want mine
> > though ;)
> >
> > Charlène.
> >
> > [1] https://transfer.sh/nv901/capture_2019-03-03_195140_14264.png
> >
>
> Because of the new colorscheme algo (decoupled colors), it seems that
> it needs more contrast for "active" elements, and there is too much
> gray in our colorscheme.
>
> I'm proposing here a diff that changes to a more appropriate color
> for active elements and blends decently with the grayish theme as
> a PoC...
ok jung@
> or we may just switch to default values.
I would prefer to keep they grayish, since easy for the eyes.
> Charlène.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/dwm/Makefile,v
> retrieving revision 1.32
> diff -u -p -u -p -r1.32 Makefile
> --- Makefile 12 Feb 2019 17:05:03 - 1.32
> +++ Makefile 3 Mar 2019 19:51:06 -
> @@ -4,6 +4,7 @@ COMMENT= dynamic window manager
>
> V= 6.2
> DISTNAME=dwm-${V}
> +REVISION=0
>
> CATEGORIES= x11
>
> Index: patches/patch-config_def_h
> ===
> RCS file: /cvs/ports/x11/dwm/patches/patch-config_def_h,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 patch-config_def_h
> --- patches/patch-config_def_h12 Feb 2019 17:05:03 - 1.14
> +++ patches/patch-config_def_h3 Mar 2019 19:51:06 -
> @@ -19,7 +19,7 @@ Index: config.def.h
> +static const char col_gray2[] = "#404040";
> +static const char col_gray3[] = "#c0c0c0";
> +static const char col_gray4[] = "#f0f0f0";
> -+static const char col_cyan[]= "#404040";
> ++static const char col_cyan[]= "#a0a0aa";
> static const char *colors[][3] = {
> /* fg bg border */
> [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
>
Re: UPDATE: x11/st
On Sun, Feb 10, 2019 at 09:17:27AM +0100, Ingo Feinerer wrote:
> Hi,
>
> update x11/st to 0.8.2.
>
> - patches/patch-st_1 and patches/patch-st_c are now upstream
> - patches/patch-config_mk is simpler as upstream has now an OpenBSD
> section which just needs to be uncommented
> - patches/patch-config_def_h is also shorter as iso14755 is gone
> upstream as well
>
> Works fine for me on amd64.
>
> OK?
ok jung@
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 2 Nov 2018 07:32:13 - 1.18
> +++ Makefile 10 Feb 2019 08:05:48 -
> @@ -2,9 +2,8 @@
>
> COMMENT= simple X terminal
>
> -V= 0.8.1
> +V= 0.8.2
> DISTNAME=st-${V}
> -REVISION=0
>
> CATEGORIES= x11
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 29 Mar 2018 21:09:09 - 1.11
> +++ distinfo 10 Feb 2019 08:05:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
> -SIZE (st-0.8.1.tar.gz) = 45423
> +SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU=
> +SIZE (st-0.8.2.tar.gz) = 44788
> Index: patches/patch-config_def_h
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_def_h
> --- patches/patch-config_def_h2 Nov 2018 07:32:13 - 1.10
> +++ patches/patch-config_def_h10 Feb 2019 08:05:48 -
> @@ -11,11 +11,3 @@ Index: config.def.h
>
> /* 8 bright colors */
> "gray50",
> -@@ -177,7 +177,6 @@ static Shortcut shortcuts[] = {
> - { TERMMOD, XK_V, clippaste, {.i = 0} },
> - { TERMMOD, XK_Y, selpaste, {.i = 0} },
> - { TERMMOD, XK_Num_Lock,numlock,{.i = 0} },
> --{ TERMMOD, XK_I, iso14755, {.i = 0} },
> - };
> -
> - /*
> Index: patches/patch-config_mk
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_mk
> --- patches/patch-config_mk 17 Mar 2018 13:28:39 - 1.10
> +++ patches/patch-config_mk 10 Feb 2019 08:05:48 -
> @@ -2,27 +2,18 @@ $OpenBSD: patch-config_mk,v 1.10 2018/03
> Index: config.mk
> --- config.mk.orig
> +++ config.mk
> -@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
> - X11LIB = /usr/X11R6/lib
> +@@ -26,10 +26,10 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
> + STLDFLAGS = $(LIBS) $(LDFLAGS)
>
> - # includes and libs
> --INCS = -I$(X11INC) \
> -- `pkg-config --cflags fontconfig` \
> -- `pkg-config --cflags freetype2`
> --LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
> -- `pkg-config --libs fontconfig` \
> -- `pkg-config --libs freetype2`
> -+INCS != pkg-config --cflags fontconfig
> -+LIBS = -lm -lX11 -lutil -lXft
> -+LIBS +!= pkg-config --libs fontconfig
> -
> - # flags
> --CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
> --STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
> --STLDFLAGS = $(LIBS) $(LDFLAGS)
> -+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> -+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
> -+STLDFLAGS += ${LIBS} ${LDFLAGS}
> + # OpenBSD:
> +-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> +-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> +-# `pkg-config --libs fontconfig` \
> +-# `pkg-config --libs freetype2`
> ++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> ++LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> ++ `pkg-config --libs fontconfig` \
> ++ `pkg-config --libs freetype2`
>
> # compiler and linker
> # CC = c99
> Index: patches/patch-st_1
> ===
> RCS file: patches/patch-st_1
> diff -N patches/patch-st_1
> --- patches/patch-st_12 Nov 2018 07:32:13 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-st_1,v 1.1 2018/11/02 07:32:13 mestre Exp $
> -
> -Index: st.1
> st.1.orig
> -+++ st.1
> -@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
> - .TP
> - .B Ctrl-Shift-v
> - Paste from the clipboard selection.
> --.TP
> --.B Ctrl-Shift-i
> --Launch dmenu to enter a unicode codepoint and send the corresponding glyph
> --to st.
> - .SH CUSTOMIZATION
> - .B st
> - can be customized by creating a custom config.h and (re)compiling the source
> Index: patches/patch-st_c
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2019/01/01 12:11:56 Modified files: x11/dstat : Makefile distinfo Log message: update to dstat-0.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/12/25 13:59:58 Modified files: net/geomyidae : Makefile distinfo net/geomyidae/pkg: geomyidae.rc Log message: update to v0.34 from sascha paunovic "go[pher] ahead" kn
Re: UPDATE: net/geomyidae 0.34
> Am 12.12.2018 um 12:14 schrieb Sascha Paunovic :
>
> Hi,
>
> here an update of net/geomyidae to 0.34:
Thanks!
ok jung@
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/geomyidae/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile1 Jul 2018 18:05:30 -1.7
> +++ Makefile12 Dec 2018 11:12:52 -
> @@ -2,11 +2,13 @@
>
> COMMENT =Gopher protocol daemon
>
> -DISTNAME =geomyidae-0.32.2
> +DISTNAME =geomyidae-v0.34
> +PKGNAME =${DISTNAME:S/-v/-/}
> +EXTRACT_SUFX =.tgz
>
> CATEGORIES =net
>
> -HOMEPAGE =http://git.r-36.net/geomyidae/
> +HOMEPAGE = http://git.r-36.net/scm/geomyidae
>
> MAINTAINER =Joerg Jung
>
> @@ -16,7 +18,7 @@ PERMIT_PACKAGE_CDROM =Yes
> # uses pledge()
> WANTLIB =c
>
> -MASTER_SITES =${HOMEPAGE}/snapshot/
> +MASTER_SITES =ftp://bitreich.org/releases/geomyidae/
>
> MAKE_FLAGS =CC="${CC}" CFLAGS="${CFLAGS} -Wall"
> MAKE_ENV =LDFLAGS="${LDFLAGS}"
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/geomyidae/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo1 Jul 2018 18:05:30 -1.4
> +++ distinfo12 Dec 2018 11:12:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (geomyidae-0.32.2.tar.gz) =
> /78PayOR9wgqLyRTTfOLTUMLoBx/QlFPCJ0vdI45Yl4=
> -SIZE (geomyidae-0.32.2.tar.gz) = 20896
> +SHA256 (geomyidae-v0.34.tgz) = JYCtDyKc0/XDNJWXWnCGea6vUnbAbsjVWHHX9pshbrA=
> +SIZE (geomyidae-v0.34.tgz) = 22242
> Index: pkg/geomyidae.rc
> ===
> RCS file: /cvs/ports/net/geomyidae/pkg/geomyidae.rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 geomyidae.rc
> --- pkg/geomyidae.rc11 Jan 2018 19:27:05 -1.3
> +++ pkg/geomyidae.rc12 Dec 2018 11:12:52 -
> @@ -3,7 +3,7 @@
> # $OpenBSD: geomyidae.rc,v 1.3 2018/01/11 19:27:05 rpe Exp $
>
> daemon="${TRUEPREFIX}/bin/geomyidae"
> -daemon_flags="-4 -l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
> +daemon_flags="-l /var/log/geomyidae.log -u _geomyidae -g _geomyidae"
>
> . /etc/rc.d/rc.subr
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/07/01 12:05:30 Modified files: net/geomyidae : Makefile distinfo net/geomyidae/patches: patch-Makefile net/geomyidae/pkg: PLIST Log message: update to 0.32.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/06/25 12:18:41 Modified files: net/geomyidae : Makefile distinfo Log message: update to 0.32.1 from hiltjo posthuma now with pledge() support ok solene
Re: [UPDATE] net/geomyidae 0.31 -> 0.32.1
> On 24. Jun 2018, at 15:43, Hiltjo Posthuma wrote:
>
> This patch updates geomyidae.
>
> Some changes compared to 0.31:
>
> - Add OpenBSD pledge support.
> - Fix: Return an error message for selectors containing two dots.
> - Log UTC time instead of localized time.
> - Add nocgi flag, which disables CGI execution.
> - Minor fixed in the manpage, CGI handling and tools.
> - Add example for tt escaping in the manpage.
Thanks, LGTM.
I will take care of it soon.
> diff --git net/geomyidae/Makefile net/geomyidae/Makefile
> index cc0936b2f6b..55a6c95914b 100644
> --- net/geomyidae/Makefile
> +++ net/geomyidae/Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT = Gopher protocol daemon
>
> -DISTNAME = geomyidae-0.31
> +DISTNAME = geomyidae-0.32.1
>
> CATEGORIES = net
>
> @@ -13,6 +13,7 @@ MAINTAINER =Joerg Jung
> # MIT/X
> PERMIT_PACKAGE_CDROM =Yes
>
> +# uses pledge()
> WANTLIB = c
>
> MASTER_SITES =${HOMEPAGE}/snapshot/
> diff --git net/geomyidae/distinfo net/geomyidae/distinfo
> index c10787f1ff3..bc6828b29b4 100644
> --- net/geomyidae/distinfo
> +++ net/geomyidae/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (geomyidae-0.31.tar.gz) = uu/bgmvBpRTR3aSWnjOy72Kn752DlMuevWX44GSbGRI=
> -SIZE (geomyidae-0.31.tar.gz) = 20265
> +SHA256 (geomyidae-0.32.1.tar.gz) =
> 34hKoERXxp8DDf+tUBeLlqw2SVIQHk2NnsoHzGCieag=
> +SIZE (geomyidae-0.32.1.tar.gz) = 20881
>
> --
> Kind regards,
> Hiltjo
>
Re: UPDATE: x11/st 0.8 -> 0.8.1
> On 20. Mar 2018, at 22:12, Klemens Nanni <k...@openbsd.org> wrote:
>
> Small regression fix release:
>
> f4020b2 fix regression by selecting clipboard text
> a5a928b don't modify argv, use a counter
> 6ac8c8a selextend: clarify: !sel.mode == SEL_IDLE
> 5345db3 clipcopy: no need to check for free(NULL), set to NULL after
> free
> 7648697 minor code-style: whitespace fixes
> 0b507bb Fix title initialization
> e7ef3c4 Fix regression from 69e32a6 when setting title.
>
> Works fine for me on amd64, OK?
ok jung but for post 6.3
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 17 Mar 2018 13:28:39 - 1.16
> +++ Makefile 20 Mar 2018 21:05:19 -
> @@ -2,7 +2,7 @@
>
> COMMENT= simple X terminal
>
> -V= 0.8
> +V= 0.8.1
> DISTNAME= st-${V}
>
> CATEGORIES= x11
> @@ -15,7 +15,7 @@ MAINTAINER= Joerg Jung <j...@openbsd.or
> PERMIT_PACKAGE_CDROM= Yes
>
> # uses pledge()
> -WANTLIB= c m util X11 Xft fontconfig freetype z
> +WANTLIB= X11 Xft fontconfig c freetype m util z
>
> MASTER_SITES= https://dl.suckless.org/st/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 17 Mar 2018 13:28:39 - 1.10
> +++ distinfo 20 Mar 2018 21:05:19 -
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.8.tar.gz) = dzU5INB9ZsaEoPV+w3wmcMQv3FyHHWOCtwFgHNxZdXY=
> -SIZE (st-0.8.tar.gz) = 45401
> +SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
> +SIZE (st-0.8.1.tar.gz) = 45423
> Index: patches/patch-st_c
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-st_c,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-st_c
> --- patches/patch-st_c17 Mar 2018 13:28:39 - 1.5
> +++ patches/patch-st_c20 Mar 2018 21:05:19 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-st_c,v 1.5 2018/03/17 13
> Index: st.c
> --- st.c.orig
> +++ st.c
> -@@ -806,9 +806,13 @@ ttynew(char *line, char *cmd, char *out, char **args)
> +@@ -805,9 +805,13 @@ ttynew(char *line, char *cmd, char *out, char **args)
> die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
> close(s);
> close(m);
>
Re: UPDATE: x11/st
-1,12 +1,13 @@
>> $OpenBSD: patch-config_mk,v 1.9 2017/04/05 21:29:57 juanfra Exp $
>> config.mk.orig Thu Aug 11 16:25:58 2016
>> -+++ config.mk Tue Mar 28 12:27:10 2017
>> -@@ -4,24 +4,21 @@ VERSION = 0.7
>> +Index: config.mk
>> +--- config.mk.orig
>> config.mk
>> +@@ -4,24 +4,21 @@ VERSION = 0.8
>> # Customize below to fit your system
>>
>> # paths
>> -PREFIX = /usr/local
>> --MANPREFIX = ${PREFIX}/share/man
>> +-MANPREFIX = $(PREFIX)/share/man
>> +PREFIX ?= /usr/local
>> +MANPREFIX = ${PREFIX}/man
> Just pass those via MAKE_ENV.
>
>>
>> @@ -16,23 +17,23 @@ $OpenBSD: patch-config_mk,v 1.9 2017/04/
>> +X11LIB = ${X11BASE}/lib
>>
>> # includes and libs
>> --INCS = -I. -I/usr/include -I${X11INC} \
>> +-INCS = -I$(X11INC) \
>> - `pkg-config --cflags fontconfig` \
>> - `pkg-config --cflags freetype2`
>> --LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXft \
>> -- `pkg-config --libs fontconfig` \
>> +-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
>> +- `pkg-config --libs fontconfig` \
>> - `pkg-config --libs freetype2`
>> +INCS != pkg-config --cflags fontconfig
>> +LIBS = -lm -lX11 -lutil -lXft
>> +LIBS +!= pkg-config --libs fontconfig
>>
>> # flags
>> --CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
>> --CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS}
>> ${CPPFLAGS}
>> --LDFLAGS += -g ${LIBS}
>> +-CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
>> +-STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
>> +-STLDFLAGS = $(LIBS) $(LDFLAGS)
>> +CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
>> -+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
>> -+LDFLAGS += ${LIBS}
>> ++STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
>> ++STLDFLAGS += ${LIBS}
> These might be handled in a clever way as well, but for now I've left
> these hunks untouched; will check later.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 26 Sep 2017 23:03:53 - 1.15
> +++ Makefile 16 Mar 2018 17:18:34 -
> @@ -2,12 +2,12 @@
>
> COMMENT= simple X terminal
>
> -DISTNAME=st-0.7
> -REVISION=1
> +V= 0.8
> +DISTNAME=st-${V}
>
> CATEGORIES= x11
>
> -HOMEPAGE=http://st.suckless.org/
> +HOMEPAGE=https://st.suckless.org/
>
> MAINTAINER= Joerg Jung <j...@openbsd.org>
>
> @@ -17,11 +17,24 @@ PERMIT_PACKAGE_CDROM= Yes
> # uses pledge()
> WANTLIB= c m util X11 Xft fontconfig freetype z
>
> -MASTER_SITES=http://dl.suckless.org/st/
> +MASTER_SITES=https://dl.suckless.org/st/
>
> -MAKE_ENV=LDFLAGS="${LDFLAGS}"
> -FAKE_FLAGS= DESTDIR=""
> +MAKE_ENV=LDFLAGS="${LDFLAGS}" \
> + PREFIX=${PREFIX} \
> + MANPREFIX=${PREFIX}/man \
> + X11INC=${X11BASE}/include \
> + X11LIB=${X11BASE}/lib
>
> NO_TEST= Yes
> +
> +SUBST_VARS= V
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/st.1
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKSRC}/st ${PREFIX}/bin/
> + ${INSTALL_MAN} ${WRKSRC}/st.1 ${PREFIX}/man/man1/
> + tic -s -x -o ${PREFIX}/share/terminfo ${WRKSRC}/st.info
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 9 Oct 2016 18:47:49 - 1.9
> +++ distinfo 16 Mar 2018 17:18:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.7.tar.gz) = 94cNkGzMmIkm7vLMmJUKmcx4cltoXpNMQiwDwSNOYAA=
> -SIZE (st-0.7.tar.gz) = 42418
> +SHA256 (st-0.8.tar.gz) = dzU5INB9ZsaEoPV+w3wmcMQv3FyHHWOCtwFgHNxZdXY=
> +SIZE (st-0.8.tar.gz) = 45401
> Index: patches/patch-Makefile
> ===
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile9 Jul 2015 22:07:23 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,44 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.4 2015/07/09 22:07:23 czarkoff Exp $
> Makefile.origTue Jul 7 22:26:44 2015
> -+++ Makefile Thu Jul 9 00:05:58 2015
> -@@ -
Re: CVS: cvs.openbsd.org: ports
On Sun, Feb 18, 2018 at 12:07:25AM +0100, Antoine Jacoutot wrote:
> On Sat, Feb 17, 2018 at 08:40:23PM +, Stuart Henderson wrote:
> > On 2018/02/17 20:28, Antoine Jacoutot wrote:
> > > On Sat, Feb 17, 2018 at 07:24:09PM +, Stuart Henderson wrote:
> > > > On 2018/02/16 14:11, Joerg Jung wrote:
> > > > > CVSROOT: /cvs
> > > > > Module name: ports
> > > > > Changes by: j...@cvs.openbsd.org2018/02/16 14:11:27
> > > > >
> > > > > Modified files:
> > > > > net/geomyidae : Makefile distinfo
> > > > > net/geomyidae/patches: patch-Makefile
> > > > > Removed files:
> > > > > net/geomyidae/patches: patch-geomyidae_8
> > > > >
> > > > > Log message:
> > > > > update to geomyidae to 0.31
> > > > >
> > > > > from Hiltjo Posthuma with tweaks by me
> > > > >
> > > >
> > > > this is broken,
> > > >
> > > > installing executable to /usr/bin
> > > > cp: /usr/bin/geomyidae: Permission denied
> > >
> > > OK?
> >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/net/geomyidae/Makefile,v
> > > retrieving revision 1.4
> > > diff -u -p -r1.4 Makefile
> > > --- Makefile 16 Feb 2018 21:11:27 - 1.4
> > > +++ Makefile 17 Feb 2018 19:28:39 -
> > > @@ -19,7 +19,6 @@ MASTER_SITES = ${HOMEPAGE}/snapshot/
> > >
> > > MAKE_FLAGS = CC="${CC}"
> > > MAKE_ENV = LDFLAGS="${LDFLAGS}"
> > > -FAKE_FLAGS = DESTDIR=""
> > >
> > > NO_TEST =Yes
> > >
> > >
> > >
> >
> > OK, though now I see it's missing CFLAGS, do you fancy updating
> > that while you're there?
> >
> > upstream has
> >
> > CFLAGS = -Wall
> > GEOM_CFLAGS = -D_DEFAULT_SOURCE -I. -I/usr/include ${CFLAGS}
> >
> > so probably
> >
> > MAKE_FLAGS =CC="${CC}" CFLAGS="${CFLAGS} -Wall"
>
> Done, thanks :)
Thanks and sorry for the breakage!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/18 14:23:44 Modified files: www/py-jinja2 : Makefile distinfo www/py-jinja2/pkg: PLIST Log message: update py-jinja2 to 2.10 conditional byte-compile and install asyncfilter.py and asyncsupport.py, as not imported in python<3.6 (https://github.com/pallets/jinja/issues/653) ok maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/18 14:17:37 Modified files: www: Makefile Log message: add www/py-yarl
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/18 14:13:30 Log message: import www/py-yarl 1.0.0 input and ok kn $ cat pkg/DESCR Yet another URL library. Status: Vendor Tag: jung Release Tags: jung-20180218 N ports/www/py-yarl/Makefile N ports/www/py-yarl/distinfo N ports/www/py-yarl/pkg/PLIST N ports/www/py-yarl/pkg/DESCR No conflicts created by this import
Re: UPDATE: net/geomyidae 0.26.3 -> 0.31
On Fri, Feb 16, 2018 at 07:51:16PM +0100, Hiltjo Posthuma wrote:
> Hi,
>
> This patch updates geomyidae from 0.26.3 to 0.31.
> There are many improvements and fixes to mention briefly.
>
> Patch below:
Thanks! I committed a slightly tweaked version.
> diff --git a/net/geomyidae/Makefile b/net/geomyidae/Makefile
> index 9e67872684f..dd7e07232e1 100644
> --- a/net/geomyidae/Makefile
> +++ b/net/geomyidae/Makefile
> @@ -2,12 +2,15 @@
>
> COMMENT =Gopher protocol daemon
>
> -DISTNAME = geomyidae-0.26.3
> -REVISION = 1
> +V = 0.31
> +DISTNAME = geomyidae-v${V}
> +PKGNAME =geomyidae-${V}
>
> CATEGORIES = net
>
> -HOMEPAGE = http://www.r-36.net/src/geomyidae/
> +HOMEPAGE = http://git.r-36.net/geomyidae/
> +
> +DISTFILES = geomyidae-v${V}.tgz
>
> MAINTAINER = Joerg Jung <j...@openbsd.org>
>
> @@ -16,7 +19,7 @@ PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB =c
>
> -MASTER_SITES = ${HOMEPAGE}
> +MASTER_SITES = ftp://bitreich.org/releases/geomyidae/
>
> MAKE_FLAGS = CC="${CC}"
> MAKE_ENV = LDFLAGS="${LDFLAGS}"
> diff --git a/net/geomyidae/distinfo b/net/geomyidae/distinfo
> index 89e1e7358fb..6a372f66c87 100644
> --- a/net/geomyidae/distinfo
> +++ b/net/geomyidae/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (geomyidae-0.26.3.tar.gz) =
> Fi9VqwWasKm+joQEl3lSk7vVHDSx9FZNzfPw3dXA2zE=
> -SIZE (geomyidae-0.26.3.tar.gz) = 15556
> +SHA256 (geomyidae-v0.31.tgz) = ZLCVznLpnaY6SPT3BD0a8BAd7DMz/Hoetz13WGtNZfA=
> +SIZE (geomyidae-v0.31.tgz) = 20267
> diff --git a/net/geomyidae/patches/patch-Makefile
> b/net/geomyidae/patches/patch-Makefile
> index 9c70333cdf9..ce694280dc9 100644
> --- a/net/geomyidae/patches/patch-Makefile
> +++ b/net/geomyidae/patches/patch-Makefile
> @@ -1,29 +1,28 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2015/06/22 15:53:45 jung Exp $
> Makefile.origSat Apr 13 21:28:27 2013
> -+++ Makefile Mon Jun 22 13:31:30 2015
> -@@ -7,7 +7,7 @@ PREFIX ?= /usr
> - BINDIR ?= $(PREFIX)/bin
> - MANDIR ?= $(PREFIX)/man/man8
> +--- Makefile.origFri Feb 16 18:54:41 2018
> Makefile Fri Feb 16 18:55:25 2018
> +@@ -9,7 +9,7 @@
> + BINDIR = ${PREFIX}/bin
> + MANDIR = ${PREFIX}/share/man/man8
>
> --CFLAGS += -O2 -Wall -I. -I/usr/include
> -+CFLAGS += -Wall -I. -I/usr/include
> - LDFLAGS += -L/usr/lib -L. -lc
> - : CC = cc
> +-CFLAGS = -O2 -Wall
> ++CFLAGS = -Wall
> + GEOM_CFLAGS = -D_DEFAULT_SOURCE -I. -I/usr/include ${CFLAGS}
> + GEOM_LDFLAGS = -L/usr/lib -L. ${LDFLAGS}
>
> -@@ -23,14 +23,12 @@ options:
> +@@ -25,14 +25,12 @@
> @echo "CC = ${CC}"
>
> .c.o:
> -@echo CC $<
> --@${CC} ${CFLAGS} -c $<
> -+${CC} ${CFLAGS} -c $<
> +-@${CC} ${GEOM_CFLAGS} -c $<
> ++${CC} ${GEOM_CFLAGS} -c $<
>
> ${OBJ}:
>
> ${NAME}: ${OBJ}
> -@echo CC -o $@
> --@${CC} -o $@ ${OBJ} ${LDFLAGS}
> -+${CC} -o $@ ${OBJ} ${LDFLAGS}
> +-@${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
> ++${CC} -o $@ ${OBJ} ${GEOM_LDFLAGS}
>
> clean:
> @echo cleaning
>
>
> --
> Kind regards,
> Hiltjo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/16 14:11:27 Modified files: net/geomyidae : Makefile distinfo net/geomyidae/patches: patch-Makefile Removed files: net/geomyidae/patches: patch-geomyidae_8 Log message: update to geomyidae to 0.31 from Hiltjo Posthuma with tweaks by me
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/11 12:02:41 Modified files: www/py-multidict: Makefile distinfo www/py-multidict/pkg: DESCR PLIST Log message: update py-multidict to 4.0.0 input and ok kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/06 12:57:33 Modified files: devel : Makefile Log message: add devel/py-voluptuous,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/02/06 12:51:50 Modified files: devel/py-voluptuous: Makefile devel/py-voluptuous/pkg: PLIST Log message: add python3 flavour ok sebastia@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/21 16:20:10 Modified files: www/py-requests: Makefile distinfo www/py-requests/pkg: PLIST Log message: update py-requests to 2.18.4 tested in a SUBDIRLIST build for all 53 victims with requests in run depends ok remi shadchin (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 15:26:42 Modified files: net: Makefile Log message: add net/py-zeroconf and net/py-zeroconf,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 15:23:58 Log message: import net/py-zeroconf ok danj $ cat pkg/DESCR This is fork of pyzeroconf, Multicast DNS Service Discovery for Python, originally by Paul Scott-Murphy (https://github.com/paulsm/pyzeroconf), modified by William McBrine (https://github.com/wmcbrine/pyzeroconf). The original William McBrine's fork note: This fork is used in all of my TiVo-related projects: HME for Python (and therefore HME/VLC), Network Remote, Remote Proxy, and pyTivo. Before this, I was tracking the changes for zeroconf.py in three separate repos. I figured I should have an authoritative source. Although I make changes based on my experience with TiVos, I expect that they're generally applicable. This version also includes patches found on the now-defunct (?) Launchpad repo of pyzeroconf, and elsewhere around the net -- not always well-documented, sorry. Compatible with: - Bonjour - Avahi Compared to some other Zeroconf/Bonjour/Avahi Python packages, python-zeroconf: - isn't tied to Bonjour or Avahi - doesn't use D-Bus - doesn't force you to use particular event loop or Twisted - is pip-installable - has PyPI distribution Status: Vendor Tag: jung Release Tags: jung-20180119 N ports/net/py-zeroconf/Makefile N ports/net/py-zeroconf/distinfo N ports/net/py-zeroconf/pkg/DESCR N ports/net/py-zeroconf/pkg/PLIST N ports/net/py-zeroconf/patches/patch-setup_py No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 15:18:00 Modified files: astro : Makefile Log message: add astro/py-astral,python3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 15:15:50 Modified files: devel : Makefile Log message: add devel/py-async-timeout
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 15:12:34 Log message: import devel/py-async-timeout ok danj $ cat pkg/DESCR asyncio-compatible timeout context manager. Status: Vendor Tag: jung Release Tags: jung-20180119 N ports/devel/py-async-timeout/Makefile N ports/devel/py-async-timeout/distinfo N ports/devel/py-async-timeout/pkg/PLIST N ports/devel/py-async-timeout/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 14:55:44 Modified files: astro : Makefile Log message: add astro/py-astral
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 14:53:46 Log message: import astro/py-astral input and ok sthen $ cat pkg/DESCR This is 'astral' a Python module which calculates * Times for various positions of the sun: dawn, sunrise, solar noon, sunset, dusk, solar elevation, solar azimuth and rahukaalam. * The phase of the moon. Status: Vendor Tag: jung Release Tags: jung-20180119 N ports/astro/py-astral/Makefile N ports/astro/py-astral/distinfo N ports/astro/py-astral/pkg/PLIST N ports/astro/py-astral/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 14:45:21 Modified files: devel/py-typing: Makefile distinfo devel/py-typing/pkg: PLIST Log message: update py-typing to 3.6.2 with input from and ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2018/01/19 14:38:36 Modified files: misc/blink1: Makefile distinfo misc/blink1/patches: patch-commandline_Makefile Removed files: misc/blink1/patches: patch-commandline_blink1-lib-lowlevel-hidapi_h patch-commandline_blink1-lib-lowlevel-hiddata_h patch-commandline_blink1-lib_c patch-commandline_blink1-tool_c Log message: update blink to 0.98a drops most of the patches, as upstreamed (thanks bluhm) with input from klemens nanni ok bluhm
Re: update misc/blink1
On Thu, Jan 18, 2018 at 11:29:38PM +, Stuart Henderson wrote: > On 2018/01/18 18:40, Joerg Jung wrote: > > > > > > > Am 18.01.2018 um 14:31 schrieb Alexander Bluhm <alexander.bl...@gmx.net>: > > > > > >> On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: > > >> +SHA256 (blink1-1.98a.tar.gz) = > > >> sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= > > >> +SIZE (blink1-1.98a.tar.gz) = 29503155 > > > > > > Github has recreated the tgz. Now I get > > > > > > SHA256 (blink1-1.98a.tar.gz) = > > > u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= > > > SIZE (blink1-1.98a.tar.gz) = 29503156 > > > > Uhhm... anyone an idea why they did this? > > Does this happen often? > > Sometimes it's due to an upstream commit on the tag. Sometimes it's due > to github upgrading something (these files are generated on-the-fly). > If you have old and new files around, diffing them might give clues. > > (I don't think I really want to know why the distfile is 28MB...) Unfortunately, there is no distfile for the command line tool we build and install. The distfile just contains everything from their repo, various libraries for python, ruby, go, nodejs, java, ... GUI tools, Windows programs, and docs, etc.
Re: update misc/blink1
> Am 18.01.2018 um 14:31 schrieb Alexander Bluhm <alexander.bl...@gmx.net>: > >> On Tue, Jan 09, 2018 at 09:19:45PM +0100, Joerg Jung wrote: >> +SHA256 (blink1-1.98a.tar.gz) = sMsN8zlejocXA2OUII+tKCW9GmmAJCuULjKR6fv5DP4= >> +SIZE (blink1-1.98a.tar.gz) = 29503155 > > Github has recreated the tgz. Now I get > > SHA256 (blink1-1.98a.tar.gz) = u0ZTJeCG2Ket9Y57Y+RcjggBSafnj1Y2KLFsxqCJTPE= > SIZE (blink1-1.98a.tar.gz) = 29503156 Uhhm... anyone an idea why they did this? Does this happen often? > Apart from that, it works with my blink1 stick. > > OK bluhm@ >
Re: update www/py-jinja2 [hass: #4]
On Wed, Jan 17, 2018 at 12:03:48AM +0100, Joerg Jung wrote:
> Hi,
>
> please find attached an update for www/py-jinja2.
> This update is needed for the upcoming homeassistant port.
Better diff below which works with python2.7 and conditional byte-
compiles and install asyncfilter.py and asyncsupport.py, as not imported
in python<3.6 (see: https://github.com/pallets/jinja/issues/653)
> OK?
>
> Regards,
> Joerg
Index: Makefile
===
RCS file: /cvs/ports/www/py-jinja2/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile6 Jan 2017 16:51:56 - 1.24
+++ Makefile17 Jan 2018 22:39:27 -
@@ -2,7 +2,7 @@
COMMENT = fast, optionally sandboxed, Python template engine
-MODPY_EGG_VERSION =2.8.1
+MODPY_EGG_VERSION =2.10
DISTNAME = Jinja2-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
Index: distinfo
===
RCS file: /cvs/ports/www/py-jinja2/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo6 Jan 2017 16:51:56 - 1.11
+++ distinfo17 Jan 2018 22:39:27 -
@@ -1,2 +1,2 @@
-SHA256 (Jinja2-2.8.1.tar.gz) = TbO+W+4FUv8YWrnybUVpTK87D7HeaMR00QdnHOlVmAE=
-SIZE (Jinja2-2.8.1.tar.gz) = 397144
+SHA256 (Jinja2-2.10.tar.gz) = DTHTRmwxOpygFKLZBP7RjNrIc6W6H3twuP2LIGzYYNY=
+SIZE (Jinja2-2.10.tar.gz) = 267508
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-jinja2/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 6 Jan 2017 16:51:56 - 1.7
+++ pkg/PLIST 17 Jan 2018 22:39:27 -
@@ -12,7 +12,9 @@ lib/python${MODPY_VERSION}/site-packages
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}_stringdefs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}_identifier.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}asyncfilters.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}asyncsupport.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}bccache.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}compiler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,9 +24,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}ext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}idtracking.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}lexer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}loaders.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}meta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}nativetypes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}nodes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}optimizer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
@@ -34,7 +38,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/${MODPY_PYCACHE}visitor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/jinja2/_compat.py
-lib/python${MODPY_VERSION}/site-packages/jinja2/_stringdefs.py
+lib/python${MODPY_VERSION}/site-packages/jinja2/_identifier.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jinja2/asyncfilters.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jinja2/asyncsupport.py
lib/python${MODPY_VERSION}/site-packages/jinja2/bccache.py
lib/python${MODPY_VERSION}/site-packages/jinja2/compiler.py
lib/python${MODPY_VERSION}/site-packages/jinja2/constants.py
@@ -44,9 +50,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jinja2/exceptions.py
lib/python${MODPY_VERSION}/site-packages/jinja2/ext.py
lib/
Re: update www/py-aiohttp [hass: #12]
On Wed, Jan 17, 2018 at 09:54:32PM +0100, Klemens Nanni wrote:
> On Wed, Jan 17, 2018 at 09:27:32PM +0100, Joerg Jung wrote:
> > On Wed, Jan 17, 2018 at 12:13:14AM +0100, Joerg Jung wrote:
> > > Hi,
> > >
> > > please find attached an update for www/py-aiohttp.
> > > This update depends on earlier send updates (py-multidict) and new ports
> > > (py-yarl) and is needed as a dependency for the upcoming homeassistant
> > > port.
> > >
> > > Unfortunately, a few tests are failing, but I have no idea why or how to
> > > fix them, any hints are welcome.
> >
> > Meanwhile 2.3.9 was released. New diff below. Still few tests failing.
> Changes between 2.3.7 and 2.3.9 seem unproblematic to me but I cannot
> properly test the homeassistant port (for now):
>
> * Do not use yarl.unquote internal function in aiohttp. Fix incorrectly
> unquoted path part in URL dispatcher (#2662)
> * Fix compatibility with yarl==1.0.0 (#2662)
> * Fix colon handing in path for dynamic resources (#2670)
>
> Updated diff using the correct homepage, doing s,http,HTTP, as done on
> their site and adding minimal version requirements.
Thanks, diff slightly better than mine. Need an OK, will commit then.
> Some tests fail, full test.log attached.
>
> 4 failed, 1912 passed, 36 skipped, 5 xfailed, 78 error in 74.05 seconds
>
> diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
> index 0cc78407356..98b60594f4c 100644
> --- a/www/py-aiohttp/Makefile
> +++ b/www/py-aiohttp/Makefile
> @@ -2,27 +2,28 @@
>
> COMMENT =http client/server for asyncio
>
> -MODPY_EGG_VERSION = 0.22.5
> +MODPY_EGG_VERSION = 2.3.9
> DISTNAME = aiohttp-${MODPY_EGG_VERSION}
> PKGNAME =py-${DISTNAME}
> CATEGORIES = www
> -REVISION = 0
> +
> +HOMEPAGE = https://docs.aiohttp.org
>
> # Apache2
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += ${MODPY_WANTLIB} pthread
> +WANTLIB += ${MODPY_WANTLIB} pthread
>
> MODULES =lang/python
>
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> -
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> -# py-multidict is python3 only
> -RUN_DEPENDS =textproc/py-chardet${MODPY_FLAVOR} \
> - www/py-multidict
> +RUN_DEPENDS =devel/py-async-timeout>=1.2.0 \
> + textproc/py-chardet${MODPY_FLAVOR} \
> + www/py-multidict>=4.0 \
> + www/py-yarl>=1.0.0
> TEST_DEPENDS = ${RUN_DEPENDS} \
> devel/py-test${MODPY_FLAVOR} \
> www/py-gunicorn${MODPY_FLAVOR}
> diff --git a/www/py-aiohttp/distinfo b/www/py-aiohttp/distinfo
> index 7083bc12244..cc43e438ec3 100644
> --- a/www/py-aiohttp/distinfo
> +++ b/www/py-aiohttp/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (aiohttp-0.22.5.tar.gz) = nFGvAwyGb5HhiiGWFOOdNF20SD7ZhgOJ0FNtdNBLDTs=
> -SIZE (aiohttp-0.22.5.tar.gz) = 475312
> +SHA256 (aiohttp-2.3.9.tar.gz) = YAO+143FkdMb2J7xbmMKHE/ZejzRe5deyUXA9G1vyIE=
> +SIZE (aiohttp-2.3.9.tar.gz) = 847835
> diff --git a/www/py-aiohttp/pkg/PLIST b/www/py-aiohttp/pkg/PLIST
> index 64d5a28d7ab..b81f752ba3c 100644
> --- a/www/py-aiohttp/pkg/PLIST
> +++ b/www/py-aiohttp/pkg/PLIST
> @@ -11,59 +11,90 @@
> lib/python${MODPY_VERSION}/site-packages/aiohttp/__init__.py
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}backport_cookies.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_proto.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_reqrep.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_ws.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}file_sender.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${
Re: new www/py-yarl [hass: #11]
On Wed, Jan 17, 2018 at 09:14:57PM +0100, Klemens Nanni wrote: > On Wed, Jan 17, 2018 at 08:34:28PM +0100, Joerg Jung wrote: > > On Wed, Jan 17, 2018 at 12:12:06AM +0100, Joerg Jung wrote: > > > Hi, > > > > > > please find attached a new port for www/py-yarl. > > > > > >$ cat pkg/DESCR > > >Yet another URL library. > > > > > > This port is a dependency for the upcoming homeassistant port. > > > > Meanwhile yarl-1.0.0 was release. Newer version is attached. > > > > > Please test and comment. OK to import? > > In addition I'd like to add minimal version requirements to its RDEPS, > see diff below ontop of your tarball. Thanks, added. New tarball attached. py-yarl.tar.gz Description: application/tar-gz
Re: update www/py-multidict [hass: #10]
On Wed, Jan 17, 2018 at 09:01:10PM +0100, Klemens Nanni wrote:
> On Wed, Jan 17, 2018 at 12:10:36AM +0100, Joerg Jung wrote:
> > Hi,
> >
> > please find attached an update for www/py-multidict.
> > This update is needed for the upcoming py-aiohttp update and the new
> > py-yarl port, which in turn are both homeassistant dependencies.
> >
> > OK?
> >
> > Regards,
> > Joerg
> >
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/py-multidict/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 Makefile
> > --- Makefile3 Jan 2017 19:28:49 - 1.2
> > +++ Makefile16 Jan 2018 20:51:00 -
> > @@ -2,15 +2,10 @@
> >
> > COMMENT = multidict implementation
> >
> > -MODPY_EGG_VERSION =1.1.0a6
> > +MODPY_EGG_VERSION =3.3.2
> > DISTNAME = multidict-${MODPY_EGG_VERSION}
> > PKGNAME = py-${DISTNAME}
> > CATEGORIES = www devel
> > -REVISION = 1
> > -
> > -GH_ACCOUNT = aio-libs
> > -GH_PROJECT = multidict
> > -GH_TAGNAME = v${MODPY_EGG_VERSION}
> >
> > WANTLIB += pthread ${MODPY_WANTLIB}
> >
> > @@ -19,8 +14,8 @@ PERMIT_PACKAGE_CDROM =Yes
> >
> > MODULES = lang/python
> >
> > +MODPY_PI = Yes
> > MODPY_SETUPTOOLS = Yes
> > -
> > MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
> >
> > TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/www/py-multidict/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 distinfo
> > --- distinfo5 Jun 2016 17:08:19 - 1.1.1.1
> > +++ distinfo16 Jan 2018 20:51:00 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (multidict-1.1.0a6.tar.gz) =
> > rD8aE0yHp/bnVHy8tZXl6zbRwYZRAad38ufAoY2CQXM=
> > -SIZE (multidict-1.1.0a6.tar.gz) = 98630
> > +SHA256 (multidict-3.3.2.tar.gz) =
> > +C5hx0CO0NzhhiEA21VZVIGRHxWdbd7As3XTW2RJUJs=
> > +SIZE (multidict-3.3.2.tar.gz) = 129806
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/www/py-multidict/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST 5 Jun 2016 17:08:19 - 1.1.1.1
> > +++ pkg/PLIST 16 Jan 2018 20:51:00 -
> > @@ -7,9 +7,17 @@ lib/python${MODPY_VERSION}/site-packages
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> > lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
> >
> > lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_compat.py
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.c
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.pyd
> > +lib/python${MODPY_VERSION}/site-packages/multidict/_istr.so
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.c
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
> > lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
> >
> Looks good to me, all tests pass on amd64.
>
> We can pull this to 4.0.0 from 14.01.2018 directly,
Yes, I sent a diff for that earlier.
> it's the next
> release after the now proposed 3.3.2 and only introduces the following
> changes according to their changelog:
>
> - Accept multiple keys in MultiDict.update() and CIMultiDict.update()
> https://github.com/aio-libs/multidict/pull/199
>
> Tests continue to pass, we can also drop pre-test and do-
Re: new sysutils/py-distro [hass: #8]
On Wed, Jan 17, 2018 at 11:17:21AM +0100, Klemens Nanni wrote: > On Wed, Jan 17, 2018 at 12:08:22AM +0100, Joerg Jung wrote: > > Hi, > > > > please find attached a new port for sysutils/py-distro. > > > >$ cat pkg/DESCR > >distro (for: Linux Distribution) provides information about the Linux > >distribution it runs on, such as a reliable machine-readable ID, or > > version > >information. > > > >It is a renewed alternative implementation for Python's original > >platform.linux_distribution function, but it also provides much more > >functionality which isn't necessarily Python bound like a command-line > >interface. > > > > While this port is basically a NOP on OpenBSD it is required for the > > upcoming homeassistant port. > > > > Please test and comment. OK to import? > Have you looked into or possibly tested the upstream PR[0]? Maybe this > gets settled in time so we can import py-distro as an actually useful > port. > > 0: https://github.com/nir0s/distro/pull/207 Yes, looks like they will make NOP doing something useful hopefully soon, but things work fine without this for now :)
Re: new productivity/homeassistant [hass: #fin]
On Wed, Jan 17, 2018 at 12:23:16AM +0100, Joerg Jung wrote: > Hi, > > finally, please find attached a port for homeassistant. > >$ cat pkg/DESCR >Home Assistant is an open-source home automation platform running on > Python 3. >Track and control all devices at home and automate control. > >If you plan to use components, please make sure that you have all necessary >dependencies installed. > > This port depends on several further new ports and requires various port > updates, I all sent earlier to the list. I believe some of them should > go into a bulk build (any volunteers?) like the py-requests or > py-sqlalchemy update to make sure they don't break anything. > > After starting hass daemon via rcctl(8) one can point browser to the web > frontend, which listens by default on http://localhost:8123. > > The port has RUN_DEPENDS only for the very basic default (minus cloud > and TTS) components. Before enabling and using further components, you > *need* to (port and) install the required dependencies. For components, > please see: https://home-assistant.io/components/ > For details on dependencies, please see: > https://github.com/home-assistant/home-assistant/blob/dev/requirements_all.txt > > I'm not sure about the '.*' in the pexp in hass.rc script, but it works > for me. Hints if this can be done better are welcome (maybe? > 'pythonMODPY_BIN_SUFFIX:'). Also portcheck is complaining about 1 > line(s) longer than 80 chars in pkg/hass.rc, I'm not sure how to fix > that either, I believe backslash makes things more unread-able here. > > Tests are not enabled as they need gazillions of further new ports and > updates. Newer tarball attached which drops py3-typing dependency and runs with/needs latest yarl, aiohttp, and multidict sent earlier. > Please test and provide feedback and comments! > > Thanks, > Regards, > Joerg > > > Index: infrastructure/db/user.list > === > RCS file: /cvs/ports/infrastructure/db/user.list,v > retrieving revision 1.301 > diff -u -p -r1.301 user.list > --- infrastructure/db/user.list 10 Jan 2018 16:20:58 - 1.301 > +++ infrastructure/db/user.list 16 Jan 2018 19:37:02 - > @@ -308,3 +308,4 @@ id user group port options > 797 _influx _influx databases/influxdb > 798 _grafana _grafanasysutils/grafana > 799 _prometheus _prometheus sysutils/prometheus > +800 _hass_hass productivity/homeassistant homeassistant.tar.gz Description: application/tar-gz
Re: update www/py-aiohttp [hass: #12]
On Wed, Jan 17, 2018 at 12:13:14AM +0100, Joerg Jung wrote:
> Hi,
>
> please find attached an update for www/py-aiohttp.
> This update depends on earlier send updates (py-multidict) and new ports
> (py-yarl) and is needed as a dependency for the upcoming homeassistant
> port.
>
> Unfortunately, a few tests are failing, but I have no idea why or how to
> fix them, any hints are welcome.
Meanwhile 2.3.9 was released. New diff below. Still few tests failing.
> OK?
>
> Regards,
> Joerg
Index: Makefile
===
RCS file: /cvs/ports/www/py-aiohttp/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile3 Jan 2017 19:28:48 - 1.4
+++ Makefile17 Jan 2018 20:16:46 -
@@ -2,11 +2,12 @@
COMMENT = http client/server for asyncio
-MODPY_EGG_VERSION =0.22.5
+MODPY_EGG_VERSION =2.3.9
DISTNAME = aiohttp-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www
-REVISION = 0
+
+HOMEPAGE = https://aiohttp.readthedocs.org
# Apache2
PERMIT_PACKAGE_CDROM = Yes
@@ -17,12 +18,12 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
-# py-multidict is python3 only
-RUN_DEPENDS = textproc/py-chardet${MODPY_FLAVOR} \
- www/py-multidict
+RUN_DEPENDS = devel/py-async-timeout \
+ textproc/py-chardet${MODPY_FLAVOR} \
+ www/py-multidict \
+ www/py-yarl
TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-test${MODPY_FLAVOR} \
www/py-gunicorn${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /cvs/ports/www/py-aiohttp/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Aug 2016 13:41:45 - 1.2
+++ distinfo17 Jan 2018 20:16:46 -
@@ -1,2 +1,2 @@
-SHA256 (aiohttp-0.22.5.tar.gz) = nFGvAwyGb5HhiiGWFOOdNF20SD7ZhgOJ0FNtdNBLDTs=
-SIZE (aiohttp-0.22.5.tar.gz) = 475312
+SHA256 (aiohttp-2.3.9.tar.gz) = YAO+143FkdMb2J7xbmMKHE/ZejzRe5deyUXA9G1vyIE=
+SIZE (aiohttp-2.3.9.tar.gz) = 847835
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-aiohttp/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 27 Aug 2016 13:41:45 - 1.2
+++ pkg/PLIST 17 Jan 2018 20:16:46 -
@@ -11,59 +11,90 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}backport_cookies.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_proto.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_reqrep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}client_ws.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}connector.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}file_sender.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}cookiejar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}formdata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}frozenlist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}hdrs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_websocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACHE}http_writer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/aiohttp/${MODPY_PYCACH
Re: update devel/py-typing [hass: #2]
On Wed, Jan 17, 2018 at 12:25:46AM +, Stuart Henderson wrote: > On 2018/01/17 01:06, Joerg Jung wrote: > > On Wed, Jan 17, 2018 at 12:55:24AM +0100, Joerg Jung wrote: > > > On Tue, Jan 16, 2018 at 11:40:57PM +, Stuart Henderson wrote: > > > > On 2018/01/17 00:01, Joerg Jung wrote: > > > > > Hi, > > > > > > > > > > please find attached an update for devel/py-typing. > > > > > > > > The update seems ok, but: > > > > > > > > > This update introduces a python3 FLAVOR, which is needed as a > > > > > dependency > > > > > for the upcoming homeassistant port. > > > > > > > > typing is in Python core for 3.5+, so I think it might be better to > > > > skip the py3 flavour. > > > > > > From PEP 484: Type Hints: > > > > > > "The module is available in Python since version 3.5.0 on a provisional > > > basis until Python 3.7.0." > > > [...] > > > "The changes are merged in three branches (3.5, 3.6, default) due to > > > the module's provisional status." > > > > > > From what I understand, provisional basis means this module is the newer > > > upstream-branch compared to the python built-in and it looks like > > > homeassistant really wants this newer one. > > > > > > But I'm not sure about this assumption :( > > > > My assumption was right, looks like the built-in is not enough, see > > trace below. > > > > However, it can be really removed from RUN_DEPENDS of py3-aiohttp-cors > > port. Thanks for the pointer. > > > > > > $ python3.6 > > > > Python 3.6.4 (default, Jan 5 2018, 14:05:05) > > [GCC 4.2.1 Compatible OpenBSD Clang 5.0.1 (tags/RELEASE_501/final)] on > > openbsd6 > > Type "help", "copyright", "credits" or "license" for more information. > > >>> import typing > > >>> typing.__all__ > > ['Any', 'Callable', 'ClassVar', 'Generic', 'Optional', 'Tuple', 'Type', > > 'TypeVar', 'Union', 'AbstractSet', 'GenericMeta', 'ByteString', > > 'Container', 'ContextManager', 'Hashable', 'ItemsView', 'Iterable', > > 'Iterator', 'KeysView', 'Mapping', 'MappingView', 'MutableMapping', > > 'MutableSequence', 'MutableSet', 'Sequence', 'Sized', 'ValuesView', > > 'Reversible', 'SupportsAbs', 'SupportsBytes', 'SupportsComplex', > > 'SupportsFloat', 'SupportsInt', 'SupportsRound', 'Counter', 'Deque', > > 'Dict', 'DefaultDict', 'List', 'Set', 'FrozenSet', 'NamedTuple', > > 'Generator', 'AnyStr', 'cast', 'get_type_hints', 'NewType', > > 'no_type_check', 'no_type_check_decorator', 'overload', 'Text', > > 'TYPE_CHECKING', 'Awaitable', 'Coroutine', 'AsyncIterable', > > 'AsyncIterator', 'Collection', 'AsyncContextManager', 'ChainMap', > > 'AsyncGenerator'] > > >>> + > > $ hass --verbose --debug > > Traceback (most recent call last): > > File "/usr/local/bin/hass", line 6, in > > from pkg_resources import load_entry_point > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 2994, in > > @_call_aside > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 2980, in _call_aside > > f(*args, **kwargs) > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 3007, in _initialize_master_working_set > > working_set = WorkingSet._build_master() > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 658, in _build_master > > ws.require(__requires__) > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 966, in require > > needed = self.resolve(parse_requirements(requirements)) > > File "/usr/local/lib/python3.6/site-packages/pkg_resources/__init__.py", > > line 852, in resolve > > raise DistributionNotFound(req, requirers) > > pkg_resources.DistributionNotFound: The 'typing<4,>=3' distribution was not > > found and is required by homeassistant > > > > As it's in Python core rather than a package, requirements doesn't > know about it. I think it's very likely to work ok if you kill it from > requirements.txt. Yes, dependency can be dropped from homeassistant. I'll send an update for this. New diff attached, now no long
Re: update www/py-multidict [hass: #10]
On Wed, Jan 17, 2018 at 12:10:36AM +0100, Joerg Jung wrote:
> Hi,
>
> please find attached an update for www/py-multidict.
> This update is needed for the upcoming py-aiohttp update and the new
> py-yarl port, which in turn are both homeassistant dependencies.
Meanwhile multidict-4.0.0 was release, so new diff below.
> OK?
>
> Regards,
> Joerg
Index: Makefile
===
RCS file: /cvs/ports/www/py-multidict/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile3 Jan 2017 19:28:49 - 1.2
+++ Makefile17 Jan 2018 19:28:00 -
@@ -2,15 +2,10 @@
COMMENT = multidict implementation
-MODPY_EGG_VERSION =1.1.0a6
+MODPY_EGG_VERSION =4.0.0
DISTNAME = multidict-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = www devel
-REVISION = 1
-
-GH_ACCOUNT = aio-libs
-GH_PROJECT = multidict
-GH_TAGNAME = v${MODPY_EGG_VERSION}
WANTLIB += pthread ${MODPY_WANTLIB}
@@ -19,8 +14,8 @@ PERMIT_PACKAGE_CDROM =Yes
MODULES = lang/python
+MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-
MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
Index: distinfo
===
RCS file: /cvs/ports/www/py-multidict/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo5 Jun 2016 17:08:19 - 1.1.1.1
+++ distinfo17 Jan 2018 19:28:00 -
@@ -1,2 +1,2 @@
-SHA256 (multidict-1.1.0a6.tar.gz) =
rD8aE0yHp/bnVHy8tZXl6zbRwYZRAad38ufAoY2CQXM=
-SIZE (multidict-1.1.0a6.tar.gz) = 98630
+SHA256 (multidict-4.0.0.tar.gz) = tySGs60rhET3r+va/aixEcGAPjcgPf6Bt3ZSmPJ4F3g=
+SIZE (multidict-4.0.0.tar.gz) = 135103
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-multidict/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 5 Jun 2016 17:08:19 - 1.1.1.1
+++ pkg/PLIST 17 Jan 2018 19:28:00 -
@@ -7,9 +7,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/multidict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/multidict/__init__.py
+lib/python${MODPY_VERSION}/site-packages/multidict/__init__.pyi
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_abc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/multidict/${MODPY_PYCACHE}_multidict_py.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/multidict/_abc.py
+lib/python${MODPY_VERSION}/site-packages/multidict/_compat.py
+lib/python${MODPY_VERSION}/site-packages/multidict/_istr.c
+lib/python${MODPY_VERSION}/site-packages/multidict/_istr.pyd
+lib/python${MODPY_VERSION}/site-packages/multidict/_istr.so
lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.c
lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.pyx
lib/python${MODPY_VERSION}/site-packages/multidict/_multidict.so
Re: new www/py-yarl [hass: #11]
On Wed, Jan 17, 2018 at 12:12:06AM +0100, Joerg Jung wrote: > Hi, > > please find attached a new port for www/py-yarl. > >$ cat pkg/DESCR >Yet another URL library. > > This port is a dependency for the upcoming homeassistant port. Meanwhile yarl-1.0.0 was release. Newer version is attached. > Please test and comment. OK to import? > > Regards, > Joerg py-yarl.tar.gz Description: application/tar-gz
Re: new www/py-aiohttp-cors [hass: #15]
On Wed, Jan 17, 2018 at 12:17:05AM +0100, Joerg Jung wrote: > Hi, > > please find attached a new port for www/py-aiohttp-cors. > >$ cat pkg/DESCR >aiohttp_cors library implements Cross Origin Resource Sharing (CORS) > support >for aiohttp asyncio-powered asynchronous HTTP server. > > This port depends on the earlier sent py-typing and py-aiohttp updates > and is a dependency for the upcoming homeassistant port. > > Please test and comment. OK to import? > > Regards, > Joerg Updated tarball attached with py-typing removed from RUN_DEPENDS as this is not needed here (thanks sthen for the pointer). py-aiohttp-cors.tar.gz Description: application/tar-gz
