UPDATE: textproc/hs-json 0.9.2
Hi ports@,
Below is a diff that updates hs-json to 0.9.2. According to the
upstream commit log, the only change in this release
``avoids a name clash with GHC 8.4'' [1]. This diff also updates the
MODGHC_PACKAGE_KEY of the port that depends on hs-json
(devel/shellcheck).
Tested on amd64.
Thanks,
Caspar Schutijser
1:
https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2
Index: textproc/hs-json/Makefile
===
RCS file: /cvs/ports/textproc/hs-json/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- textproc/hs-json/Makefile 8 Mar 2018 20:30:48 - 1.1.1.1
+++ textproc/hs-json/Makefile 14 Apr 2018 06:43:31 -
@@ -2,7 +2,7 @@
COMMENT = JSON library
-DISTNAME = json-0.9.1
+DISTNAME = json-0.9.2
CATEGORIES = textproc
MAINTAINER = Caspar Schutijser
@@ -14,7 +14,7 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-MODGHC_PACKAGE_KEY = LsxwzMHf4pS7O5VCo6vFnl
+MODGHC_PACKAGE_KEY = 7rB8qNGKE8tQN0WTAH0G5
RUN_DEPENDS += devel/hs-mtl \
devel/hs-parsec \
Index: textproc/hs-json/distinfo
===
RCS file: /cvs/ports/textproc/hs-json/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- textproc/hs-json/distinfo 8 Mar 2018 20:30:48 - 1.1.1.1
+++ textproc/hs-json/distinfo 14 Apr 2018 06:43:31 -
@@ -1,2 +1,2 @@
-SHA256 (ghc/json-0.9.1.tar.gz) = lrV+TRZ+RdyArv+HKpIq6c25U6He0p67tRAZto8AhaI=
-SIZE (ghc/json-0.9.1.tar.gz) = 22568
+SHA256 (ghc/json-0.9.2.tar.gz) = 5rsW+nkcw4M657RZt+eIXBwrEbDSlLfglSh8VPpzc44=
+SIZE (ghc/json-0.9.2.tar.gz) = 22650
Index: devel/shellcheck/Makefile
===
RCS file: /cvs/ports/devel/shellcheck/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/shellcheck/Makefile 8 Mar 2018 20:47:50 - 1.1.1.1
+++ devel/shellcheck/Makefile 14 Apr 2018 06:43:31 -
@@ -7,6 +7,7 @@ COMMENT-lib = ShellCheck library
V =0.4.7
DISTNAME = ShellCheck-${V}
+REVISION = 0
PKGNAME-main = shellcheck-${V}
PKGNAME-lib = hs-shellcheck-${V}
CATEGORIES = devel
@@ -25,7 +26,7 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-MODGHC_PACKAGE_KEY = 2v3KY7caHZkFqKIPumZT3l
+MODGHC_PACKAGE_KEY = FGszl8wDu4DoQ1UCsbZPa
BUILD_DEPENDS += devel/hs-mtl>=2.2.1 \
devel/hs-parsec \
UPDATE: devel/intellij 2018.1.1
Hi ports@,
Below is a diff that updates devel/intellij to 2018.1.1. While there,
I changed the link to the website in the manpage to HTTPS. Tested on
amd64.
Thanks,
Caspar Schutijser
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile14 Feb 2018 05:59:05 - 1.48
+++ Makefile14 Apr 2018 06:29:47 -
@@ -2,7 +2,7 @@
COMMENT= IntelliJ IDEA Java IDE
-V= 2017.3.4
+V= 2018.1.1
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
@@ -26,7 +26,7 @@ NO_TEST= Yes
SUBST_VARS+= JAVA_HOME
-WRKDIST= ${WRKDIR}/idea-IC-173.4548.28
+WRKDIST= ${WRKDIR}/idea-IC-181.4445.78
IJ=${PREFIX}/intellij
# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
Index: distinfo
===
RCS file: /cvs/ports/devel/intellij/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo14 Feb 2018 05:59:05 - 1.29
+++ distinfo14 Apr 2018 06:29:47 -
@@ -1,2 +1,2 @@
-SHA256 (ideaIC-2017.3.4.tar.gz) = iT6Sq09gvABq5MMKGwTQkJYPLMnfjA7n51DW+nN0Gpc=
-SIZE (ideaIC-2017.3.4.tar.gz) = 457068423
+SHA256 (ideaIC-2018.1.1.tar.gz) = paT5SNJZc0rFZJEi0ML36IW0gWLN545DQVY4y/16eqM=
+SIZE (ideaIC-2018.1.1.tar.gz) = 541428785
Index: files/idea.1
===
RCS file: /cvs/ports/devel/intellij/files/idea.1,v
retrieving revision 1.2
diff -u -p -r1.2 idea.1
--- files/idea.13 Feb 2016 20:47:13 - 1.2
+++ files/idea.114 Apr 2018 06:29:47 -
@@ -13,5 +13,4 @@
starts up the IntelliJ IDEA Community Edition Java Integrated
Development Environment.
.Sh SEE ALSO
-The web site
-.Lk http://www.jetbrains.com/idea/ .
+.Lk https://www.jetbrains.com/idea/
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/intellij/pkg/PLIST,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST
--- pkg/PLIST 14 Feb 2018 05:59:05 - 1.30
+++ pkg/PLIST 14 Apr 2018 06:29:47 -
@@ -90,9 +90,9 @@ intellij/lib/asm-all.jar
intellij/lib/asm-analysis-5.0.3.jar
intellij/lib/asm-tree-5.0.3.jar
intellij/lib/automaton.jar
+intellij/lib/baksmali-2.2.1.jar
intellij/lib/batik-all.jar
-intellij/lib/bcprov-jdk15on-155.jar
-intellij/lib/boot.jar
+intellij/lib/bcprov-jdk15on-1.55.jar
intellij/lib/bootstrap.jar
intellij/lib/cglib-nodep-3.2.4.jar
intellij/lib/cli-parser-1.1.jar
@@ -103,6 +103,7 @@ intellij/lib/commons-codec-1.9.jar
intellij/lib/commons-compress-1.10.jar
intellij/lib/commons-httpclient-3.1-patched.jar
intellij/lib/commons-imaging-1.0-RC.jar
+intellij/lib/commons-io-2.2.jar
intellij/lib/commons-logging-1.2.jar
intellij/lib/commons-net-3.3.jar
intellij/lib/constraint-layout.jar
@@ -110,19 +111,20 @@ intellij/lib/coverage-agent.jar
intellij/lib/coverage-instrumenter.jar
intellij/lib/coverage-util.jar
intellij/lib/cucumber-core-1.2.4.jar
-intellij/lib/cucumber-groovy-1.2.4.jar
+intellij/lib/dexlib2-2.2.1.jar
intellij/lib/ecj-4.7.2.jar
+intellij/lib/eddsa-0.2.0.jar
intellij/lib/emma.jar
intellij/lib/extensions.jar
intellij/lib/external-system-rt.jar
intellij/lib/fest-assert-1.5.0-SNAPSHOT.jar
intellij/lib/fest-reflect-2.0-SNAPSHOT.jar
-intellij/lib/fest-swing-1.4.1-SNAPSHOT.jar
+intellij/lib/fest-swing-1.4.4.jar
intellij/lib/fest-util-1.3.0-SNAPSHOT.jar
intellij/lib/fluent-hc-4.5.2.jar
intellij/lib/forms_rt.jar
+intellij/lib/fst-2.56.jar
intellij/lib/gherkin-2.12.2.jar
-intellij/lib/google-analytics-library.jar
intellij/lib/groovy-all-2.4.12.jar
intellij/lib/gson-2.8.2.jar
intellij/lib/guava-21.0.jar
@@ -137,18 +139,23 @@ intellij/lib/imageio-core-3.2.1.jar
intellij/lib/imageio-metadata-3.2.1.jar
intellij/lib/imageio-tiff-3.2.1.jar
intellij/lib/imgscalr-lib-4.2.jar
-intellij/lib/ini4j-0.5.2-patched.jar
+intellij/lib/ini4j-0.5.5-2.jar
intellij/lib/isorelax.jar
+intellij/lib/jackson-core-2.8.8.jar
+intellij/lib/java-api.jar
+intellij/lib/java-impl.jar
+intellij/lib/java_resources_en.jar
intellij/lib/javac2.jar
+intellij/lib/javassist-3.21.0-GA.jar
intellij/lib/jaxen-1.1.3.jar
intellij/lib/jayatana-1.2.4.jar
-intellij/lib/jcip-annotations.jar
+intellij/lib/jbcrypt-1.0.0.jar
+intellij/lib/jcip-annotations-1.0.jar
intellij/lib/jdkAnnotations.jar
intellij/lib/jdom.jar
-intellij/lib/jediterm-pty-2.6.jar
-intellij/lib/jgoodies-common-1.2.1.jar
+intellij/lib/jediterm-pty-2.7.jar
+intellij/lib/jgoodies-common-1.4.0.jar
intellij/lib/jgoodies-forms.jar
-intellij/lib/jgoodies-looks-2.4.2.jar
intellij/lib/jh.jar
intellij/lib/jimfs-1.1.jar
intellij/lib/jing.jar
@@ -159,13 +166,6 @@ intellij/lib/jps-builders.jar
intellij/lib/jps-launcher.jar
intellij/lib/jps-model.jar
intellij/l
Re: php on arm
On Fri, Apr 13, 2018 at 10:44:53PM +0100, Stuart Henderson wrote:
> On 2018/04/13 14:22, s_g...@telus.net wrote:
> > cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude -I../src -I.
> > -I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo -MD -MP -MF
> > src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o
> > src/arm/.libs/sysv.o
> > ../src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
> > fldmiadgt ip, {d0-d7}
> > ^
> > ../src/arm/sysv.S:412:2: error: invalid instruction, did you mean: fstmiax?
> > fstmiadeq r2, {d0-d3}
> > ^
> > /tmp/sysv-897c4d.s:263:2: error: invalid instruction
> > fstmfdd sp!, {d0-d7}
> > ^
> > /tmp/sysv-897c4d.s:313:2: error: invalid instruction, did you mean: fldmiax?
> > fldmiad sp, {d0-d1}
> > ^
> > /tmp/sysv-897c4d.s:316:2: error: invalid instruction, did you mean: fldmiax?
> > fldmiad sp, {d0-d3}
> > ^
> > Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include
> > -Iinclude -I../src -I. -I../include -Iinclude -I../src -O2 -pipe -MT
> > src/arm/sysv.lo -MD -MP -MF src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S
> > -fPIC -DPIC -o src/arm/.libs/sysv.o
> > *** Error 2 in arm-unknown-openbsd6.3 (Makefile:1337 'src/arm/sysv.lo')
> > *** Error 1 in arm-unknown-openbsd6.3 (Makefile:1621 'all-recursive')
> > *** Error 1 in arm-unknown-openbsd6.3 (Makefile:730 'all')
> > *** Error 1 in /usr/ports/pobj/libffi-3.2.1/libffi-3.2.1 (Makefile:616
> > 'all')
>
> Please apply this diff to ports/devel/libffi, clean and retry and
> report back whether you're able to successfully build libffi.
> (Don't wait until you have other pieces for php built before letting
> us know about libffi, please).
>
> jasper, ok with you if it works? (there is finally a 3.3.0 rc now
> but probably better to avoid going down that route for now just to
> fix this :)
Seemed to have worked; OK with me.
> Index: patches/patch-src_arm_sysv_S
> ===
> RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_sysv_S,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_arm_sysv_S
> --- patches/patch-src_arm_sysv_S 22 Jan 2018 06:28:00 - 1.7
> +++ patches/patch-src_arm_sysv_S 13 Apr 2018 21:41:29 -
> @@ -1,10 +1,24 @@
> -$OpenBSD: patch-src_arm_sysv_S,v 1.7 2018/01/22 06:28:00 bcallah Exp $
> +$OpenBSD$
>
> +From FreeBSD, see also
> https://github.com/libffi/libffi/issues/162
> +https://github.com/libffi/libffi/issues/191
> +
> +This code is completely different in the 3.3 branch so can probably just
> +be removed straight off when a release has been from there.
>
> Index: src/arm/sysv.S
> --- src/arm/sysv.S.orig
> +++ src/arm/sysv.S
> +@@ -360,7 +360,7 @@ ARM_FUNC_START(ffi_call_VFP)
> + cmp r0, #3
> + sub ip, fp, #64
> + flddle d0, [ip]
> +-fldmiadgt ip, {d0-d7}
> ++vldmiagtip, {d0-d7}
> +
> + LSYM(Lbase_args):
> + @ move first 4 parameters in registers
> @@ -396,7 +396,7 @@ LSYM(Lbase_args):
> beq LSYM(Lepilogue_vfp)
>
> @@ -14,3 +28,34 @@ Index: src/arm/sysv.S
> beq LSYM(Lepilogue_vfp)
>
> cmp r3, #FFI_TYPE_FLOAT
> +@@ -409,7 +409,7 @@ LSYM(Lbase_args):
> +
> + cmp r3, #FFI_TYPE_STRUCT_VFP_FLOAT
> + cmpne r3, #FFI_TYPE_STRUCT_VFP_DOUBLE
> +-fstmiadeq r2, {d0-d3}
> ++vstmiaeqr2, {d0-d3}
> +
> + LSYM(Lepilogue_vfp):
> + RETLDM "r0-r3,fp"
> +@@ -420,7 +420,7 @@ LSYM(Lepilogue_vfp):
> +
> +
> + ARM_FUNC_START(ffi_closure_VFP)
> +-fstmfdd sp!, {d0-d7}
> ++vstmdb sp!, {d0-d7}
> + @ r0-r3, then d0-d7
> + UNWIND .pad #80
> + add ip, sp, #80
> +@@ -470,10 +470,10 @@ ARM_FUNC_START(ffi_closure_VFP)
> + ldmia sp, {r0, r1}
> + b .Lclosure_epilogue_vfp
> + .Lretfloat_struct_vfp:
> +-fldmiad sp, {d0-d1}
> ++vldmia sp, {d0-d1}
> + b .Lclosure_epilogue_vfp
> + .Lretdouble_struct_vfp:
> +-fldmiad sp, {d0-d3}
> ++vldmia sp, {d0-d3}
> + b .Lclosure_epilogue_vfp
> +
> + .ffi_closure_VFP_end:
>
--
jasper
Re: php on arm
The patch allowed the build to continue.
Packages so far:
op1bsd63snap$ pkg_info
autoconf-2.69p2 automatically configure source code on many Un*x platforms
bison-3.0.4p0 GNU parser generator
bzip2-1.0.6p8 block-sorting file compressor, unencumbered
gettext-0.19.8.1p1 GNU gettext runtime libraries and programs
help2man-1.47.5 generates simple manual pages from program output
libiconv-1.14p3 character set conversion library
libsigsegv-2.12 library for handling page faults in user mode
m4-1.4.18 GNU m4
metaauto-1.0p1 wrapper for gnu auto*
pcre-8.41 perl-compatible regular expression library
xz-5.2.3p0 LZMA compression and decompression tools
op1bsd63snap$ pkg_info
autoconf-2.69p2 automatically configure source code on many Un*x platforms
bison-3.0.4p0 GNU parser generator
bzip2-1.0.6p8 block-sorting file compressor, unencumbered
gettext-0.19.8.1p1 GNU gettext runtime libraries and programs
help2man-1.47.5 generates simple manual pages from program output
libiconv-1.14p3 character set conversion library
libsigsegv-2.12 library for handling page faults in user mode
m4-1.4.18 GNU m4
metaauto-1.0p1 wrapper for gnu auto*
pcre-8.41 perl-compatible regular expression library
sqlite3-3.22.0p0embedded SQL implementation
xz-5.2.3p0 LZMA compression and decompression tools
op1bsd63snap$ pkg_info
autoconf-2.69p2 automatically configure source code on many Un*x platforms
bison-3.0.4p0 GNU parser generator
bzip2-1.0.6p8 block-sorting file compressor, unencumbered
gettext-0.19.8.1p1 GNU gettext runtime libraries and programs
help2man-1.47.5 generates simple manual pages from program output
libffi-3.2.1p4 Foreign Function Interface
libiconv-1.14p3 character set conversion library
libsigsegv-2.12 library for handling page faults in user mode
m4-1.4.18 GNU m4
metaauto-1.0p1 wrapper for gnu auto*
pcre-8.41 perl-compatible regular expression library
sqlite3-3.22.0p0embedded SQL implementation
xz-5.2.3p0 LZMA compression and decompression tools
op1bsd63snap$
-Original Message-
From: owner-po...@openbsd.org On Behalf Of Stuart
Henderson
Sent: April 13, 2018 2:45 PM
To: s_g...@telus.net
Cc: 'Peter Hessler' ; ports@openbsd.org; Jasper Lievisse
Adriaanse
Subject: Re: php on arm
On 2018/04/13 14:22, s_g...@telus.net wrote:
> cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude -I../src -I.
> -I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo -MD -MP
> -MF src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o
> src/arm/.libs/sysv.o
> ../src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
> fldmiadgt ip, {d0-d7}
> ^
> ../src/arm/sysv.S:412:2: error: invalid instruction, did you mean: fstmiax?
> fstmiadeq r2, {d0-d3}
> ^
> /tmp/sysv-897c4d.s:263:2: error: invalid instruction fstmfdd sp!,
> {d0-d7} ^
> /tmp/sysv-897c4d.s:313:2: error: invalid instruction, did you mean: fldmiax?
> fldmiad sp, {d0-d1}
> ^
> /tmp/sysv-897c4d.s:316:2: error: invalid instruction, did you mean: fldmiax?
> fldmiad sp, {d0-d3}
> ^
> Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include
> -Iinclude -I../src -I. -I../include -Iinclude -I../src -O2 -pipe -MT
> src/arm/sysv.lo -MD -MP -MF src/arm/.deps/sysv.Tpo -c
> ../src/arm/sysv.S -fPIC -DPIC -o src/arm/.libs/sysv.o
> *** Error 2 in arm-unknown-openbsd6.3 (Makefile:1337
> 'src/arm/sysv.lo')
> *** Error 1 in arm-unknown-openbsd6.3 (Makefile:1621 'all-recursive')
> *** Error 1 in arm-unknown-openbsd6.3 (Makefile:730 'all')
> *** Error 1 in /usr/ports/pobj/libffi-3.2.1/libffi-3.2.1 (Makefile:616
> 'all')
Please apply this diff to ports/devel/libffi, clean and retry and report back
whether you're able to successfully build libffi.
(Don't wait until you have other pieces for php built before letting us know
about libffi, please).
jasper, ok with you if it works? (there is finally a 3.3.0 rc now but probably
better to avoid going down that route for now just to fix this :)
Index: patches/patch-src_arm_sysv_S
===
RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_sysv_S,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_arm_sysv_S
--- patches/patch-src_arm_sysv_S22 Jan 2018 06:28:00 - 1.7
+++ patches/patch-src_arm_sysv_S13 Apr 2018 21:41:29 -
@@ -1,10 +1,24 @@
-$OpenBSD: patch-src_arm_sysv_S,v 1.7 2018/01/22 06:28:00 bcallah Exp $
+$OpenBSD$
+From FreeBSD, see also
https://github.com/libffi/libffi/issues/162
+https://github.com/libffi/libffi/issues/191
+
+This code is completely different in the 3.3 branch so can probably
+just be removed straight off when a release has been from there.
Index: src/arm/sysv.S
--- src/arm/sysv.S.orig
+++ src/arm/sysv.S
+@@ -360,7 +360,7 @@ ARM_FUNC_START(ffi_call_VFP)
+ cmp r0, #3
+
Re: japanese/Wnn: remove jgroff dependency
Hi,
Marc Espie wrote on Fri, Apr 13, 2018 at 11:05:22AM +0200:
> On Thu, Apr 12, 2018 at 10:55:05PM +0900, YASUOKA Masahiko wrote:
>> I don't think installing EUC is needed. Even if people is still using
>> EUC terminal, they can use MANPAGER=jless to see the UTF-8 manuals.
>> Since our jless started support both EUC and UTF-8, so both
>>
>> env MANPATH=/usr/local/man/ja MANPAGER=jless
>> env MANPATH=/usr/local/man/ja_JP.EUC MANPAGER=jless
>>
>> will show the same result. Also theoretically there may be conversion
>> problems between EUC and UTF-8, but I think it's no problem if we fix
>> them when we hit such problems.
Thank you very much for having a look!
> Ah, cool, I wasn't aware of the jless update.
> I have no objection left, then.
Great, so here is a patch building on bentley@'s work,
but also removing the EUC files.
Note that this port provides both Japanese and English manual
pages. So it is not possible to coerce everything into man/ja/.
Instead, do the right things in individual directories:
* directory Wnn, subpackage -main:
Install to man/ja/ only.
* directory Xwnmo, subpackage -xwnmo:
Install to man/ja/ *and* English man/.
* directory cWnn, subpackage -zh:
Install to English man/ only.
* subpackage -ko:
No manuals, but bump to add the missing @bin annotations.
OK?
Ingo
Index: Makefile
===
RCS file: /cvs/ports/japanese/Wnn/Makefile,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile
--- Makefile14 May 2017 19:49:29 - 1.80
+++ Makefile14 Apr 2018 01:21:33 -
@@ -16,19 +16,19 @@ CATEGORIES =japanese
MULTI_PACKAGES = -main -dict -zh -zhdict -ko -kodict -xwnmo -data
PKGNAME-main = ja-Wnn-4.2
-REVISION-main =14
+REVISION-main =15
PKGNAME-dict = ja-Wnndict-4.2
REVISION-dict =0
PKGNAME-zh = zh-Wnn-4.2
-REVISION-zh = 8
+REVISION-zh = 9
PKGNAME-zhdict = zh-Wnndict-4.2
REVISION-zhdict = 0
PKGNAME-ko = ko-Wnn-4.2
-REVISION-ko = 8
+REVISION-ko = 9
PKGNAME-kodict = ko-Wnndict-4.2
REVISION-kodict = 0
PKGNAME-xwnmo =Wnn-xwnmo-4.2
-REVISION-xwnmo = 9
+REVISION-xwnmo = 10
PKGNAME-data = Wnn-data-4.2
WNNDICBASE = /var
@@ -75,11 +75,8 @@ JDOC_FROM = ${WRKSRC}/Wnn
PORT_CDOCDIR = ${PREFIX}/share/doc/zh-cWnn
CDOC_FROM =${WRKSRC}/cWnn
-# Will turn into a RUN_DEPENDS when we install non-formatted manpages
BUILD_DEPENDS =devel/imake \
- japanese/groff
-# Run depends ensure this does not turn into infinite recursion, since
-# this is not needed before package build time.
+ japanese/nkf
do-distpatch:
cd ${WRKDIR} && tar zxf ${FULLDISTDIR}/Wnn4.2.patch.tar.gz
Index: patches/patch-Wnn_man_2_env_dic_Imakefile
===
RCS file: patches/patch-Wnn_man_2_env_dic_Imakefile
diff -N patches/patch-Wnn_man_2_env_dic_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Wnn_man_2_env_dic_Imakefile 14 Apr 2018 01:21:33 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: Wnn/man/2.env/dic/Imakefile
+--- Wnn/man/2.env/dic/Imakefile.orig
Wnn/man/2.env/dic/Imakefile
+@@ -3,6 +3,10 @@ XCOMM $Id: Imakefile,v 1.5 1994/08/17 05:53:05 kuwa Ex
+ XCOMM
+ MANSUFFIX = 5
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_2_env_wnn_Imakefile
===
RCS file: patches/patch-Wnn_man_2_env_wnn_Imakefile
diff -N patches/patch-Wnn_man_2_env_wnn_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Wnn_man_2_env_wnn_Imakefile 14 Apr 2018 01:21:33 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Wnn/man/2.env/wnn/Imakefile
+--- Wnn/man/2.env/wnn/Imakefile.orig
Wnn/man/2.env/wnn/Imakefile
+@@ -3,6 +3,12 @@ XCOMM $Id: Imakefile,v 1.4 1994/08/17 05:53:13 kuwa Ex
+ XCOMM
+ MANSUFFIX = 4
+
++MANDIR = $(MANPATH)/ja/man$(MANSUFFIX)
++#undef InstallManPage
++#define InstallManPage InstallJManPage
++#undef InstallManPageLong
++#define InstallManPageLong InstallJManPageLong
++
+ all::
+
+ depend::
Index: patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
===
RCS file: patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
diff -N patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Wnn_man_3_libwnn_jl_lib_Imakefile 14 Apr 2018 01:21:33
-
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+Index: Wnn/man/3.libwnn/jl_lib/Imakefile
+--- Wnn/man/3.libwnn/jl_lib/Imakefile.orig
Wnn/man/3.libwnn/jl_lib/Imakefile
+@@ -4,6 +4,14 @@ XCOMM
+ MANDIR = $(LIBMANDIR)
+ MANSUFFIX = $(LIBMANSUFFIX)
+
++MANDIR = $(MANPATH)/ja/man$(MANSU
Re: [armv7 fix] Build database/redis
On Thu, Apr 12 2018, Klemens Nanni wrote: > On Sat, Apr 07, 2018 at 08:26:10AM +0200, Markus Hennecke wrote: >> With the attached fix the redis port builds, but is unable to complete the >> regression tests (see https://github.com/antirez/redis/issues/4640). > What's the status on armv7 without this fix? Tons of undefined references to functions from libunwind (included in libc++abi, hence the fix proposed by Markus): --8<-- [...] ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0xd8): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0xe0): more undefined references to `__aeabi_unwind_cpp_pr1' follow ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0x118): undefined reference to `__aeabi_unwind_cpp_pr0' ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0x120): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0x128): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(hiredis.o):(.ARM.exidx+0x130): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(read.o):(.ARM.exidx+0x0): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(read.o):(.ARM.exidx+0x8): undefined reference to `__aeabi_unwind_cpp_pr1' ../deps/hiredis/libhiredis.a(read.o):(.ARM.exidx+0x10): more undefined references to `__aeabi_unwind_cpp_pr1' follow ../deps/hiredis/libhiredis.a(read.o):(.ARM.exidx+0x18): undefined reference to `__aeabi_unwind_cpp_pr0' cc: error: linker command failed with exit code 1 (use -v to see invocation) gmake[1]: *** [Makefile:204: redis-server] Error 1 gmake[1]: Leaving directory '/usr/obj/pobj/redis-4.0.8/redis-4.0.8/src' gmake: *** [Makefile:6: all] Error 2 *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2740 '/usr/obj/pobj/redis-4.0.8/.build_done') *** Error 1 in /usr/ports/databases/redis (/usr/ports/infrastructure/mk/bsd.port.mk:2417 'all') cubox /usr/obj/pobj/redis-4.0.8/redis-4.0.8$ -->8-- Those functions are referenced because of the use of -funwind-tables on arm platforms, see src/Makefile: --8<-- # To get ARM stack traces if Redis crashes we need a special C flag. ifneq (,$(findstring armv,$(uname_M))) CFLAGS+=-funwind-tables endif -->8-- Maybe clang ought to link with libunwind if -funwind-tables is used, but we don't provide a separate libunwind library. Maybe Mark (cc'd) has thoughts to share here. I can confirm that Markus' diff fixes the build. Another solution would be to remove the use of -funwind-tables (patch proposal at the end of this mail, no bump needed). IIUC it's been deemed useful because of backtrace support in the bundled jemalloc (which we forcibly remove). > Have you tried the newer > 4.0.9 version? *I* haven't, but the snippet above is still in the master branch upstream, so I wouldn't expect an improvement. > I don't have access to that platform but the diff looks ok port-wise. > > There's another redis diff from me pending on ports@. but I'd also like > to update the port to 4.0.9, maybe we can combine this with your fix? Personally I prefer when different issues are addressed by separate commits. Index: patch-src_Makefile === RCS file: /d/cvs/ports/databases/redis/patches/patch-src_Makefile,v retrieving revision 1.27 diff -u -p -p -u -r1.27 patch-src_Makefile --- patch-src_Makefile 9 Aug 2017 09:16:09 - 1.27 +++ patch-src_Makefile 14 Apr 2018 00:27:57 - @@ -21,6 +21,15 @@ Index: src/Makefile INSTALL=install # Default allocator defaults to Jemalloc if it's not an ARM +@@ -40,7 +41,7 @@ endif + + # To get ARM stack traces if Redis crashes we need a special C flag. + ifneq (,$(findstring armv,$(uname_M))) +-CFLAGS+=-funwind-tables ++#CFLAGS+=-funwind-tables + endif + + # Backwards compatibility for selecting an allocator @@ -66,7 +67,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: graphics/farbfeld 3 -> 4
On Fri, Apr 13, 2018 at 11:09:07PM +0100, Kaashif Hymabaccus wrote:
> On Thu, Apr 12, 2018 at 10:23:56AM +0200, Klemens Nanni wrote:
> > On Thu, Apr 12, 2018 at 01:52:48AM +0100, Kaashif Hymabaccus wrote:
> > > This is an update to graphics/farbfeld. The main change to the port is
> > > that USE_GMAKE isn't needed any more.
> > >
> > > Works fine for me on amd64 (converted some images to ff and back,
> > > still seems to work).
> > Can you provide a simple do-install and drop patch-Makefile instead?
> > This was recently done for x11/{dmenu,st} as well. This would be
> > reasonably simpler and keep suckless ports somewhat consistent across
> > the tree.
>
> Thanks for the suggestion, the updated diff is below.
Looks good to me, OK kn with with the following comments fixed.
> diff --git patches/patch-config_mk patches/patch-config_mk
> index b27e187cb51..f660d82096f 100644
> --- patches/patch-config_mk
> +++ patches/patch-config_mk
> @@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
> bcallah Exp $
> Index: config.mk
> --- config.mk.orig
> +++ config.mk
> -@@ -4,15 +4,15 @@ VERSION = 3
> +@@ -4,15 +4,15 @@ VERSION = 4
> # Customize below to fit your system
>
> # paths
> -PREFIX = /usr/local
> +-MANPREFIX = $(PREFIX)/share/man
> +PREFIX ?= /usr/local
> - MANPREFIX = ${PREFIX}/man
> ++MANPREFIX = $(PREFIX)/man
Now that you're rolling your own do-install, this hunk is obsolete.
> # flags
> CPPFLAGS = -D_DEFAULT_SOURCE
> @@ -17,8 +18,8 @@ Index: config.mk
> -LDFLAGS = -s
> +CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
> +LDFLAGS += -s -L${LOCALBASE}/lib
> - PNG-LDFLAGS = -lpng
> - JPG-LDFLAGS = -ljpeg
> + PNG-LDLIBS = -lpng
> + JPG-LDLIBS = -ljpeg
>
> # compiler and linker
> -CC = cc
CC is already passed in MAKE_ENV, this can go, too.
Re: UPDATE: graphics/farbfeld 3 -> 4
On Thu, Apr 12, 2018 at 10:23:56AM +0200, Klemens Nanni wrote:
> On Thu, Apr 12, 2018 at 01:52:48AM +0100, Kaashif Hymabaccus wrote:
> > This is an update to graphics/farbfeld. The main change to the port is
> > that USE_GMAKE isn't needed any more.
> >
> > Works fine for me on amd64 (converted some images to ff and back,
> > still seems to work).
> Can you provide a simple do-install and drop patch-Makefile instead?
> This was recently done for x11/{dmenu,st} as well. This would be
> reasonably simpler and keep suckless ports somewhat consistent across
> the tree.
Thanks for the suggestion, the updated diff is below.
--
Kaashif Hymabaccus
GPG: 3E810B04
diff --git Makefile Makefile
index 8d499d1ad33..7a0cc01f58c 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
COMMENT = lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,16 @@ LIB_DEPENDS =graphics/png \
RUN_DEPENDS = graphics/ImageMagick
-USE_GMAKE =Yes
MAKE_ENV = CC="${CC}"
NO_TEST = Yes
+do-install:
+ ${INSTALL_PROGRAM} \
+ ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+ ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
.include
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
- rm -rf "farbfeld-$(VERSION)"
-
- install: all
-- mkdir -p "$(DESTDIR)$(PREFIX)/bin"
-- cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
-- for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
-- cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
-- for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
-- cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
-- for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+ ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+ ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+ ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
-
- uninstall:
- for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..f660d82096f 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
+@@ -4,15 +4,15 @@ VERSION = 4
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+-MANPREFIX = $(PREFIX)/share/man
+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
++MANPREFIX = $(PREFIX)/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +18,8 @@ Index: config.mk
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
# compiler and linker
-CC = cc
Re: php on arm
On 2018/04/13 14:22, s_g...@telus.net wrote:
> cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude -I../src -I.
> -I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo -MD -MP -MF
> src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o
> src/arm/.libs/sysv.o
> ../src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
> fldmiadgt ip, {d0-d7}
> ^
> ../src/arm/sysv.S:412:2: error: invalid instruction, did you mean: fstmiax?
> fstmiadeq r2, {d0-d3}
> ^
> /tmp/sysv-897c4d.s:263:2: error: invalid instruction
> fstmfdd sp!, {d0-d7}
> ^
> /tmp/sysv-897c4d.s:313:2: error: invalid instruction, did you mean: fldmiax?
> fldmiad sp, {d0-d1}
> ^
> /tmp/sysv-897c4d.s:316:2: error: invalid instruction, did you mean: fldmiax?
> fldmiad sp, {d0-d3}
> ^
> Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude
> -I../src -I. -I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo
> -MD -MP -MF src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o
> src/arm/.libs/sysv.o
> *** Error 2 in arm-unknown-openbsd6.3 (Makefile:1337 'src/arm/sysv.lo')
> *** Error 1 in arm-unknown-openbsd6.3 (Makefile:1621 'all-recursive')
> *** Error 1 in arm-unknown-openbsd6.3 (Makefile:730 'all')
> *** Error 1 in /usr/ports/pobj/libffi-3.2.1/libffi-3.2.1 (Makefile:616 'all')
Please apply this diff to ports/devel/libffi, clean and retry and
report back whether you're able to successfully build libffi.
(Don't wait until you have other pieces for php built before letting
us know about libffi, please).
jasper, ok with you if it works? (there is finally a 3.3.0 rc now
but probably better to avoid going down that route for now just to
fix this :)
Index: patches/patch-src_arm_sysv_S
===
RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_sysv_S,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_arm_sysv_S
--- patches/patch-src_arm_sysv_S22 Jan 2018 06:28:00 - 1.7
+++ patches/patch-src_arm_sysv_S13 Apr 2018 21:41:29 -
@@ -1,10 +1,24 @@
-$OpenBSD: patch-src_arm_sysv_S,v 1.7 2018/01/22 06:28:00 bcallah Exp $
+$OpenBSD$
+From FreeBSD, see also
https://github.com/libffi/libffi/issues/162
+https://github.com/libffi/libffi/issues/191
+
+This code is completely different in the 3.3 branch so can probably just
+be removed straight off when a release has been from there.
Index: src/arm/sysv.S
--- src/arm/sysv.S.orig
+++ src/arm/sysv.S
+@@ -360,7 +360,7 @@ ARM_FUNC_START(ffi_call_VFP)
+ cmp r0, #3
+ sub ip, fp, #64
+ flddle d0, [ip]
+- fldmiadgt ip, {d0-d7}
++ vldmiagtip, {d0-d7}
+
+ LSYM(Lbase_args):
+ @ move first 4 parameters in registers
@@ -396,7 +396,7 @@ LSYM(Lbase_args):
beq LSYM(Lepilogue_vfp)
@@ -14,3 +28,34 @@ Index: src/arm/sysv.S
beq LSYM(Lepilogue_vfp)
cmp r3, #FFI_TYPE_FLOAT
+@@ -409,7 +409,7 @@ LSYM(Lbase_args):
+
+ cmp r3, #FFI_TYPE_STRUCT_VFP_FLOAT
+ cmpne r3, #FFI_TYPE_STRUCT_VFP_DOUBLE
+- fstmiadeq r2, {d0-d3}
++ vstmiaeqr2, {d0-d3}
+
+ LSYM(Lepilogue_vfp):
+ RETLDM "r0-r3,fp"
+@@ -420,7 +420,7 @@ LSYM(Lepilogue_vfp):
+
+
+ ARM_FUNC_START(ffi_closure_VFP)
+- fstmfdd sp!, {d0-d7}
++ vstmdb sp!, {d0-d7}
+ @ r0-r3, then d0-d7
+ UNWIND .pad #80
+ add ip, sp, #80
+@@ -470,10 +470,10 @@ ARM_FUNC_START(ffi_closure_VFP)
+ ldmia sp, {r0, r1}
+ b .Lclosure_epilogue_vfp
+ .Lretfloat_struct_vfp:
+- fldmiad sp, {d0-d1}
++ vldmia sp, {d0-d1}
+ b .Lclosure_epilogue_vfp
+ .Lretdouble_struct_vfp:
+- fldmiad sp, {d0-d3}
++ vldmia sp, {d0-d3}
+ b .Lclosure_epilogue_vfp
+
+ .ffi_closure_VFP_end:
Re: php on arm
I tried to build php 7 on a freshly installed current arm7 system.
The following packages were built before an error occurred:
op1bsd63snap$ pkg_info
autoconf-2.69p2 automatically configure source code on many Un*x platforms
bison-3.0.4p0 GNU parser generator
bzip2-1.0.6p8 block-sorting file compressor, unencumbered
gettext-0.19.8.1p1 GNU gettext runtime libraries and programs
help2man-1.47.5 generates simple manual pages from program output
libiconv-1.14p3 character set conversion library
libsigsegv-2.12 library for handling page faults in user mode
m4-1.4.18 GNU m4
metaauto-1.0p1 wrapper for gnu auto*
pcre-8.41 perl-compatible regular expression library
xz-5.2.3p0 LZMA compression and decompression tools
op1bsd63snap$ pkg_info
autoconf-2.69p2 automatically configure source code on many Un*x platforms
bison-3.0.4p0 GNU parser generator
bzip2-1.0.6p8 block-sorting file compressor, unencumbered
gettext-0.19.8.1p1 GNU gettext runtime libraries and programs
help2man-1.47.5 generates simple manual pages from program output
libiconv-1.14p3 character set conversion library
libsigsegv-2.12 library for handling page faults in user mode
m4-1.4.18 GNU m4
metaauto-1.0p1 wrapper for gnu auto*
pcre-8.41 perl-compatible regular expression library
sqlite3-3.22.0p0embedded SQL implementation
xz-5.2.3p0 LZMA compression and decompression tools
op1bsd63snap$
The error trace:
cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude -I../src -I.
-I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo -MD -MP -MF
src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o src/arm/.libs/sysv.o
../src/arm/sysv.S:363:2: error: invalid instruction, did you mean: fldmiax?
fldmiadgt ip, {d0-d7}
^
../src/arm/sysv.S:412:2: error: invalid instruction, did you mean: fstmiax?
fstmiadeq r2, {d0-d3}
^
/tmp/sysv-897c4d.s:263:2: error: invalid instruction
fstmfdd sp!, {d0-d7}
^
/tmp/sysv-897c4d.s:313:2: error: invalid instruction, did you mean: fldmiax?
fldmiad sp, {d0-d1}
^
/tmp/sysv-897c4d.s:316:2: error: invalid instruction, did you mean: fldmiax?
fldmiad sp, {d0-d3}
^
Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I. -I../include -Iinclude
-I../src -I. -I../include -Iinclude -I../src -O2 -pipe -MT src/arm/sysv.lo -MD
-MP -MF src/arm/.deps/sysv.Tpo -c ../src/arm/sysv.S -fPIC -DPIC -o
src/arm/.libs/sysv.o
*** Error 2 in arm-unknown-openbsd6.3 (Makefile:1337 'src/arm/sysv.lo')
*** Error 1 in arm-unknown-openbsd6.3 (Makefile:1621 'all-recursive')
*** Error 1 in arm-unknown-openbsd6.3 (Makefile:730 'all')
*** Error 1 in /usr/ports/pobj/libffi-3.2.1/libffi-3.2.1 (Makefile:616 'all')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:2742
'/usr/ports/pobj/libffi-3.2.1/.build_done')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:1938
'/usr/ports/packages/arm/all/libffi-3.2.1p4.tgz')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:2440 '_internal-package')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'package')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:1956
'/var/db/pkg/libffi-3.2.1p4/+CONTENTS')
*** Error 1 in /usr/ports/devel/libffi
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'install')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:2073
'/usr/ports/pobj/Python-2.7.14/.dep-devel-libffi')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:2508
'/usr/ports/pobj/Python-2.7.14/.extract_done')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:1938
'/usr/ports/packages/arm/all/python-2.7.14p1.tgz')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:2440 '_internal-package')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'package')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:1956
'/var/db/pkg/python-2.7.14p1/+CONTENTS')
*** Error 1 in /usr/ports/lang/python/2.7
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'install')
*** Error 1 in /usr/ports/textproc/libxml
(/usr/ports/infrastructure/mk/bsd.port.mk:2073
'/usr/ports/pobj/libxml2-2.9.8/.dep-lang-python-2.7')
*** Error 1 in /usr/ports/textproc/libxml
(/usr/ports/infrastructure/mk/bsd.port.mk:2508
'/usr/ports/pobj/libxml2-2.9.8/.extract_done')
*** Error 1 in /usr/ports/textproc/libxml
(/usr/ports/infrastructure/mk/bsd.port.mk:1938
'/usr/ports/packages/arm/all/libxml-2.9.8.tgz')
*** Error 1 in /usr/ports/textproc/libxml
(/usr/ports/infrastructure/mk/bsd.port.mk:2440 '_internal-package')
*** Error 1 in /usr/ports/textproc/libxml
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'package')
*** Error 1 in /usr/ports/textproc/libxml
(/u
Re: new misc/os-test
ok.
cd ${WRKBUILD} && make -V SUITE_LIST >suite.list
cd ${WRKBUILD} && for suite in `cat suite.list`; do\
make -C $$suite -V TESTS > $$suite-test.list;\
done
For ports we'd normally use ${MAKE_PROGRAM} rather than hardcoding,
but it doesn't make a lot of difference so I don't mind either way.
The gitlab distfile is liable to change when they update tools but
that's probably easiest to handle by mirroring if it happens.
os-test.tgz
Description: application/tar-gz
Fix emulators/dgen-sdl for clang 6.
OK?
Index: patches/patch-main_cpp
===
RCS file: patches/patch-main_cpp
diff -N patches/patch-main_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-main_cpp 13 Apr 2018 13:31:21 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+C++11 fixes.
+
+Index: main.cpp
+--- main.cpp.orig
main.cpp
+@@ -82,7 +82,7 @@ static char temp[65536] = "";
+ static void help()
+ {
+ printf(
+- "DGen/SDL v"VER"\n"
++ "DGen/SDL v" VER "\n"
+ "Usage: dgen [options] [romname [...]]\n\n"
+ "Where options are:\n"
+ "-v Print version number and exit.\n"
+@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
+ {
+ case 'v':
+ // Show version and exit
+-printf("DGen/SDL version "VER"\n");
++printf("DGen/SDL version " VER "\n");
+ return 0;
+ case 'r':
+ // Parse another RC file or stdin
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
Re: clang6 fallout
Note that qt4 knocks out hundreds of ports. Updated list as of Apr 13, 12:30 UTC: archivers/gcab audio/caps-plugins cad/kicad comms/hylafax databases/mysqlcc databases/pgadmin3 devel/avr/gcc devel/ptlib devel/qt-creator devel/sdcc emulators/BasiliskII emulators/desmume emulators/dgen-sdl emulators/fceux emulators/frodo emulators/nestopia games/alephone/alephone games/amoebax games/blobby games/dangerdeep games/enigma games/f1spirit games/ja2-stracciatella games/lostpixels games/meandmyshadow games/roadfighter games/stepmania games/sumwars games/vegastrike/engine games/warmux games/xminehunter graphics/animorph graphics/discwrapper graphics/rawstudio inputmethods/scim-anthy japanese/groff java/jlint math/libqalculate misc/openbabel misc/xnc multimedia/libmp4v2 multimedia/swfmill net/mldonkey net/mutella net/nam net/nepenthes sysutils/facter textproc/wkhtmltopdf www/mongrel2 x11/hs-X11-xft x11/kde/libs3 x11/qt4, -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: games/vegastrike/engine clang6 fix
Would this version fits better ?
Regards.
On 13 April 2018 at 11:55, Jonathan Gray wrote:
> On Fri, Apr 13, 2018 at 11:05:58AM +0100, David CARLIER wrote:
> > Hi,
> >
> > here a simple fix turning to C++03 mode.
>
> This will break gcc archs. --std only goes to c++98 with 4.2.1.
>
> >
> > Regards.
>
> > Index: engine/Makefile
> > ===
> > RCS file: /cvs/ports/games/vegastrike/engine/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- engine/Makefile 26 Dec 2017 19:18:57 - 1.10
> > +++ engine/Makefile 13 Apr 2018 10:02:23 -
> > @@ -41,7 +41,8 @@ CONFIGURE_ARGS += --with-python-version=
> > --disable-ffmpeg \
> > --with-data-dir="${TRUEPREFIX}/share/vegastrike"
> >
> > -CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue
> > +CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue \
> > + -std=c++03
> >
> > CONFIGURE_ENV = \
> > CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
> -I${LOCALBASE}/include/libpng" \
>
>
Index: engine/Makefile
===
RCS file: /cvs/ports/games/vegastrike/engine/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- engine/Makefile 26 Dec 2017 19:18:57 - 1.10
+++ engine/Makefile 13 Apr 2018 12:18:41 -
@@ -41,7 +41,12 @@ CONFIGURE_ARGS += --with-python-version=
--disable-ffmpeg \
--with-data-dir="${TRUEPREFIX}/share/vegastrike"
+.include
+
CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue
+.if ${PROPERTIES:Mclang}
+CXXFLAGS += -std=c++03
+.endif
CONFIGURE_ENV = \
CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
Re: UPDATE security/encfs
On Thu, Apr 12 2018, Björn Ketelaars wrote:
> A newer version of encfs is available (1.9.4), which fixes some issues.
> Changelog can be found at https://github.com/vgough/encfs/releases
>
> Regression test (there is only 1 unit test) succeeds. Tested lightly on
> amd64.
>
> Comments/OKs?
Have you tested runtime? If so, ok jca@, except for one of the comments
inline.
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/encfs/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile 19 Jan 2018 15:37:34 - 1.16
> +++ Makefile 12 Apr 2018 17:28:11 -
> @@ -4,7 +4,7 @@ BROKEN-powerpc = undefined reference to
>
> COMMENT =fuse-based cryptographic filesystem
>
> -V = 1.9.2
> +V = 1.9.4
> DISTNAME = encfs-$V
>
> CATEGORIES = security
> @@ -21,6 +21,7 @@ MASTER_SITES = https://github.com/vgoug
> COMPILER = base-clang ports-clang ports-gcc
>
> MODULES =devel/cmake
> +USE_NINJA = No
This doesn't seem to be desirable, is it?
> BUILD_DEPENDS = devel/gettext-tools
> LIB_DEPENDS =devel/gettext \
> textproc/tinyxml2
> @@ -28,11 +29,6 @@ LIB_DEPENDS = devel/gettext \
> CONFIGURE_ARGS = -DUSE_INTERNAL_TINYXML:Bool=Off
> CONFIGURE_ENV = CXXFLAGS="-DHAVE_UTIMENSAT
> -D_DIRENT_HAVE_D_TYPE"
>
> -# fixup, but those tests don't pass anyway
> -post-extract:
> - sed -i 's,\./build/,${WRKBUILD}/,g' ${WRKSRC}/tests/*.pl
> -
> -do-test:
> - ${SETENV} ${MAKE_ENV} ${WRKBUILD}/checkops
> +TEST_TARGET =unittests test
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/encfs/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 22 Aug 2017 01:32:34 - 1.2
> +++ distinfo 12 Apr 2018 17:28:11 -
> @@ -1,2 +1,2 @@
> -SHA256 (encfs-1.9.2.tar.gz) = zZ6XLNlWXNwmRzyG0sd8mN4x/G9gT6fRSd1dbjXUbqo=
> -SIZE (encfs-1.9.2.tar.gz) = 11043181
> +SHA256 (encfs-1.9.4.tar.gz) = IGVrTq1Y69jV9JpcNGtZ5w3C3DEiAVnltaEVv6G8QNY=
> +SIZE (encfs-1.9.4.tar.gz) = 2794574
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/security/encfs/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 22 Aug 2017 01:32:34 - 1.1
> +++ patches/patch-CMakeLists_txt 12 Apr 2018 17:28:11 -
> @@ -3,12 +3,21 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -244,7 +244,7 @@ if (POD2MAN)
> - ${CMAKE_CURRENT_LIST_DIR}/encfs/encfsctl.pod encfsctl.1)
> +@@ -120,6 +120,8 @@ if(LINKER_SUPPORTS_WLASNEEDED)
> + SET(EXTRA_LINKER_FLAGS "-Wl,--as-needed")
> + endif()
>
> - install (FILES ${CMAKE_BINARY_DIR}/encfs.1 ${CMAKE_BINARY_DIR}/encfsctl.1
> --DESTINATION share/man/man1)
> -+DESTINATION man/man1)
> - endif (POD2MAN)
> ++SET(EXTRA_LINKER_FLAGS "-L/usr/lib")
> ++
> + set(CMAKE_REQUIRED_FLAGS)
>
> - # Tests
> + # Check if we have some standard functions.
> +@@ -323,7 +325,7 @@ file (GLOB_RECURSE all_headers ${CMAKE_CURRENT_LIST_DI
> + add_custom_target (all_placeholder SOURCES ${all_headers})
> +
> + if (POD2MAN)
> +- set (MAN_DESTINATION "share/man/man1")
> ++ set (MAN_DESTINATION "man/man1")
> + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
> + set (MAN_DESTINATION "man/man1")
> + endif()
> Index: patches/patch-encfs_SSL_Compat_h
> ===
> RCS file: patches/patch-encfs_SSL_Compat_h
> diff -N patches/patch-encfs_SSL_Compat_h
> --- patches/patch-encfs_SSL_Compat_h 22 Aug 2017 01:32:34 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-encfs_SSL_Compat_h,v 1.1 2017/08/22 01:32:34 jca Exp $
> -
> -Index: encfs/SSL_Compat.h
> encfs/SSL_Compat.h.orig
> -+++ encfs/SSL_Compat.h
> -@@ -22,7 +22,7 @@
> - #define _SSL_Compat_incl_
> -
> - // OpenSSL < 1.1.0
> --#if OPENSSL_VERSION_NUMBER < 0x1010L
> -+#if OPENSSL_VERSION_NUMBER < 0x1010L || defined(LIBRESSL_VERSION_NUMBER)
The patch not needed any more because it's been committed upstream:
https://github.com/vgough/encfs/issues/455
But LibreSSL now provides the functions in that compat header. This
pattern is harmful, we should stop using dumb #ifdefs like this.
> - // Equivalent methods
> - #define EVP_MD_CTX_new EVP_MD_CTX_create
> Index: patches/patch-internal_easylogging++_h
> ===
> RCS file: patches/patch-internal_easylogging++_h
> diff -N patches/patch-internal_easylogging++_h
> --- patches/patch-int
Re: games/vegastrike/engine clang6 fix
On Fri, Apr 13, 2018 at 11:05:58AM +0100, David CARLIER wrote:
> Hi,
>
> here a simple fix turning to C++03 mode.
This will break gcc archs. --std only goes to c++98 with 4.2.1.
>
> Regards.
> Index: engine/Makefile
> ===
> RCS file: /cvs/ports/games/vegastrike/engine/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- engine/Makefile 26 Dec 2017 19:18:57 - 1.10
> +++ engine/Makefile 13 Apr 2018 10:02:23 -
> @@ -41,7 +41,8 @@ CONFIGURE_ARGS += --with-python-version=
> --disable-ffmpeg \
> --with-data-dir="${TRUEPREFIX}/share/vegastrike"
>
> -CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue
> +CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue \
> + -std=c++03
>
> CONFIGURE_ENV = \
> CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include
> -I${LOCALBASE}/include/libpng" \
update games/ja2-stracciatella
Hi,
here an update proposal for this port.
Regards.
Index: Makefile
===
RCS file: /cvs/ports/games/ja2-stracciatella/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 26 Jul 2017 22:45:21 - 1.3
+++ Makefile 13 Apr 2018 10:51:37 -
@@ -29,6 +29,8 @@ USE_GMAKE = Yes
MAKE_FLAGS = Q= WITH_UNITTESTS=0 WITH_DEBUGINFO=1 \
CXX=c++
+MAKE_ENV = CXXFLAGS="${CXXFLAGS} -std=c++03"
+
NO_TEST = Yes
# strip BOM, gcc 4.2.1 doesn't understand it
games/vegastrike/engine clang6 fix
Hi,
here a simple fix turning to C++03 mode.
Regards.
Index: engine/Makefile
===
RCS file: /cvs/ports/games/vegastrike/engine/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- engine/Makefile 26 Dec 2017 19:18:57 - 1.10
+++ engine/Makefile 13 Apr 2018 10:02:23 -
@@ -41,7 +41,8 @@ CONFIGURE_ARGS += --with-python-version=
--disable-ffmpeg \
--with-data-dir="${TRUEPREFIX}/share/vegastrike"
-CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue
+CXXFLAGS += -Wno-undefined-var-template -Wno-unused-volatile-lvalue \
+ -std=c++03
CONFIGURE_ENV = \
CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
Re: japanese/Wnn: remove jgroff dependency
On Thu, Apr 12, 2018 at 10:55:05PM +0900, YASUOKA Masahiko wrote: > Hi, > > > - Somebody please check whether installing EUC is *really* still > >important. As soon as it is confirmed that it is not, stop > >doing so. But don't let that delay this cleanup. > > I don't think installing EUC is needed. Even if people is still using > EUC terminal, they can use MANPAGER=jless to see the UTF-8 manuals. > Since our jless started support both EUC and UTF-8, so both > > env MANPATH=/usr/local/man/ja MANPAGER=jless > env MANPATH=/usr/local/man/ja_JP.EUC MANPAGER=jless > > will show the same result. Also theoretically there may be conversion > problems between EUC and UTF-8, but I think it's no problem if we fix > them when we hit such problems. Ah, cool, I wasn't aware of the jless update. I have no objection left, then.
