Wednesday, January 01, 2020

Re: UPDATE mail/s-nail

Solene Rapenne wrote in <20191231233617.31a040b9@t400.my.domain>:
|Le Tue, 31 Dec 2019 20:55:02 +0100,
|Steffen Nurpmeso <steffen@sdaoden.eu> a écrit :
|> An update to v14.9.16. Mailcap support etc., many fixes.
...
|hi, portcheck(1) reports this error but I'm unsure why
|
|Missing library for idn2>=0.0
|*** Error 1 in . (/home/ports/infrastructure/mk/bsd.port.mk:3374 'port-w\
|antlib-args')
|*** Error 1 in /home/ports/mail/s-nail (/home/ports/infrastructure/mk/bs\
|d.port.mk:3033 'print-plist-with-depends')
|in FLAVOR "idna": the following libraries in WANTLIB look like masked \
|by RUN_DEPENDS: idn2

Thank you. For what do i have

(
echo '(5)'
cd ports/mail/s-nail || exit 41
echo Please perform adjustments, then hit RETURN
read
export NO_DEPENDS=Yes
echo '(6)'
/usr/ports/infrastructure/bin/portcheck
echo '(7)'
make makesum
echo '(8)'
make checksum
echo '(9)'
make extract
echo '(10)'
make build
echo '(12)'
make fake
echo '(13)'
make plist # ignore error?
echo '(14)'
make package
) || exit 41
(
echo '(15)'
cd ports/mail/s-nail || exit 42
cvs diff . > /tmp/s-nail.diff
) || exit 42

if i do not address the output!

--End of <20191231233617.31a040b9@t400.my.domain>

Stuart Henderson wrote in <20191231225753.GC70067@symphytum.spacehopper.org>:
|On 2019/12/31 23:36, Solene Rapenne wrote:
|> hi, portcheck(1) reports this error but I'm unsure why
|>
|> Missing library for idn2>=0.0
|> *** Error 1 in . (/home/ports/infrastructure/mk/bsd.port.mk:3374 \
|> 'port-wantlib-args')
|> *** Error 1 in /home/ports/mail/s-nail (/home/ports/infrastructure/mk/bs\
|> d.port.mk:3033 'print-plist-with-depends')
|> in FLAVOR "idna": the following libraries in WANTLIB look like masked \
|> by RUN_DEPENDS: idn2
|
|good catch,
|
|: .if ${FLAVOR:Midna}
|: WANTLIB+= idn2
|: LIB_DEPENDS+= devel/libidn2
|: [...]
|: .endif
|:
|: [...]
|:
|: LIB_DEPENDS= converters/libiconv
|
|The second LIB_DEPENDS with = not += hides the first one. (see
|"make show=LIB_DEPENDS").

!! Indeed. Fixed in the below.

|The "Missing library" is because there's no valid dependency path to the
|idn2 entry in WANTLIB.
|
|portcheck's "masked by RUN_DEPENDS" message is bogus but that's not really
|unusual :)

This i do not understand. What can i do to address this?

Anyway, the idna flavour also does compile and test fine with the
below.

--End of <20191231225753.GC70067@symphytum.spacehopper.org>

Thank you both!
Ciao,

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/s-nail/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 20 Aug 2019 09:59:59 -0000 1.25
+++ Makefile 1 Jan 2020 18:27:46 -0000
@@ -2,7 +2,7 @@

COMMENT= SysV mail/BSD Mail/POSIX mailx: send and receive mail

-DISTNAME= s-nail-14.9.15
+DISTNAME= s-nail-14.9.16
CATEGORIES= mail
HOMEPAGE= https://www.sdaoden.eu/code.html\#s-mailx

@@ -26,10 +26,8 @@ MAKE_FLAGS= CC="${CC}" \
VAL_SYSCONFDIR="${SYSCONFDIR}" \
VAL_SID= \
OPT_ALWAYS_UNICODE_LOCALE=yes \
- OPT_AGENT=no \
OPT_AUTOCC=no \
OPT_DOTLOCK=no \
- OPT_GSSAPI=no \
VAL_RANDOM=arc4

.if ${FLAVOR:Midna}
@@ -48,7 +46,7 @@ FAKE_FLAGS+= OPT_DEBUG=yes

MAKE_ENV= VERBOSE=Yes

-LIB_DEPENDS= converters/libiconv
+LIB_DEPENDS+= converters/libiconv

post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nail
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/s-nail/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 20 Aug 2019 09:59:59 -0000 1.18
+++ distinfo 1 Jan 2020 18:27:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (s-nail-14.9.15.tar.gz) = TEux2uD9btq/HSaKxqR23pqrPBW0u+IUFUmhHb8rrnM=
-SIZE (s-nail-14.9.15.tar.gz) = 1036102
+SHA256 (s-nail-14.9.16.tar.gz) = 6tdv3+YquK8P2w3a2fi4QZeqsYge0V6y+mVFcqjLvu0=
+SIZE (s-nail-14.9.16.tar.gz) = 1075490
Index: patches/patch-include_su_code_h
===================================================================
RCS file: patches/patch-include_su_code_h
diff -N patches/patch-include_su_code_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-include_su_code_h 1 Jan 2020 18:27:46 -0000
@@ -0,0 +1,39 @@
+$OpenBSD$
+
+commit 0eb2314c
+Author: Steffen Nurpmeso <steffen@sdaoden.eu>
+AuthorDate: 2019-12-31 20:34:34 +0100
+Commit: Steffen Nurpmeso <steffen@sdaoden.eu>
+CommitDate: 2019-12-31 20:34:52 +0100
+
+ FIX clang: not inlining with <-O2; comment out _Alignof() usage
+---
+ include/su/code.h | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/include/su/code.h b/include/su/code.h
+index 6e6cd74c..af1e5a30 100644
+--- include/su/code.h
++++ include/su/code.h
+@@ -470,8 +470,9 @@ do{\
+ # define su_INLINE static inline
+ # define su_SINLINE static inline
+ # else
+-# define su_INLINE inline
+-# define su_SINLINE static inline
++ /* clang does not like inline with <-O2 */
++# define su_INLINE inline __attribute__((always_inline))
++# define su_SINLINE static inline __attribute__((always_inline))
+ # endif
+ # else
+ # define su_INLINE static __inline
+@@ -534,7 +535,8 @@ do{\
+ #define su_ROUND_UP2(X,BASE) (((X) + ((BASE) - 1)) & (~((BASE) - 1)))
+
+ /* Alignment. Note: su_uz POW2 asserted in POD section below! */
+-#if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 201112L
++/* Commented out: "_Alignof() applied to an expression is a GNU extension" */
++#if 0 && defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 201112L
+ # include <stdalign.h>
+ # define su_ALIGNOF(X) _Alignof(X)
+ #else

--steffen
|
|Der Kragenbaer, The moon bear,
|der holt sich munter he cheerfully and one by one
|einen nach dem anderen runter wa.ks himself off
|(By Robert Gernhardt)

No comments:

Post a Comment