CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/12/30 00:04:39

Modified files:
www/seamonkey  : Makefile 
www/seamonkey/pkg: PLIST-lightning PLIST-main 

Log message:
Fix lightning packaging, somehow i commited the PLIST for 2.46rc6 but
ended up not building/packaging 2.46 final, and thus build failed.

Note that as stated in the upstream release notes, chatzilla and dom
inspector are not shipped anymore (temporarly, due to repacking issues?),
install them from addons.mozilla.org if you rely on them.

Failure reported by naddy@ and nigel@

NEW: security/shadowsocks-libev

[Henrik Friedrichsen]

Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded
devices and low-end boxes. It is a fork of shadowsocks written in C
using libevent and OpenSSL.

It can be used to circumvent restrictive firewalls.

This package contains the client and server. I have tested both on
OpenBSD machines (amd64).

Feedback? OK?


shadowsocks-libev.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 21:07:51

Modified files:
x11/gnustep/libobjc2: Makefile 

Log message:
Mark gnustep-libobjc2 as broken on arm.  It assumes the toolchain
supports neon with no way to disable it.

libobjc2-1.8/objc_msgSend.arm.S:7: Error: unknown floating point format `neon'

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 20:41:43

Modified files:
databases/leveldb: Makefile 

Log message:
Don't try to build this on arm as it requires  on !x86
which was renamed to  in gcc 4.5 so it won't even build
with gcc 4.9.

ssh-ldap-helper fix for arm

[Jeremie Courreges-Anglas]

ssh-ldap-helper fails on arm:

  
http://build-failures.rhaalovely.net//arm/2016-12-20/security/ssh-ldap-helper.log

This is because the configure script sets the macro
LDAP_SET_REBIND_PROC_ARGS to $ac_cv_ldap_set_rebind_proc instead of the
intended value 3.  Since "All symbol names containing a dollar character
('$') are reserved to ARM" what is a warning elsewhere becomes fatal on
arm.

I had to use a hackish sed command to modify configure.ac; patching
configure.ac is complicated by ${WRKDIR}/openssh-5.3p1-ldap.patch, which
is applied as a regular patch instead of a dist patch.  If someone knows
how to turn this sed script in a regular patch, please let me know.
(Hosting openssh-5.3p1-ldap.patch separately, maybe?)

No revision bump because the preprocessor tests results don't change.

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/security/ssh-ldap-helper/Makefile,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 Makefile
--- Makefile11 Mar 2013 11:41:28 -  1.2
+++ Makefile30 Dec 2016 00:26:10 -
@@ -34,6 +34,17 @@ BUILD_DEPENDS=   rpm-*|rpm2cpio-*:converte
 LIB_DEPENDS =  databases/openldap
 WANTLIB += c crypto lber ldap util z
 
+# The LDAP_SET_REBIND_PROC_ARGS macro is set to literal
+# "$ac_cv_ldap_set_rebind_proc" instead of "3" because of the improper
+# use of AC_DEFINE instead of AC_DEFINE_UNQUOTED. This fails on arm,
+# where '$' is reserved. Fixing this would lead the preprocessor tests
+# to succeed, and the code to call ldap_set_rebind_proc() with bogus
+# parameters, so let's just define the macro to 0.
+# XXX should really be a patch
+post-patch:
+   sed -i 's/AC_DEFINE(LDAP_SET_REBIND_PROC_ARGS, 
$$ac_cv_ldap_set_rebind_proc/AC_DEFINE(LDAP_SET_REBIND_PROC_ARGS, 0/' \
+   ${WRKSRC}/configure.ac
+
 post-configure:
${SUBST_CMD} ${WRKSRC}/ssh-ldap-{helper.8,wrapper}
 



-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

[UPDATE] benchmarks/speedtest-cli to 1.0.1

[Frederic Cambus]

Hi ports@,

Here is a diff to update speedtest-cli to 1.0.1. This is a bugfix
release, reverting some code which impacted timing on devices with
a small amount of RAM.

OK?

Index: Makefile
===
RCS file: /cvs/ports/benchmarks/speedtest-cli/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile19 Nov 2016 14:32:53 -  1.7
+++ Makefile29 Dec 2016 23:26:43 -
@@ -2,7 +2,7 @@
 
 COMMENT =  command-line client for speedtest.net bandwidth tester
 
-MODPY_EGG_VERSION =1.0.0
+MODPY_EGG_VERSION =1.0.1
 DISTNAME = speedtest-cli-${MODPY_EGG_VERSION}
 CATEGORIES =   benchmarks net
 
Index: distinfo
===
RCS file: /cvs/ports/benchmarks/speedtest-cli/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo19 Nov 2016 14:32:53 -  1.5
+++ distinfo29 Dec 2016 23:26:43 -
@@ -1,2 +1,2 @@
-SHA256 (speedtest-cli-1.0.0.tar.gz) = 
boJabhNIy0rnVc0oycZAyub6joEpQZrqNpM5m0Y4ZnE=
-SIZE (speedtest-cli-1.0.0.tar.gz) = 20332
+SHA256 (speedtest-cli-1.0.1.tar.gz) = 
0jEhzLy2rEtVPRBG4qqd4c9HFMAaBLWI/4B6X7a3Mtk=
+SIZE (speedtest-cli-1.0.1.tar.gz) = 20353

[UPDATE] graphics/cadubi to 1.3.3

[Frederic Cambus]

Hi ports@,

Here is a diff to update cadubi to 1.3.3 and remove unneeded HOMEPAGE as
it's created from the GH_ variables.

OK?

Index: Makefile
===
RCS file: /cvs/ports/graphics/cadubi/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile4 Oct 2016 21:22:42 -   1.15
+++ Makefile29 Dec 2016 23:11:45 -
@@ -4,11 +4,9 @@ COMMENT=   ASCII drawing utility
 
 GH_ACCOUNT =   statico
 GH_PROJECT =   cadubi
-GH_TAGNAME =   v1.3.1
+GH_TAGNAME =   v1.3.3
 
 CATEGORIES=graphics editors
-
-HOMEPAGE=  https://github.com/statico/cadubi
 
 # MIT
 PERMIT_PACKAGE_CDROM=  Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/cadubi/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo4 Oct 2016 21:22:42 -   1.6
+++ distinfo29 Dec 2016 23:11:45 -
@@ -1,2 +1,2 @@
-SHA256 (cadubi-1.3.1.tar.gz) = Fiw7p0i70qsWmcldStDiV//hg5WebOCEq5HvvT63P4o=
-SIZE (cadubi-1.3.1.tar.gz) = 65672
+SHA256 (cadubi-1.3.3.tar.gz) = ea9W1dZZ4oMG6gd0HjrZfV8Obp23pbC2MqnCG4f2Mko=
+SIZE (cadubi-1.3.3.tar.gz) = 65659

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 16:16:30

Modified files:
x11/mrxvt/patches: patch-src_rxvt_h 

Log message:
Can't use names containing '$' on arm.

http://build-failures.rhaalovely.net//arm/2016-12-20/x11/mrxvt.log

CVS: cvs.openbsd.org: ports

[Vadim Zhukov]

CVSROOT:/cvs
Module name:ports
Changes by: z...@cvs.openbsd.org2016/12/29 13:59:05

Modified files:
x11/qt5: Makefile.inc 
x11/qt5/qtbase-docs: Makefile 

Log message:
LIB_DEPENDS doesn't contain x11/qt5/qtbase at the time Makefile.inc
gets processed. As a result, qtbase-docs,-docindex didn't get into
BUILD_DEPENDS, thus qtenginio-html build may still break.

Spotted by naddy@

CVS: cvs.openbsd.org: ports

[Pascal Stumpf]

CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2016/12/29 09:12:00

Modified files:
converters/libunistring: Makefile distinfo 
converters/libunistring/patches: patch-Makefile_in 

Log message:
Update to libunistring 0.9.7.  License change and doc/autoconf fixes only.

deadbeef/libsndiod NULL dereference

[Martin Pieuchot]

I am running GNOME3 and my music player is audio/deadbeef.  Since the
last package update very time my screen saver starts the music stop.
Previously it was only the first time per session.

Here's my last output of /var/log/messages.  The screen saver started
at 16:35, 16:42 and 16:49.

Dec 29 16:30:04 oliva gdm: vfprintf %s NULL in "GdmSession: Setting display 
device: %s"
Dec 29 16:35:51 oliva pulseaudio[70213]: [sndio] module-sndio.c: POLLHUP!
Dec 29 16:35:51 oliva gnome-settings-daemon: vfprintf %s NULL in 
"gvc-mixer-output-set-property - card port name: %s "
Dec 29 16:35:51 oliva gnome-shell: vfprintf %s NULL in 
"gvc-mixer-output-set-property - card port name: %s "
Dec 29 16:42:30 oliva gdm: vfprintf %s NULL in "GdmSession: Setting display 
device: %s"
Dec 29 16:49:24 oliva gdm: vfprintf %s NULL in "GdmSession: Setting display 
device: %s"

The last time deadbeef crashed, here's the backtrace:

#0  sio_write (hdl=0x0, buf=0x171416be2230, len=3528)
at /usr/src/lib/libsndio/sio.c:330
330 if (hdl->eof) {
(gdb) bt
#0  sio_write (hdl=0x0, buf=0x171416be2230, len=3528)
at /usr/src/lib/libsndio/sio.c:330
#1  0x1714690edd3e in sndio_thread () from /usr/local/lib/deadbeef/sndio.so
#2  0x17147941e7ee in _rthread_start (v=Variable "v" is not available.
)
at /usr/src/lib/librthread/rthread.c:114
#3  0x1714184daf8b in __tfork_thread ()
at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75
#4  0x in ?? ()

Anything else I can provide?

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 08:51:29

Modified files:
security/libnettle: Makefile 

Log message:
Remove workaround for binutils-2.15 on arm.

ok ajacoutot@ (maintainer)

CVS: cvs.openbsd.org: ports

[Alexandr Shadchin]

CVSROOT:/cvs
Module name:ports
Changes by: shadc...@cvs.openbsd.org2016/12/29 07:48:52

Modified files:
devel/ectags   : Makefile 
Added files:
devel/ectags/patches: patch-entry_c 

Log message:
Fix segfault on OpenBSD src-repository.

>From Anton Lindqvist 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/12/29 07:39:28

Modified files:
security/vault : Makefile distinfo 

Log message:
Update to vault-0.6.4.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 07:37:40

Modified files:
multimedia/daala: Makefile 

Log message:
Use --disable-asm on arm

It's not clear how useful the assembler code is on arm, and it's
detected using MSVC __emit() or Linux /proc/cpuinfo; let's just disable
it.

ok czarkoff@ (maintainer)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 07:29:37

Modified files:
audio/jack : Makefile 

Log message:
Needs atomic builtins, build with lang/gcc on arm.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 07:15:15

Modified files:
www/kore   : Makefile 

Log message:
Needs atomic builtins, use lang/gcc on arm.

ok fcambus@ (maintainer)

Re: games/tome4 - post import fixes

[Adam Wolk]

On Thu, Dec 29, 2016 at 02:36:38PM +0100, Antoine Jacoutot wrote:
> On Thu, Dec 29, 2016 at 01:48:16PM +0100, Adam Wolk wrote:
> > Thanks for the feedback. Attaching an updated diff.
> 
> Thanks, that looks good. OK for me.
> 

Committed, thanks!

Regards,
Adam

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/12/29 07:07:11

Modified files:
games/tome4: Makefile 
games/tome4/patches: patch-premake4_lua 
games/tome4/pkg: PLIST-data PLIST-main 

Log message:
Fix games/tome4 problems

spoted by ajacoutot & fcambus

- MODGCC_ARCHS changed to MODGCC4_ARCHS
- MODGCC_LANGS removed as language 'c' is the default
so setting this variable is not needed here
- Updated patch-premake4_lua to use variable substitution
instead of hard-coded paths
- Added share/tome4/ and share/tome4/game/ to PLIST-data
and remove it from PLIST-main. Without it removing tome4
would error out informing about non empty directories
- Simplified the RUN_DEPENDS-main line, the way it was
done previously prevented REVISION bumps from working
- bumped REVISION of both packages to 0

OK ajacoutot@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 07:05:08

Modified files:
net/haproxy: Makefile 

Log message:
Needs __sync_sub_and_fetch_4 and friends, build with lang/gcc on arm.

ok danj (maintainer)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 06:52:14

Modified files:
net/haproxy: Makefile 

Log message:
Move NO_TEST, and kill a trailing whitespace.

ok danj@ (maintainer)

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 06:50:31

Modified files:
sysutils/tmux-mem-cpu-load: Makefile 

Log message:
Needs a C++11 compiler, also use lang/gcc on arm.

ok jasper@ (maintainer)

Re: games/tome4 - post import fixes

[Antoine Jacoutot]

On Thu, Dec 29, 2016 at 01:48:16PM +0100, Adam Wolk wrote:
> Thanks for the feedback. Attaching an updated diff.

Thanks, that looks good. OK for me.

> 
> On Thu, Dec 29, 2016 at 01:25:00PM +0100, Antoine Jacoutot wrote:
> > On Thu, Dec 29, 2016 at 01:16:52PM +0100, Adam Wolk wrote:
> > > After the import Antoine & Frederic spotted some issues.
> > > 
> > > Here's a diff fixing them. The changes are as follows:
> > > 
> > >  - MODGCC_ARCHS changed to MODGCC4_ARCHS
> > >  - MODGCC_LANGS removed as language 'c' is the default
> > >so setting this variable is not needed here
> > >  - Updated patch-premake4_lua to use variable substitution
> > >instead of hard-coded paths
> > >  - SUBST_VARS just append GAMEDIR to keep default
> > >substitutions working
> > 
> > That's not needed.
> > It is already appended, not replaced.
> > 
> 
> Reverted the SUBST_VARS change.
> 
> > >  - Added share/tome4/ and share/tome4/game/ to PLIST-data
> > >without it removing tome4 would error out informing
> > >about non empty directories
> > 
> > They are already part of -main. Shoudn't you remove them from here then 
> > since
> > -main depends on -data ?
> >
> 
> I removed the entries from PLIST-main in the updated diff.
>  
> > >  - Simplified the RUN_DEPENDS-main line, the way it was
> > >done previously prevented REVISION bumps from working
> > >  - bumped REVISION of both packages to 0
> > 
> > Please use explicit subpackage REVISIONs (i.e. REVISION-main ...).
> > 
> 
> Done. Using explicit REVISIONs per package.
> 
> > > Feedback? OK's?
> > > 

> ? tome4-1.4.9p0.diff
> ? tome4-1.4.9p0.diff.0
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/tome4/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  28 Dec 2016 18:34:57 -  1.1.1.1
> +++ Makefile  29 Dec 2016 12:43:42 -
> @@ -8,6 +8,9 @@ PKGNAME-main =tome4-${V}
>  PKGNAME-data =   tome4-data-${V}
>  CATEGORIES = games x11
>  
> +REVISION-main =  0
> +REVISION-data =  0
> +
>  MASTER_SITES =   http://te4.org/dl/t-engine/
>  DISTNAME =   t-engine4-src-${V}
>  EXTRACT_SUFX =   .tar.bz2
> @@ -31,7 +34,7 @@ LIB_DEPENDS-main =  devel/sdl2 \
>   audio/libvorbis \
>   audio/openal
>  
> -RUN_DEPENDS-main =   ${FULLPKGNAME-data}:${BUILD_PKGPATH},-data
> +RUN_DEPENDS-main =   games/tome4,-data
>  
>  LIB_DEPENDS-data =
>  WANTLIB-data =
> @@ -40,8 +43,7 @@ GAMEDIR =   ${PREFIX}/share/tome4
>  SUBST_VARS = GAMEDIR
>  
>  MODULES =gcc4
> -MODGCC_ARCHS =   *
> -MODGCC_LANGS =   c
> +MODGCC4_ARCHS =  *
>  
>  NO_TEST =YES
>  
> @@ -51,6 +53,7 @@ MAKE_ENV =  config=release
>  
>  do-configure:
>   ${SUBST_CMD} ${WRKSRC}/src/getself.c
> + ${SUBST_CMD} ${WRKSRC}/premake4.lua
>   @cd ${WRKSRC} ; premake4 gmake
>  
>  do-install:
> Index: patches/patch-premake4_lua
> ===
> RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-premake4_lua
> --- patches/patch-premake4_lua28 Dec 2016 18:34:57 -  1.1.1.1
> +++ patches/patch-premake4_lua29 Dec 2016 12:43:42 -
> @@ -1,16 +1,19 @@
>  $OpenBSD: patch-premake4_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
>  --- premake4.lua.origMon May 19 10:42:14 2014
> -+++ premake4.lua Fri Dec  2 11:30:43 2016
> -@@ -45,9 +45,12 @@ end
>  premake4.lua Thu Dec 29 12:28:14 2016
> +@@ -44,10 +44,13 @@ end
> + 
>   configuration "bsd"
>   libdirs {
> - "/usr/local/lib",
> -+"/usr/X11R6/lib",
> +-"/usr/local/lib",
> ++"${LOCALBASE}/lib",
> ++"${X11BASE}/lib",
>   }
>   includedirs {
> - "/usr/local/include",
> -+"/usr/local/include/SDL2",
> -+"/usr/X11R6/include/",
> +-"/usr/local/include",
> ++"${LOCALBASE}/include",
> ++"${LOCALBASE}/include/SDL2",
> ++"${X11BASE}/include/",
>   }
>   
>   if _OPTIONS.wincross then
> Index: pkg/PLIST-data
> ===
> RCS file: /cvs/ports/games/tome4/pkg/PLIST-data,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-data
> --- pkg/PLIST-data28 Dec 2016 18:34:57 -  1.1.1.1
> +++ pkg/PLIST-data29 Dec 2016 12:43:42 -
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST-data,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
> +share/tome4/
> +share/tome4/game/
>  share/tome4/game/modules/
>  share/tome4/game/modules/boot-te4-1.4.9.team
>  share/tome4/game/modules/tome-1.4.9-gfx.team
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/games/tome4/pkg/PLIST-main,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-main
> --- 

Re: games/tome4 - post import fixes

[Adam Wolk]

Thanks for the feedback. Attaching an updated diff.

On Thu, Dec 29, 2016 at 01:25:00PM +0100, Antoine Jacoutot wrote:
> On Thu, Dec 29, 2016 at 01:16:52PM +0100, Adam Wolk wrote:
> > After the import Antoine & Frederic spotted some issues.
> > 
> > Here's a diff fixing them. The changes are as follows:
> > 
> >  - MODGCC_ARCHS changed to MODGCC4_ARCHS
> >  - MODGCC_LANGS removed as language 'c' is the default
> >so setting this variable is not needed here
> >  - Updated patch-premake4_lua to use variable substitution
> >instead of hard-coded paths
> >  - SUBST_VARS just append GAMEDIR to keep default
> >substitutions working
> 
> That's not needed.
> It is already appended, not replaced.
> 

Reverted the SUBST_VARS change.

> >  - Added share/tome4/ and share/tome4/game/ to PLIST-data
> >without it removing tome4 would error out informing
> >about non empty directories
> 
> They are already part of -main. Shoudn't you remove them from here then since
> -main depends on -data ?
>

I removed the entries from PLIST-main in the updated diff.
 
> >  - Simplified the RUN_DEPENDS-main line, the way it was
> >done previously prevented REVISION bumps from working
> >  - bumped REVISION of both packages to 0
> 
> Please use explicit subpackage REVISIONs (i.e. REVISION-main ...).
> 

Done. Using explicit REVISIONs per package.

> > Feedback? OK's?
> > 
? tome4-1.4.9p0.diff
? tome4-1.4.9p0.diff.0
Index: Makefile
===
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile28 Dec 2016 18:34:57 -  1.1.1.1
+++ Makefile29 Dec 2016 12:43:42 -
@@ -8,6 +8,9 @@ PKGNAME-main =  tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES =   games x11
 
+REVISION-main =0
+REVISION-data =0
+
 MASTER_SITES = http://te4.org/dl/t-engine/
 DISTNAME = t-engine4-src-${V}
 EXTRACT_SUFX = .tar.bz2
@@ -31,7 +34,7 @@ LIB_DEPENDS-main =devel/sdl2 \
audio/libvorbis \
audio/openal
 
-RUN_DEPENDS-main = ${FULLPKGNAME-data}:${BUILD_PKGPATH},-data
+RUN_DEPENDS-main = games/tome4,-data
 
 LIB_DEPENDS-data =
 WANTLIB-data =
@@ -40,8 +43,7 @@ GAMEDIR = ${PREFIX}/share/tome4
 SUBST_VARS =   GAMEDIR
 
 MODULES =  gcc4
-MODGCC_ARCHS = *
-MODGCC_LANGS = c
+MODGCC4_ARCHS =*
 
 NO_TEST =  YES
 
@@ -51,6 +53,7 @@ MAKE_ENV =config=release
 
 do-configure:
${SUBST_CMD} ${WRKSRC}/src/getself.c
+   ${SUBST_CMD} ${WRKSRC}/premake4.lua
@cd ${WRKSRC} ; premake4 gmake
 
 do-install:
Index: patches/patch-premake4_lua
===
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-premake4_lua
--- patches/patch-premake4_lua  28 Dec 2016 18:34:57 -  1.1.1.1
+++ patches/patch-premake4_lua  29 Dec 2016 12:43:42 -
@@ -1,16 +1,19 @@
 $OpenBSD: patch-premake4_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
 --- premake4.lua.orig  Mon May 19 10:42:14 2014
-+++ premake4.lua   Fri Dec  2 11:30:43 2016
-@@ -45,9 +45,12 @@ end
 premake4.lua   Thu Dec 29 12:28:14 2016
+@@ -44,10 +44,13 @@ end
+ 
  configuration "bsd"
libdirs {
-   "/usr/local/lib",
-+  "/usr/X11R6/lib",
+-  "/usr/local/lib",
++  "${LOCALBASE}/lib",
++  "${X11BASE}/lib",
}
includedirs {
-   "/usr/local/include",
-+  "/usr/local/include/SDL2",
-+  "/usr/X11R6/include/",
+-  "/usr/local/include",
++  "${LOCALBASE}/include",
++  "${LOCALBASE}/include/SDL2",
++  "${X11BASE}/include/",
}
  
  if _OPTIONS.wincross then
Index: pkg/PLIST-data
===
RCS file: /cvs/ports/games/tome4/pkg/PLIST-data,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-data
--- pkg/PLIST-data  28 Dec 2016 18:34:57 -  1.1.1.1
+++ pkg/PLIST-data  29 Dec 2016 12:43:42 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST-data,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
+share/tome4/
+share/tome4/game/
 share/tome4/game/modules/
 share/tome4/game/modules/boot-te4-1.4.9.team
 share/tome4/game/modules/tome-1.4.9-gfx.team
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/games/tome4/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-main
--- pkg/PLIST-main  28 Dec 2016 18:34:57 -  1.1.1.1
+++ pkg/PLIST-main  29 Dec 2016 12:43:42 -
@@ -1,9 +1,7 @@
 @comment $OpenBSD: PLIST-main,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
 @bin bin/tome4
-share/tome4/
 share/tome4/bootstrap/
 share/tome4/bootstrap/boot.lua
-share/tome4/game/
 share/tome4/game/addons/
 

Re: games/tome4 - post import fixes

[Antoine Jacoutot]

On Thu, Dec 29, 2016 at 01:16:52PM +0100, Adam Wolk wrote:
> After the import Antoine & Frederic spotted some issues.
> 
> Here's a diff fixing them. The changes are as follows:
> 
>  - MODGCC_ARCHS changed to MODGCC4_ARCHS
>  - MODGCC_LANGS removed as language 'c' is the default
>so setting this variable is not needed here
>  - Updated patch-premake4_lua to use variable substitution
>instead of hard-coded paths
>  - SUBST_VARS just append GAMEDIR to keep default
>substitutions working

That's not needed.
It is already appended, not replaced.

>  - Added share/tome4/ and share/tome4/game/ to PLIST-data
>without it removing tome4 would error out informing
>about non empty directories

They are already part of -main. Shoudn't you remove them from here then since
-main depends on -data ?

>  - Simplified the RUN_DEPENDS-main line, the way it was
>done previously prevented REVISION bumps from working
>  - bumped REVISION of both packages to 0

Please use explicit subpackage REVISIONs (i.e. REVISION-main ...).

> Feedback? OK's?
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/games/tome4/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile  28 Dec 2016 18:34:57 -  1.1.1.1
> +++ Makefile  29 Dec 2016 12:05:20 -
> @@ -8,6 +8,8 @@ PKGNAME-main =tome4-${V}
>  PKGNAME-data =   tome4-data-${V}
>  CATEGORIES = games x11
>  
> +REVISION =   0
> +
>  MASTER_SITES =   http://te4.org/dl/t-engine/
>  DISTNAME =   t-engine4-src-${V}
>  EXTRACT_SUFX =   .tar.bz2
> @@ -31,17 +33,16 @@ LIB_DEPENDS-main =devel/sdl2 \
>   audio/libvorbis \
>   audio/openal
>  
> -RUN_DEPENDS-main =   ${FULLPKGNAME-data}:${BUILD_PKGPATH},-data
> +RUN_DEPENDS-main =   games/tome4,-data
>  
>  LIB_DEPENDS-data =
>  WANTLIB-data =
>  
>  GAMEDIR =${PREFIX}/share/tome4
> -SUBST_VARS = GAMEDIR
> +SUBST_VARS +=GAMEDIR
>  
>  MODULES =gcc4
> -MODGCC_ARCHS =   *
> -MODGCC_LANGS =   c
> +MODGCC4_ARCHS =  *
>  
>  NO_TEST =YES
>  
> @@ -51,6 +52,7 @@ MAKE_ENV =  config=release
>  
>  do-configure:
>   ${SUBST_CMD} ${WRKSRC}/src/getself.c
> + ${SUBST_CMD} ${WRKSRC}/premake4.lua
>   @cd ${WRKSRC} ; premake4 gmake
>  
>  do-install:
> Index: patches/patch-premake4_lua
> ===
> RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-premake4_lua
> --- patches/patch-premake4_lua28 Dec 2016 18:34:57 -  1.1.1.1
> +++ patches/patch-premake4_lua29 Dec 2016 12:05:20 -
> @@ -1,16 +1,19 @@
>  $OpenBSD: patch-premake4_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
>  --- premake4.lua.origMon May 19 10:42:14 2014
> -+++ premake4.lua Fri Dec  2 11:30:43 2016
> -@@ -45,9 +45,12 @@ end
>  premake4.lua Thu Dec 29 12:28:14 2016
> +@@ -44,10 +44,13 @@ end
> + 
>   configuration "bsd"
>   libdirs {
> - "/usr/local/lib",
> -+"/usr/X11R6/lib",
> +-"/usr/local/lib",
> ++"${LOCALBASE}/lib",
> ++"${X11BASE}/lib",
>   }
>   includedirs {
> - "/usr/local/include",
> -+"/usr/local/include/SDL2",
> -+"/usr/X11R6/include/",
> +-"/usr/local/include",
> ++"${LOCALBASE}/include",
> ++"${LOCALBASE}/include/SDL2",
> ++"${X11BASE}/include/",
>   }
>   
>   if _OPTIONS.wincross then
> Index: pkg/PLIST-data
> ===
> RCS file: /cvs/ports/games/tome4/pkg/PLIST-data,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST-data
> --- pkg/PLIST-data28 Dec 2016 18:34:57 -  1.1.1.1
> +++ pkg/PLIST-data29 Dec 2016 12:05:20 -
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST-data,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
> +share/tome4/
> +share/tome4/game/
>  share/tome4/game/modules/
>  share/tome4/game/modules/boot-te4-1.4.9.team
>  share/tome4/game/modules/tome-1.4.9-gfx.team


-- 
Antoine

games/tome4 - post import fixes

[Adam Wolk]

After the import Antoine & Frederic spotted some issues.

Here's a diff fixing them. The changes are as follows:

 - MODGCC_ARCHS changed to MODGCC4_ARCHS
 - MODGCC_LANGS removed as language 'c' is the default
   so setting this variable is not needed here
 - Updated patch-premake4_lua to use variable substitution
   instead of hard-coded paths
 - SUBST_VARS just append GAMEDIR to keep default
   substitutions working
 - Added share/tome4/ and share/tome4/game/ to PLIST-data
   without it removing tome4 would error out informing
   about non empty directories
 - Simplified the RUN_DEPENDS-main line, the way it was
   done previously prevented REVISION bumps from working
 - bumped REVISION of both packages to 0

Feedback? OK's?

Index: Makefile
===
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile28 Dec 2016 18:34:57 -  1.1.1.1
+++ Makefile29 Dec 2016 12:05:20 -
@@ -8,6 +8,8 @@ PKGNAME-main =  tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES =   games x11
 
+REVISION = 0
+
 MASTER_SITES = http://te4.org/dl/t-engine/
 DISTNAME = t-engine4-src-${V}
 EXTRACT_SUFX = .tar.bz2
@@ -31,17 +33,16 @@ LIB_DEPENDS-main =  devel/sdl2 \
audio/libvorbis \
audio/openal
 
-RUN_DEPENDS-main = ${FULLPKGNAME-data}:${BUILD_PKGPATH},-data
+RUN_DEPENDS-main = games/tome4,-data
 
 LIB_DEPENDS-data =
 WANTLIB-data =
 
 GAMEDIR =  ${PREFIX}/share/tome4
-SUBST_VARS =   GAMEDIR
+SUBST_VARS +=  GAMEDIR
 
 MODULES =  gcc4
-MODGCC_ARCHS = *
-MODGCC_LANGS = c
+MODGCC4_ARCHS =*
 
 NO_TEST =  YES
 
@@ -51,6 +52,7 @@ MAKE_ENV =config=release
 
 do-configure:
${SUBST_CMD} ${WRKSRC}/src/getself.c
+   ${SUBST_CMD} ${WRKSRC}/premake4.lua
@cd ${WRKSRC} ; premake4 gmake
 
 do-install:
Index: patches/patch-premake4_lua
===
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-premake4_lua
--- patches/patch-premake4_lua  28 Dec 2016 18:34:57 -  1.1.1.1
+++ patches/patch-premake4_lua  29 Dec 2016 12:05:20 -
@@ -1,16 +1,19 @@
 $OpenBSD: patch-premake4_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
 --- premake4.lua.orig  Mon May 19 10:42:14 2014
-+++ premake4.lua   Fri Dec  2 11:30:43 2016
-@@ -45,9 +45,12 @@ end
 premake4.lua   Thu Dec 29 12:28:14 2016
+@@ -44,10 +44,13 @@ end
+ 
  configuration "bsd"
libdirs {
-   "/usr/local/lib",
-+  "/usr/X11R6/lib",
+-  "/usr/local/lib",
++  "${LOCALBASE}/lib",
++  "${X11BASE}/lib",
}
includedirs {
-   "/usr/local/include",
-+  "/usr/local/include/SDL2",
-+  "/usr/X11R6/include/",
+-  "/usr/local/include",
++  "${LOCALBASE}/include",
++  "${LOCALBASE}/include/SDL2",
++  "${X11BASE}/include/",
}
  
  if _OPTIONS.wincross then
Index: pkg/PLIST-data
===
RCS file: /cvs/ports/games/tome4/pkg/PLIST-data,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-data
--- pkg/PLIST-data  28 Dec 2016 18:34:57 -  1.1.1.1
+++ pkg/PLIST-data  29 Dec 2016 12:05:20 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST-data,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
+share/tome4/
+share/tome4/game/
 share/tome4/game/modules/
 share/tome4/game/modules/boot-te4-1.4.9.team
 share/tome4/game/modules/tome-1.4.9-gfx.team

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Wed, Dec 28, 2016 at 11:34:57AM -0700, Adam Wolk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   aw...@cvs.openbsd.org   2016/12/28 11:34:57
> 
> Log message:
> Import games/tome4
> 
> OK fcambus@
> 
> note: upstream is known to re-roll tarballs silently see
> http://forums.te4.org/viewtopic.php?f=42=47073
> for details.
> 
> $ cat pkg/DESCR-main
> Tales of Maj'Eyal (ToME) is a free, open source roguelike RPG,
> featuring tactical turn-based combat and advanced character building.
> Play as one of many unique races and classes in the lore-filled world
> of Eyal, exploring random dungeons, facing challenging battles, and
> developing characters with your own tailored mix of abilities and
> powers.  With a modern graphical and customisable interface, intuitive
> mouse control, streamlined mechanics and deep, challenging combat,
> Tales of Maj'Eyal offers engaging roguelike gameplay for the 21st
> century.
> 
> This package contains the engine of the game.
> 
> Status:
> 
> Vendor Tag:   awolk
> Release Tags: awolk_20161228
> 
> N ports/games/tome4/distinfo
> N ports/games/tome4/Makefile
> N ports/games/tome4/patches/patch-premake4_lua
> N ports/games/tome4/patches/patch-src_getself_c
> N ports/games/tome4/patches/patch-bootstrap_boot_lua
> N ports/games/tome4/patches/patch-build_te4core_lua
> N ports/games/tome4/pkg/PLIST-main
> N ports/games/tome4/pkg/PLIST-data
> N ports/games/tome4/pkg/DESCR-main
> N ports/games/tome4/pkg/DESCR-data
> 
> No conflicts created by this import

These variables don't exist:
MODGCC_ARCHS =  *   
MODGCC_LANGS =  c

It should be MODGCC4_...

Also there are hardcoded paths in patch-premake4_lua.

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/12/29 02:59:15

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.13.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/12/29 02:28:17

Modified files:
net/py-raet: Makefile distinfo 
net/py-raet/pkg: PLIST 

Log message:
Update to py-raet-0.6.6.

Re: sysutils/stow: fix for 'make test'

[Jeremie Courreges-Anglas]

Andreas Kusalananda Kähäri  writes:

> Hi,
>
> I noticed that "make test" fails for the sysutils/stow port that I'm the
> maintainer of.  The failure is due to not finding IO::Scalar which is
> part of the devel/p5-IO-stringy port.
>
> This tiny patch fixes that by adding devel/p5-IO-stringy to TEST_DEPENDS:

I committed a slightly tweaked version (each dep on its own line, sorted).

Thanks,
-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/12/29 02:10:36

Modified files:
sysutils/stow  : Makefile 

Log message:
p5-IO-stringy is needed for tests.

>From Andreas Kusalananda Kahari (maintainer)

sysutils/stow: fix for 'make test'

[Andreas Kusalananda Kähäri]

Hi,

I noticed that "make test" fails for the sysutils/stow port that I'm the
maintainer of.  The failure is due to not finding IO::Scalar which is
part of the devel/p5-IO-stringy port.

This tiny patch fixes that by adding devel/p5-IO-stringy to TEST_DEPENDS:

Index: Makefile
===
RCS file: /cvs/ports/sysutils/stow/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- Makefile10 Nov 2015 09:13:50 -  1.11
+++ Makefile29 Dec 2016 08:49:43 -
@@ -17,6 +17,6 @@ MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
 CONFIGURE_STYLE=gnu
 USE_GMAKE=Yes
 
-TEST_DEPENDS=  devel/p5-Test-Output
+TEST_DEPENDS=  devel/p5-Test-Output devel/p5-IO-stringy
 
 .include 


Cheers,
Andreas


signature.asc
Description: PGP signature