Re: [NEW] security/p5-Auth-Yubikey_Decrypter

[Landry Breuil]

On Mon, Apr 09, 2018 at 11:41:56PM +0200, Julien Dhaille wrote:
> Hello @ports
> 
> here is a new port : security/p5-Auth-Yubikey_Decrypter
> 
> This is a dependency for some programs using Yubikey tokens : 
> http://www.yubico.com/home/index/

Missing # $OpenBSD$ header per Makefile.template, and some spaces vs
tabs discrepancies, otherwise looks good to import to whoever wants to
do it.

Landry

clang6 fixes for audio/libmusicbrainz

[Timo Myyrä]

Hi,

Adding space and converting NULL to char conversion with '\0' seems to be enough
for libmusicbrainz.

timo

Index: patches/patch-src_webservice_cpp
===
RCS file: patches/patch-src_webservice_cpp
diff -N patches/patch-src_webservice_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_webservice_cpp10 Apr 2018 05:24:34 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/webservice.cpp
+--- src/webservice.cpp.orig
 src/webservice.cpp
+@@ -184,7 +184,7 @@ WebService::get(const std::string ,
+   if (!sess) 
+   throw WebServiceError("ne_session_create() failed.");
+   ne_set_server_auth(sess, httpAuth, this);
+-  ne_set_useragent(sess, PACKAGE"/"VERSION);
++  ne_set_useragent(sess, PACKAGE "/" VERSION);
+   
+   // Use proxy server
+   if (!d->proxyHost.empty()) {
+@@ -269,7 +269,7 @@ WebService::post(const std::string ,
+   if (!sess) 
+   throw WebServiceError("ne_session_create() failed.");
+   ne_set_server_auth(sess, httpAuth, this);
+-  ne_set_useragent(sess, PACKAGE"/"VERSION);
++  ne_set_useragent(sess, PACKAGE "/" VERSION);
+ 
+   // Use proxy server
+   if (!d->proxyHost.empty()) {
Index: patches/patch-src_xmlParser_xmlParser_cpp
===
RCS file: patches/patch-src_xmlParser_xmlParser_cpp
diff -N patches/patch-src_xmlParser_xmlParser_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_xmlParser_xmlParser_cpp   10 Apr 2018 05:24:34 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/xmlParser/xmlParser.cpp
+--- src/xmlParser/xmlParser.cpp.orig
 src/xmlParser/xmlParser.cpp
+@@ -740,7 +740,7 @@ LPTSTR stringDup(LPCTSTR lpszData, int cbData)
+ if (lpszNew)
+ {
+ memcpy(lpszNew, lpszData, (cbData) * sizeof(TCHAR));
+-lpszNew[cbData] = (TCHAR)NULL;
++lpszNew[cbData] = '\0';
+ }
+ return lpszNew;
+ }

update: math/z3

[Matthew Martin]

Update z3; builds here with clang 6. Enable tests while here.

- Matthew Martin


diff --git Makefile Makefile
index 6fe70abc40a..b32659d5940 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
 
 COMMENT =  z3 theorem prover
 
-VERSION =  4.5.0
+VERSION =  4.6.0
 DISTNAME = z3-${VERSION}
-REVISION = 0
 
 GH_ACCOUNT =   Z3Prover
 GH_PROJECT =   z3
@@ -25,11 +24,12 @@ MODULES =   lang/python
 
 WRKDIST =  ${WRKDIR}/z3-${DISTNAME}
 
-NO_TEST =  Yes
-
 do-build:
cd ${WRKSRC}/build && make
 
+do-test:
+   cd ${WRKSRC}/build && make test
+
 do-install:
cd ${WRKSRC}/build && make install DESTDIR=""
 
diff --git distinfo distinfo
index 367c197e8d9..78a13056b2b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (z3-4.5.0.tar.gz) = rq4dI5xeBqwYO+fdhTd1uEaY2xJlyyJY5ZGKKDctSgw=
-SIZE (z3-4.5.0.tar.gz) = 3573695
+SHA256 (z3-4.6.0.tar.gz) = UR2jHR+YXPDHmy3gW9pOBXNxulGXadFUb/ceEwT+U8k=
+SIZE (z3-4.6.0.tar.gz) = 3987830
diff --git pkg/PLIST pkg/PLIST
index 0d452ebdc7f..ad83b890997 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -12,6 +12,7 @@ include/z3_macros.h
 include/z3_optimization.h
 include/z3_polynomial.h
 include/z3_rcf.h
+include/z3_spacer.h
 include/z3_v1.h
 lib/libz3.so
 lib/python${MODPY_VERSION}/site-packages/z3/

Re: UPDATE net/unison

[Björn Ketelaars]

On Tue 03/04/2018 20:28, Björn Ketelaars wrote:
> unison received an update to 2.51.2. An overview on what has changed can
> be found at https://github.com/bcpierce00/unison/releases. Noticeable is
> that this version breaks compatibility with older versions.
> 
> Tested OK on amd64, and make test runs successfully.
> 
> Response MAINTAINER: 'fine, ok giovanni@'.
> 
> Additional comments/OKs?

Ping!

clang 6 fix astro/celestia

[Matthew Martin]

Neither of these changes are in the code on github because these chunks
of code are no where to be found (even in history). Regardless builds
and runs here now.

- Matthew Martin


diff --git Makefile Makefile
index 5d8943d5330..2b18df5a1af 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT=   free space simulator and planetarium
 
 DISTNAME=  celestia-1.6.1
-REVISION=  12
+REVISION=  13
 
 CATEGORIES=astro x11
 
diff --git patches/patch-src_celestia_celestiacore_cpp 
patches/patch-src_celestia_celestiacore_cpp
index a2195a5dc9c..0c701fdf16d 100644
--- patches/patch-src_celestia_celestiacore_cpp
+++ patches/patch-src_celestia_celestiacore_cpp
@@ -1,6 +1,16 @@
 $OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.5 2011/07/09 01:41:13 
ajacoutot Exp $
 src/celestia/celestiacore.cpp.orig Sun Jun  5 18:11:13 2011
-+++ src/celestia/celestiacore.cpp  Sat Jul  9 03:23:48 2011
+Index: src/celestia/celestiacore.cpp
+--- src/celestia/celestiacore.cpp.orig
 src/celestia/celestiacore.cpp
+@@ -439,7 +439,7 @@ void CelestiaCore::activateFavorite(FavoritesEntry& fa
+ sim->setTime(fav.jd);
+ sim->setObserverPosition(fav.position);
+ sim->setObserverOrientation(fav.orientation);
+-if (fav.fov != NULL)
++if (fav.fov != 0)
+ {
+ sim->getActiveObserver()->setFOV(fav.fov);
+ setZoomFromFOV();
 @@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const string* config
  }
  else
diff --git patches/patch-src_celestia_favorites_cpp 
patches/patch-src_celestia_favorites_cpp
new file mode 100644
index 000..039a7af4e61
--- /dev/null
+++ patches/patch-src_celestia_favorites_cpp
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: src/celestia/favorites.cpp
+--- src/celestia/favorites.cpp.orig
 src/celestia/favorites.cpp
+@@ -80,7 +80,7 @@ FavoritesList* ReadFavoritesList(istream& in)
+ 
+ // Get fov
+ if (!favParams->getNumber("fov", fav->fov))
+-fav->fov = NULL;
++fav->fov = 0;
+ 
+ // Get time
+ fav->jd = 0.0;
+@@ -137,7 +137,7 @@ void WriteFavoritesList(FavoritesList& favorites, ostr
+ out << "\tangle  " << angle << '\n';
+ out << setprecision(16);
+ out << "\ttime   " << fav->jd << '\n';
+-if (fav->fov != NULL)
++if (fav->fov != 0)
+ out << "\tfov   " << fav->fov << '\n';
+ out << "\tselection \"" << fav->selectionName << "\"\n";
+ out << "\tcoordsys \"";

Re: clang6 fallout

[Christian Weisgerber]

Updated list as of Apr 9, 22:00 UTC:

astro/celestia
audio/audacity
audio/caps-plugins
audio/gogglesmm
audio/libmusicbrainz
audio/libmusicbrainz5
audio/libsidplay
cad/kicad
comms/gpsk31
comms/hylafax
databases/mysqlcc
databases/pgadmin3
devel/arm-none-eabi/gcc-linaro
devel/bouml
devel/bullet
devel/jdk/1.8
devel/mysql++
devel/openmpi
devel/ptlib
devel/qt-creator
devel/sdcc
devel/smpeg
devel/smpeg2
devel/tclcl
editors/fte
education/drgeo
emulators/BasiliskII
emulators/desmume
emulators/dgen-sdl
emulators/fceux
emulators/frodo
emulators/fs-uae
emulators/nestopia
games/amph
games/blobby
games/crack-attack
games/ja2-stracciatella
games/stepmania
games/sumwars
games/vegastrike/engine
games/xminehunter
games/xwelltris,no_sdl
geo/gpstk
graphics/animorph
graphics/animorph
graphics/cal3d
graphics/dcmtk
graphics/discwrapper
graphics/rawstudio
inputmethods/scim-anthy
japanese/groff
java/jlint
mail/mimetic
mail/prepop
math/libqalculate
math/minisat
math/openfst
math/z3
misc/openbabel
misc/xnc
multimedia/libmp4v2
multimedia/sfml
multimedia/swfmill
net/amule
net/centerim
net/dhcdrop
net/dxpc
net/kismet
net/libtorrent-rasterbar
net/livemedia
net/mldonkey
net/mutella
net/nepenthes
net/ntopng
net/ruby-eventmachine
net/synergy
net/tcpreen
news/pan
print/texlive/base
security/steghide
sysutils/facter
sysutils/facter
textproc/arabica
textproc/clucene
textproc/exempi
textproc/lq-sp
textproc/opensp
textproc/sablotron
textproc/sphinx
textproc/wkhtmltopdf
www/mongrel2
www/phantomjs
x11/kde/libs3
x11/qt4

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

[NEW] security/p5-Auth-Yubikey_Decrypter

[Julien Dhaille]

Hello @ports

here is a new port : security/p5-Auth-Yubikey_Decrypter

This is a dependency for some programs using Yubikey tokens : 
http://www.yubico.com/home/index/

Cheers



p5-Auth-Yubikey_Decrypter.tar.gz
Description: GNU Zip compressed data

[NEW] security/py-ropper

[Remi Pointel]

Hi,

attached is ropper, a rop gadget finder and binary information tool.

-
$ pkg_info py-ropper
Information for inst:py-ropper-1.11.6

Comment:
rop gadget finder and binary information tool

Description:
Ropper can be used to look at information about files in different file 
formats
and can find ROP and JOP gadgets to build chains for different 
architectures.
Ropper supports ELF, MachO and the PE file format. Other files can be 
opened in

RAW format.

Maintainer: Remi Pointel 

WWW: https://scoding.de/ropper/
-

Ok?

Cheers,

Remi.


py-ropper-1.11.6.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/09 13:03:43

Modified files:
net/p5-Net-DNS-SEC: Makefile distinfo 
Removed files:
net/p5-Net-DNS-SEC/patches: patch-Makefile_PL 

Log message:
update p5-Net-DNS-SEC to 1.07

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 12:21:05

Modified files:
editors/ht/patches: patch-htapp_cc patch-htelfphs_cc 
Added files:
editors/ht/patches: patch-classview_cc patch-htcfg_cc 
patch-htcoffhd_cc patch-htelfhd_cc 
patch-htelfshs_cc patch-htfinfo_cc 
patch-htinfo_h patch-htleent_cc 
patch-htlehead_cc patch-htleobj_cc 
patch-htmacho_cc patch-htmachohd_cc 
patch-htmzhead_cc patch-htnehead_cc 
patch-htneobj_cc patch-htpefhd_cc 
patch-htpehead_cc patch-htxbehead_cc 
patch-htxexhead_cc patch-io_types_h 
patch-main_cc patch-output_out_html_cc 
patch-output_out_txt_cc 

Log message:
fix build with clang6; from upstream

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 12:07:24

Added files:
misc/cdrdao/patches: patch-dao_CdrDriver_cc 
 patch-dao_CdrDriver_h 

Log message:
fix build with clang6; from freebsd

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 11:26:54

Added files:
lang/apl/patches: patch-src_emacs_mode_TcpListener_cc 
  patch-src_emacs_mode_UnixSocketListener_cc 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 11:17:08

Added files:
lang/erlang/16/patches: patch-lib_wx_c_src_wxe_gl_cpp 

Log message:
fix build with clang6; patch from upstream

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:45:05

Modified files:
games/dungeon-crawl/patches: patch-source_newgame_cc 
Added files:
games/dungeon-crawl/patches: patch-source_itemname_cc 
 patch-source_liblinux_cc 

Log message:
fix build with clang6; from Timo Myyra with feedback from stsp@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:43:50

Added files:
games/kobodeluxe/patches: patch-filemap_cpp patch-prefs_cpp 

Log message:
fix build with clang6; from Timo Myyra

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:43:01

Modified files:
games/scorched3d/patches: 
  patch-src_common_weapons_AccessoryStore_cpp 

Log message:
fix mangled patch

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:41:36

Modified files:
games/numptyphysics/patches: patch-Canvas_cpp 
Added files:
games/numptyphysics/patches: patch-Font_cpp 

Log message:
fix build with clang6; from Timo Myyra

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:35:38

Modified files:
games/maelstrom: Makefile 
games/maelstrom/patches: patch-load_h 
games/maelstrom/pkg: PLIST 
Added files:
games/maelstrom/patches: patch-controls_cpp patch-load_cpp 

Log message:
fix build with clang6; from Timo Myyra

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 10:34:05

Added files:
games/scorched3d/patches: 
  patch-src_common_weapons_AccessoryStore_cpp 

Log message:
fix build with clang6; from Timo Myyra

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2018/04/09 09:58:26

Modified files:
archivers/p7zip: Makefile 
Added files:
archivers/p7zip/patches: patch-CPP_Windows_ErrorMsg_cpp 

Log message:
Unbreak build - fix for clang 6.0.

rsadowski significantly simplified the initial fix. Thanks!

Maintainer (Josh Grosse) ok.

OK rsadowski@

Re: UPDATE www/urlwatch

[Gleydson Soares]

On Mon, Apr 09, 2018 at 05:16:53PM +0200, Björn Ketelaars wrote:
> Enclosed diff brings urlwatch to 2.9. Changelog can be found at
> https://github.com/thp/urlwatch/blob/master/ChangeLog
> 
> 'make test' runs successfully. Tested ok on AMD64.
> 
> OK?

OK gsoares@

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/urlwatch/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile  24 Feb 2018 19:02:57 -  1.12
> +++ Makefile  9 Apr 2018 15:06:17 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= monitor webpages for updates
>  
> -MODPY_EGG_VERSION=   2.8
> +MODPY_EGG_VERSION=   2.9
>  DISTNAME=urlwatch-${MODPY_EGG_VERSION}
>  
>  CATEGORIES=  www
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/urlwatch/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo  24 Feb 2018 19:02:57 -  1.7
> +++ distinfo  9 Apr 2018 15:06:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (urlwatch-2.8.tar.gz) = zt9hLZ88TEfKj/0qNnU7CGhyKhCBOSCPD70rV/bjQLM=
> -SIZE (urlwatch-2.8.tar.gz) = 32745
> +SHA256 (urlwatch-2.9.tar.gz) = DRWq7sZBIrOIq4i/vkAKp16Q9AoSLM2rzXPw8YgbZb8=
> +SIZE (urlwatch-2.9.tar.gz) = 33891
> 

UPDATE www/urlwatch

[Björn Ketelaars]

Enclosed diff brings urlwatch to 2.9. Changelog can be found at
https://github.com/thp/urlwatch/blob/master/ChangeLog

'make test' runs successfully. Tested ok on AMD64.

OK?


Index: Makefile
===
RCS file: /cvs/ports/www/urlwatch/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile24 Feb 2018 19:02:57 -  1.12
+++ Makefile9 Apr 2018 15:06:17 -
@@ -2,7 +2,7 @@
 
 COMMENT=   monitor webpages for updates
 
-MODPY_EGG_VERSION= 2.8
+MODPY_EGG_VERSION= 2.9
 DISTNAME=  urlwatch-${MODPY_EGG_VERSION}
 
 CATEGORIES=www
Index: distinfo
===
RCS file: /cvs/ports/www/urlwatch/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo24 Feb 2018 19:02:57 -  1.7
+++ distinfo9 Apr 2018 15:06:17 -
@@ -1,2 +1,2 @@
-SHA256 (urlwatch-2.8.tar.gz) = zt9hLZ88TEfKj/0qNnU7CGhyKhCBOSCPD70rV/bjQLM=
-SIZE (urlwatch-2.8.tar.gz) = 32745
+SHA256 (urlwatch-2.9.tar.gz) = DRWq7sZBIrOIq4i/vkAKp16Q9AoSLM2rzXPw8YgbZb8=
+SIZE (urlwatch-2.9.tar.gz) = 33891

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2018/04/09 09:14:33

Modified files:
plan9/plan9port: Makefile 
Added files:
plan9/plan9port/patches: patch-src_libthread_thread_c 
 patch-src_libthread_threadimpl_h 

Log message:
make plan9port work with MAP_STACK
initial diff from Aaron Poffenberger 

clang6 fixes for games/numptyphysics

[Timo Myyrä]

Hi,

Here's patches to add missing static casts to numptyphysics.
These allow it to compile but got following crash when I tried to run it on 
amd64:
$ numptyphysics 

 
created dir /home/tmy/.numptyphysics
libunwind: _Unwind_Resume 
/usr/src/lib/libcxxabi/../libunwind/src/UnwindLevel1.c:391 - _Unwind_Resume() 
can't return
Abort trap (core dumped) 

timo

Index: patches/patch-Canvas_cpp
===
RCS file: /cvs/ports/games/numptyphysics/patches/patch-Canvas_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Canvas_cpp
--- patches/patch-Canvas_cpp12 Dec 2012 14:58:00 -  1.2
+++ patches/patch-Canvas_cpp9 Apr 2018 13:16:32 -
@@ -1,7 +1,66 @@
 $OpenBSD: patch-Canvas_cpp,v 1.2 2012/12/12 14:58:00 dcoppa Exp $
 Canvas.cpp.origWed Dec  5 17:24:18 2012
-+++ Canvas.cpp Wed Dec  5 17:28:19 2012
-@@ -801,12 +801,8 @@ void Window::setSubName( const char *sub )
+Index: Canvas.cpp
+--- Canvas.cpp.orig
 Canvas.cpp
+@@ -454,7 +454,12 @@ void Canvas::scale( int w, int h )
+ void Canvas::clear( const Rect& r )
+ {
+   if ( m_bgImage ) {
+-SDL_Rect srcRect = { r.tl.x, r.tl.y, r.br.x-r.tl.x+1, r.br.y-r.tl.y+1 };
++SDL_Rect srcRect = {
++static_cast(r.tl.x),
++  static_cast(r.tl.y),
++  static_cast(r.br.x-r.tl.x+1),
++  static_cast(r.br.y-r.tl.y+1)
++};
+ SDL_BlitSurface( SURFACE(m_bgImage), , SURFACE(this),  );
+   } else {
+ drawRect( r, m_bgColour );
+@@ -471,8 +476,18 @@ void Canvas::drawImage( Canvas *canvas, int x, int y )
+ //dest.tl.x, dest.tl.y, dest.br.x, dest.br.y);
+ //   }
+ 
+-  SDL_Rect sdlsrc = { dest.tl.x-x, dest.tl.y-y, dest.width(), dest.height() };
+-  SDL_Rect sdldst = { dest.tl.x, dest.tl.y, 0, 0 };
++  SDL_Rect sdlsrc = {
++static_cast(dest.tl.x-x),
++static_cast(dest.tl.y-y),
++static_cast(dest.width()),
++static_cast(dest.height())
++  };
++  SDL_Rect sdldst = {
++static_cast(dest.tl.x),
++static_cast(dest.tl.y),
++0,
++0
++  };
+   SDL_BlitSurface( SURFACE(canvas), , SURFACE(this),  );
+ }
+ 
+@@ -606,10 +621,20 @@ void Canvas::drawRect( int x, int y, int w, int h, int
+   if ( fill ) {
+ Rect dest(x,y,x+w,y+h);
+ dest.clipTo(m_clip);
+-SDL_Rect r = { dest.tl.x, dest.tl.y, dest.width(), dest.height() };
++SDL_Rect r = {
++static_cast(dest.tl.x),
++  static_cast(dest.tl.y),
++  static_cast(dest.width()),
++  static_cast(dest.height())
++};
+ SDL_FillRect( SURFACE(this), , c );
+   } else {
+-SDL_Rect f = { x, y, w, h };
++SDL_Rect f = {
++static_cast(x),
++static_cast(y),
++static_cast(w),
++static_cast(h)
++};
+ SDL_Rect r;
+ r=f; r.h=1; SDL_FillRect( SURFACE(this), , c );
+ r.y+=f.h-1; SDL_FillRect( SURFACE(this), , c );
+@@ -801,12 +826,8 @@ void Window::setSubName( const char *sub )
  Image::Image( const char* file, bool alpha )
  {
//alpha = false;
@@ -15,7 +74,17 @@ $OpenBSD: patch-Canvas_cpp,v 1.2 2012/12
if ( img ) {
  printf("loaded image %s\n",(f+file).c_str());
  if ( alpha ) {
-@@ -873,15 +869,24 @@ int Canvas::writeBMP( const char* filename ) const
+@@ -865,23 +886,32 @@ int Canvas::writeBMP( const char* filename ) const
+ 
+   int w = width();
+   int h = height();
+-  BMPHEADER head = { 'B'|('M'<<8), 14+40+w*h*3, 0, 0, 14+40 };
+-  BMPINFOHEADER info = { 40, w, h, 1, 24, 0, w*h*3, 100, 100, 0, 0 };
++  BMPHEADER head = { 'B'|('M'<<8), static_cast(14+40+w*h*3), 0, 0, 14+40 };
++  BMPINFOHEADER info = { 40, w, h, 1, 24, 0, static_cast(w*h*3), 100, 100, 0, 0 };
+ 
+   FILE *f = fopen( filename, "wb" );
+   if ( f ) {
  Uint32 bpp;
  bpp = SURFACE(this)->format->BytesPerPixel;
  
Index: patches/patch-Font_cpp
===
RCS file: patches/patch-Font_cpp
diff -N patches/patch-Font_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Font_cpp  9 Apr 2018 13:16:32 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: Font.cpp
+--- Font.cpp.orig
 Font.cpp
+@@ -48,7 +48,11 @@ Vec2 Font::metrics( const std::string& text ) const
+ void Font::drawLeft( Canvas* canvas, Vec2 pt,
+const std::string& text, int colour ) const
+ {
+-  SDL_Color fg = { colour>>16, colour>>8, colour };
++  SDL_Color fg = {
++static_cast(colour>>16),
++static_cast(colour>>8),
++static_cast(colour)
++  };
+   FontCanvas temp( TTF_RenderText_Blended( FONT(this),
+  text.c_str(),
+  fg ) );

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/09 06:40:34

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/patches: patch-src_app_qgisapp_cpp 
  patch-src_server_CMakeLists_txt 
geo/qgis/pkg   : PLIST 
Added files:
geo/qgis/patches: patch-src_server_qgsserverplugins_cpp 
Removed files:
geo/qgis/patches: patch-CMakeLists_txt 
  patch-cmake_FindGDAL_cmake 
  patch-cmake_FindGEOS_cmake 
  patch-cmake_FindPostgres_cmake 
  patch-debian_qgis_desktop 
  patch-doc_CMakeLists_txt 
  patch-src_app_qgsabout_cpp 
  patch-src_core_CMakeLists_txt 
  patch-src_core_qgsapplication_cpp 
  patch-src_helpviewer_CMakeLists_txt 
  patch-src_providers_delimitedtext_CMakeLists_txt 
  patch-src_providers_wms_CMakeLists_txt 

Log message:
Major update to QGIS 3.0.1.

- Switch from python2/Qt4 to python3/Qt5 (note that a handful of plugins
arent ported yet..)
- overhaul post-install for proper icons/desktop files, mostly taken
from debian packaging
- lots of patches merged upstream (github PRs #6169 & 6171 among others)
- still a nasty bug with file dialogs when running inside a gtk desktop
environment, being investigated (upstream ticket #17825).

See http://blog.qgis.org/2018/02/23/qgis-3-0-girona-is-released/ &
https://qgis.org/en/site/forusers/visualchangelog30 for user-facing details.

Mostly worked on at a HAM and then at p2k18, been using various
snapshots of master at work since some months, and playing with 3d features...

clang6 fix games/maelstrom

[Timo Myyrä]

Hi,

Adding few spaces to sources helps the maelstrom to compile.
Quickly tested playing the game and seems to work.

timo

Index: patches/patch-controls_cpp
===
RCS file: patches/patch-controls_cpp
diff -N patches/patch-controls_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-controls_cpp  9 Apr 2018 12:09:34 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: controls.cpp
+--- controls.cpp.orig
 controls.cpp
+@@ -83,7 +83,7 @@ static FILE *OpenData(char *mode, char **fname)
+   if ( fname ) {
+   *fname = datafile;
+   }
+-  sprintf(datafile,  "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
++  sprintf(datafile,  "%s" DIR_SEP "%s", home, MAELSTROM_DATA);
+   if ( (data=fopen(datafile, mode)) == NULL )
+   return(NULL);
+   return(data);
Index: patches/patch-load_cpp
===
RCS file: patches/patch-load_cpp
diff -N patches/patch-load_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-load_cpp  9 Apr 2018 12:09:34 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: load.cpp
+--- load.cpp.orig
 load.cpp
+@@ -81,7 +81,7 @@ SDL_Surface *Load_Title(FrameBuf *screen, int title_id
+   SDL_Surface *bmp, *title;
+   
+   /* Open the title file -- we know its colormap is our global one */
+-  sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
++  sprintf(file, "Images" DIR_SEP "Maelstrom_Titles#%d.bmp", title_id);
+   bmp = SDL_LoadBMP(path.Path(file));
+   if ( bmp == NULL ) {
+   return(NULL);
+@@ -103,7 +103,7 @@ SDL_Surface *GetCIcon(FrameBuf *screen, short cicn_id)
+   Uint16 w, h;
+   
+   /* Open the cicn sprite file.. */
+-  sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
++  sprintf(file, "Images" DIR_SEP "Maelstrom_Icon#%hd.cicn", cicn_id);
+   if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) {
+   error("GetCIcon(%hd): Can't open CICN %s: ",
+   cicn_id, path.Path(file));
Index: patches/patch-load_h
===
RCS file: /cvs/ports/games/maelstrom/patches/patch-load_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-load_h
--- patches/patch-load_h4 Jun 2008 06:50:20 -   1.1.1.1
+++ patches/patch-load_h9 Apr 2018 12:09:34 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-load_h,v 1.1.1.1 2008/06/04 06:50:20 phessler Exp $
 load.h.origSat Jul 21 13:46:17 2001
-+++ load.h Tue Jun  3 19:05:51 2008
+Index: load.h
+--- load.h.orig
 load.h
 @@ -21,7 +21,7 @@ static inline char *strdup(const char *str)
return(newstr);
  }
@@ -19,3 +20,12 @@ $OpenBSD: patch-load_h,v 1.1.1.1 2008/06
  #define DIR_SEP   "/"
  #define CUR_DIR   "."
  #elif defined(WIN32)
+@@ -106,7 +106,7 @@ class LibPath { (public)
+   if ( strcmp(directory, DIR_SEP) == 0 ) {
+   sprintf(path, DIR_SEP"%s", filename);
+   } else {
+-  sprintf(path, "%s"DIR_SEP"%s", directory, filename);
++  sprintf(path, "%s" DIR_SEP "%s", directory, filename);
+   }
+   return(path);
+   }
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/maelstrom/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   4 Jun 2008 16:23:33 -   1.2
+++ pkg/PLIST   9 Apr 2018 12:09:34 -
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2008/06/04 16:23:33 phessler Exp $
-bin/maelstrom
-bin/maelstrom-netd
+@bin bin/maelstrom
+@bin bin/maelstrom-netd
 share/doc/maelstrom/
 share/doc/maelstrom/COPYING
 share/doc/maelstrom/COPYING.GPL

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/04/09 06:13:31

Modified files:
textproc   : Makefile 

Log message:
Add ruby-rouge.

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/04/09 06:11:56

Log message:
Import textproc/ruby-rouge.

Rouge is a pure-ruby syntax highlighter. It can highlight 100 different
languages, and output HTML or ANSI 256-color text.

Its HTML output is compatible with stylesheets designed for pygments.

OK jeremy@

Status:

Vendor Tag: fcambus
Release Tags:   fcambus_20180409

N ports/textproc/ruby-rouge/Makefile
N ports/textproc/ruby-rouge/distinfo
N ports/textproc/ruby-rouge/pkg/PLIST
N ports/textproc/ruby-rouge/pkg/DESCR

No conflicts created by this import

clang6 fix games/kobodeluxe

[Timo Myyrä]

Hi,

Few patches fix "error: invalid suffix on literal; C++11 requires a space
between literal and identifier".

timo

Index: patches/patch-filemap_cpp
===
RCS file: patches/patch-filemap_cpp
diff -N patches/patch-filemap_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-filemap_cpp   9 Apr 2018 10:38:15 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: filemap.cpp
+--- filemap.cpp.orig
 filemap.cpp
+@@ -851,7 +851,7 @@ void filemapper_t::print(FILE *f, const char *ref)
+   while(k)
+   {
+   if(strcmp(k->key, key) == 0 || all)
+-  fprintf(f, "%s"FM_DEREF_TOKEN" --> \"%s\"\n", k->key, 
k->path);
++  fprintf(f, "%s" FM_DEREF_TOKEN " --> \"%s\"\n", k->key, 
k->path);
+   k = k->next;
+   }
+ }
Index: patches/patch-prefs_cpp
===
RCS file: patches/patch-prefs_cpp
diff -N patches/patch-prefs_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-prefs_cpp 9 Apr 2018 10:38:15 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: prefs.cpp
+--- prefs.cpp.orig
 prefs.cpp
+@@ -30,7 +30,7 @@
+ void prefs_t::init()
+ {
+   comment("");
+-  comment(" Kobo Deluxe "VERSION" Configuration File");
++  comment(" Kobo Deluxe " VERSION " Configuration File");
+   comment("");
+   comment(" Switches - [no]");
+   comment(" Values -  [|\"\"]");

building texmacs; meaning of an error

[Rudolf Sykora]

Hello,

I am trying to build TeXmacs (since I need it) from ports on amd64
on openBSD 6.3.

I know that on linux it can be built with clang.

So I wanted to try. But as soon as I issue 'make' in the port directory
with an unmodified Makefile I get an error (see below), seemingly
somewhere in bsd.port.mk, whose meaning I do not understand.
Can anybody please comment on it or direct  me as to what  I should read?

Thanks
Ruda

make
===> TeXmacs-1.99.6p1 depends on: ghostscript-* -> ghostscript-9.07p7
===> TeXmacs-1.99.6p1 depends on: metaauto-* -> metaauto-1.0p1
===> TeXmacs-1.99.6p1 depends on: autoconf-2.69 -> autoconf-2.69p2
===> TeXmacs-1.99.6p1 depends on: gmake-* -> gmake-4.2.1
===> TeXmacs-1.99.6p1 depends on: guile-* -> guile-1.8.8p5
===> TeXmacs-1.99.6p1 depends on: qt4-* -> qt4-4.8.7p14
===>  Verifying specs:  ICE QtGui SM X11 Xext Xi Xinerama Xrender c
fontconfig freetype gmp guile ltdl m pthread c++ c++abi pthread util z
lib/qt4/QtCore
===>  found ICE.10.0 QtGui.10.1 SM.9.0 X11.16.1 Xext.13.0 Xi.12.1
Xinerama.6.0 Xrender.6.0 c.92.3 fontconfig.11.0 freetype.28.2 gmp.10.0
guile.20.0 ltdl.5.0 m.10.1 pthread.25.1 c++.1.0 c++abi.0.0 util.13.0
z.5.0 lib/qt4/QtCore.9.0
===>  Checking files for TeXmacs-1.99.6p1
>> Fetch http://texmacs.org//Download/ftp/tmftp/source/TeXmacs-1.99.6-src.tar.gz
TeXmacs-1.99.6-src.tar.gz 100%
|*|
24493 KB00:07
>> No size recorded for TeXmacs-1.99.6-src.tar.gz
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2936
'/usr/ports/distfiles/TeXmacs-1.99.6-src.tar.gz':
@lock=TeXmacs-1.99.6-src.t...)
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2267
'_internal-fetch')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2508
'/usr/ports/pobj/TeXmacs-1.99.6/.extract_done')
*** Error 1 in /usr/ports/editors/TeXmacs
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'all')

UPDATE: Apachetop-0.17.4

[Gonzalo L. Rodriguez]

Hello,

Update for Apachetop to 0.17.4:

https://github.com/tessus/apachetop/releases

Now on github also fix for clang6

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/apachetop/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile8 Apr 2018 10:30:32 -   1.11
+++ Makefile9 Apr 2018 10:13:05 -
@@ -2,8 +2,9 @@
 
 COMMENT =  top-like monitor for Apache
 
-DISTNAME = apachetop-0.12.6
-REVISION = 3
+GH_ACCOUNT =   tessus
+GH_PROJECT =   apachetop
+GH_TAGNAME =   0.17.4
 CATEGORIES =   sysutils
 
 MAINTAINER =   Gonzalo L. R. 
@@ -15,12 +16,16 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 MASTER_SITES = http://www.webta.org/apachetop/
 
-CONFIGURE_STYLE =  autoconf
-AUTOCONF_VERSION = 2.59
+CONFIGURE_STYLE =  autoconf automake
+AUTOCONF_VERSION = 2.65
+AUTOMAKE_VERSION = 1.15
 
-CONFIGURE_ARGS =   --disable-fam \
-   --with-logfile=/var/www/logs/access_log
+CONFIGURE_ARGS =   --with-logfile=/var/www/logs/access_log
 
-WANTLIB += c m ncurses readline ${COMPILER_LIBCXX}
+WANTLIB += c m curses readline ${COMPILER_LIBCXX}
+
+post-patch:
+   cd ${WRKSRC} && ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apachetop/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:15:09 -  1.2
+++ distinfo9 Apr 2018 10:13:05 -
@@ -1,2 +1,2 @@
-SHA256 (apachetop-0.12.6.tar.gz) = hQBiQUUXBV6rJEC3iLUD1F6+mykNSy4Cel+IetcPPyk=
-SIZE (apachetop-0.12.6.tar.gz) = 126930
+SHA256 (apachetop-0.17.4.tar.gz) = iS7TuDtF6ziBHnTQaAibHow0cHeH8kDOEz2MkxmNf/A=
+SIZE (apachetop-0.17.4.tar.gz) = 42729
Index: patches/patch-src_log_cc
===
RCS file: /cvs/ports/sysutils/apachetop/patches/patch-src_log_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_log_cc
--- patches/patch-src_log_cc8 Apr 2018 10:30:32 -   1.1
+++ patches/patch-src_log_cc9 Apr 2018 10:13:05 -
@@ -6,13 +6,13 @@ Index: src/log.cc
 @@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
if (!bufcp)
return -1;
-   
+ 
 -  *bufcp = (char) NULL;
 +  *bufcp = '\0';
++bufcp;
  
/* quickly figure out if this is an IP or a host. We do this by
-@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi
+@@ -176,7 +176,7 @@ int CommonLogParser::parse(char *logline, struct logbi
/* find the end of referrer and null it */
if (!(bufcp = strchr(bufsp, '"')))
return -1;
@@ -21,7 +21,7 @@ Index: src/log.cc
  
/* unless they want to keep it, skip over the protocol, ie http:// */
if ((cf.preserve_ref_protocol == 0) && (bufcp = strstr(bufsp, "://")))
-@@ -230,7 +230,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
+@@ -234,7 +234,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
return NULL;
  
/* null the space in front of it */
@@ -30,7 +30,7 @@ Index: src/log.cc
  
/* TODO maybe we can use the protocol someday.. */
  
-@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -262,7 +262,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
char *bufcp, *endptr, *workptr;
  
endptr = *url + *length;
@@ -39,7 +39,7 @@ Index: src/log.cc
  
/* do we want to keep the query string? */
if (!cf.keep_querystring)
-@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -277,7 +277,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
if (workptr < endptr)
{
/* we're ok */
@@ -48,7 +48,7 @@ Index: src/log.cc
bufcp = workptr+1;
}
}
-@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -312,7 +312,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
if (workptr == endptr)
bufcp = workptr;
}

Re: CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

On Mon, Apr 09 2018, Jeremie Courreges-Anglas  wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   j...@cvs.openbsd.org2018/04/09 03:36:37
>
> Modified files:
>   mail   : Makefile 
>   devel/quirks   : Makefile 
>   devel/quirks/files: Quirks.pm 
> Removed files:
>   mail/prepop: Makefile distinfo 
>   mail/prepop/patches: patch-base64_cc patch-display_cc 
>patch-header_cc patch-help_cc patch-main_cc 
>   mail/prepop/pkg: DESCR PLIST 
>
> Log message:
> Remove prepop, questionable usefulness and on life support since 2004
>
> ok landry@

Also ok fcambus@

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

Re: CVS: cvs.openbsd.org: ports

[Gonzalo L. Rodriguez]

On [08/04/18] [10:30P], Stuart Henderson wrote:

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/08 04:30:32

Modified files:
sysutils/apachetop: Makefile
Added files:
sysutils/apachetop/patches: patch-src_apachetop_cc
patch-src_display_cc
patch-src_hits_circle_cc
patch-src_log_cc

Log message:
add clang6 patches from Matthew Martin

update homepage while there, someone should look at updating this,
the newest release (2017-04) includes a buffer overflow fix



Yes, I was working on that.

Moving to git, and update to the last version with the clang6 fix.

Diff attached.

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/apachetop/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile8 Apr 2018 10:30:32 -   1.11
+++ Makefile9 Apr 2018 10:13:05 -
@@ -2,8 +2,9 @@
 
 COMMENT =  top-like monitor for Apache
 
-DISTNAME = apachetop-0.12.6
-REVISION = 3
+GH_ACCOUNT =   tessus
+GH_PROJECT =   apachetop
+GH_TAGNAME =   0.17.4
 CATEGORIES =   sysutils
 
 MAINTAINER =   Gonzalo L. R. 
@@ -15,12 +16,16 @@ PERMIT_PACKAGE_CDROM=   Yes
 
 MASTER_SITES = http://www.webta.org/apachetop/
 
-CONFIGURE_STYLE =  autoconf
-AUTOCONF_VERSION = 2.59
+CONFIGURE_STYLE =  autoconf automake
+AUTOCONF_VERSION = 2.65
+AUTOMAKE_VERSION = 1.15
 
-CONFIGURE_ARGS =   --disable-fam \
-   --with-logfile=/var/www/logs/access_log
+CONFIGURE_ARGS =   --with-logfile=/var/www/logs/access_log
 
-WANTLIB += c m ncurses readline ${COMPILER_LIBCXX}
+WANTLIB += c m curses readline ${COMPILER_LIBCXX}
+
+post-patch:
+   cd ${WRKSRC} && ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apachetop/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:15:09 -  1.2
+++ distinfo9 Apr 2018 10:13:05 -
@@ -1,2 +1,2 @@
-SHA256 (apachetop-0.12.6.tar.gz) = hQBiQUUXBV6rJEC3iLUD1F6+mykNSy4Cel+IetcPPyk=
-SIZE (apachetop-0.12.6.tar.gz) = 126930
+SHA256 (apachetop-0.17.4.tar.gz) = iS7TuDtF6ziBHnTQaAibHow0cHeH8kDOEz2MkxmNf/A=
+SIZE (apachetop-0.17.4.tar.gz) = 42729
Index: patches/patch-src_log_cc
===
RCS file: /cvs/ports/sysutils/apachetop/patches/patch-src_log_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_log_cc
--- patches/patch-src_log_cc8 Apr 2018 10:30:32 -   1.1
+++ patches/patch-src_log_cc9 Apr 2018 10:13:05 -
@@ -6,13 +6,13 @@ Index: src/log.cc
 @@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
if (!bufcp)
return -1;
-   
+ 
 -  *bufcp = (char) NULL;
 +  *bufcp = '\0';
++bufcp;
  
/* quickly figure out if this is an IP or a host. We do this by
-@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi
+@@ -176,7 +176,7 @@ int CommonLogParser::parse(char *logline, struct logbi
/* find the end of referrer and null it */
if (!(bufcp = strchr(bufsp, '"')))
return -1;
@@ -21,7 +21,7 @@ Index: src/log.cc
  
/* unless they want to keep it, skip over the protocol, ie http:// */
if ((cf.preserve_ref_protocol == 0) && (bufcp = strstr(bufsp, "://")))
-@@ -230,7 +230,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
+@@ -234,7 +234,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
return NULL;
  
/* null the space in front of it */
@@ -30,7 +30,7 @@ Index: src/log.cc
  
/* TODO maybe we can use the protocol someday.. */
  
-@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -262,7 +262,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
char *bufcp, *endptr, *workptr;
  
endptr = *url + *length;
@@ -39,7 +39,7 @@ Index: src/log.cc
  
/* do we want to keep the query string? */
if (!cf.keep_querystring)
-@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -277,7 +277,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
if (workptr < endptr)
{
/* we're ok */
@@ -48,7 +48,7 @@ Index: src/log.cc
bufcp = workptr+1;
}
}
-@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
+@@ -312,7 +312,7 @@ int 

Re: clang6 fix for games/dungeon-crawl

[Timo Myyrä]

Stefan Sperling  writes:

> On Mon, Apr 09, 2018 at 11:13:58AM +0300, Timo Myyrä wrote:
>
>> Hi,
>> 
>> Few casts to fix dungeon-crawl build.
>> 
>> Timo
>
>>  $OpenBSD: patch-source_newgame_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
>>  source/newgame.cc.orig  Sat Oct 22 16:05:21 2005
>> -+++ source/newgame.cc   Sat Oct 22 16:06:32 2005
>> -@@ -253,8 +253,13 @@ static bool check_saved_game(void)
>> - }
>> +Index: source/newgame.cc
>> +--- source/newgame.cc.orig
>>  source/newgame.cc
>> +@@ -1911,7 +1911,7 @@ void enterPlayerName(bool blankOK)
>> + {
>> + textcolor( CYAN );
>> + if (blankOK && first_time)
>> +-cprintf(EOL "Press  to answer this after race and 
>> class are chosen."EOL);
>> ++cprintf(EOL "Press  to answer this after race and 
>> class are chosen." EOL);
>>   
>> - #else
>> -+# ifdef SAVE_DIR_PATH
>> -+snprintf( char_fil, sizeof(char_fil), 
>> -+  SAVE_DIR_PATH "%s%d", you.your_name, (int) getuid() );
>> -+# else
>> - strcpy(char_fil, "");
>> - strncat(char_fil, you.your_name, kFileNameLen);
>> -+# endif
>> - strcat(char_fil, ".sav");
>> - #endif
>> + first_time = false;
>>   
>> 
>
> Why is this last chunk of the patch being removed?

Ah, that would be my mistake, here's an revised diff:

Timo

Index: patches/patch-source_itemname_cc
===
RCS file: patches/patch-source_itemname_cc
diff -N patches/patch-source_itemname_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_itemname_cc9 Apr 2018 10:11:44 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: source/itemname.cc
+--- source/itemname.cc.orig
 source/itemname.cc
+@@ -2785,7 +2785,7 @@ unsigned char check_item_knowledge(void)
+ yps = wherey();
+ 
+ // item_name now requires a "real" item, so we'll create a tmp
+-item_def tmp = { ft, j, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
++item_def tmp = { static_cast(ft), 
static_cast(j), 0, 0, 0, 1, 0, 0, 0, 0, 0 };
+ item_name( tmp, DESC_PLAIN, st_pass );
+ 
+ cprintf(st_pass);
Index: patches/patch-source_liblinux_cc
===
RCS file: patches/patch-source_liblinux_cc
diff -N patches/patch-source_liblinux_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_liblinux_cc9 Apr 2018 10:11:44 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: source/liblinux.cc
+--- source/liblinux.cc.orig
 source/liblinux.cc
+@@ -487,7 +487,7 @@ int itoa(int value, char *strptr, int radix)
+ if (!startflag) /* Special case if value == 0 */
+ sprintf((strptr + ctr++), "0");
+ 
+-strptr[ctr] = (char) NULL;
++strptr[ctr] = (char) 0;
+ }
+ return (OK);/* Me? Fail? Nah. */
+ }
Index: patches/patch-source_newgame_cc
===
RCS file: /cvs/ports/games/dungeon-crawl/patches/patch-source_newgame_cc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source_newgame_cc
--- patches/patch-source_newgame_cc 22 Oct 2005 15:20:28 -  1.1.1.1
+++ patches/patch-source_newgame_cc 9 Apr 2018 10:11:44 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-source_newgame_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
 source/newgame.cc.orig Sat Oct 22 16:05:21 2005
-+++ source/newgame.cc  Sat Oct 22 16:06:32 2005
+Index: source/newgame.cc
+--- source/newgame.cc.orig
 source/newgame.cc
 @@ -253,8 +253,13 @@ static bool check_saved_game(void)
  }
  
@@ -14,4 +15,13 @@ $OpenBSD: patch-source_newgame_cc,v 1.1.
 +# endif
  strcat(char_fil, ".sav");
  #endif
+ 
+@@ -1911,7 +1916,7 @@ void enterPlayerName(bool blankOK)
+ {
+ textcolor( CYAN );
+ if (blankOK && first_time)
+-cprintf(EOL "Press  to answer this after race and 
class are chosen."EOL);
++cprintf(EOL "Press  to answer this after race and 
class are chosen." EOL);
+ 
+ first_time = false;
  

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/09 03:36:37

Modified files:
mail   : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
mail/prepop: Makefile distinfo 
mail/prepop/patches: patch-base64_cc patch-display_cc 
 patch-header_cc patch-help_cc patch-main_cc 
mail/prepop/pkg: DESCR PLIST 

Log message:
Remove prepop, questionable usefulness and on life support since 2004

ok landry@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/09 03:20:39

Modified files:
print/qpdf : Makefile distinfo 
print/qpdf/pkg : PLIST 

Log message:
Update to qpdf-8.0.2.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/09 02:53:23

Modified files:
inputmethods/scim: Makefile 
Added files:
inputmethods/scim/patches: patch-src_scim_debug_h 
   patch-src_scim_pointer_h 

Log message:
Fix build with clang 6, from FreeBSD

Re: clang6 fix for games/dungeon-crawl

[Stefan Sperling]

On Mon, Apr 09, 2018 at 11:13:58AM +0300, Timo Myyrä wrote:
> Hi,
> 
> Few casts to fix dungeon-crawl build.
> 
> Timo

>  $OpenBSD: patch-source_newgame_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
>  source/newgame.cc.orig   Sat Oct 22 16:05:21 2005
> -+++ source/newgame.ccSat Oct 22 16:06:32 2005
> -@@ -253,8 +253,13 @@ static bool check_saved_game(void)
> - }
> +Index: source/newgame.cc
> +--- source/newgame.cc.orig
>  source/newgame.cc
> +@@ -1911,7 +1911,7 @@ void enterPlayerName(bool blankOK)
> + {
> + textcolor( CYAN );
> + if (blankOK && first_time)
> +-cprintf(EOL "Press  to answer this after race and 
> class are chosen."EOL);
> ++cprintf(EOL "Press  to answer this after race and 
> class are chosen." EOL);
>   
> - #else
> -+# ifdef SAVE_DIR_PATH
> -+snprintf( char_fil, sizeof(char_fil), 
> -+  SAVE_DIR_PATH "%s%d", you.your_name, (int) getuid() );
> -+# else
> - strcpy(char_fil, "");
> - strncat(char_fil, you.your_name, kFileNameLen);
> -+# endif
> - strcat(char_fil, ".sav");
> - #endif
> + first_time = false;
>   
> 

Why is this last chunk of the patch being removed?

clang6 fix for games/dungeon-crawl

[Timo Myyrä]

Hi,

Few casts to fix dungeon-crawl build.

Timo

Index: patches/patch-source_itemname_cc
===
RCS file: patches/patch-source_itemname_cc
diff -N patches/patch-source_itemname_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_itemname_cc9 Apr 2018 08:06:23 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: source/itemname.cc
+--- source/itemname.cc.orig
 source/itemname.cc
+@@ -2785,7 +2785,7 @@ unsigned char check_item_knowledge(void)
+ yps = wherey();
+ 
+ // item_name now requires a "real" item, so we'll create a tmp
+-item_def tmp = { ft, j, 0, 0, 0, 1, 0, 0, 0, 0, 0 };
++item_def tmp = { static_cast(ft), 
static_cast(j), 0, 0, 0, 1, 0, 0, 0, 0, 0 };
+ item_name( tmp, DESC_PLAIN, st_pass );
+ 
+ cprintf(st_pass);
Index: patches/patch-source_liblinux_cc
===
RCS file: patches/patch-source_liblinux_cc
diff -N patches/patch-source_liblinux_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-source_liblinux_cc9 Apr 2018 08:06:23 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: source/liblinux.cc
+--- source/liblinux.cc.orig
 source/liblinux.cc
+@@ -487,7 +487,7 @@ int itoa(int value, char *strptr, int radix)
+ if (!startflag) /* Special case if value == 0 */
+ sprintf((strptr + ctr++), "0");
+ 
+-strptr[ctr] = (char) NULL;
++strptr[ctr] = (char) 0;
+ }
+ return (OK);/* Me? Fail? Nah. */
+ }
Index: patches/patch-source_newgame_cc
===
RCS file: /cvs/ports/games/dungeon-crawl/patches/patch-source_newgame_cc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source_newgame_cc
--- patches/patch-source_newgame_cc 22 Oct 2005 15:20:28 -  1.1.1.1
+++ patches/patch-source_newgame_cc 9 Apr 2018 08:06:23 -
@@ -1,17 +1,13 @@
 $OpenBSD: patch-source_newgame_cc,v 1.1.1.1 2005/10/22 15:20:28 espie Exp $
 source/newgame.cc.orig Sat Oct 22 16:05:21 2005
-+++ source/newgame.cc  Sat Oct 22 16:06:32 2005
-@@ -253,8 +253,13 @@ static bool check_saved_game(void)
- }
+Index: source/newgame.cc
+--- source/newgame.cc.orig
 source/newgame.cc
+@@ -1911,7 +1911,7 @@ void enterPlayerName(bool blankOK)
+ {
+ textcolor( CYAN );
+ if (blankOK && first_time)
+-cprintf(EOL "Press  to answer this after race and 
class are chosen."EOL);
++cprintf(EOL "Press  to answer this after race and 
class are chosen." EOL);
  
- #else
-+# ifdef SAVE_DIR_PATH
-+snprintf( char_fil, sizeof(char_fil), 
-+  SAVE_DIR_PATH "%s%d", you.your_name, (int) getuid() );
-+# else
- strcpy(char_fil, "");
- strncat(char_fil, you.your_name, kFileNameLen);
-+# endif
- strcat(char_fil, ".sav");
- #endif
+ first_time = false;
  

UPDATE: Sqtop-2015.02.08

[Gonzalo L. Rodriguez]

Hallo,

Update for Sqtop to 2015.02.08:

Switch to github, with the clang6 fix included,

https://github.com/paleg/sqtop/compare/v2015-02-08...master

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/sqtop/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile7 Dec 2017 13:12:44 -   1.9
+++ Makefile9 Apr 2018 07:51:55 -
@@ -2,23 +2,22 @@
 
 COMMENT=   top-like monitor for Squid
 
-DISTNAME=  sqtop-2011-11-01
-PKGNAME=   sqtop-2011.11.01
-REVISION=  2
+PKGNAME=   sqtop-2015.02.08
+GH_ACCOUNT=paleg
+GH_PROJECT=sqtop
+GH_TAGNAME=v2015-02-08
+
 CATEGORIES=www
 FIX_EXTRACT_PERMISSIONS=Yes
 
 MAINTAINER=Gonzalo L. R. 
 
-HOMEPAGE=  https://code.google.com/p/sqtop/
-EXTRACT_SUFX=  .tar.bz2
+HOMEPAGE=  https://github.com/paleg/sqtop
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB += c m ncurses pthread ${COMPILER_LIBCXX}
-
-MASTER_SITES=  ${MASTER_SITE_GOOGLECODE:=sqtop/}
+WANTLIB += ${COMPILER_LIBCXX} c curses m
 
 CONFIGURE_STYLE=   gnu
 
Index: distinfo
===
RCS file: /cvs/ports/www/sqtop/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:15:50 -  1.2
+++ distinfo9 Apr 2018 07:51:55 -
@@ -1,2 +1,2 @@
-SHA256 (sqtop-2011-11-01.tar.bz2) = 
GCPv6rmcEYxwc2KoIFOALQiaGKCUD9Kg2hmxI+Sy0OI=
-SIZE (sqtop-2011-11-01.tar.bz2) = 116110
+SHA256 (sqtop-2015-02-08.tar.gz) = 6uTIvBbb/nDHdtmQ7PFDKKyrDtc28L870WR6OsL16L8=
+SIZE (sqtop-2015-02-08.tar.gz) = 154535
Index: patches/patch-src_Utils_cpp
===
RCS file: patches/patch-src_Utils_cpp
diff -N patches/patch-src_Utils_cpp
--- patches/patch-src_Utils_cpp 30 Jun 2013 03:17:43 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,82 +0,0 @@
-$OpenBSD: patch-src_Utils_cpp,v 1.1 2013/06/30 03:17:43 william Exp $
-
-Revision: 8ce6ee3cad09: print errors in more convenient way
-Revision: 502a2c7e81bf: renamed (Gb, Mb, Kb) -> (GB, MB, KB) as bytes
-Revision: f04cf1d965bc: sqstat: reworked parsing peer info to properly handle 
ipv6 addresses
-Revision: 50c930f74dc7: Utils: bugfix - replaced size_t with 
std::string::size_type for find_last_of result
-
-
 src/Utils.cpp.orig Fri Nov  4 16:10:30 2011
-+++ src/Utils.cpp  Wed Jun 26 21:30:44 2013
-@@ -35,6 +35,16 @@ vector Utils::SplitString(string str, string d
-return result;
- }
- 
-+std::pair  Utils::SplitIPPort(string ipport) {
-+   std::pair  result;
-+   std::string::size_type found = ipport.find_last_of(":");
-+   if (found != string::npos) {
-+  result.first = ipport.substr(0, found);
-+  result.second = ipport.substr(found+1);
-+   }
-+   return result;
-+}
-+
- string Utils::JoinVector(vector inv, string delim) {
-string result = "";
-for (vector::iterator it = inv.begin(); it != inv.end(); ++it)
-@@ -105,12 +115,12 @@ string Utils::ConvertSize(long long esize) {
- long long mb = esize/1024/1024 - gb*1024;
- long long kb = (esize/1024) % 1024;
- if (gb != 0) {
--result += itos(gb) + "Gb ";
-+result += itos(gb) + "GB ";
- }
- if (mb != 0) {
--result += itos(mb) + "Mb ";
-+result += itos(mb) + "MB ";
- }
--result += itos(kb) + "Kb";
-+result += itos(kb) + "KB";
- return result;
- }
- 
-@@ -120,17 +130,17 @@ std::pair  Utils::ConvertSpeedPair(lon
-//long kb = speed/1024;
-if (mb != 0) {
-result.first = ftos(speed/1024.0/1024.0, 2);
--   result.second = "Mb/s";
-+   result.second = "MB/s";
-} else {
-result.first = ftos(speed/1024.0, 1);
--   result.second = "Kb/s";
-+   result.second = "KB/s";
-}
-return result;
- }
- 
- string Utils::ConvertSpeed(long long speed) {
-std::pair  result = Utils::ConvertSpeedPair(speed);
--   return result.first+result.second;
-+   return result.first+" "+result.second;
- }
- 
- bool Utils::VectorFindSubstr(vector& v, string& str) {
-@@ -192,6 +202,17 @@ bool Utils::UserMemberOf(vector& v, vector SplitString(std::string str, std::string 
delim);
-+   extern std::pair  SplitIPPort(std::string 
ipport);
-extern std::string JoinVector(std::vector inv, std::string 
delim);
-extern std::string itos(long long num);
-extern long int stol(std::string s);
-@@ -26,6 +27,7 @@ namespace Utils {
-extern bool IPMemberOf(std::vector& v, std::string& ip_in);
-extern void ToLower(std::string& rData);
-extern bool UserMemberOf(std::vector& v, 
std::vector& users);
-+   extern std::string replace(std::string text, std::string s, std::string 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/09 01:48:38

Modified files:
games/moon-buggy: Makefile 

Log message:
reset MAINTAINER per felix' request

clang6 fix games/amph

[Timo Myyrä]

Hi,

Some casts to games/amph to make it build with clang6.
Builds and runs on amd64.

timo

Index: patches/patch-src_Element_cpp
===
RCS file: patches/patch-src_Element_cpp
diff -N patches/patch-src_Element_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_Element_cpp   9 Apr 2018 07:47:00 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: src/Element.cpp
+--- src/Element.cpp.orig
 src/Element.cpp
+@@ -279,7 +279,13 @@ CBackgroundElement::CBackgroundElement(short initx, sh
+ 
+ void  CBackgroundElement::OnAllocate()
+ {
+-  short   params[5] = {-1, xs, ys, xe - xs, ye - ys};
++  short   params[5] = {
++  -1,
++  static_cast(xs),
++  static_cast(ys),
++  static_cast(xe - xs),
++  static_cast(ye - ys)
++  };
+   unsigned char *tmpBmp;
+ 
+   tmpBmp = gShapeManager->GetBackground(params[1], params[2]);
+@@ -373,4 +379,4 @@ void   CBackgroundElement::Read(FILE *f)
+   CElement::Read(f);
+ 
+   OnAllocate();
+-}
+\ No newline at end of file
++}
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/amph/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   15 Sep 2004 00:46:07 -  1.3
+++ pkg/PLIST   9 Apr 2018 07:47:00 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:07 espie Exp $
-bin/amph
+@bin bin/amph
 share/amph/
 share/amph/amph.conf
 share/amph/amph.xpm

clang6 fixes for games/ja2-stracciatella

[Timo Myyrä]

Hi,

Here's patches for adding static casts to ja2-stracciatella.
Builds but I haven't tested it further as I don't have data files on my laptop.

Timo

Index: patches/patch-Build_Editor_EditorItems_cc
===
RCS file: patches/patch-Build_Editor_EditorItems_cc
diff -N patches/patch-Build_Editor_EditorItems_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Build_Editor_EditorItems_cc   9 Apr 2018 07:40:23 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: Build/Editor/EditorItems.cc
+--- Build/Editor/EditorItems.cc.orig
 Build/Editor/EditorItems.cc
+@@ -292,7 +292,7 @@ void InitEditorItemsInfo(ToolbarMode const uiItemType)
+   //copy a blank chunk of the editor interface to the new buffer.
+   for (i = 0; i < w; i += 60)
+   {
+-  SGPBox const r = { 100, EDITOR_TASKBAR_POS_Y, 60, 80 };
++  SGPBox const r = { 100,  
static_cast(EDITOR_TASKBAR_POS_Y), 60, 80 };
+   BltVideoSurface(eInfo.uiBuffer, FRAME_BUFFER, i, 0, );
+   }
+ 
+@@ -511,7 +511,7 @@ void RenderEditorItemsInfo()
+ 
+   INT16 const scroll_idx = eInfo.sScrollIndex;
+ 
+-  SGPBox const r = { 60 * scroll_idx, 0, 360, 80 };
++  SGPBox const r = { static_cast(60 * scroll_idx), 0, 360, 80 };
+   BltVideoSurface(FRAME_BUFFER, eInfo.uiBuffer, 110, 
EDITOR_TASKBAR_POS_Y, );
+ 
+   /* Calculate the min and max index that is currently shown.  This 
determines
Index: patches/patch-Build_Editor_EditorMercs_cc
===
RCS file: patches/patch-Build_Editor_EditorMercs_cc
diff -N patches/patch-Build_Editor_EditorMercs_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Build_Editor_EditorMercs_cc   9 Apr 2018 07:40:23 -
@@ -0,0 +1,35 @@
+$OpenBSD$
+
+Index: Build/Editor/EditorMercs.cc
+--- Build/Editor/EditorMercs.cc.orig
 Build/Editor/EditorMercs.cc
+@@ -2174,10 +2174,10 @@ static void AddNewItemToSelectedMercsInventory(BOOLEAN
+   INT32   const  iSrcHeight = pObject.usHeight;
+   SGPBox  const  src_rect   =
+   {
+-  SrcRect.iLeft + pObject.sOffsetX,
+-  SrcRect.iTop  + pObject.sOffsetY,
+-  iSrcWidth,
+-  iSrcHeight
++  static_cast(SrcRect.iLeft + pObject.sOffsetX),
++  static_cast(SrcRect.iTop  + pObject.sOffsetY),
++  static_cast(iSrcWidth),
++  static_cast(iSrcHeight)
+   };
+ 
+   //if the source image width is less than 30 (small slot), then modify 
the DstRect.
+@@ -2219,10 +2219,10 @@ static void AddNewItemToSelectedMercsInventory(BOOLEAN
+   //use the new width and height values to calculate the new dest rect 
(center the item)
+   SGPBox const dst_rect =
+   {
+-  (DstRect.iRight  - DstRect.iLeft - iDstWidth)  / 2,
+-  (DstRect.iBottom - DstRect.iTop  - iDstHeight) / 2,
+-  iDstWidth,
+-  iDstHeight
++  static_cast((DstRect.iRight  - DstRect.iLeft - 
iDstWidth)  / 2),
++  static_cast((DstRect.iBottom - DstRect.iTop  - 
iDstHeight) / 2),
++  static_cast(iDstWidth),
++  static_cast(iDstHeight)
+   };
+ 
+   //scale the item down to the smaller buffer.
Index: patches/patch-Build_HelpScreen_cc
===
RCS file: patches/patch-Build_HelpScreen_cc
diff -N patches/patch-Build_HelpScreen_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Build_HelpScreen_cc   9 Apr 2018 07:40:23 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: Build/HelpScreen.cc
+--- Build/HelpScreen.cc.orig
 Build/HelpScreen.cc
+@@ -1892,7 +1892,7 @@ static void RenderTextBufferToScreen(void)
+   SGPBox const SrcRect =
+   {
+   0,
+-  gHelpScreen.iLineAtTopOfTextBuffer * 
HLP_SCRN__HEIGHT_OF_1_LINE_IN_BUFFER,
++  static_cast(gHelpScreen.iLineAtTopOfTextBuffer * 
HLP_SCRN__HEIGHT_OF_1_LINE_IN_BUFFER),
+   HLP_SCRN__WIDTH_OF_TEXT_BUFFER,
+   HLP_SCRN__HEIGHT_OF_TEXT_AREA - 2 * 8
+   };
Index: patches/patch-Build_Laptop_AIMMembers_cc
===
RCS file: patches/patch-Build_Laptop_AIMMembers_cc
diff -N patches/patch-Build_Laptop_AIMMembers_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Build_Laptop_AIMMembers_cc9 Apr 2018 07:40:23 -
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: Build/Laptop/AIMMembers.cc
+--- Build/Laptop/AIMMembers.cc.orig
 Build/Laptop/AIMMembers.cc
+@@ -1700,10 +1700,10 @@ static BOOLEAN DisplayTalkingMercFaceForVideoPopUp(con
+ 
+   SGPBox const DestRect =
+   {
+-  AIM_MEMBER_VIDEO_FACE_X,
+-  AIM_MEMBER_VIDEO_FACE_Y,
+-  AIM_MEMBER_VIDEO_FACE_WIDTH,
+-  AIM_MEMBER_VIDEO_FACE_HEIGHT
++   

Kill mail/prepop?

[Jeremie Courreges-Anglas]

naddy fixed the build with gcc3 in 2004, I fixed the build with clang
last year, now it's broken again.  The fix would be trivial, but this
kind of unmaintained, rotting software should just leave the tree IMO.
DESCR is kind of funny, also..

ok to kill it?

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

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/04/09 00:29:21

Added files:
devel/xtensa-elf/gcc/patches: patch-gcc_ubsan_c 

Log message:
Fix build with clang 6.

CenterIM

[Gonzalo L. Rodriguez]

Hallo,

There is someone out there using CenterIM? I am not using it for a very long 
time
now, and there is so many new hipsters messengers now, so.. I want to burn it
with fire.

Any objections?

Cheers.-

--
Sending from my toaster.