Re: NEW: security/dicepassc
You can obtain a diceware passphrase using tools already in base. $ sort -R diceware.asc | head -6 | cut -f2 P.S. The real fun with diceware is using some quality casino dice. On Mar 01 22:32, Mikolaj Kucharski wrote: > On Sat, Feb 25, 2017 at 09:52:09PM +, Mikolaj Kucharski wrote: > > > Can you add > > > # uses pledge() > > > just before WANTLIB? > > > > > > With that, ok danj@ if someone wants to import it. > > > > Updated port attached. > > Ping. > > https://marc.info/?l=openbsd-ports=148805954307219=2 > > -- > best regards > q# > -- Crescent ArnouxD59B 9AEA C09B 1EB6 1AF1 97CA 8750 F5B2 5C10 49F4 http://pastebin.com/rENiaPLq
Re: Ports with hardcoded "gcc", "g++"
On Thu, Mar 02, 2017 at 12:46:58AM +0100, Juan Francisco Cantero Hurtado wrote: > On Wed, Mar 01, 2017 at 11:36:52PM +0100, Juan Francisco Cantero Hurtado > wrote: > > On Wed, Mar 01, 2017 at 11:09:03PM +0100, Christian Weisgerber wrote: > > > Juan Francisco Cantero Hurtado: > > > > > > > They have a simple option to change the compilers but we need a variable > > > > with the realname of the compiler, i.e. clang or gcc. > > > > > > > > You can use "nim c -cc:clang" or "nim c -cc:gcc" (the default) or "nim c > > > > -cc:egcc". All of them are the name of the profile, not the compiler > > > > executable. > > > > > > > > Here is the patch. It includes some adittional changes. If someone has > > > > an better idea for the conditional... I'm listening :) > > > > > > CLANG_ARCHS was added incompletely, so you need arch-defines.mk > > > r1.32 for that: > > > > > > .include > > > > > > # CC is always "cc". We need the real name. > > > .if ${PROPERTIES:Mclang} > > > CC = clang > > > .else > > > CC = gcc > > > .endif > > > > > > BTW, I think using CC for a variable with different semantics is a > > > bad idea. Pick a different name, please. > > > > Thanks. How about "COMPILER" or "C_COMP"? > > I changed the variable to NIM_CC. OK? And now with "elif" -> "else" fixed. Index: Makefile === RCS file: /cvs/ports/lang/nim/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile9 Jan 2017 10:32:33 - 1.6 +++ Makefile1 Mar 2017 23:41:07 - @@ -5,6 +5,7 @@ ONLY_FOR_ARCHS =i386 amd64 COMMENT = statically typed, imperative programming language VERSION = 0.16.0 +REVISION = 0 DISTNAME = nim-${VERSION} EXTRACT_SUFX = .tar.xz @@ -19,23 +20,28 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = c m +SUBST_VARS += NIM_CC + post-patch: mkdir -p ${WRKSRC}/nimcache-port mkdir -p ${WRKSRC}/nimcache-port-test perl -i -pe "s#NIM_PORT_PATH#${PATH}#" ${WRKSRC}/koch.nim perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \ ${WRKSRC}/koch.nim + ${SUBST_CMD} ${WRKSRC}/koch.nim ${WRKSRC}/tests/testament/tester.nim \ + ${WRKSRC}/config/nim.cfg do-build: - cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ + cd ${WRKSRC} && ${SETENV} CC="${NIM_CC}" LINKER="${NIM_CC}" \ CFLAGS="${CFLAGS}" sh build.sh # slow machines can get a head of themselves and fail to link - cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" koch - cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" + cd ${WRKSRC} && bin/nim c -d:release --cc:${NIM_CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" \ + koch + cd ${WRKSRC} && ./koch boot -d:release --cc:${NIM_CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin @@ -49,9 +55,17 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim do-test: - cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \ - --parallelBuild:1 --listFullPaths --listCmd \ - --nimcache:"${WRKSRC}/nimcache-port-test" \ - --putenv:"PATH=${PATH}" + cd ${WRKSRC} && ${SETENV} ./koch test all -d:release --threads:on \ + --cc:${NIM_CC} --parallelBuild:1 --listFullPaths --listCmd \ + --passL:"-pthread -Wl,-rpath=.:/usr/local/lib:${WRKSRC}/nimcache-port-test/" \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" + +.include + +.if ${PROPERTIES:Mclang} +NIM_CC = clang +.else +NIM_CC = gcc +.endif .include Index: patches/patch-config_nim_cfg === RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_nim_cfg --- patches/patch-config_nim_cfg9 Jan 2017 10:32:33 - 1.3 +++ patches/patch-config_nim_cfg1 Mar 2017 23:41:07 - @@ -1,6 +1,15 @@ $OpenBSD: patch-config_nim_cfg,v 1.3 2017/01/09 10:32:33 juanfra Exp $ --- config/nim.cfg.origSun Jan 8 21:33:42 2017 -+++ config/nim.cfg Mon Jan 9 02:28:32 2017 config/nim.cfg Wed Mar 1 00:00:37 2017 +@@ -8,7 +8,7 @@ + # Environment variables can be accessed like so: + #
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 01, 2017 at 11:36:52PM +0100, Juan Francisco Cantero Hurtado wrote: > On Wed, Mar 01, 2017 at 11:09:03PM +0100, Christian Weisgerber wrote: > > Juan Francisco Cantero Hurtado: > > > > > They have a simple option to change the compilers but we need a variable > > > with the realname of the compiler, i.e. clang or gcc. > > > > > > You can use "nim c -cc:clang" or "nim c -cc:gcc" (the default) or "nim c > > > -cc:egcc". All of them are the name of the profile, not the compiler > > > executable. > > > > > > Here is the patch. It includes some adittional changes. If someone has > > > an better idea for the conditional... I'm listening :) > > > > CLANG_ARCHS was added incompletely, so you need arch-defines.mk > > r1.32 for that: > > > > .include > > > > # CC is always "cc". We need the real name. > > .if ${PROPERTIES:Mclang} > > CC = clang > > .else > > CC = gcc > > .endif > > > > BTW, I think using CC for a variable with different semantics is a > > bad idea. Pick a different name, please. > > Thanks. How about "COMPILER" or "C_COMP"? I changed the variable to NIM_CC. OK? Index: Makefile === RCS file: /cvs/ports/lang/nim/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile9 Jan 2017 10:32:33 - 1.6 +++ Makefile1 Mar 2017 23:41:07 - @@ -5,6 +5,7 @@ ONLY_FOR_ARCHS =i386 amd64 COMMENT = statically typed, imperative programming language VERSION = 0.16.0 +REVISION = 0 DISTNAME = nim-${VERSION} EXTRACT_SUFX = .tar.xz @@ -19,23 +20,28 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = c m +SUBST_VARS += NIM_CC + post-patch: mkdir -p ${WRKSRC}/nimcache-port mkdir -p ${WRKSRC}/nimcache-port-test perl -i -pe "s#NIM_PORT_PATH#${PATH}#" ${WRKSRC}/koch.nim perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \ ${WRKSRC}/koch.nim + ${SUBST_CMD} ${WRKSRC}/koch.nim ${WRKSRC}/tests/testament/tester.nim \ + ${WRKSRC}/config/nim.cfg do-build: - cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ + cd ${WRKSRC} && ${SETENV} CC="${NIM_CC}" LINKER="${NIM_CC}" \ CFLAGS="${CFLAGS}" sh build.sh # slow machines can get a head of themselves and fail to link - cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" koch - cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" + cd ${WRKSRC} && bin/nim c -d:release --cc:${NIM_CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" \ + koch + cd ${WRKSRC} && ./koch boot -d:release --cc:${NIM_CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin @@ -49,9 +55,17 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim do-test: - cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \ - --parallelBuild:1 --listFullPaths --listCmd \ - --nimcache:"${WRKSRC}/nimcache-port-test" \ - --putenv:"PATH=${PATH}" + cd ${WRKSRC} && ${SETENV} ./koch test all -d:release --threads:on \ + --cc:${NIM_CC} --parallelBuild:1 --listFullPaths --listCmd \ + --passL:"-pthread -Wl,-rpath=.:/usr/local/lib:${WRKSRC}/nimcache-port-test/" \ + --putenv:"PATH=${PATH} CC=${NIM_CC} LINKER=${NIM_CC}" + +.include + +.if ${PROPERTIES:Mclang} +NIM_CC = clang +.elif +NIM_CC = gcc +.endif .include Index: patches/patch-config_nim_cfg === RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v retrieving revision 1.3 diff -u -p -r1.3 patch-config_nim_cfg --- patches/patch-config_nim_cfg9 Jan 2017 10:32:33 - 1.3 +++ patches/patch-config_nim_cfg1 Mar 2017 23:41:07 - @@ -1,6 +1,15 @@ $OpenBSD: patch-config_nim_cfg,v 1.3 2017/01/09 10:32:33 juanfra Exp $ --- config/nim.cfg.origSun Jan 8 21:33:42 2017 -+++ config/nim.cfg Mon Jan 9 02:28:32 2017 config/nim.cfg Wed Mar 1 00:00:37 2017 +@@ -8,7 +8,7 @@ + # Environment variables can be accessed like so: + # gcc.path %= "$CC_PATH" + +-cc = gcc ++cc = ${NIM_CC} + + # additional options always passed to the compiler: + --parallel_build: "0" # 0 to auto-detect number of processors @@ -76,7
Re: sysctl set up in packages
On 2017/03/01 18:07, sven falempin wrote: > On Wed, Mar 1, 2017 at 10:25 AM, Marc Espiewrote: > > > On Tue, Feb 28, 2017 at 10:21:05PM +, Stuart Henderson wrote: > > > Send diff :) > > > > Rather, do not. > > > > Removing keywords from pkg tools is somewhat tricky. > > There are some steps you have to take to keep pkg_add -u working. > http://pastebin.com/QZacSKMU > > This breaks pkg_add -u because old installed package with the > sysctl declaration wont be understood. Actually it breaks pkg_delete too. And looking at the rcs files, some of the ports using this were removed only relatively recently (relating to linux emul, etc). There's definitely more involved than just removing the lines. > Running this would fix no ? > > sed -i s/@sysctl.*//g /var/db/pkg/*/+CONTENTS In some cases. In others the command line will be too long. In any event poking the package db files like that isn't recommended. > > Are you implying some user out there are using package to push > configuration live ? > ( The sysctl wont be there after a reboot ) > > Index: pkg_create.1 > === > RCS file: /cvs/src/usr.sbin/pkg_add/pkg_create.1,v > retrieving revision 1.102 > diff -u -p -r1.102 pkg_create.1 > --- pkg_create.128 Jun 2016 15:30:29 - 1.102 > +++ pkg_create.11 Mar 2017 23:07:12 - > @@ -730,6 +730,9 @@ variable > is set to exactly/at least a given value > .Ar val . > Adjust it otherwise. > +.Xr > +sysctl.conf 5 > +must be updated. > .Pp > .It Cm @unexec Ar command > Execute > > > -- > > - > () ascii ribbon campaign - against html e-mail > /\
Re: sysctl set up in packages
On Wed, Mar 1, 2017 at 10:25 AM, Marc Espiewrote: > On Tue, Feb 28, 2017 at 10:21:05PM +, Stuart Henderson wrote: > > Send diff :) > > Rather, do not. > > Removing keywords from pkg tools is somewhat tricky. > There are some steps you have to take to keep pkg_add -u working. > http://pastebin.com/QZacSKMU This breaks pkg_add -u because old installed package with the sysctl declaration wont be understood. Running this would fix no ? sed -i s/@sysctl.*//g /var/db/pkg/*/+CONTENTS Are you implying some user out there are using package to push configuration live ? ( The sysctl wont be there after a reboot ) Index: pkg_create.1 === RCS file: /cvs/src/usr.sbin/pkg_add/pkg_create.1,v retrieving revision 1.102 diff -u -p -r1.102 pkg_create.1 --- pkg_create.128 Jun 2016 15:30:29 - 1.102 +++ pkg_create.11 Mar 2017 23:07:12 - @@ -730,6 +730,9 @@ variable is set to exactly/at least a given value .Ar val . Adjust it otherwise. +.Xr +sysctl.conf 5 +must be updated. .Pp .It Cm @unexec Ar command Execute -- - () ascii ribbon campaign - against html e-mail /\
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jmatt...@cvs.openbsd.org2017/03/01 15:54:13 Modified files: databases/riak : Makefile databases/riak/patches: patch-deps_eleveldb_c_src_leveldb_build_config_mk Log message: honor CC and CXX
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 01, 2017 at 11:09:03PM +0100, Christian Weisgerber wrote: > Juan Francisco Cantero Hurtado: > > > They have a simple option to change the compilers but we need a variable > > with the realname of the compiler, i.e. clang or gcc. > > > > You can use "nim c -cc:clang" or "nim c -cc:gcc" (the default) or "nim c > > -cc:egcc". All of them are the name of the profile, not the compiler > > executable. > > > > Here is the patch. It includes some adittional changes. If someone has > > an better idea for the conditional... I'm listening :) > > CLANG_ARCHS was added incompletely, so you need arch-defines.mk > r1.32 for that: > > .include > > # CC is always "cc". We need the real name. > .if ${PROPERTIES:Mclang} > CC = clang > .else > CC = gcc > .endif > > BTW, I think using CC for a variable with different semantics is a > bad idea. Pick a different name, please. Thanks. How about "COMPILER" or "C_COMP"? -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: NEW: security/dicepassc
On Sat, Feb 25, 2017 at 09:52:09PM +, Mikolaj Kucharski wrote: > > Can you add > > # uses pledge() > > just before WANTLIB? > > > > With that, ok danj@ if someone wants to import it. > > Updated port attached. Ping. https://marc.info/?l=openbsd-ports=148805954307219=2 -- best regards q#
Re: UPDATE: www/cgit 1.1
On Wed, Mar 01, 2017 at 09:47:12PM +0100, Rafael Sadowski wrote: > > Please switch HOMEPAGE and MASTER_SITES0 to https, thanks. > Good point! Changed: diff --git a/www/cgit/Makefile b/www/cgit/Makefile index a3040ebf78e..c339fbadb88 100644 --- a/www/cgit/Makefile +++ b/www/cgit/Makefile @@ -2,15 +2,15 @@ COMMENT = web frontend for git repositories -DISTNAME = cgit-1.0 +DISTNAME = cgit-1.1 CATEGORIES = www devel DISTFILES =${DISTNAME}.tar.gz:0 \ - git-2.8.3.tar.gz:1 + git-2.10.2.tar.gz:1 -MASTER_SITES0 =http://git.zx2c4.com/cgit/snapshot/ +MASTER_SITES0 =https://git.zx2c4.com/cgit/snapshot/ MASTER_SITES1 =https://www.kernel.org/pub/software/scm/git/ -HOMEPAGE = http://git.zx2c4.com/cgit/about/ +HOMEPAGE = https://git.zx2c4.com/cgit/about/ # GPLv2 PERMIT_PACKAGE_CDROM = Yes @@ -20,7 +20,7 @@ USE_GMAKE = yes LIB_DEPENDS = converters/libiconv PREFIX = ${VARBASE}/www -MAKE_FLAGS += V=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib' +MAKE_FLAGS += V=1 NO_GETTEXT=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib' post-extract: rmdir ${WRKSRC}/git diff --git a/www/cgit/distinfo b/www/cgit/distinfo index d71bfacc15a..d1f527d5097 100644 --- a/www/cgit/distinfo +++ b/www/cgit/distinfo @@ -1,4 +1,4 @@ -SHA256 (cgit-1.0.tar.gz) = 56yIddhatPaqQc3fGB3JjAuoBI6HdFLOtEAcPucvpPQ= -SHA256 (git-2.8.3.tar.gz) = La1Qx1gznW9SNTCdtiDlEkngAA/zSqLyrLy4TCEj7Qk= -SIZE (cgit-1.0.tar.gz) = 105139 -SIZE (git-2.8.3.tar.gz) = 5847849 +SHA256 (cgit-1.1.tar.gz) = 9A3soz5VbJohi73Ce9nEd62ZxwhjkjCWhtIWkB3RDTs= +SHA256 (git-2.10.2.tar.gz) = PX7yddgLl6qmHztr6dPcUWIC5vb12IXywJtZ66WS3MQ= +SIZE (cgit-1.1.tar.gz) = 105738 +SIZE (git-2.10.2.tar.gz) = 6065116 diff --git a/www/cgit/patches/patch-Makefile b/www/cgit/patches/patch-Makefile index a21e6ae7038..f3fc76d1edf 100644 --- a/www/cgit/patches/patch-Makefile +++ b/www/cgit/patches/patch-Makefile @@ -1,9 +1,8 @@ -$OpenBSD: patch-Makefile,v 1.7 2016/06/17 07:22:39 landry Exp $ Makefile.orig Tue Jun 7 14:45:04 2016 -+++ Makefile Fri Jun 17 07:30:53 2016 +--- Makefile.orig Thu Feb 23 10:40:08 2017 Makefile Thu Feb 23 10:42:15 2017 @@ -2,11 +2,11 @@ all:: - CGIT_VERSION = v1.0 + CGIT_VERSION = v1.1 CGIT_SCRIPT_NAME = cgit.cgi -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit -CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) @@ -23,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.7 2016/06/17 07:22:39 landry Exp $ $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt - $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) -- $(COPYTREE) filters/* $(DESTDIR)$(filterdir) +- $(COPYTREE) filters/* $(DESTDIR)$(filterdir) install-doc: install-man install-html install-pdf diff --git a/www/cgit/patches/patch-setup_c b/www/cgit/patches/patch-setup_c new file mode 100644 index 000..f7985677bb1 --- /dev/null +++ b/www/cgit/patches/patch-setup_c @@ -0,0 +1,18 @@ +--- git/setup.c.orig Wed Mar 1 21:01:06 2017 git/setup.cWed Mar 1 21:01:56 2017 +@@ -1024,6 +1024,7 @@ const char *resolve_gitdir(const char *suspect) + /* if any standard file descriptor is missing open it to /dev/null */ + void sanitize_stdfds(void) + { ++#if 0 + int fd = open("/dev/null", O_RDWR, 0); + while (fd != -1 && fd < 2) + fd = dup(fd); +@@ -1031,6 +1032,7 @@ void sanitize_stdfds(void) + die_errno("open /dev/null or dup failed"); + if (fd > 2) + close(fd); ++#endif + } + + int daemonize(void) diff --git a/www/cgit/pkg/README b/www/cgit/pkg/README index fc0ef92f4dc..29f18b8eb5a 100644 --- a/www/cgit/pkg/README +++ b/www/cgit/pkg/README @@ -12,6 +12,21 @@ Refer to http://git.zx2c4.com/cgit/tree/cgitrc.5.txt for the syntax. Webserver config +OpenBSD httpd +- +ext_ip="0.0.0.0" +server "default" { + listen on $ext_ip port 80 + + # don't serve static files from cgit CGI: cgit.css and cgit.png + location "/cgit.*" { + root "/cgit" + no fastcgi + } + root "/cgi-bin/cgit.cgi" + fastcgi socket "/run/slowcgi.sock" +} + Nginx - An example nginx config snippet is provided below, to run with @@ -47,3 +62,14 @@ ScriptAlias /cgit /cgi-bin/cgit.cgi Order allow,deny Allow from all + + +snapshots +- +Nginx and OpenBSD httpd use chroot(2). + +For .tar.gz snapshot support a static binary in $chroot/bin/gzip is required. + + cd /usr/src/usr.bin/compress + make clean && make LDFLAGS="-static -pie" + cp obj/compress $chroot/bin/gzip -- Kind regards, Hiltjo
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 01, 2017 at 08:41:17PM +, Stuart Henderson wrote: > On 2017/03/01 21:15, Juan Francisco Cantero Hurtado wrote: > > On Wed, Mar 01, 2017 at 05:45:32PM +, Stuart Henderson wrote: > > > On 2017/03/01 17:10, Juan Francisco Cantero Hurtado wrote: > > > > On Tue, Feb 28, 2017 at 07:11:48PM +0100, Juan Francisco Cantero > > > > Hurtado wrote: > > > > > On Tue, Feb 28, 2017 at 01:03:38PM +, Christian Weisgerber wrote: > > > > > > The fixes that have been committed have unlocked additional parts > > > > > > of the ports tree, revealing new build failures. Here is an updated > > > > > > list. I've added the MAINTAINERs. > > > > > > > > > > > > lang/nimThe OpenBSD ports mailing-list > > > > > >> > > > > > > > > > I've a patch for nim from two or three days ago. It builds the package > > > > > but I don't find where is the gcc command in the tests and I don't > > > > > want > > > > > commit the changes without to run first the tests. > > > > > > > > Everything is working now but I need help with something. Nim uses a > > > > kind of compiler profiles, so we can't just add "${CC}" to the build, we > > > > need to define the real compiler, i.e. gcc, egcc or clang. Now I'm using > > > > an if/else conditional with MACHINE_ARCH to define the compiler but I > > > > would like to use something like "if CLANG_ARCHS contains > > > > MACHINE_ARCH...". I don't know how to write that. Any idea?. > > > > > > > > -- > > > > Juan Francisco Cantero Hurtado http://juanfra.info > > > > > > > > > > Ports should honour CC/CXX. Can you sed these into wherever the > > > compiler profile is defined? > > > > No, because ${CC} is always "cc", not "gcc" or "clang". > > ${CC} is not always "cc", it can be set to something else. For example > if I do "scan-build make", it is /usr/local/bin/../libexec/ccc-analyzer. > It might be something else if I want to use distcc, etc. I know. I meant "by default". I used "make CC=clang" to work in the port. Anyway, I need a final solution for the port. If people wants to use "mycompiler" to build nim, then they can create a new entry for the compiler in the nim config and to run make with "CC=mycompiler". e.g. jturner@ added the entry for "egcc" long time ago. Meanwhile, I could commit the port with the conditional commented: #.if ${MACHINE_ARCH} == "amd64" #CC = clang #.elif CC = gcc #.endif With the changes, "CC=cc" will not work anymore. In fact, nim never used "cc" as its compiler. -- Juan Francisco Cantero Hurtado http://juanfra.info
Re: Ports with hardcoded "gcc", "g++"
Juan Francisco Cantero Hurtado: > They have a simple option to change the compilers but we need a variable > with the realname of the compiler, i.e. clang or gcc. > > You can use "nim c -cc:clang" or "nim c -cc:gcc" (the default) or "nim c > -cc:egcc". All of them are the name of the profile, not the compiler > executable. > > Here is the patch. It includes some adittional changes. If someone has > an better idea for the conditional... I'm listening :) CLANG_ARCHS was added incompletely, so you need arch-defines.mk r1.32 for that: .include # CC is always "cc". We need the real name. .if ${PROPERTIES:Mclang} CC = clang .else CC = gcc .endif BTW, I think using CC for a variable with different semantics is a bad idea. Pick a different name, please. -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fcam...@cvs.openbsd.org 2017/03/01 15:02:56 Modified files: net/gophernicus: Makefile distinfo Log message: Update gophernicus to 2.4. OK juanfra@, sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2017/03/01 14:58:53 Modified files: infrastructure/mk: arch-defines.mk Log message: add CLANG_ARCHS to PROPERTIES
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 1, 2017, at 17:47, Amit Kulkarni wrote: > I meant to say the .a file is missing for libQtWebkit > > Thanks > Found the cause and fixed it. Attached patch makes it build correctly without g++/gcc. Thanks again Stuart and Amit for the hints. Frank Index: Makefile === RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile 13 Sep 2016 18:52:06 - 1.12 +++ Makefile 1 Mar 2017 20:06:14 - @@ -39,7 +39,9 @@ LIB_DEPENDS = converters/libiconv \ USE_GMAKE = Yes MAKE_FLAGS = LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION} -MAKE_ENV += WRKBUILD=${WRKBUILD} +MAKE_ENV += WRKBUILD=${WRKBUILD} \ + PORTS_CC="${CC}" PORTS_CXX="${CXX}" +CONFIGURE_ENV = PORTS_CC="${CC}" PORTS_CXX="${CXX}" FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX} SEPARATE_BUILD = Yes @@ -51,7 +53,7 @@ pre-patch: cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt do-configure: - mkdir ${WRKBUILD}/qt + mkdir -p ${WRKBUILD}/qt # qt config options taken from scripts/build.py cd ${WRKBUILD}/qt && \ env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \ Index: patches/patch-qt_configure === RCS file: patches/patch-qt_configure diff -N patches/patch-qt_configure --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-qt_configure 1 Mar 2017 20:06:14 - @@ -0,0 +1,12 @@ +$OpenBSD$ +--- qt/configure.orig Wed Mar 1 20:53:04 2017 qt/configure Wed Mar 1 20:53:19 2017 +@@ -3411,7 +3411,7 @@ else + CFG_FRAMEWORK=no + fi + +-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` ++QMAKE_CONF_COMPILER="${PORTS_CXX}" + TEST_COMPILER="$CXX" + + [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER Index: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf === RCS file: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf diff -N patches/patch-qt_mkspecs_openbsd-g++_qmake_conf --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-qt_mkspecs_openbsd-g++_qmake_conf 1 Mar 2017 20:06:14 - @@ -0,0 +1,36 @@ +$OpenBSD$ +--- qt/mkspecs/openbsd-g++/qmake.conf.orig Tue May 10 09:19:52 2016 qt/mkspecs/openbsd-g++/qmake.conf Wed Mar 1 12:07:44 2017 +@@ -8,7 +8,7 @@ TEMPLATE = app + CONFIG += qt warn_on release link_prl gdb_dwarf_index + QT += core gui + +-QMAKE_CC = gcc ++QMAKE_CC = ${PORTS_CC} + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -24,7 +24,7 @@ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread + +-QMAKE_CXX = g++ ++QMAKE_CXX = ${PORTS_CXX} + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +@@ -45,10 +45,10 @@ QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] + QMAKE_INCDIR_OPENGL = /usr/X11R6/include + QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +-QMAKE_LINK = g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LINK_C = gcc +-QMAKE_LINK_C_SHLIB = gcc ++QMAKE_LINK = $$QMAKE_CXX ++QMAKE_LINK_SHLIB = $$QMAKE_CXX ++QMAKE_LINK_C = $$QMAKE_CC ++QMAKE_LINK_C_SHLIB = $$QMAKE_CC + QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ + $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ + -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2017/03/01 13:42:57 Modified files: games/teeworlds: Makefile Added files: games/teeworlds/patches: patch-configure_lua Log message: honor CC, from maintainer Donovan Watteau
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2017/03/01 13:43:06 Modified files: audio/quodlibet: Makefile Log message: fix RUN_DEPENDS, breakage reported by Lars
Re: Ports with hardcoded "gcc", "g++"
On 2017/03/01 21:15, Juan Francisco Cantero Hurtado wrote: > On Wed, Mar 01, 2017 at 05:45:32PM +, Stuart Henderson wrote: > > On 2017/03/01 17:10, Juan Francisco Cantero Hurtado wrote: > > > On Tue, Feb 28, 2017 at 07:11:48PM +0100, Juan Francisco Cantero Hurtado > > > wrote: > > > > On Tue, Feb 28, 2017 at 01:03:38PM +, Christian Weisgerber wrote: > > > > > The fixes that have been committed have unlocked additional parts > > > > > of the ports tree, revealing new build failures. Here is an updated > > > > > list. I've added the MAINTAINERs. > > > > > > > > > > lang/nimThe OpenBSD ports mailing-list> > > > > > > > I've a patch for nim from two or three days ago. It builds the package > > > > but I don't find where is the gcc command in the tests and I don't want > > > > commit the changes without to run first the tests. > > > > > > Everything is working now but I need help with something. Nim uses a > > > kind of compiler profiles, so we can't just add "${CC}" to the build, we > > > need to define the real compiler, i.e. gcc, egcc or clang. Now I'm using > > > an if/else conditional with MACHINE_ARCH to define the compiler but I > > > would like to use something like "if CLANG_ARCHS contains > > > MACHINE_ARCH...". I don't know how to write that. Any idea?. > > > > > > -- > > > Juan Francisco Cantero Hurtado http://juanfra.info > > > > > > > Ports should honour CC/CXX. Can you sed these into wherever the > > compiler profile is defined? > > No, because ${CC} is always "cc", not "gcc" or "clang". ${CC} is not always "cc", it can be set to something else. For example if I do "scan-build make", it is /usr/local/bin/../libexec/ccc-analyzer. It might be something else if I want to use distcc, etc.
UPDATE: www/cgit 1.1
Hi, This bumps the version of cgit from 1.0 to 1.1. Changed in the patch below: - pass the option NO_GETTEXT=1 to git to disable gettext support. - add a patch patches/patch-setup_c to not open /dev/null in the chroot. alternatively the user can not use this patch and make the device node in $chroot/dev/null and disable the "nodev" mountpoint option if needed. - minor change made to patch/patch_Makefile required to patch. - add a OpenBSD httpd (with slowcgi) example to the README. - add an explanation a static gzip binary is required for .tar.gz snapshot support. tested on amd64. Unrelated, but maybe worth mentioning: Cgit used to output a part of the header to the client, because it uses write(2) directly unbuffered. I'm happy to report this commit in -current fixed it: https://github.com/openbsd/src/commit/e6c0e46b10b1ac06c178c4ee0b2e0bd058797eb4 diff --git a/www/cgit/Makefile b/www/cgit/Makefile index a3040ebf78e..ca9e9369059 100644 --- a/www/cgit/Makefile +++ b/www/cgit/Makefile @@ -2,11 +2,11 @@ COMMENT = web frontend for git repositories -DISTNAME = cgit-1.0 +DISTNAME = cgit-1.1 CATEGORIES = www devel DISTFILES =${DISTNAME}.tar.gz:0 \ - git-2.8.3.tar.gz:1 + git-2.10.2.tar.gz:1 MASTER_SITES0 =http://git.zx2c4.com/cgit/snapshot/ MASTER_SITES1 =https://www.kernel.org/pub/software/scm/git/ @@ -20,7 +20,7 @@ USE_GMAKE = yes LIB_DEPENDS = converters/libiconv PREFIX = ${VARBASE}/www -MAKE_FLAGS += V=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib' +MAKE_FLAGS += V=1 NO_GETTEXT=1 NO_LUA=1 LDFLAGS+='${STATIC} -L${LOCALBASE}/lib' post-extract: rmdir ${WRKSRC}/git diff --git a/www/cgit/distinfo b/www/cgit/distinfo index d71bfacc15a..d1f527d5097 100644 --- a/www/cgit/distinfo +++ b/www/cgit/distinfo @@ -1,4 +1,4 @@ -SHA256 (cgit-1.0.tar.gz) = 56yIddhatPaqQc3fGB3JjAuoBI6HdFLOtEAcPucvpPQ= -SHA256 (git-2.8.3.tar.gz) = La1Qx1gznW9SNTCdtiDlEkngAA/zSqLyrLy4TCEj7Qk= -SIZE (cgit-1.0.tar.gz) = 105139 -SIZE (git-2.8.3.tar.gz) = 5847849 +SHA256 (cgit-1.1.tar.gz) = 9A3soz5VbJohi73Ce9nEd62ZxwhjkjCWhtIWkB3RDTs= +SHA256 (git-2.10.2.tar.gz) = PX7yddgLl6qmHztr6dPcUWIC5vb12IXywJtZ66WS3MQ= +SIZE (cgit-1.1.tar.gz) = 105738 +SIZE (git-2.10.2.tar.gz) = 6065116 diff --git a/www/cgit/patches/patch-Makefile b/www/cgit/patches/patch-Makefile index a21e6ae7038..f3fc76d1edf 100644 --- a/www/cgit/patches/patch-Makefile +++ b/www/cgit/patches/patch-Makefile @@ -1,9 +1,8 @@ -$OpenBSD: patch-Makefile,v 1.7 2016/06/17 07:22:39 landry Exp $ Makefile.orig Tue Jun 7 14:45:04 2016 -+++ Makefile Fri Jun 17 07:30:53 2016 +--- Makefile.orig Thu Feb 23 10:40:08 2017 Makefile Thu Feb 23 10:42:15 2017 @@ -2,11 +2,11 @@ all:: - CGIT_VERSION = v1.0 + CGIT_VERSION = v1.1 CGIT_SCRIPT_NAME = cgit.cgi -CGIT_SCRIPT_PATH = /var/www/htdocs/cgit -CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) @@ -23,7 +22,7 @@ $OpenBSD: patch-Makefile,v 1.7 2016/06/17 07:22:39 landry Exp $ $(INSTALL) -m 0644 favicon.ico $(DESTDIR)$(CGIT_DATA_PATH)/favicon.ico $(INSTALL) -m 0644 robots.txt $(DESTDIR)$(CGIT_DATA_PATH)/robots.txt - $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) -- $(COPYTREE) filters/* $(DESTDIR)$(filterdir) +- $(COPYTREE) filters/* $(DESTDIR)$(filterdir) install-doc: install-man install-html install-pdf diff --git a/www/cgit/patches/patch-setup_c b/www/cgit/patches/patch-setup_c new file mode 100644 index 000..f7985677bb1 --- /dev/null +++ b/www/cgit/patches/patch-setup_c @@ -0,0 +1,18 @@ +--- git/setup.c.orig Wed Mar 1 21:01:06 2017 git/setup.cWed Mar 1 21:01:56 2017 +@@ -1024,6 +1024,7 @@ const char *resolve_gitdir(const char *suspect) + /* if any standard file descriptor is missing open it to /dev/null */ + void sanitize_stdfds(void) + { ++#if 0 + int fd = open("/dev/null", O_RDWR, 0); + while (fd != -1 && fd < 2) + fd = dup(fd); +@@ -1031,6 +1032,7 @@ void sanitize_stdfds(void) + die_errno("open /dev/null or dup failed"); + if (fd > 2) + close(fd); ++#endif + } + + int daemonize(void) diff --git a/www/cgit/pkg/README b/www/cgit/pkg/README index fc0ef92f4dc..29f18b8eb5a 100644 --- a/www/cgit/pkg/README +++ b/www/cgit/pkg/README @@ -12,6 +12,21 @@ Refer to http://git.zx2c4.com/cgit/tree/cgitrc.5.txt for the syntax. Webserver config +OpenBSD httpd +- +ext_ip="0.0.0.0" +server "default" { + listen on $ext_ip port 80 + + # don't serve static files from cgit CGI: cgit.css and cgit.png + location "/cgit.*" { + root "/cgit" + no fastcgi + } + root "/cgi-bin/cgit.cgi" + fastcgi socket "/run/slowcgi.sock" +} + Nginx - An example nginx config snippet is provided below, to run with @@ -47,3 +62,14 @@ ScriptAlias /cgit /cgi-bin/cgit.cgi Order allow,deny Allow from all + +
[UPDATE] net/gophernicus to 2.4
Hi ports@, Here is a diff to update net/gophernicus to 2.4. OK? Index: Makefile === RCS file: /cvs/ports/net/gophernicus/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- Makefile28 Dec 2016 17:09:17 - 1.14 +++ Makefile1 Mar 2017 20:23:59 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.14 2016/12/28 17:09:17 fcambus Exp $ COMMENT= modern gopher server -DISTNAME= gophernicus-2.2 +DISTNAME= gophernicus-2.4 CATEGORIES=net HOMEPAGE= gopher://gophernicus.org/ Index: distinfo === RCS file: /cvs/ports/net/gophernicus/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo28 Dec 2016 17:09:17 - 1.7 +++ distinfo1 Mar 2017 20:23:59 - @@ -1,2 +1,2 @@ -SHA256 (gophernicus-2.2.tar.gz) = mWuKkZNuPLX+WHUWTqjpHZpUje0u0zwMYvoEb1BAorw= -SIZE (gophernicus-2.2.tar.gz) = 207600 +SHA256 (gophernicus-2.4.tar.gz) = kFzujCtuyq0W9JZdlPCLXNJ4Fu1WIPkHD4XlEWQIueU= +SIZE (gophernicus-2.4.tar.gz) = 51310
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 01, 2017 at 05:45:32PM +, Stuart Henderson wrote: > On 2017/03/01 17:10, Juan Francisco Cantero Hurtado wrote: > > On Tue, Feb 28, 2017 at 07:11:48PM +0100, Juan Francisco Cantero Hurtado > > wrote: > > > On Tue, Feb 28, 2017 at 01:03:38PM +, Christian Weisgerber wrote: > > > > The fixes that have been committed have unlocked additional parts > > > > of the ports tree, revealing new build failures. Here is an updated > > > > list. I've added the MAINTAINERs. > > > > > > > > lang/nimThe OpenBSD ports mailing-list> > > > > > I've a patch for nim from two or three days ago. It builds the package > > > but I don't find where is the gcc command in the tests and I don't want > > > commit the changes without to run first the tests. > > > > Everything is working now but I need help with something. Nim uses a > > kind of compiler profiles, so we can't just add "${CC}" to the build, we > > need to define the real compiler, i.e. gcc, egcc or clang. Now I'm using > > an if/else conditional with MACHINE_ARCH to define the compiler but I > > would like to use something like "if CLANG_ARCHS contains > > MACHINE_ARCH...". I don't know how to write that. Any idea?. > > > > -- > > Juan Francisco Cantero Hurtado http://juanfra.info > > > > Ports should honour CC/CXX. Can you sed these into wherever the > compiler profile is defined? No, because ${CC} is always "cc", not "gcc" or "clang". We can't use a regex blindly to modify nim because it will give us problems. Patching the code is even worse because the updates will be harder and nim hasn't a maintainer. They have a simple option to change the compilers but we need a variable with the realname of the compiler, i.e. clang or gcc. You can use "nim c -cc:clang" or "nim c -cc:gcc" (the default) or "nim c -cc:egcc". All of them are the name of the profile, not the compiler executable. Here is the patch. It includes some adittional changes. If someone has an better idea for the conditional... I'm listening :) Index: Makefile === RCS file: /cvs/ports/lang/nim/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile9 Jan 2017 10:32:33 - 1.6 +++ Makefile1 Mar 2017 19:55:21 - @@ -5,6 +5,7 @@ ONLY_FOR_ARCHS =i386 amd64 COMMENT = statically typed, imperative programming language VERSION = 0.16.0 +REVISION = 0 DISTNAME = nim-${VERSION} EXTRACT_SUFX = .tar.xz @@ -19,23 +20,28 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB = c m +SUBST_VARS += CC + post-patch: mkdir -p ${WRKSRC}/nimcache-port mkdir -p ${WRKSRC}/nimcache-port-test perl -i -pe "s#NIM_PORT_PATH#${PATH}#" ${WRKSRC}/koch.nim perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \ ${WRKSRC}/koch.nim + ${SUBST_CMD} ${WRKSRC}/koch.nim ${WRKSRC}/tests/testament/tester.nim \ + ${WRKSRC}/config/nim.cfg do-build: cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \ CFLAGS="${CFLAGS}" sh build.sh # slow machines can get a head of themselves and fail to link - cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" koch - cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \ - --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \ - --listCmd --putenv:"PATH=${PATH}" + cd ${WRKSRC} && bin/nim c -d:release --cc:${CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${CC} LINKER=${CC}" \ + koch + cd ${WRKSRC} && ./koch boot -d:release --cc:${CC} --parallelBuild:1 \ + --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths --listCmd \ + --putenv:"PATH=${PATH} CC=${CC} LINKER=${CC}" do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin @@ -49,9 +55,16 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/config/*.cfg ${PREFIX}/share/examples/nim do-test: - cd ${WRKSRC} && ${SETENV} ./koch test all -d:release \ - --parallelBuild:1 --listFullPaths --listCmd \ - --nimcache:"${WRKSRC}/nimcache-port-test" \ - --putenv:"PATH=${PATH}" + cd ${WRKSRC} && ${SETENV} ./koch test all -d:release --threads:on \ + --cc:${CC} --parallelBuild:1 --listFullPaths --listCmd \ + --passL:"-pthread -Wl,-rpath=.:/usr/local/lib:${WRKSRC}/nimcache-port-test/" \ + --putenv:"PATH=${PATH} CC=${CC} LINKER=${CC}" + +# CC is always "cc". We need the real name. +.if ${MACHINE_ARCH} == "amd64" +CC = clang +.elif +CC = gcc +.endif .include Index: patches/patch-config_nim_cfg
UPDATE: graphics/inkscape
Hi All! simple bug fix update. Diff see below. Tested on amd64. Best regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/inkscape/Makefile,v retrieving revision 1.56 diff -u -p -u -p -r1.56 Makefile --- Makefile27 Feb 2017 19:42:43 - 1.56 +++ Makefile1 Mar 2017 19:18:15 - @@ -2,12 +2,14 @@ COMMENT = SVG vector drawing application -DISTNAME = inkscape-0.92.0 +DISTNAME = inkscape-0.92.1 CATEGORIES = graphics -MASTER_SITES = https://inkscape.org/gallery/item/10552/ +MASTER_SITES = https://inkscape.org/gallery/item/10682/ HOMEPAGE = https://www.inkscape.org/ + EXTRACT_SUFX = .tar.bz2 +DISTFILES =${DISTNAME}${EXTRACT_SUFX}{${DISTNAME}.tar_XlpI7qT.bz2} MAINTAINER = Rafael SadowskiIndex: distinfo === RCS file: /cvs/ports/graphics/inkscape/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo24 Feb 2017 08:05:34 - 1.11 +++ distinfo1 Mar 2017 19:18:15 - @@ -1,2 +1,2 @@ -SHA256 (inkscape-0.92.0.tar.bz2) = uLTBWaAESNRlOEUz5acNPzPl+ca3THbqXWNt3W3XulY= -SIZE (inkscape-0.92.0.tar.bz2) = 30827883 +SHA256 (inkscape-0.92.1.tar.bz2) = JXQFv4At4SXxfRI2OAk6N9sC6+M00kPPmw2JA/fIkAU= +SIZE (inkscape-0.92.1.tar.bz2) = 31222684 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/inkscape/pkg/PLIST,v retrieving revision 1.12 diff -u -p -u -p -r1.12 PLIST --- pkg/PLIST 24 Feb 2017 08:05:34 - 1.12 +++ pkg/PLIST 1 Mar 2017 19:18:15 - @@ -705,6 +705,16 @@ share/inkscape/tutorials/edge3d.svg share/inkscape/tutorials/gpl-2.svg share/inkscape/tutorials/making_markers.svg share/inkscape/tutorials/oldguitar.jpg +share/inkscape/tutorials/pixelart-dialog.de.png +share/inkscape/tutorials/pixelart-dialog.el.png +share/inkscape/tutorials/pixelart-dialog.en.png +share/inkscape/tutorials/pixelart-dialog.fr.png +share/inkscape/tutorials/pixelart-dialog.nl.png +share/inkscape/tutorials/pixelart-dialog.png +share/inkscape/tutorials/pixelart-dialog.pt.png +share/inkscape/tutorials/pixelart-dialog.ru.png +share/inkscape/tutorials/pixelart-dialog.sk.png +share/inkscape/tutorials/pixelart-dialog.zh_TW.png share/inkscape/tutorials/potrace.be.png share/inkscape/tutorials/potrace.ca.png share/inkscape/tutorials/potrace.de.png @@ -892,6 +902,8 @@ share/inkscape/tutorials/tutorial-tracin share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg share/inkscape/tutorials/tutorial-tracing-pixelart.pt.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg +share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg share/inkscape/tutorials/tutorial-tracing-pixelart.svg share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg share/inkscape/tutorials/tutorial-tracing.be.svg
Re: Ports with hardcoded "gcc", "g++"
On 2017/03/01 17:10, Juan Francisco Cantero Hurtado wrote: > On Tue, Feb 28, 2017 at 07:11:48PM +0100, Juan Francisco Cantero Hurtado > wrote: > > On Tue, Feb 28, 2017 at 01:03:38PM +, Christian Weisgerber wrote: > > > The fixes that have been committed have unlocked additional parts > > > of the ports tree, revealing new build failures. Here is an updated > > > list. I've added the MAINTAINERs. > > > > > > lang/nimThe OpenBSD ports mailing-list> > > > I've a patch for nim from two or three days ago. It builds the package > > but I don't find where is the gcc command in the tests and I don't want > > commit the changes without to run first the tests. > > Everything is working now but I need help with something. Nim uses a > kind of compiler profiles, so we can't just add "${CC}" to the build, we > need to define the real compiler, i.e. gcc, egcc or clang. Now I'm using > an if/else conditional with MACHINE_ARCH to define the compiler but I > would like to use something like "if CLANG_ARCHS contains > MACHINE_ARCH...". I don't know how to write that. Any idea?. > > -- > Juan Francisco Cantero Hurtado http://juanfra.info > Ports should honour CC/CXX. Can you sed these into wherever the compiler profile is defined?
Re: Ports with hardcoded "gcc", "g++"
On Tue, Feb 28, 2017 at 07:11:48PM +0100, Juan Francisco Cantero Hurtado wrote: > On Tue, Feb 28, 2017 at 01:03:38PM +, Christian Weisgerber wrote: > > The fixes that have been committed have unlocked additional parts > > of the ports tree, revealing new build failures. Here is an updated > > list. I've added the MAINTAINERs. > > > > lang/nimThe OpenBSD ports mailing-list> > I've a patch for nim from two or three days ago. It builds the package > but I don't find where is the gcc command in the tests and I don't want > commit the changes without to run first the tests. Everything is working now but I need help with something. Nim uses a kind of compiler profiles, so we can't just add "${CC}" to the build, we need to define the real compiler, i.e. gcc, egcc or clang. Now I'm using an if/else conditional with MACHINE_ARCH to define the compiler but I would like to use something like "if CLANG_ARCHS contains MACHINE_ARCH...". I don't know how to write that. Any idea?. -- Juan Francisco Cantero Hurtado http://juanfra.info
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2017/03/01 10:14:41 Modified files: x11/isomaster : Makefile Log message: Honour $CC
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2017/03/01 09:56:50 Modified files: editors/nano : Makefile distinfo editors/nano/patches: patch-doc_nano_1 Log message: update to 2.7.5 for various bug fixes and small improvements
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 1, 2017 at 10:44 AM, Amit Kulkarniwrote: > On Wed, Mar 1, 2017 at 10:10 AM, Frank Groeneveld > wrote: >> On Wed, Mar 1, 2017, at 15:14, Stuart Henderson wrote: >>> Oops, I forgot to re-run update-patches and had an old one. However >>> unfortunately >>> not enough as linking fails. >>> >> >> Thanks, that gets us a lot further indeed. The complete QT build >> finished and now only the final linking step fails indeed. >> For the interested, this is the command: >> >> c++ -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -pthread >> -shared -Wl,-soname,libwkhtmltox.so.0 -fPIC -o libwkhtmltox.so.0.0 >> loadsettings.o multipageloader.o tempfile.o converter.o websettings.o >> reflect.o utilities.o pdfsettings.o pdfconverter.o outline.o >> tocstylesheet.o imagesettings.o imageconverter.o pdf_c_bindings.o >> image_c_bindings.o moc_multipageloader_p.o moc_converter_p.o >> moc_pdfconverter_p.o moc_imageconverter_p.o moc_pdf_c_bindings_p.o >> moc_image_c_bindings_p.o moc_converter.o moc_multipageloader.o >> moc_utilities.o moc_pdfconverter.o moc_imageconverter.o >> qrc_wkhtmltopdf.o-L/usr/local/lib >> -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib >> -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/plugins/codecs >> -lqcncodecs -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib >> -L/usr/local/lib -lqjpcodecs -lqkrcodecs -lqtwcodecs -lQtWebKit >> -L/usr/X11R6/lib -lQtSvg -lQtXmlPatterns -lQtGui -ljpeg -lpng -lXrender >> -lfontconfig -lfreetype -lXext -lX11 -lQtNetwork -lQtCore -lz -lm >> -liconv >> /usr/bin/ld: cannot find -lQtWebKit >> >> Which seems weird to me, because: >> >> $ ls /usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib >> libQAxContainer.prllibQtNetwork.a libQtSvg.prl >> libQAxServer.prl libQtNetwork.lalibQtTest.a >> libQt3Support.la libQtNetwork.prl libQtTest.la >> libQt3Support.prl libQtOpenGL.la libQtTest.prl >> libQtCore.alibQtOpenGL.prllibQtWebKit.la >> libQtCore.la libQtOpenVG.la libQtWebKit.prl >> libQtCore.prl libQtOpenVG.prllibQtXml.a >> libQtDBus.la libQtScript.la libQtXml.la >> libQtDBus.prl libQtScript.prllibQtXml.prl >> libQtDeclarative.lalibQtScriptTools.lalibQtXmlPatterns.a >> libQtDeclarative.prl libQtScriptTools.prl >> libQtXmlPatterns.la >> libQtGui.a libQtSql.a >> libQtXmlPatterns.prl >> libQtGui.lalibQtSql.lalibpvrQWSWSEGL.prl >> libQtGui.prl libQtSql.prl pkgconfig >> libQtMultimedia.la libQtSvg.a >> libQtMultimedia.prllibQtSvg.la >> >> libQtWebkit seems to be there, right? >> >> > > libQtWebkit does not seem to be listed in /usr/ports/pobj, but the > others seem to be listed. I see QtNetwork is listed... I meant to say the .a file is missing for libQtWebkit Thanks
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 1, 2017 at 10:10 AM, Frank Groeneveldwrote: > On Wed, Mar 1, 2017, at 15:14, Stuart Henderson wrote: >> Oops, I forgot to re-run update-patches and had an old one. However >> unfortunately >> not enough as linking fails. >> > > Thanks, that gets us a lot further indeed. The complete QT build > finished and now only the final linking step fails indeed. > For the interested, this is the command: > > c++ -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -pthread > -shared -Wl,-soname,libwkhtmltox.so.0 -fPIC -o libwkhtmltox.so.0.0 > loadsettings.o multipageloader.o tempfile.o converter.o websettings.o > reflect.o utilities.o pdfsettings.o pdfconverter.o outline.o > tocstylesheet.o imagesettings.o imageconverter.o pdf_c_bindings.o > image_c_bindings.o moc_multipageloader_p.o moc_converter_p.o > moc_pdfconverter_p.o moc_imageconverter_p.o moc_pdf_c_bindings_p.o > moc_image_c_bindings_p.o moc_converter.o moc_multipageloader.o > moc_utilities.o moc_pdfconverter.o moc_imageconverter.o > qrc_wkhtmltopdf.o-L/usr/local/lib > -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib > -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/plugins/codecs > -lqcncodecs -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib > -L/usr/local/lib -lqjpcodecs -lqkrcodecs -lqtwcodecs -lQtWebKit > -L/usr/X11R6/lib -lQtSvg -lQtXmlPatterns -lQtGui -ljpeg -lpng -lXrender > -lfontconfig -lfreetype -lXext -lX11 -lQtNetwork -lQtCore -lz -lm > -liconv > /usr/bin/ld: cannot find -lQtWebKit > > Which seems weird to me, because: > > $ ls /usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib > libQAxContainer.prllibQtNetwork.a libQtSvg.prl > libQAxServer.prl libQtNetwork.lalibQtTest.a > libQt3Support.la libQtNetwork.prl libQtTest.la > libQt3Support.prl libQtOpenGL.la libQtTest.prl > libQtCore.alibQtOpenGL.prllibQtWebKit.la > libQtCore.la libQtOpenVG.la libQtWebKit.prl > libQtCore.prl libQtOpenVG.prllibQtXml.a > libQtDBus.la libQtScript.la libQtXml.la > libQtDBus.prl libQtScript.prllibQtXml.prl > libQtDeclarative.lalibQtScriptTools.lalibQtXmlPatterns.a > libQtDeclarative.prl libQtScriptTools.prl > libQtXmlPatterns.la > libQtGui.a libQtSql.a > libQtXmlPatterns.prl > libQtGui.lalibQtSql.lalibpvrQWSWSEGL.prl > libQtGui.prl libQtSql.prl pkgconfig > libQtMultimedia.la libQtSvg.a > libQtMultimedia.prllibQtSvg.la > > libQtWebkit seems to be there, right? > > libQtWebkit does not seem to be listed in /usr/ports/pobj, but the others seem to be listed. I see QtNetwork is listed...
Re: Ports with hardcoded "gcc", "g++"
On Wed, Mar 1, 2017, at 15:14, Stuart Henderson wrote: > Oops, I forgot to re-run update-patches and had an old one. However > unfortunately > not enough as linking fails. > Thanks, that gets us a lot further indeed. The complete QT build finished and now only the final linking step fails indeed. For the interested, this is the command: c++ -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -pthread -shared -Wl,-soname,libwkhtmltox.so.0 -fPIC -o libwkhtmltox.so.0.0 loadsettings.o multipageloader.o tempfile.o converter.o websettings.o reflect.o utilities.o pdfsettings.o pdfconverter.o outline.o tocstylesheet.o imagesettings.o imageconverter.o pdf_c_bindings.o image_c_bindings.o moc_multipageloader_p.o moc_converter_p.o moc_pdfconverter_p.o moc_imageconverter_p.o moc_pdf_c_bindings_p.o moc_image_c_bindings_p.o moc_converter.o moc_multipageloader.o moc_utilities.o moc_pdfconverter.o moc_imageconverter.o qrc_wkhtmltopdf.o-L/usr/local/lib -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/plugins/codecs -lqcncodecs -L/usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib -L/usr/local/lib -lqjpcodecs -lqkrcodecs -lqtwcodecs -lQtWebKit -L/usr/X11R6/lib -lQtSvg -lQtXmlPatterns -lQtGui -ljpeg -lpng -lXrender -lfontconfig -lfreetype -lXext -lX11 -lQtNetwork -lQtCore -lz -lm -liconv /usr/bin/ld: cannot find -lQtWebKit Which seems weird to me, because: $ ls /usr/ports/pobj/wkhtmltopdf-0.12.3.2/build-amd64/qt/lib libQAxContainer.prllibQtNetwork.a libQtSvg.prl libQAxServer.prl libQtNetwork.lalibQtTest.a libQt3Support.la libQtNetwork.prl libQtTest.la libQt3Support.prl libQtOpenGL.la libQtTest.prl libQtCore.alibQtOpenGL.prllibQtWebKit.la libQtCore.la libQtOpenVG.la libQtWebKit.prl libQtCore.prl libQtOpenVG.prllibQtXml.a libQtDBus.la libQtScript.la libQtXml.la libQtDBus.prl libQtScript.prllibQtXml.prl libQtDeclarative.lalibQtScriptTools.lalibQtXmlPatterns.a libQtDeclarative.prl libQtScriptTools.prl libQtXmlPatterns.la libQtGui.a libQtSql.a libQtXmlPatterns.prl libQtGui.lalibQtSql.lalibpvrQWSWSEGL.prl libQtGui.prl libQtSql.prl pkgconfig libQtMultimedia.la libQtSvg.a libQtMultimedia.prllibQtSvg.la libQtWebkit seems to be there, right? Frank
[update] zathura 0.3.7 and plugins
Hi, i just updated x11/girara to fix a gtk3 issue, and realized there was a pending update for zathura and its plugins... please test it if you use it (i only use the poppler plugin). It also removes all mupdf compat patches which were merged usptream. Landry Index: core/Makefile === RCS file: /cvs/ports/textproc/zathura/core/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- core/Makefile 17 Oct 2016 08:37:44 - 1.9 +++ core/Makefile 1 Mar 2017 16:07:53 - @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.9 2016/10/17 08:37:44 sthen Exp $ -V =0.3.6 -REVISION = 0 +V =0.3.7 COMMENT = document viewer for PDF and other formats with a vi-like UI DISTNAME = zathura-${V} CATEGORIES = textproc x11 @@ -24,7 +23,7 @@ LIB_DEPENDS = databases/sqlite3 \ graphics/gdk-pixbuf2 \ devel/libmagic \ - x11/girara>=0.2.3 + x11/girara>=0.2.7 MAKE_FLAGS = MANPREFIX=${PREFIX}/man \ DESKTOPPREFIX=${PREFIX}/share/applications \ Index: core/distinfo === RCS file: /cvs/ports/textproc/zathura/core/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- core/distinfo 16 Oct 2016 13:50:35 - 1.4 +++ core/distinfo 1 Mar 2017 16:07:53 - @@ -1,2 +1,2 @@ -SHA256 (zathura-0.3.6.tar.gz) = CGqL4l1Tj8ZTn77o8B7PFtJYGd+q1QzS29hOMBUsyzs= -SIZE (zathura-0.3.6.tar.gz) = 169560 +SHA256 (zathura-0.3.7.tar.gz) = Iq//ifQJPyL7ghiEF/+b+paVsZpP6JTcoFt8ghs5D/A= +SIZE (zathura-0.3.7.tar.gz) = 174095 Index: plugins/cb/Makefile === RCS file: /cvs/ports/textproc/zathura/plugins/cb/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- plugins/cb/Makefile 16 Oct 2016 13:51:21 - 1.5 +++ plugins/cb/Makefile 1 Mar 2017 16:07:53 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.5 2016/10/16 13:51:21 sthen Exp $ -V =0.1.5 +V =0.1.6 COMMENT = comic book plugin for zathura DISTNAME = zathura-cb-${V} Index: plugins/cb/distinfo === RCS file: /cvs/ports/textproc/zathura/plugins/cb/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- plugins/cb/distinfo 16 Oct 2016 13:51:21 - 1.2 +++ plugins/cb/distinfo 1 Mar 2017 16:07:53 - @@ -1,2 +1,2 @@ -SHA256 (zathura-cb-0.1.5.tar.gz) = N19pEr15ZIYDutUcNjXOKOrKe/TfUhwA/5Zz2bT/av0= -SIZE (zathura-cb-0.1.5.tar.gz) = 7193 +SHA256 (zathura-cb-0.1.6.tar.gz) = iI6VQh4TuUTRlgT6sSnlmSY29ATn7SB1HU9QVG8lNbo= +SIZE (zathura-cb-0.1.6.tar.gz) = 7205 Index: plugins/djvu/Makefile === RCS file: /cvs/ports/textproc/zathura/plugins/djvu/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- plugins/djvu/Makefile 16 Oct 2016 13:51:21 - 1.5 +++ plugins/djvu/Makefile 1 Mar 2017 16:07:53 - @@ -1,6 +1,6 @@ # $OpenBSD: Makefile,v 1.5 2016/10/16 13:51:21 sthen Exp $ -V =0.2.5 +V =0.2.6 COMMENT = djvu plugin for zathura DISTNAME = zathura-djvu-${V} Index: plugins/djvu/distinfo === RCS file: /cvs/ports/textproc/zathura/plugins/djvu/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- plugins/djvu/distinfo 16 Oct 2016 13:51:21 - 1.2 +++ plugins/djvu/distinfo 1 Mar 2017 16:07:53 - @@ -1,2 +1,2 @@ -SHA256 (zathura-djvu-0.2.5.tar.gz) = CLcRCvE+F6nSIb16D307R5s+MWMdeLxsXvtGJxopnA0= -SIZE (zathura-djvu-0.2.5.tar.gz) = 11137 +SHA256 (zathura-djvu-0.2.6.tar.gz) = rv72o7cC+gYUXxbyVZSQ9NltMga6/U4MeKwYR4jKwF8= +SIZE (zathura-djvu-0.2.6.tar.gz) = 11137 Index: plugins/mupdf/Makefile === RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- plugins/mupdf/Makefile 13 Dec 2016 13:15:17 - 1.9 +++ plugins/mupdf/Makefile 1 Mar 2017 16:07:53 - @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.9 2016/12/13 13:15:17 sthen Exp $ -V =0.3.0 -REVISION = 0 +V =0.3.1 COMMENT = mupdf pdf plugin for zathura DISTNAME = zathura-pdf-mupdf-${V} @@ -16,5 +15,6 @@ WANTLIB += atk-1.0 cairo cairo-gobject crypto gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 girara-gtk3 glib-2.0 gobject-2.0 gtk-3 intl WANTLIB += jbig2dec jpeg mupdf openjp2 pango-1.0 pangocairo-1.0 +WANTLIB += freetype harfbuzz z .include Index: plugins/mupdf/distinfo === RCS file: /cvs/ports/textproc/zathura/plugins/mupdf/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- plugins/mupdf/distinfo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2017/03/01 08:47:01 Modified files: x11/girara : Makefile distinfo x11/girara/pkg : PLIST Log message: Update to girara 0.2.7. Fixes dozens of warnings on the console when starting zathura since Gtk 3.22 update. (ie https://github.com/pwmt/girara/commit/949c879aa84e9496fabc7d3602060e29f9dc42a1)
Re: sysctl set up in packages
On Tue, Feb 28, 2017 at 10:21:05PM +, Stuart Henderson wrote: > Send diff :) Rather, do not. Removing keywords from pkg tools is somewhat tricky. There are some steps you have to take to keep pkg_add -u working.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2017/03/01 07:33:21 Modified files: net/py-idna: Makefile distinfo Log message: update to py-idna-2.3
Re: Ports with hardcoded "gcc", "g++"
On 2017/03/01 12:12, Stuart Henderson wrote: > On 2017/03/01 11:02, Frank Groeneveld wrote: > > On Tue, Feb 28, 2017, at 14:03, Christian Weisgerber wrote: > > > textproc/wkhtmltopdf Frank Groeneveld> > > > I've been trying to fix textporc/wkhtmltopdf in the last few days, but > > can't seem to make qmake use the correct compiler. The do-configure step > > of this port configures the patched QT that is part of the port. I've > > tried adding CXX="${CXX}" and/or SYS_CXX="${CXX}" to the env of that > > step, but it seems to be unused. Anybody got some hints on how to fix > > this one? > > > > Thanks! > > Frank > > > > It gets further with this, build is still running so there might be > more needed. Oops, I forgot to re-run update-patches and had an old one. However unfortunately not enough as linking fails. Index: Makefile === RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile13 Sep 2016 18:52:06 - 1.12 +++ Makefile1 Mar 2017 14:13:39 - @@ -39,7 +39,9 @@ LIB_DEPENDS = converters/libiconv \ USE_GMAKE =Yes MAKE_FLAGS = LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION} -MAKE_ENV +=WRKBUILD=${WRKBUILD} +MAKE_ENV +=WRKBUILD=${WRKBUILD} \ + PORTS_CC="${CC}" PORTS_CXX="${CXX}" +CONFIGURE_ENV =PORTS_CC="${CC}" PORTS_CXX="${CXX}" FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX} SEPARATE_BUILD = Yes @@ -51,7 +53,7 @@ pre-patch: cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt do-configure: - mkdir ${WRKBUILD}/qt + mkdir -p ${WRKBUILD}/qt # qt config options taken from scripts/build.py cd ${WRKBUILD}/qt && \ env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \ Index: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf === RCS file: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf diff -N patches/patch-qt_mkspecs_openbsd-g++_qmake_conf --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-qt_mkspecs_openbsd-g++_qmake_conf 1 Mar 2017 14:13:39 - @@ -0,0 +1,36 @@ +$OpenBSD$ +--- qt/mkspecs/openbsd-g++/qmake.conf.orig Tue May 10 09:19:52 2016 qt/mkspecs/openbsd-g++/qmake.conf Wed Mar 1 12:07:44 2017 +@@ -8,7 +8,7 @@ TEMPLATE = app + CONFIG+= qt warn_on release link_prl gdb_dwarf_index + QT+= core gui + +-QMAKE_CC = gcc ++QMAKE_CC = ${PORTS_CC} + QMAKE_LEX = flex + QMAKE_LEXFLAGS= + QMAKE_YACC= yacc +@@ -24,7 +24,7 @@ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread + +-QMAKE_CXX = g++ ++QMAKE_CXX = ${PORTS_CXX} + QMAKE_CXXFLAGS= $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON +@@ -45,10 +45,10 @@ QMAKE_LIBDIR_QT= $$[QT_INSTALL_LIBS] + QMAKE_INCDIR_OPENGL = /usr/X11R6/include + QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +-QMAKE_LINK= g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LINK_C = gcc +-QMAKE_LINK_C_SHLIB= gcc ++QMAKE_LINK= $$QMAKE_CXX ++QMAKE_LINK_SHLIB = $$QMAKE_CXX ++QMAKE_LINK_C = $$QMAKE_CC ++QMAKE_LINK_C_SHLIB= $$QMAKE_CC + QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ + $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ + -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2017/03/01 07:12:56 Modified files: devel/p5-Class-Virtual: Makefile distinfo Log message: Update to p5-Class-Virtual-0.08.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2017/03/01 06:52:46 Modified files: devel/p5-autobox: Makefile distinfo Log message: Update to p5-autobox-2.85.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2017/03/01 06:43:24 Modified files: databases/p5-DBIx-XHTML_Table: Makefile distinfo Log message: Update to p5-DBIx-XHTML_Table-1.49.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2017/03/01 06:11:07 Modified files: converters/p5-JSON-MaybeXS: Makefile distinfo Log message: update p5-JSON-MaybeXS to 1.003009
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2017/03/01 06:04:15 Modified files: x11/smplayer : Makefile distinfo x11/smplayer/patches: patch-Makefile x11/smplayer/pkg: PLIST Added files: x11/smplayer/patches: patch-webserver_Makefile Log message: Update for SMPlayer to 17.2.0 Tested by: Josh, thanks as always OK benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2017/03/01 05:23:10 Modified files: archivers/p5-Archive-Extract: Makefile distinfo Log message: Update to p5-Archive-Extract-0.80.
Re: Ports with hardcoded "gcc", "g++"
On 2017/03/01 11:02, Frank Groeneveld wrote: > On Tue, Feb 28, 2017, at 14:03, Christian Weisgerber wrote: > > textproc/wkhtmltopdf Frank Groeneveld> > I've been trying to fix textporc/wkhtmltopdf in the last few days, but > can't seem to make qmake use the correct compiler. The do-configure step > of this port configures the patched QT that is part of the port. I've > tried adding CXX="${CXX}" and/or SYS_CXX="${CXX}" to the env of that > step, but it seems to be unused. Anybody got some hints on how to fix > this one? > > Thanks! > Frank > It gets further with this, build is still running so there might be more needed. Index: Makefile === RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile13 Sep 2016 18:52:06 - 1.12 +++ Makefile1 Mar 2017 12:12:09 - @@ -39,7 +39,9 @@ LIB_DEPENDS = converters/libiconv \ USE_GMAKE =Yes MAKE_FLAGS = LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION} -MAKE_ENV +=WRKBUILD=${WRKBUILD} +MAKE_ENV +=WRKBUILD=${WRKBUILD} \ + PORTS_CC="${CC}" PORTS_CXX="${CXX}" +CONFIGURE_ENV =PORTS_CC="${CC}" PORTS_CXX="${CXX}" FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX} SEPARATE_BUILD = Yes @@ -51,7 +53,7 @@ pre-patch: cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt do-configure: - mkdir ${WRKBUILD}/qt + mkdir -p ${WRKBUILD}/qt # qt config options taken from scripts/build.py cd ${WRKBUILD}/qt && \ env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \ Index: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf === RCS file: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf diff -N patches/patch-qt_mkspecs_openbsd-g++_qmake_conf --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-qt_mkspecs_openbsd-g++_qmake_conf 1 Mar 2017 12:12:09 - @@ -0,0 +1,36 @@ +$OpenBSD$ +--- qt/mkspecs/openbsd-g++/qmake.conf.orig Wed Mar 1 12:02:31 2017 qt/mkspecs/openbsd-g++/qmake.conf Wed Mar 1 12:03:23 2017 +@@ -8,7 +8,7 @@ TEMPLATE = app + CONFIG+= qt warn_on release link_prl gdb_dwarf_index + QT+= core gui + +-QMAKE_CC = gcc ++QMAKE_CC = ${CC} + QMAKE_LEX = flex + QMAKE_LEXFLAGS= + QMAKE_YACC= yacc +@@ -24,7 +24,7 @@ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread + +-QMAKE_CXX = g++ ++QMAKE_CXX = ${CXX} + QMAKE_CXXFLAGS= $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON +@@ -45,10 +45,10 @@ QMAKE_LIBDIR_QT= $$[QT_INSTALL_LIBS] + QMAKE_INCDIR_OPENGL = /usr/X11R6/include + QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +-QMAKE_LINK= g++ +-QMAKE_LINK_SHLIB = g++ +-QMAKE_LINK_C = gcc +-QMAKE_LINK_C_SHLIB= gcc ++QMAKE_LINK= $$QMAKE_CXX ++QMAKE_LINK_SHLIB = $$QMAKE_CXX ++QMAKE_LINK_C = $$QMAKE_CC ++QMAKE_LINK_C_SHLIB= $$QMAKE_CC + QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ + $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ + -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2017/03/01 04:56:05 Modified files: devel/cvsweb : Makefile devel/cvsweb/pkg: README Log message: update chroot instructions for perl 5.24.1
Re: Nuke some Ocaml ports
On 27 Feb 2017, at 20:58, Daniel Dickmanwrote: > > > >> On Feb 27, 2017, at 3:23 PM, Christopher Zimmermann >> wrote: >> >>> On 2017-02-27 Kenneth R Westerback wrote: >>> >>> Anyway, I'm happy to do the dirty work of nuking any or all of these >>> ports and then continuing the process of weeding out ports that >>> might be more useful to get people sourcing from opam. >>> >>> And thus hopefully making it simpler to keep us on the ocaml bleeding >>> edge. >>> >>> Thoughts? >>> >>> Ken >>> >>> The numbers // >>> >>> Anil: >>> ./databases/ocaml-postgresql 3.2.1/4.0.1/4.0.1 (master & homepage dead?) >>> ./databases/ocaml-sqlite3 2.0.9/4.1.2/4.1.2 (master & homepage dead?) >>> ./devel/ocaml-calendar 2.03.2/2.0.4/2.03.2 >>> ./graphics/ocaml-camlimages 4.2.1/4.2.1/4.2.3 >>> ./security/ocaml-cryptokit 1.10/1.11/1.11 >>> ./textproc/ocaml-rss 2.0/2.2.1/2.2.2 >>> ./textproc/ocaml-xml-light 2.2/2.4/2.4 >>> ./textproc/ocaml-xmlm 1.2.0/1.2.0/1.2.0 >>> >>> Chrisz >>> ./devel/ocaml-batteries 2.5.0/2.5.3/2.5.3 >>> ./devel/ocaml-net 4.0.2/4.1.2/4.1.2 >> >> OK chrisz@ >> >>> Edd: >>> ./devel/ocaml-mlgmp 0.13/20120224/20120224 >>> >>> None: >>> ./devel/ocaml-bitstring 2.0.4/2.0.4/2.1.0 (google code!?) >>> ./devel/ocaml-curses 1.0.3/1.0.3/1.0.3 >>> ./textproc/ocaml-csv 1.4.1/1.6/1.6 >> >> OK chrisz@ >> >> >> I would like to add more to this list: >> >> devel/utop > > please no. > >> devel/ocaml-lambda-term >> devel/ocaml-zed >> devel/ocaml-lwt >> devel/ocaml-menhir > > please no. it's required for compcert. I'm ok with deleting the intermediate ports, but we should indeed keep anything that is required for Compcert in the ports tree. It's very useful to have a binary package of it. As for utop, I'd be happy just installing that through OPAM. You typically also need to install libraries with utop to make it useful, and that's difficult to do with a system OCaml and a port-installed OPAM (it can use the system compiler fine, but libraries must be managed all through opam or not at all). Anil
[wip] Firefox 52.0rc1
On Wed, Feb 15, 2017 at 08:55:01AM +0100, Landry Breuil wrote: > Yo, > > i realized i missed the every-six-weeks email for 51, so here's one for > 52, which i dunno will make the cut for 6.1 - would be nice as it's an > ESR and would allow www/firefox-esr to be 'supported' for longer than > the 45 branch in the -stable series. We're now at 52.0rc1, no decision taken for 6.1 yet. Upstream release planned next tuesday. Since pkg.conf support was removed, install the pkg using PKG_PATH.. doas env PKG_PATH=https://packages.rhaalovely.net/snapshots/amd64 pkg_add -u firefox Tb 52.0b4 will be soon available too. https://cgit.rhaalovely.net/mozilla-firefox/?h=beta Landry
Re: Ports with hardcoded "gcc", "g++"
On Tue, Feb 28, 2017, at 14:03, Christian Weisgerber wrote: > textproc/wkhtmltopdf Frank GroeneveldI've been trying to fix textporc/wkhtmltopdf in the last few days, but can't seem to make qmake use the correct compiler. The do-configure step of this port configures the patched QT that is part of the port. I've tried adding CXX="${CXX}" and/or SYS_CXX="${CXX}" to the env of that step, but it seems to be unused. Anybody got some hints on how to fix this one? Thanks! Frank
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2017/03/01 03:15:27 Modified files: games/roadfighter: Makefile Log message: honor CXX
powerpc bulk build report
bulk build on macppc-1.ports.openbsd.org started on Thu Feb 16 16:09:19 MST 2017 finished at Wed Mar 1 02:35:23 MST 2017 lasted 13D03h26m done with kern.version=OpenBSD 6.0-current (GENERIC.MP) #68: Wed Jan 11 13:01:37 MST 2017 built packages:7806 Feb 16:413 Feb 17:371 Feb 18:637 Feb 19:123 Feb 20:470 Feb 21:420 Feb 22:350 Feb 23:473 Feb 24:470 Feb 25:411 Feb 26:453 Feb 27:561 Feb 28:1896 Mar 1:757 build failures: 5 http://build-failures.rhaalovely.net//powerpc/2017-02-16/devel/libf2c.log http://build-failures.rhaalovely.net//powerpc/2017-02-16/devel/llvm.log http://build-failures.rhaalovely.net//powerpc/2017-02-16/devel/reposurgeon.log http://build-failures.rhaalovely.net//powerpc/2017-02-16/graphics/pdfsandwich.log http://build-failures.rhaalovely.net//powerpc/2017-02-16/mail/postfix/snapshot,mysql.log recurrent failures failures/devel/llvm.log failures/devel/reposurgeon.log new failures +++ ls-failures Wed Mar 1 02:35:49 2017 +failures/devel/libf2c.log +failures/graphics/pdfsandwich.log +failures/mail/postfix/snapshot,mysql.log resolved failures --- ../old/powerpc/last//ls-failuresWed Feb 15 14:24:10 2017 -failures/devel/xulrunner/24.log -failures/graphics/lensfun.log -failures/multimedia/libvpx.log -failures/www/pear.log Base libs: curses.14.0 edit.5.2 event.4.1 expat.11.0 form.6.0 formw.6.0 fuse.1.1 iberty.12.0 menu.6.0 menuw.6.0 ncurses.14.0 ncursesw.14.0 objc.6.0 ossaudio.4.0 panel.6.0 panelw.6.0 perl.17.1 readline.4.0 rpcsvc.2.0 skey.6.0 radius.1.0 sndio.6.1 stdc++.57.0 termcap.14.0 .14.0 z.5.0 usbhid.7.0 util.12.1 pthread.23.0 c.89.2 c.89.2.a kvm.16.2 m.10.0 pcap.8.3 crypto.41.0 ssl.42.0 tls.14.0 X libs: FS.10.0 GLESv1_CM.1.0 GLU.9.0 GLw.6.0 ICE.10.0 SM.9.0 X11-xcb.2.0 X11.16.1 XRes.5.0 Xau.10.0 Xaw.15.0 Xaw7.15.0 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0 Xdmcp.11.0 Xext.13.0 Xfixes.6.0 Xfontcache.5.0 Xi.12.1 Xinerama.6.0 Xmu.11.0 Xmuu.6.0 Xpm.9.0 Xrender.6.0 Xss.6.0 Xt.11.0 Xtst.11.0 Xv.6.0 XvMC.6.0 XvMCW.2.0 Xxf86dga.6.0 dmx.2.0 Xxf86misc.6.0 Xxf86vm.6.0 fontenc.4.0 epoxy.2.0 pciaccess.2.0 pixman-1.32.6 pthread-stubs.2.0 txc_dxtn.0.0 xcb-composite.1.0 xcb-damage.1.0 xcb-dpms.1.0 xcb-dri2.1.1 xcb-dri3.0.0 xcb-ewmh.2.0 xcb-cursor.0.0 xcb-icccm.4.0 xcb-image.2.0 xcb-res.1.1 xcb-keysyms.3.0 xkbui.5.0 xcb-shm.1.1 xcb-xevie.1.0 xcb-xf86dri.2.0 xcb-util.0.0 xcb-xinerama.1.0 xcb-xtest.1.0 xcb-xvmc.1.0 xkbfile.6.0 Xrandr.7.1 XvMCr600.1.0 xcb-render-util.2.0 drm_nouveau.3.0 drm_radeon.4.0 Xfont.13.0 Xft.10.0 glapi.0.2 fontconfig.11.0 xcb-glx.1.1 xcb-randr.2.2 xcb-present.0.1 xcb-record.1.1 xcb-render.1.1 xcb-screensaver.1.1 xcb-shape.1.1 xcb-sync.1.2 xcb-xfixes.1.2 xcb-xkb.0.1 xcb-xprint.3.0 xcb-xv.1.1 xcb.4.0 freetype.27.0 xcb-xrm.0.0 drm.7.3 EGL.1.1 drm_amdgpu.1.2 GL.17.1 GLESv2.1.2 OSMesa.10.1 gbm.0.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/03/01 01:55:28 Modified files: devel/llvm : Makefile devel/llvm/patches: patch-tools_clang_lib_Basic_Targets_cpp Log message: Fix types for OpenBSD/mips64. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/03/01 01:53:46 Modified files: multimedia/x264: Makefile multimedia/x264/patches: patch-common_osdep_h multimedia/x265: Makefile Log message: Use atomic ops on aarch64. from Brad (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/03/01 01:32:00 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.11.56.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2017/03/01 01:31:42 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py-botocore-1.5.19.