Re: NEW: lang/regina

[Brian Callahan]

On 04/24/18 12:15, Brian Callahan wrote:

Hi ports --

Attached is a new port, lang/regina. Regina is an ANSI-compliant 
interpreter for the REXX language.


---
pkg/DESCR:
Regina is an ANSI-compliant Rexx interpreter. Rexx is a programming
language that was designed to be easy to use for inexperienced
programmers yet powerful enough for experienced users. It is also a
language ideally suited as a macro language for other applications.
---

Builds some sample code I have here.

OK?

~Brian



Better tarball that actually allows regina to build on all platforms.

~Brian



regina.tgz
Description: Binary data

Re: update print/transfig

[Marc Espie]

On Sat, Apr 28, 2018 at 05:07:27PM +0200, Antoine Jacoutot wrote:
> On Sat, Apr 28, 2018 at 04:20:15PM +0200, Solene Rapenne wrote:
> > Following diff updates print/transfig, so the port get synced with the
> > newer version of xfig
> 
> Looks fine portwise.
> OK aja
> 

For the record, unfortunately, there's a bug in there... either that or
our texlive's   tikz is too old.

In any case, I've got some rather simple .pics that don't convert correctly
where they converted correctly before.

It seems the preamble code got broken.

Minimal example that worked perfectly fine with fig2dev 3.2.6:

fig2dev -L tikz fig1.fig fig1.tikz
pdflatex t
(./fig1.tikz
! No room for a new \dimen .
\ch@ck ...\else \errmessage {No room for a new #3}
  \fi 
l.9 ...alloc@1\dimen\dimendef\insc@unt}\temp\XFigu
  \catcode`\@12\fi}
? x


work-around is to use -W, which means it's the dimension-setting code that
changed in incompatible ways.

It does NOT happen for every picture, no idea why this one is special :(

(I'll have a closer look later, but it's not okay to update as-is)
#FIG 3.2  Produced by xfig version 3.2.6
Landscape
Center
Inches
Letter
100.00
Single
-2
1200 2
2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 600 900 2700 900 2700 5400 600 5400 600 900
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 2400 2700 2400
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 3000 2700 3000
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 600 3600 2700 3600
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
0 0 2.00 210.00 255.00
 3300 2400 3300 4200
4 0 0 50 -1 0 12 0. 4 150 540 900 1500 Buffer\001
4 0 0 50 -1 0 12 0. 0 195 1215 900 2700 Frame pointer\001
4 0 0 50 -1 0 12 0. 0 150 1305 900 3300 Return address\001


t.tex
Description: t.tex
\ifx\XFigwidth\undefined\dimen1=0pt\else\dimen1\XFigwidth\fi
\divide\dimen1 by 2829
\ifx\XFigheight\undefined\dimen3=0pt\else\dimen3\XFigheight\fi
\divide\dimen3 by 4524
\ifdim\dimen1=0pt\ifdim\dimen3=0pt\dimen1=3946sp\dimen3\dimen1
  \else\dimen1\dimen3\fi\else\ifdim\dimen3=0pt\dimen3\dimen1\fi\fi
\tikzpicture[x=+\dimen1, y=+\dimen3]
{\ifx\XFigu\undefined\catcode`\@11
\def\temp{\alloc@1\dimen\dimendef\insc@unt}\temp\XFigu\catcode`\@12\fi}
\XFigu3946sp
% Uncomment to scale line thicknesses with the same
% factor as width of the drawing.
%\pgfextractx\XFigu{\pgfqpointxy{1}{1}}
\ifdim\XFigu<0pt\XFigu-\XFigu\fi
\pgfdeclarearrow{
  name = xfiga0,
  parameters = {
\the\pgfarrowlinewidth \the\pgfarrowlength \the\pgfarrowwidth},
  defaults = {
  line width=+7.5\XFigu, length=+120\XFigu, width=+60\XFigu},
  setup code = {
% miter protrusion = thk * sqrt(wd^2 + (tipmv*len)^2) / (2 * wd)
\dimen7 2.15\pgfarrowlength\pgfmathveclen{\the\dimen7}{\the\pgfarrowwidth}
\dimen7 2\pgfarrowwidth\pgfmathdivide{\pgfmathresult}{\the\dimen7}
\dimen7 \pgfmathresult\pgfarrowlinewidth
\pgfarrowssettipend{+\dimen7}
\pgfarrowssetbackend{+-\pgfarrowlength}
\dimen9 -0.5\pgfarrowlinewidth
\pgfarrowssetvisualbackend{+\dimen9}
\pgfarrowssetlineend{+-0.5\pgfarrowlinewidth}
\pgfarrowshullpoint{+\dimen7}{+0pt}
\pgfarrowsupperhullpoint{+-\pgfarrowlength}{+0.5\pgfarrowwidth}
\pgfarrowssavethe\pgfarrowlinewidth
\pgfarrowssavethe\pgfarrowlength
\pgfarrowssavethe\pgfarrowwidth
  },
  drawing code = {\pgfsetdash{}{+0pt}

\ifdim\pgfarrowlinewidth=\pgflinewidth\else\pgfsetlinewidth{+\pgfarrowlinewidth}\fi
\pgfpathmoveto{\pgfqpoint{-\pgfarrowlength}{0.5\pgfarrowwidth}}
\pgfpathlineto{\pgfqpoint{0pt}{0pt}}
\pgfpathlineto{\pgfqpoint{-\pgfarrowlength}{-0.5\pgfarrowwidth}}
\pgfusepathqstroke
  }
}
\clip(588,-5412) rectangle (3417,-888);
\tikzset{inner sep=+0pt, outer sep=+0pt}
\pgftext[base,left,at=\pgfqpointxy{900}{-3300}] {\fontsize{12}{14.4}\normalfont 
Return address}
\pgfsetlinewidth{+7.5\XFigu}
\draw (600,-2400)--(2700,-2400);
\draw (600,-3000)--(2700,-3000);
\draw (600,-3600)--(2700,-3600);
\pgfsetarrows{[line width=15\XFigu, width=210\XFigu, length=255\XFigu]}
\pgfsetarrowsend{xfiga0}
\draw (3300,-2400)--(3300,-4200);
\pgftext[base,left,at=\pgfqpointxy{900}{-1500}] 
{\fontsize{12}{14.4}\usefont{T1}{ptm}{m}{n}Buffer}
\pgftext[base,left,at=\pgfqpointxy{900}{-2700}] {\fontsize{12}{14.4}\normalfont 
Frame pointer}
\draw (600,-900) rectangle (2700,-5400);
\endtikzpicture%

Re: [New] [WIP] Toxcore, Toxic and uTox

[Brian Callahan]

On 04/28/18 19:43, mazocomp wrote:

Hi!

Is there any hope this port will be accepted
or should I keep maintaining it in WIP tree?

I know toxcore is unstable, but I don't know alternatives.
(except bloated ricochet and retroshare)



toxcore's license marker should be tweaked to GPLv3+, otherwise ok.
toxic doesn't need HOMEPAGE set if you're using GH_*, otherwise ok.
utox sets -std=gnu11 so should have COMPILER=base-clang ports-gcc, also 
needs NO_TEST=Yes, otherwise ok.


I don't know anyone who uses tox so I can't test beyond making sure they 
start up and close without crashing, with both do.


You are not listed as MAINTAINER of any of these. Do you want to be 
MAINTAINER?


~Brian

Re: [New] [WIP] Toxcore, Toxic and uTox

[mazocomp]

Hi!

Is there any hope this port will be accepted
or should I keep maintaining it in WIP tree?

I know toxcore is unstable, but I don't know alternatives.
(except bloated ricochet and retroshare)

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/04/28 16:13:57

Modified files:
x11/sakura : Makefile 

Log message:
s/MAINTAIMER/MAINTAINER/

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 16:00:53

Modified files:
infrastructure/bin: update-plist 

Log message:
first step at stripping dependencies dirs
- need cwd in plist
- so add DONT for items we don't print

(still need to do a 2nd pass to remove inter-subpackages directories)

Re: update astro/wmspaceweather

[Jeremie Courreges-Anglas]

On Fri, Apr 27 2018, Solene Rapenne  wrote:
> Solene Rapenne writes:
>
>> Fix astro/wmspaceweather
>>
>> Patch from Michael
>> https://marc.info/?l=openbsd-ports=148616321627634=2
>>
>> Various fixes:
>> - Updated NOAA URLs
>> - Silence ftp
>> - ctime.pl -> Time::localtime
>>
>> Michael asked to be maintainer on the port.
>>
>> I modified an hardcoded netscape command to xdg-open and added
>> devel/xdg-utils to RUN_DEPENDS, and moved MASTER_SITES variable to the
>> correct place.
>
> oops,
>
> MASTER_SITES was at the right place...
>
> New diff following

If it works for Michael, ok jca@.  While you're looking at this port,
may I suggest using https://www.dockapps.net/wmspaceweather as HOMEPAGE?

>
> Index: Makefile
> ===
> RCS file: /cvs/ports/astro/wmspaceweather/Makefile,v
> retrieving revision 1.32
> diff -u -p -r1.32 Makefile
> --- Makefile  24 Nov 2015 09:11:03 -  1.32
> +++ Makefile  27 Apr 2018 10:24:12 -
> @@ -4,15 +4,19 @@ COMMENT=wm-dockapp; space weather moni
>  
>  DISTNAME=wmSpaceWeather-1.04
>  PKGNAME= ${DISTNAME:L}
> -REVISION=5
> +REVISION=6
>  CATEGORIES=  astro x11 x11/windowmaker
>  
> +MAINTAINER=  Michael 
> +
>  # GPL
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB= X11 Xext Xpm c
>  
>  MASTER_SITES=https://distfiles.nl/
> +
> +RUN_DEPENDS= devel/xdg-utils
>  
>  MAKE_ENV=CC="${CC}"
>  
> cvs server: Diffing patches
> Index: patches/patch-GetKp
> ===
> RCS file: /cvs/ports/astro/wmspaceweather/patches/patch-GetKp,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-GetKp
> --- patches/patch-GetKp   20 Jun 2008 10:49:42 -  1.3
> +++ patches/patch-GetKp   27 Apr 2018 10:24:12 -
> @@ -1,9 +1,13 @@
>  $OpenBSD: patch-GetKp,v 1.3 2008/06/20 10:49:42 martynas Exp $
>  wmSpaceWeather/GetKp.origFri Feb 12 06:42:01 1999
> -+++ wmSpaceWeather/GetKp Thu Jun 19 20:41:26 2008
> -@@ -7,19 +7,31 @@
> +Index: wmSpaceWeather/GetKp
> +--- wmSpaceWeather/GetKp.orig
>  wmSpaceWeather/GetKp
> +@@ -5,21 +5,33 @@
> + #
>   
> - require "ctime.pl";
> + 
> +-require "ctime.pl";
> ++use Time::localtime;
>   
>  +#
>  +#  Change to users home directory. We used to dump into /tmp
> @@ -37,7 +41,7 @@ $OpenBSD: patch-GetKp,v 1.3 2008/06/20 1
>   
>  -$grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q 
> ftp://www.sec.noaa.gov/pub/indices/DGD.txt;;
>  +
> -+$grabcmd = "ftp -V ftp://www.sec.noaa.gov/pub/indices/DGD.txt;;
> ++$grabcmd = "ftp -VM ftp://ftp.swpc.noaa.gov/pub/indices/DGD.txt;;
>   system "$grabcmd";
>   
>   
> @@ -55,7 +59,7 @@ $OpenBSD: patch-GetKp,v 1.3 2008/06/20 1
>   # Add in very latest stuff
>   #
>  -$grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q 
> ftp://www.sec.noaa.gov/pub/latest/curind.txt;;
> -+$grabcmd = "ftp -V ftp://www.sec.noaa.gov/pub/latest/curind.txt;;
> ++$grabcmd = "ftp -VM ftp://ftp.swpc.noaa.gov/pub/latest/curind.txt;;
>   system "$grabcmd";
>   %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 
> 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
>   
> @@ -74,3 +78,12 @@ $OpenBSD: patch-GetKp,v 1.3 2008/06/20 1
>   foreach $key  (sort keys %Result ) {
>   if ($Result{$key} > 10) { $Result{$key} = -1; }
>   printf TmpFile "$key $Result{$key}\n";
> +@@ -201,7 +213,7 @@ sub year_month_day{
> + 
> + local($ldate_string, $ldow, $lmon, $ldom, $ltim, $lyear, %lmonstr, 
> $tzone, @lval);
> + 
> +-$ldate_string = (time);
> ++$ldate_string = ctime(time);
> + ($ldow, $lmon, $ldom, $ltim, $lyear) = split(" ", $ldate_string);
> + 
> + %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 
> 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12);
> Index: patches/patch-wmSpaceWeather_c
> ===
> RCS file: /cvs/ports/astro/wmspaceweather/patches/patch-wmSpaceWeather_c,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-wmSpaceWeather_c
> --- patches/patch-wmSpaceWeather_c18 Dec 2007 10:39:47 -  1.3
> +++ patches/patch-wmSpaceWeather_c27 Apr 2018 10:24:12 -
> @@ -1,6 +1,7 @@
>  $OpenBSD: patch-wmSpaceWeather_c,v 1.3 2007/12/18 10:39:47 ajacoutot Exp $
>  wmSpaceWeather/wmSpaceWeather.c.orig Thu Feb 18 18:57:45 1999
> -+++ wmSpaceWeather/wmSpaceWeather.c  Tue Dec 18 10:22:00 2007
> +Index: wmSpaceWeather/wmSpaceWeather.c
> +--- wmSpaceWeather/wmSpaceWeather.c.orig
>  wmSpaceWeather/wmSpaceWeather.c
>  @@ -115,7 +115,7 @@ XEvent   event;
>   int i, n, s, k, m, dt1, dt2;
>   int Year, Month, Day, DayOfMonth, OldDayOfMonth;
> @@ -68,7 +69,7 @@ 

Re: UPDATE: audio/soundtouch 2.0.0

[Brian Callahan]

On 04/28/18 16:59, Neeraj Pal wrote:

Hi,

Here is a minor update to the soundtouch in the audio category.
I have done the quick regression tests on soundtouch-2.0.0.

Comments/okay?

Only in /usr/ports/audio/soundtouch: CVS
diff -ur /usr/ports/audio/soundtouch/Makefile
/usr/ports/mystuff/audio/soundtouch/Makefile
--- /usr/ports/audio/soundtouch/MakefileThu Jul 27 12:42:36 2017
+++ /usr/ports/mystuff/audio/soundtouch/MakefileSun Apr 29 02:16:18 2018
@@ -2,10 +2,10 @@

  COMMENT=   tempo/pitch audio processing library

-DISTNAME=  soundtouch-1.9.2
+DISTNAME=  soundtouch-2.0.0
  SHARED_LIBS += SoundTouch  3.0  # .0.0


Did you check that there were no function changes to the SHARED_LIB? I'm 
guessing there's probably a major bump to be made here.


~Brian


  CATEGORIES=audio devel
-REVISION = 2
+REVISION = 0

  HOMEPAGE=  http://www.surina.net/soundtouch/

diff -ur /usr/ports/audio/soundtouch/distinfo
/usr/ports/mystuff/audio/soundtouch/distinfo
--- /usr/ports/audio/soundtouch/distinfoMon Jan  4 14:06:15 2016
+++ /usr/ports/mystuff/audio/soundtouch/distinfoSun Apr 29 02:16:36 2018
@@ -1,2 +1,2 @@
-SHA256 (soundtouch-1.9.2.tar.gz) = yuuGUR6BQg7rRUy121P1bZa4RR032Jr25VsS602hxRM=
-SIZE (soundtouch-1.9.2.tar.gz) = 171369
+SHA256 (soundtouch-2.0.0.tar.gz) = 0iT30UIbX450p0yFdBNFvZgCYYpArjDOW0J6VwXInSU=
+SIZE (soundtouch-2.0.0.tar.gz) = 455148








Thank you
Neeraj Pal

Re: UPDATE: audio/soundtouch 2.0.0

[Stuart Henderson]

This library has several dependencies in the tree. Which have you tested? 
Have you reviewed for any ABI changes that would require a SHARED_LIBS bump 
(http://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs)


--
Sent from a phone, apologies for poor formatting.
On 28 April 2018 21:59:59 Neeraj Pal  wrote:


Hi,

Here is a minor update to the soundtouch in the audio category.
I have done the quick regression tests on soundtouch-2.0.0.

Comments/okay?

Only in /usr/ports/audio/soundtouch: CVS
diff -ur /usr/ports/audio/soundtouch/Makefile
/usr/ports/mystuff/audio/soundtouch/Makefile
--- /usr/ports/audio/soundtouch/MakefileThu Jul 27 12:42:36 2017
+++ /usr/ports/mystuff/audio/soundtouch/MakefileSun Apr 29 02:16:18 
2018

@@ -2,10 +2,10 @@

COMMENT=   tempo/pitch audio processing library

-DISTNAME=  soundtouch-1.9.2
+DISTNAME=  soundtouch-2.0.0
SHARED_LIBS += SoundTouch  3.0  # .0.0
CATEGORIES=audio devel
-REVISION = 2
+REVISION = 0

HOMEPAGE=  http://www.surina.net/soundtouch/

diff -ur /usr/ports/audio/soundtouch/distinfo
/usr/ports/mystuff/audio/soundtouch/distinfo
--- /usr/ports/audio/soundtouch/distinfoMon Jan  4 14:06:15 2016
+++ /usr/ports/mystuff/audio/soundtouch/distinfoSun Apr 29 02:16:36 
2018

@@ -1,2 +1,2 @@
-SHA256 (soundtouch-1.9.2.tar.gz) = 
yuuGUR6BQg7rRUy121P1bZa4RR032Jr25VsS602hxRM=

-SIZE (soundtouch-1.9.2.tar.gz) = 171369
+SHA256 (soundtouch-2.0.0.tar.gz) = 
0iT30UIbX450p0yFdBNFvZgCYYpArjDOW0J6VwXInSU=

+SIZE (soundtouch-2.0.0.tar.gz) = 455148








Thank you
Neeraj Pal

Re: NEW: security/hitch (pledged)

[Klemens Nanni]

On Sat, Apr 28, 2018 at 10:59:36PM +0200, Jeremie Courreges-Anglas wrote:
> On Sat, Apr 28 2018, Klemens Nanni  wrote:
> > Take three with updated pledge diff also fixing an actual bug in the
> > reloading logic when the `ocsp-dir' parameter has changed.
> >
> > It's already reported upstream, I discovered this while playing around
> > to reduce pledge promises.
> 
> I don't understand why you seem to hold a grudge against
> CONFIGURE_STYLE=gnu.  Using it, you could drop CONFIGURE_ARGS and
> TEST_TARGET.
Just getting used to it :)
> 
> Using PORTS_PRIVSEP=Yes and the default pf rules blocking _pbuild,
> I get:
> 
> 
> Testsuite summary for hitch 1.4.8
> 
> # TOTAL: 27
> # PASS:  6
> # SKIP:  1
> # XFAIL: 0
> # FAIL:  20
> # XPASS: 0
> # ERROR: 0
> 
Oh, that's why I put the comment there.

> Instead of adding a comment, I would add TEST_IS_INTERACTIVE = connects to ...
That'll do, thanks.

I'll send a new tarball soon together with pledge updates.

Re: CVS: cvs.openbsd.org: src

[Stuart Henderson]

It needs more of a change than that, the syntax is different.

--
Sent from a phone, apologies for poor formatting.
On 28 April 2018 18:30:32 Vadim Zhukov  wrote:


2018-04-28 19:54 GMT+03:00 Eric Faurot :
> CVSROOT:/cvs
> Module name:src
> Changes by: e...@cvs.openbsd.org2018/04/28 10:54:11
>
> Modified files:
> usr.sbin/smtpd : Makefile
>
> Log message:
> link smtp(1) to the build
>
> ok deraadt@

Some care would be needed for apcupsd port, which installs
/usr/local/sbin/smtp. IIUC, it does the same thing as /usr/bin/smtp
and port could just stop installing it. The existing smtp users could
be affected, though, so I propose the following patch. Any better
ideas/objections/okays?

--
 WBR,
 Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile12 Jan 2018 14:05:10 -  1.38
+++ Makefile28 Apr 2018 17:27:33 -
@@ -9,7 +9,7 @@ PKGNAME-main =  ${DISTNAME}
PKGNAME-cgi =  ${DISTNAME:S/-/-cgi-/}
PKGNAME-x11 =  ${DISTNAME:S/-/-x11-/}
REVISION = 1
-REVISION-main =2
+REVISION-main =3

CATEGORIES =   sysutils

@@ -108,5 +108,6 @@ post-install:
   ${WRKINST}/${WEB_ROOT}/cgi-bin/apcupsd/
   cd ${PREFIX}/share; chown -R root:wheel doc/apcupsd examples/apcupsd
   chmod 755 ${PREFIX}/sbin/apcupsctl
+   rm -f ${PREFIX}/sbin/smtp

.include 
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE-main28 Apr 2018 17:27:33 -
@@ -0,0 +1,2 @@
+The ${LOCALBASE}/sbin/smtp from this package is gone since OpenBSD 6.4.
+Any scripts using it should now use the /usr/bin/smtp instead.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main  22 Jan 2015 21:23:30 -  1.9
+++ pkg/PLIST-main  28 Apr 2018 17:27:33 -
@@ -14,7 +14,6 @@
@mode
@owner
sbin/apcupsctl
-@bin sbin/smtp
@comment share/applications/
@group
share/doc/apcupsd/

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/04/28 15:18:46

Modified files:
databases/py-sqlite2: Makefile 
databases/py-storm: Makefile 
devel/py-blist : Makefile 
devel/py-trollius: Makefile 
devel/py-zopetesting: Makefile 
graphics/freeimage: Makefile 

Log message:
Remove eric@ from maintainer, discussed with him.

Re: NEW: x11/kde-applications/ktouch

[Rafael Sadowski]

On Sat Apr 28, 2018 at 11:05:46PM +0300, Vadim Zhukov wrote:
> 2018-04-28 22:44 GMT+03:00 Rafael Sadowski :
> >
> > On Thu Apr 26, 2018 at 10:43:14PM +0300, Vadim Zhukov wrote:
> >> 2018-04-26 21:58 GMT+03:00 Rafael Sadowski :
> >> > Please find attached next new KDE4 replacement.
> >> >
> >> > Conflict bits are set:
> >> >
> >> > @conflict ktouch-<17.12.3
> >> > @conflict kdebase-*
> >> > @pkgpath x11/kde4/ktouch
> >> >
> >> > $ cat x11/kde-applications/ktouch/pkg/DESCR
> >> > KTouch is a typing learning tool for KDE.
> >> >
> >> > It is a part of KDE Edu project.
> >> >
> >> > Ok? Commenst?
> >>
> >> Well, ktouch conflicts with ktouch by definition, so the first
> >> @conflict shouldn't be needed. :)
> >
> > That was exactly the idea of not allowing either.
> >
> > The question is: do we want to replace everything step by step but how
> > if we set conflict with kdebase-*. That doesn't make much sense to me.
> > Or do we want KDE4 || KDE5 Application?
> >
> > I think teh following is wrong:
> >
> >> > @conflict ktouch-<17.12.3
> >> > @conflict kdebase-*
> >> > @pkgpath x11/kde4/ktouch
> >
> > Because "@pkgpath x11/kde4/*" is in conflict with "@conflict kdebase-*"
> >
> > I prefer it like now. x11/kde4 OR x11/kde-applications/*:
> >
> >> > @conflict ktouch-<17.12.3
> >> > @conflict kdebase-*
> >
> > without pkgpath.
> >
> > I would be happy to hear the opinion of our pro porters!?
> 
> I think you've got @conflict and @pkgpath wrong.
> 
> The @conflict marks that you can't have both packages installed at the
> same time. The package by default conflicts with any other with same
> name, version and flavors are out of this check.
> 
> The @pkgpath instead tells that given package should be "compatible"
> with another one, even with different name, in case of updating
> packages.
> 
> So we have to have "@conflict kdebase-*" since both kdebase and ktouch
> packages contain same file(-s). And there is no point in having
> "@conflict ktouch-<17.12.3" since it's superseded by implicit default
> "@conflict ktouch-*".
> 
> But "@pkgpath x11/kde4/ktouch" solves a totally different problem,
> allowing pkg_add not to complain when replacing KDE4's KTouch with
> KDE5 one. Note that @pkgpath kicks only when there's @conflict, either
> implicit or explicit.
> 
> The appropriate @conflict+@pkgpat pair would mean not "you can't
> install this" but "you can upgrade to this".

ACK;

> 
> Now to main question: do we want to have KDE Applications both from
> KDE4 and KDE5 worlds? They are almost equal at resources being used,
> but KDE4 isn't maintained upstream at all. And KF5-based apps
> perfectly work under KDE4 desktop and talk with KDE4 apps via, e.g.,
> D-Bus. Yes, you'll have both Qt4 and Qt5 installed, as well quiet a
> few other libraries, until migration ends. Does such situation hurt
> anyone running modern desktop?
> 
> My plan a long ago was getting rid of KDE4 as soon as KF5-based stuff
> comes in. Thus, x11/kde4/ktouch gets unlinked at the same time
> x11/kde-applications/ktouch is linked to build. But since I'm not
> doing the real work right now, it's not my right to take decisions
> here.

I think you're right, and it's the best decision. Are there any
objections?

Besides, we don't need to fix the old stuff no more ;)

$ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all pkg_add -u -U
kqtquickcharts-4.14.3p1->17.12.3: ok
ktouch-4.14.3p3->17.12.3: ok
Read shared items: ok

Btw I need an ok to import ktouch.

UPDATE: graphics/feh 2.23.1 => 2.26

[Brian Callahan]

Hi all --

Attached is an update to graphics/feh. It fixes a bug in the version we 
have according to upstream's changelogs among other added features.


Additionally, I am hoping we can remove some patches and instead compile 
with a -std=gnu99 flag. It seems like extra work to maintain support for 
C89 compilers, and even gcc-3.3.5 has the -std=gnu99 flag.


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- Makefile	11 Feb 2018 19:23:49 -	1.89
+++ Makefile	28 Apr 2018 21:09:49 -
@@ -2,7 +2,7 @@
 
 COMMENT=	lightweight image viewer
 
-DISTNAME=	feh-2.23.1
+DISTNAME=	feh-2.26
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
 FIX_EXTRACT_PERMISSIONS=Yes
@@ -27,12 +27,13 @@ RUN_DEPENDS+=	devel/desktop-file-utils \
 TEST_DEPENDS=	devel/p5-Test-Command
 
 CFLAGS+=	-I${LOCALBASE}/include \
-		-I${X11BASE}/include
+		-I${X11BASE}/include \
+		-std=gnu99
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 MAKE_FLAGS=	LDFLAGS="${LDFLAGS}" \
 		man_dir="${DESTDIR}${PREFIX}/man" \
 		example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
-		exif=1
+		exif=1 verscmp=0
 FAKE_FLAGS=	PREFIX="${PREFIX}"
 
 USE_GMAKE=	Yes
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.56
diff -u -p -r1.56 distinfo
--- distinfo	11 Feb 2018 19:23:49 -	1.56
+++ distinfo	28 Apr 2018 21:09:49 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
-SIZE (feh-2.23.1.tar.bz2) = 2130373
+SHA256 (feh-2.26.tar.bz2) = sda/3XkGDYZLjv8FuRYVO+BIAZmBSGIBJeOsMfmfbIY=
+SIZE (feh-2.26.tar.bz2) = 2131837
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Makefile
--- patches/patch-Makefile	11 Feb 2018 19:23:49 -	1.7
+++ patches/patch-Makefile	28 Apr 2018 21:09:49 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.7 2018/02/1
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -91,6 +91,7 @@ install-examples:
+@@ -93,6 +93,7 @@ install-examples:
  	@echo installing examples to ${example_dir}
  	@mkdir -p ${example_dir}
  	@cp examples/* ${example_dir}
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/graphics/feh/patches/patch-config_mk,v
retrieving revision 1.9
diff -u -p -r1.9 patch-config_mk
--- patches/patch-config_mk	11 Feb 2018 19:23:49 -	1.9
+++ patches/patch-config_mk	28 Apr 2018 21:09:49 -
@@ -7,7 +7,7 @@ fix "filelist.c:253:45: error: use of un
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -35,10 +35,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
+@@ -36,10 +36,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
  
  # default CFLAGS
  CFLAGS ?= -g -O2
Index: patches/patch-man_feh_pre
===
RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
retrieving revision 1.41
diff -u -p -r1.41 patch-man_feh_pre
--- patches/patch-man_feh_pre	11 Feb 2018 19:23:49 -	1.41
+++ patches/patch-man_feh_pre	28 Apr 2018 21:09:49 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.41 2018/
 Index: man/feh.pre
 --- man/feh.pre.orig
 +++ man/feh.pre
-@@ -1088,7 +1088,7 @@ which
+@@ -1186,7 +1186,7 @@ which
  defaults to
  .Pa ~/.config/feh/ .
  If the files are not found in that directory, it will also try
Index: patches/patch-src_keyevents_c
===
RCS file: /cvs/ports/graphics/feh/patches/patch-src_keyevents_c,v
retrieving revision 1.17
diff -u -p -r1.17 patch-src_keyevents_c
--- patches/patch-src_keyevents_c	17 Mar 2018 08:30:09 -	1.17
+++ patches/patch-src_keyevents_c	28 Apr 2018 21:09:49 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_keyevents_c,v 1.17 2
 Index: src/keyevents.c
 --- src/keyevents.c.orig
 +++ src/keyevents.c
-@@ -225,7 +225,7 @@ void init_keyevents(void) {
+@@ -226,7 +226,7 @@ void init_keyevents(void) {
  
  	free(confpath);
  
@@ -11,13 +11,3 @@ Index: src/keyevents.c
  		return;
  
  	while (fgets(line, sizeof(line), conf)) {
-@@ -390,7 +390,8 @@ void feh_event_handle_keypress(XEvent * ev)
- 
- fehkey *feh_str_to_kb(char *action)
- {
--	for (unsigned int i = 0; i < EVENT_LIST_END; i++) {
-+	unsigned int i;
-+	for (i = 0; i < EVENT_LIST_END; i++) {
- 		if (!strcmp(action, keys[i].name)) {
- 			return [i];
- 		}
Index: patches/patch-src_wallpaper_c
===
RCS file: patches/patch-src_wallpaper_c
diff -N patches/patch-src_wallpaper_c
--- patches/patch-src_wallpaper_c	17 Mar 2018 08:30:09 -	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_wallpaper_c,v 1.3 2018/03/17 08:30:09 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/04/28 15:09:04

Modified files:
x11/kde-applications/kate: Makefile 
x11/kde-applications/kate/pkg: PLIST 

Log message:
zap conflict marker with kate-<17.12.3

Spotted by zhuk@

Re: NEW: security/hitch (pledged)

[Jeremie Courreges-Anglas]

On Sat, Apr 28 2018, Klemens Nanni  wrote:
> Take three with updated pledge diff also fixing an actual bug in the
> reloading logic when the `ocsp-dir' parameter has changed.
>
> It's already reported upstream, I discovered this while playing around
> to reduce pledge promises.

I don't understand why you seem to hold a grudge against
CONFIGURE_STYLE=gnu.  Using it, you could drop CONFIGURE_ARGS and
TEST_TARGET.

Using PORTS_PRIVSEP=Yes and the default pf rules blocking _pbuild,
I get:


Testsuite summary for hitch 1.4.8

# TOTAL: 27
# PASS:  6
# SKIP:  1
# XFAIL: 0
# FAIL:  20
# XPASS: 0
# ERROR: 0

Instead of adding a comment, I would add TEST_IS_INTERACTIVE = connects to ...

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

[new/wip] synapse, the matrix.org server

[Landry Breuil]

Hi,

that's still a bit wip, but i managed to start the synapse server,
register a user, and connect to the provided web client. Haven't tried
connecting from http://riot.im/app or connect to the federation.

it has shittons of new dependencies, for most of them i used upt to do
the heavy lifting of creating the Makefile. All of them are not finished
at all :)

There's a small README in the synapse port which isnt installed, but can
be seen as a quick startup guide. https://github.com/matrix-org/synapse
and https://matrix.org/ has more info :)

Landry


synapse+deps.tgz
Description: application/tar-gz

UPDATE: audio/soundtouch 2.0.0

[Neeraj Pal]

Hi,

Here is a minor update to the soundtouch in the audio category.
I have done the quick regression tests on soundtouch-2.0.0.

Comments/okay?

Only in /usr/ports/audio/soundtouch: CVS
diff -ur /usr/ports/audio/soundtouch/Makefile
/usr/ports/mystuff/audio/soundtouch/Makefile
--- /usr/ports/audio/soundtouch/MakefileThu Jul 27 12:42:36 2017
+++ /usr/ports/mystuff/audio/soundtouch/MakefileSun Apr 29 02:16:18 2018
@@ -2,10 +2,10 @@

 COMMENT=   tempo/pitch audio processing library

-DISTNAME=  soundtouch-1.9.2
+DISTNAME=  soundtouch-2.0.0
 SHARED_LIBS += SoundTouch  3.0  # .0.0
 CATEGORIES=audio devel
-REVISION = 2
+REVISION = 0

 HOMEPAGE=  http://www.surina.net/soundtouch/

diff -ur /usr/ports/audio/soundtouch/distinfo
/usr/ports/mystuff/audio/soundtouch/distinfo
--- /usr/ports/audio/soundtouch/distinfoMon Jan  4 14:06:15 2016
+++ /usr/ports/mystuff/audio/soundtouch/distinfoSun Apr 29 02:16:36 2018
@@ -1,2 +1,2 @@
-SHA256 (soundtouch-1.9.2.tar.gz) = yuuGUR6BQg7rRUy121P1bZa4RR032Jr25VsS602hxRM=
-SIZE (soundtouch-1.9.2.tar.gz) = 171369
+SHA256 (soundtouch-2.0.0.tar.gz) = 0iT30UIbX450p0yFdBNFvZgCYYpArjDOW0J6VwXInSU=
+SIZE (soundtouch-2.0.0.tar.gz) = 455148








Thank you
Neeraj Pal
Only in /usr/ports/audio/soundtouch: CVS
diff -ur /usr/ports/audio/soundtouch/Makefile /usr/ports/mystuff/audio/soundtouch/Makefile
--- /usr/ports/audio/soundtouch/Makefile	Thu Jul 27 12:42:36 2017
+++ /usr/ports/mystuff/audio/soundtouch/Makefile	Sun Apr 29 02:16:18 2018
@@ -2,10 +2,10 @@
 
 COMMENT=	tempo/pitch audio processing library
 
-DISTNAME=	soundtouch-1.9.2
+DISTNAME=	soundtouch-2.0.0
 SHARED_LIBS +=	SoundTouch	3.0  # .0.0
 CATEGORIES=	audio devel
-REVISION =	2
+REVISION =	0
 
 HOMEPAGE=	http://www.surina.net/soundtouch/
 
diff -ur /usr/ports/audio/soundtouch/distinfo /usr/ports/mystuff/audio/soundtouch/distinfo
--- /usr/ports/audio/soundtouch/distinfo	Mon Jan  4 14:06:15 2016
+++ /usr/ports/mystuff/audio/soundtouch/distinfo	Sun Apr 29 02:16:36 2018
@@ -1,2 +1,2 @@
-SHA256 (soundtouch-1.9.2.tar.gz) = yuuGUR6BQg7rRUy121P1bZa4RR032Jr25VsS602hxRM=
-SIZE (soundtouch-1.9.2.tar.gz) = 171369
+SHA256 (soundtouch-2.0.0.tar.gz) = 0iT30UIbX450p0yFdBNFvZgCYYpArjDOW0J6VwXInSU=
+SIZE (soundtouch-2.0.0.tar.gz) = 455148

Re: [armv7 fix] net/echoping

[Jeremie Courreges-Anglas]

On Thu, Apr 26 2018, Markus Hennecke  wrote:
> The configure test for mandatory -lm is broken, because the single 
> pow(a,b) call is optimized away. Fix this by forcing the call to be 
> compiled in via return statement.
> This compiles without a change on amd64 and fixes the build on armv7.

Committed, thanks.  This code should be using AC_SEARCH_LIBS instead...

> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-configure   26 Apr 2018 16:47:22 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -4432,9 +4432,8 @@ cat >>conftest.$ac_ext <<_ACEOF
> + int
> + main ()
> + {
> +-pow(a,b)
> ++return pow(a,b)
> +   ;
> +-  return 0;
> + }
> + _ACEOF
> + rm -f conftest.$ac_objext conftest$ac_exeext
>

-- 
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.org2018/04/28 14:52:45

Modified files:
net/echoping   : Makefile 

Log message:
Update HOMEPAGE, development moved to github long ago

Keep sourceforge as MASTER_SITES just for the lulz, sf is currently
serving a large HTML page instead of the tarball.

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/04/28 14:50:52

Modified files:
net/echoping   : Makefile 
Added files:
net/echoping/patches: patch-configure 

Log message:
Fix build on arm

>From Markus Hennecke.  REVISION bumped just to be safe.

Re: update lang/sbcl

[Josh Elsasser]

On Fri, Apr 27, 2018 at 08:56:04PM -0700, Josh Elsasser wrote:
> Patching the i386 and ppc *-arch.c files isn't necessary. However i386
> didn't build for me (in a VM). I think we need to do this in
> patches/patch-src_runtime_bsd-os_c:

This is obviously wrong now that I look closer. I'll investigate further.

> $OpenBSD$
> 
> MAP_TRYFIXED is needed to allow SBCL to relocate its heap if the
> hardcoded virtual address is unavailable.
> 
> Index: src/runtime/bsd-os.c
> --- src/runtime/bsd-os.c.orig
> +++ src/runtime/bsd-os.c
> @@ -157,7 +157,11 @@ os_validate(int movable, os_vm_address_t addr, os_vm_s
>   * the hint address, and moreover that it "is the default behavior") 
> */
>  // FALLTHROUGH_INTENDED
>  case NOT_MOVABLE:
> +#ifdef MAP_TRYFIXED
> +flags = MAP_TRYFIXED;
> +#else
>  flags = MAP_FIXED;
> +#endif
>  }
>  #ifdef MAP_EXCL // not defined in OpenBSD, NetBSD, DragonFlyBSD
>  if (flags & MAP_FIXED) flags |= MAP_EXCL;
> 

Re: net/echoping - off-by-one intermittent core dump

[Theo Buehler]

Thanks for the diff -- fixed.

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2018/04/28 14:33:55

Modified files:
net/echoping   : Makefile 
Added files:
net/echoping/patches: patch-util_c 

Log message:
Fix an off-by-one in random_string().
(I didn't see that that the string it fills isn't really random.)

>From Mike 

ok jca

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2018/04/28 14:29:13

ports/net/echoping/patches

Update of /cvs/ports/net/echoping/patches
In directory cvs.openbsd.org:/tmp/cvs-serv1085/patches

Log Message:
Directory /cvs/ports/net/echoping/patches added to the repository

Re: UPDATE: graphics/farbfeld 3 -> 4

[Stuart Henderson]

Btw (as was done in the certain that got committed), as long as it doesn't 
call make recursively, just use MAKE_FLAGS and it overrides variables from 
the file, so there's no need to patch with ?=.


--
Sent from a phone, apologies for poor formatting.
On 28 April 2018 16:40:39 Kaashif Hymabaccus  wrote:


On Sat, Apr 28, 2018 at 03:11:08PM +0100, Stuart Henderson wrote:
> Please don't rely on the cc wrapper. It's a hack for certain situations.
> Also it's easier to verify that a port does the right thing if CC is
> passed correctly.

OK, here is a diff that leaves the CC stuff as it was, passed in
MAKE_ENV and config.mk is patched with ?= so it gets picked up.

diff --git Makefile Makefile
index 8d499d1ad33..7a0cc01f58c 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $

COMMENT =   lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES =graphics converters

HOMEPAGE =  https://tools.suckless.org/farbfeld
@@ -19,9 +19,16 @@ LIB_DEPENDS =graphics/png \

RUN_DEPENDS =   graphics/ImageMagick

-USE_GMAKE =Yes
MAKE_ENV =  CC="${CC}"

NO_TEST =   Yes

+do-install:
+   ${INSTALL_PROGRAM} \
+   ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+   ${PREFIX}/bin/
+   ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+   ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+   ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
.include 
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
-   rm -rf "farbfeld-$(VERSION)"
-
- install: all
--  mkdir -p "$(DESTDIR)$(PREFIX)/bin"
--  cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
--  for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
--  mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
--  cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
--  for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
--  mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
--  cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
--  for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+  ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+  ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+  ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+  ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+  ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+  ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
-
- uninstall:
-   for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..b3bd00fb313 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,7 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20 
bcallah Exp $

Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
- # Customize below to fit your system
-
- # paths
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
+@@ -9,10 +9,10 @@ MANPREFIX = $(PREFIX)/share/man

 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +11,8 @@ Index: config.mk
-LDFLAGS  = -s
+CFLAGS   += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS  += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg

 # compiler and linker
-CC = cc

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 14:20:14

Modified files:
infrastructure/bin: update-plist 

Log message:
look thru the dependency tree

might get a second pass (!)

the idea is to mark common directories so we don't spew them out.
This is just the recursive/caching pass that gets them all THEN we
have to mark objects as NOT relevant (and we can do it a second time
after creating the plists)

Re: NEW: x11/kde-applications/ktouch

[Vadim Zhukov]

2018-04-28 22:44 GMT+03:00 Rafael Sadowski :
>
> On Thu Apr 26, 2018 at 10:43:14PM +0300, Vadim Zhukov wrote:
>> 2018-04-26 21:58 GMT+03:00 Rafael Sadowski :
>> > Please find attached next new KDE4 replacement.
>> >
>> > Conflict bits are set:
>> >
>> > @conflict ktouch-<17.12.3
>> > @conflict kdebase-*
>> > @pkgpath x11/kde4/ktouch
>> >
>> > $ cat x11/kde-applications/ktouch/pkg/DESCR
>> > KTouch is a typing learning tool for KDE.
>> >
>> > It is a part of KDE Edu project.
>> >
>> > Ok? Commenst?
>>
>> Well, ktouch conflicts with ktouch by definition, so the first
>> @conflict shouldn't be needed. :)
>
> That was exactly the idea of not allowing either.
>
> The question is: do we want to replace everything step by step but how
> if we set conflict with kdebase-*. That doesn't make much sense to me.
> Or do we want KDE4 || KDE5 Application?
>
> I think teh following is wrong:
>
>> > @conflict ktouch-<17.12.3
>> > @conflict kdebase-*
>> > @pkgpath x11/kde4/ktouch
>
> Because "@pkgpath x11/kde4/*" is in conflict with "@conflict kdebase-*"
>
> I prefer it like now. x11/kde4 OR x11/kde-applications/*:
>
>> > @conflict ktouch-<17.12.3
>> > @conflict kdebase-*
>
> without pkgpath.
>
> I would be happy to hear the opinion of our pro porters!?

I think you've got @conflict and @pkgpath wrong.

The @conflict marks that you can't have both packages installed at the
same time. The package by default conflicts with any other with same
name, version and flavors are out of this check.

The @pkgpath instead tells that given package should be "compatible"
with another one, even with different name, in case of updating
packages.

So we have to have "@conflict kdebase-*" since both kdebase and ktouch
packages contain same file(-s). And there is no point in having
"@conflict ktouch-<17.12.3" since it's superseded by implicit default
"@conflict ktouch-*".

But "@pkgpath x11/kde4/ktouch" solves a totally different problem,
allowing pkg_add not to complain when replacing KDE4's KTouch with
KDE5 one. Note that @pkgpath kicks only when there's @conflict, either
implicit or explicit.

The appropriate @conflict+@pkgpat pair would mean not "you can't
install this" but "you can upgrade to this".

Now to main question: do we want to have KDE Applications both from
KDE4 and KDE5 worlds? They are almost equal at resources being used,
but KDE4 isn't maintained upstream at all. And KF5-based apps
perfectly work under KDE4 desktop and talk with KDE4 apps via, e.g.,
D-Bus. Yes, you'll have both Qt4 and Qt5 installed, as well quiet a
few other libraries, until migration ends. Does such situation hurt
anyone running modern desktop?

My plan a long ago was getting rid of KDE4 as soon as KF5-based stuff
comes in. Thus, x11/kde4/ktouch gets unlinked at the same time
x11/kde-applications/ktouch is linked to build. But since I'm not
doing the real work right now, it's not my right to take decisions
here.

--
  WBR,
  Vadim Zhukov

IMPROVEMENT security/libb2

[Björn Ketelaars]

Upstream of libb2 started offering distfiles via githubs release
infrastructure.

Changes to the port:

- Move from GH_* to MASTER_SITES and DISTNAME
  * Set EPOCH as version numbering has changed
  * Set HOMEPAGE
- No need to pull in automake and libtool
  * Drop BDEPs
  * Change CONFIGURE_STYLE
- Follow Makefile.template
- Change email address MAINTAINER

'make test' runs successfully, build tested all customers, and run
tested with borgbackup.

Comments/OKs?


Index: Makefile
===
RCS file: /cvs/ports/security/libb2/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile1 Jan 2018 15:40:55 -   1.1.1.1
+++ Makefile28 Apr 2018 19:36:15 -
@@ -1,37 +1,31 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2018/01/01 15:40:55 bcallah Exp $
 
 COMMENT =  library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
-DISTNAME = libb2-0.98.20171225
-CATEGORIES =   security
 
-SHARED_LIBS += b20.0 # 1.3
+V =0.98
+DISTNAME = libb2-${V}
+EPOCH =0
+
+SHARED_LIBS =  b2  0.0 # 1.3
 
-# No GH_TAGNAME
-GH_ACCOUNT =   BLAKE2
-GH_PROJECT =   libb2
-GH_COMMIT =60ea749837362c226e8501718f505ab138e5c19d
+CATEGORIES =   security
 
-MAINTAINER =   Bjorn Ketelaars 
+HOMEPAGE = https://blake2.net/
+
+MAINTAINER =   Bjorn Ketelaars 
 
 # CC0
 PERMIT_PACKAGE_CDROM = Yes
 
-BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
-   ${MODGNU_AUTOMAKE_DEPENDS} \
-   devel/libtool
+MASTER_SITES = https://github.com/BLAKE2/libb2/releases/download/v${V}/
 
-CONFIGURE_STYLE =  gnu
+SEPARATE_BUILD =   Yes
+
+CONFIGURE_STYLE =  autoconf
 CONFIGURE_ARGS =   --disable-fat \
--disable-native \
--disable-openmp
 
-SEPARATE_BUILD =   Yes
-
 AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.15
-
-pre-configure:
-   cd ${WRKSRC} && ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/libb2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo1 Jan 2018 15:40:55 -   1.1.1.1
+++ distinfo28 Apr 2018 19:36:15 -
@@ -1,2 +1,2 @@
-SHA256 (libb2-0.98.20171225-60ea7498.tar.gz) = 
hFPmDkOFj1DIsdroNJEzyl/mzA4PeLWIFl/AVTtMGnk=
-SIZE (libb2-0.98.20171225-60ea7498.tar.gz) = 275231
+SHA256 (libb2-0.98.tar.gz) = 6Gngw6k7xW0QUuzL6c2SW4qMcwi0F1MoKacAzzdLA28=
+SIZE (libb2-0.98.tar.gz) = 530982

Re: NEW: x11/kde-applications/ktouch

[Rafael Sadowski]

On Thu Apr 26, 2018 at 10:43:14PM +0300, Vadim Zhukov wrote:
> 2018-04-26 21:58 GMT+03:00 Rafael Sadowski :
> > Please find attached next new KDE4 replacement.
> >
> > Conflict bits are set:
> >
> > @conflict ktouch-<17.12.3
> > @conflict kdebase-*
> > @pkgpath x11/kde4/ktouch
> >
> > $ cat x11/kde-applications/ktouch/pkg/DESCR
> > KTouch is a typing learning tool for KDE.
> >
> > It is a part of KDE Edu project.
> >
> > Ok? Commenst?
> 
> Well, ktouch conflicts with ktouch by definition, so the first
> @conflict shouldn't be needed. :)

That was exactly the idea of not allowing either.

The question is: do we want to replace everything step by step but how
if we set conflict with kdebase-*. That doesn't make much sense to me.
Or do we want KDE4 || KDE5 Application?

I think teh following is wrong:

> > @conflict ktouch-<17.12.3
> > @conflict kdebase-*
> > @pkgpath x11/kde4/ktouch

Because "@pkgpath x11/kde4/*" is in conflict with "@conflict kdebase-*"

I prefer it like now. x11/kde4 OR x11/kde-applications/*:

> > @conflict ktouch-<17.12.3
> > @conflict kdebase-*

without pkgpath.

I would be happy to hear the opinion of our pro porters!?

>
> IIRC, I've added such markers to
> stuff under x11/kde-applications initially, thinking about
> co-installation of KDE4 and KDE5 ones. But later I realized that they
> co-exist more or less fine anyway, and dropped kde5- prefix idea, but
> forgot about @conflict markers.
> 
> Sorry for missing similar thing in kate port as well.
> 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 13:23:55

Modified files:
x11/gnome/vinagre: Makefile 
Added files:
x11/gnome/vinagre/patches: patch-configure 
   patch-plugins_rdp_vinagre-rdp-tab_c 

Log message:
Fix build & certificate issues at runtime with FreeRDP 2.
Mostly from https://bugzilla.gnome.org/show_bug.cgi?id=774473

ok ajacoutot@

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 13:22:24

Modified files:
x11/remmina: Makefile distinfo 
x11/remmina/pkg: PLIST 
Added files:
x11/remmina/patches: patch-CMakeLists_txt 
Removed files:
x11/remmina/patches: patch-cmake_FindFREERDP_cmake 
 patch-remmina-plugins_rdp_rdp_plugin_c 

Log message:
Update to remmina 1.2.0rc29, based on an original diff from semarie@

ok jasper@ (MAINTAINER) ajacoutot@

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 13:20:17

Modified files:
x11/freerdp: Makefile distinfo 
x11/freerdp/patches: patch-CMakeLists_txt 
 patch-client_X11_CMakeLists_txt 
 patch-winpr_include_winpr_crt_h 
 patch-winpr_libwinpr_utils_CMakeLists_txt 
x11/freerdp/pkg: PLIST 
Added files:
x11/freerdp/patches: patch-client_common_CMakeLists_txt 
 patch-winpr_libwinpr_CMakeLists_txt 
 patch-winpr_libwinpr_utils_ssl_c 
 patch-winpr_winpr_pc_in 
Removed files:
x11/freerdp/patches: patch-channels_CMakeLists_txt 
 patch-channels_client_CMakeLists_txt 
 patch-client_CMakeLists_txt 
 patch-libfreerdp_crypto_tls_c 
 patch-server_CMakeLists_txt 
 patch-third-party_CMakeLists_txt 
 patch-winpr_libwinpr_crt_alignment_c 
 patch-winpr_libwinpr_synch_CMakeLists_txt 
 patch-winpr_libwinpr_synch_wait_c 
 patch-winpr_libwinpr_sysinfo_CMakeLists_txt 
 patch-winpr_libwinpr_sysinfo_sysinfo_c 
 patch-winpr_pc_in 

Log message:
Update to FreeRDP 2.0.0rc1, original diff from semarie@

Don't update to 2.0.0rc2, as it now requires POSIX timers that we lack
(ie timer_create(), cf #4592)
Switch to real releases instead of github
Fixes a bunch of vulns, cf
https://blog.talosintelligence.com/2017/07/vulnerbility-spotlight-freerdp-multiple.html

tested by denis@ giovanni@ ajacoutot@ sthen@, thanks!
ok ajacoutot@ sthen@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 13:04:41

Modified files:
audio/pulseaudio: Makefile 

Log message:
Take MAINTAINER from robert@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 13:00:49

Modified files:
print/foomatic-db: Makefile distinfo 
print/foomatic-db/pkg: PLIST 

Log message:
Update to foomatic-db-4.0.20180228.

UPDATE: lang/elctlsh 1.16

[Matthieu Herrb]

Ok ?

Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile23 Oct 2017 17:10:51 -  1.30
+++ Makefile28 Apr 2018 18:47:46 -
@@ -2,13 +2,12 @@
 
 COMMENT =  Libedit interface to Tcl/Tk interpreters
 
-DISTNAME = eltclsh-1.12
+DISTNAME = eltclsh-1.16
 CATEGORIES =   lang x11
-REVISION = 2
 
-MASTER_SITES = http://www.openrobots.org/distfiles/eltclsh/
+MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
 
-HOMEPAGE = http://www.openrobots.org/wiki/eltclsh
+HOMEPAGE = https://git.openrobots.org/projects/eltclsh/
 
 MAINTAINER =   Matthieu Herrb 
 
@@ -37,8 +36,8 @@ NO_TEST = Yes
 LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
 
 post-install:
-   rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.la
-   rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.a
+   rm ${WRKINST}${MODTCL_TCLDIR}/libeltclsh.la
+   rm ${WRKINST}${MODTCL_TCLDIR}/libeltclsh.a
rm ${WRKINST}${MODTCL_TCLDIR}/pkgconfig/eltclsh.pc
rmdir ${WRKINST}${MODTCL_TCLDIR}/pkgconfig
 
Index: distinfo
===
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo10 Oct 2012 22:09:29 -  1.7
+++ distinfo28 Apr 2018 18:47:46 -
@@ -1,2 +1,2 @@
-SHA256 (eltclsh-1.12.tar.gz) = 75GlppHX8BQ+hsez2tlw30WPGqPNhqo8evKx0QE6TGk=
-SIZE (eltclsh-1.12.tar.gz) = 244359
+SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
+SIZE (eltclsh-1.16.tar.gz) = 357909
Index: patches/patch-configure
===
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configure
--- patches/patch-configure 10 Oct 2012 22:09:29 -  1.1
+++ patches/patch-configure 28 Apr 2018 18:47:46 -
@@ -1,11 +1,15 @@
-$OpenBSD: patch-configure,v 1.1 2012/10/10 22:09:29 stu Exp $
 configure.orig Mon Apr 30 12:41:06 2012
-+++ configure  Mon Apr 30 12:41:39 2012
-@@ -11462,6 +11462,7 @@ $as_echo "$as_me: tk support not found/disabled" >&6;}
-file=${tk_prefix}/tkConfig.sh
-. $file
-   eval TK_INCLUDE_SPEC="\"${TK_INCLUDE_SPEC} ${TK_XINCLUDES}\""
-+  eval TK_LIB_SPEC="\"${TK_LIB_SPEC} ${TK_LIBS}\""
- 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tk headers" >&5
- $as_echo_n "checking for tk headers... " >&6; }
+$OpenBSD$
+
+Find X includes
+
+Index: configure
+--- configure.orig
 configure
+@@ -643,6 +643,7 @@ TK_LIB_SPEC
+ TK_LIB_FLAG
+ TK_LIB_FILE
+ TK_INCLUDE_SPEC
++TK_XINCLUDES
+ TK_SRC_DIR
+ TK_BIN_DIR
+ TK_VERSION
Index: patches/patch-src_Makefile_in
===
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in   10 Oct 2012 22:09:29 -  1.1
+++ patches/patch-src_Makefile_in   28 Apr 2018 18:47:46 -
@@ -1,12 +1,24 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2012/10/10 22:09:29 stu Exp $
 src/Makefile.in.orig   Tue Oct  9 01:01:16 2012
-+++ src/Makefile.inTue Oct  9 01:01:38 2012
-@@ -104,7 +104,7 @@ $(ELWISH): $(elwishobjs) $(commonobjs)
- #
- lib$(ELPKG).la: $(pkgobjs)
-   $(LTLD) -avoid-version -o $@ $(CFLAGS) $(pkgobjs)   \
--  $(addprefix -XCClinker ,$(TCLSTUB_LDFLAGS)) \
-+  $(TCLSTUB_LDFLAGS)  \
-   -rpath $(datadir) $(LDFLAGS) $(EL_LDFLAGS)
+$OpenBSD$
+
+Find X and Tcl includes
+
+Index: src/Makefile.in
+--- src/Makefile.in.orig
 src/Makefile.in
+@@ -292,6 +292,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+ TCL_VERSION = @TCL_VERSION@
+ TK_BIN_DIR = @TK_BIN_DIR@
+ TK_INCLUDE_SPEC = @TK_INCLUDE_SPEC@
++TK_XINCLUDES = @TK_XINCLUDES@
+ TK_LIB_FILE = @TK_LIB_FILE@
+ TK_LIB_FLAG = @TK_LIB_FLAG@
+ TK_LIB_SPEC = @TK_LIB_SPEC@
+@@ -377,7 +378,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
+   -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
+ eltclsh_LDFLAGS = ${RUNTIME_PATH}
+ eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}
+-elwish_CPPFLAGS = ${TK_INCLUDE_SPEC}
++elwish_CPPFLAGS = ${TK_XINCLUDES} ${TK_INCLUDE_SPEC} ${TCL_INCLUDE_SPEC}
+ elwish_LDFLAGS = ${RUNTIME_PATH}
+ elwish_LDADD = libcommon.la ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
  
- # object files
Index: patches/patch-src_elwish_c
===
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_elwish_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-src_elwish_c
--- patches/patch-src_elwish_c  10 Oct 2012 22:09:29 -  1.3
+++ patches/patch-src_elwish_c  28 Apr 2018 18:47:46 -
@@ -1,7 

Re: NEW: security/hitch (pledged)

[Klemens Nanni]

Take three with updated pledge diff also fixing an actual bug in the
reloading logic when the `ocsp-dir' parameter has changed.

It's already reported upstream, I discovered this while playing around
to reduce pledge promises.


hitch3.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:22:55

Modified files:
x11/sakura : Makefile distinfo 
Removed files:
x11/sakura/patches: patch-src_sakura_c 

Log message:
Update to sakura-3.5.0
Build as -std=gnu99 and remove the patch.
>From new MAINTAINER Victor Kukshiev 

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:18:14

Modified files:
sysutils/fabric: Makefile distinfo 

Log message:
Update to fabric-1.14.0
ok Pablo Mendez Hernandez  (MAINTAINER) - thanks!

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:11:32

Modified files:
games/xye  : Makefile 
Added files:
games/xye/patches: patch-src_xsb_level_cpp 

Log message:
Unbreak build on gcc-4.2.1
Noticed by and ok naddy@

CVS: cvs.openbsd.org: ports

[James Turner]

CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2018/04/28 12:11:53

Modified files:
databases/ksql : Makefile distinfo 

Log message:
Update ksql to 0.3.1

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:10:51

ports/games/xye/patches

Update of /cvs/ports/games/xye/patches
In directory cvs.openbsd.org:/tmp/cvs-serv53395/patches

Log Message:
Directory /cvs/ports/games/xye/patches added to the repository

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:10:04

Modified files:
games/valyriatear: Makefile 
Added files:
games/valyriatear/patches: patch-src_common_options_handler_cpp 
   patch-src_engine_system_cpp 
   patch-src_engine_video_video_cpp 
   patch-src_main_cpp 
   patch-src_main_options_cpp 
   patch-src_utils_utils_files_cpp 

Log message:
Unbreak build with gcc-4.2.1
Noticed by and ok naddy@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:08:24

Modified files:
games/liberalcrimesquad: Makefile distinfo 
Added files:
games/liberalcrimesquad/patches: patch-src_compat_cpp 

Log message:
Update to liberalcrimesquad-4.10.0 -- new upstream on GitHub.
Remove -std=c++03 since gcc-4.2.1 doesn't have it and that breaks the
build on !CLANG_ARCHS.
noticed by and ok naddy@

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/04/28 12:06:52

ports/games/liberalcrimesquad/patches

Update of /cvs/ports/games/liberalcrimesquad/patches
In directory cvs.openbsd.org:/tmp/cvs-serv90518/patches

Log Message:
Directory /cvs/ports/games/liberalcrimesquad/patches added to the repository

FW: still failing to build gcc on arm - fbracket

[s_graf]

I have successfully built gcc 4.9 after using you patch.  Thank you. The patch 
did not apply cleanly. Probably the inline was altered by outlook, so I just 
manually added the brackets to the makefile patch.

Jeremie, the rampage ain't over till it's over!

-Original Message-
From: owner-po...@openbsd.org  On Behalf Of Markus 
Hennecke
Sent: April 27, 2018 3:24 PM
To: s_g...@telus.net
Cc: ports@openbsd.org; 'Jeremie Courreges-Anglas' 
Subject: Re: still failing to build gcc on arm - fbracket

On Fri, 27 Apr 2018, s_g...@telus.net wrote:

>
>
> I loaded the latest ports and src this morning.  Do some other 
> packages need to be rebuilt also?

I should have checked but didn't have the time. And at first glance everything 
looked ok. But Makefile is different to the configure shell script. The problem 
is fixed by using $(CC) instead of $CC in the shell
expression:

Index: patches/patch-gcc_Makefile_in
===
RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-gcc_Makefile_in
--- patches/patch-gcc_Makefile_in   25 Apr 2018 12:56:56 -
1.2
+++ patches/patch-gcc_Makefile_in   27 Apr 2018 22:16:34 -
@@ -9,7 +9,7 @@ Index: gcc/Makefile.in

  CFLAGS-gcc.o += $(DRIVER_DEFINES)

-+ISCLANG = $(shell $CC --version | grep -c clang)
++ISCLANG = $(shell $(CC) --version | grep -c clang)
 +
 +ifeq ($(ISCLANG),1)
 +CFLAGS-insn-attrtab.o += -fbracket-depth=512

UPDATE: xcursor-themes-1.0.5

[Matthieu Herrb]

ok ?

Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/xcursor-themes/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile22 Jun 2015 20:15:32 -  1.13
+++ Makefile28 Apr 2018 17:50:25 -
@@ -1,7 +1,7 @@
 #  $OpenBSD: Makefile,v 1.13 2015/06/22 20:15:32 naddy Exp $
 
 COMMENT =  X11 Cursors themes
-DISTNAME = xcursor-themes-1.0.4
+DISTNAME = xcursor-themes-1.0.5
 CATEGORIES =   x11
 
 HOMEPAGE = http://wiki.X.Org/
Index: distinfo
===
RCS file: /cvs/OpenBSD/ports/x11/xcursor-themes/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- distinfo16 Mar 2014 21:57:56 -  1.4
+++ distinfo28 Apr 2018 17:50:25 -
@@ -1,2 +1,2 @@
-SHA256 (xcursor-themes-1.0.4.tar.gz) = 
jtI7qxOkAQ/k6Vs37vtjTjGsfLgkC4s7fZGcOi2wlQM=
-SIZE (xcursor-themes-1.0.4.tar.gz) = 2549600
+SHA256 (xcursor-themes-1.0.5.tar.gz) = 
hWNqN3TevoMKFbnNPEOBcTVvtFHX42ZyEnd6VdiPeJc=
+SIZE (xcursor-themes-1.0.5.tar.gz) = 2557532

-- 
Matthieu Herrb

Re: CVS: cvs.openbsd.org: src

[Vadim Zhukov]

2018-04-28 19:54 GMT+03:00 Eric Faurot :
> CVSROOT:/cvs
> Module name:src
> Changes by: e...@cvs.openbsd.org2018/04/28 10:54:11
>
> Modified files:
> usr.sbin/smtpd : Makefile
>
> Log message:
> link smtp(1) to the build
>
> ok deraadt@

Some care would be needed for apcupsd port, which installs
/usr/local/sbin/smtp. IIUC, it does the same thing as /usr/bin/smtp
and port could just stop installing it. The existing smtp users could
be affected, though, so I propose the following patch. Any better
ideas/objections/okays?

--
  WBR,
  Vadim Zhukov


Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile12 Jan 2018 14:05:10 -  1.38
+++ Makefile28 Apr 2018 17:27:33 -
@@ -9,7 +9,7 @@ PKGNAME-main =  ${DISTNAME}
 PKGNAME-cgi =  ${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =  ${DISTNAME:S/-/-x11-/}
 REVISION = 1
-REVISION-main =2
+REVISION-main =3

 CATEGORIES =   sysutils

@@ -108,5 +108,6 @@ post-install:
${WRKINST}/${WEB_ROOT}/cgi-bin/apcupsd/
cd ${PREFIX}/share; chown -R root:wheel doc/apcupsd examples/apcupsd
chmod 755 ${PREFIX}/sbin/apcupsctl
+   rm -f ${PREFIX}/sbin/smtp

 .include 
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE-main28 Apr 2018 17:27:33 -
@@ -0,0 +1,2 @@
+The ${LOCALBASE}/sbin/smtp from this package is gone since OpenBSD 6.4.
+Any scripts using it should now use the /usr/bin/smtp instead.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main  22 Jan 2015 21:23:30 -  1.9
+++ pkg/PLIST-main  28 Apr 2018 17:27:33 -
@@ -14,7 +14,6 @@
 @mode
 @owner
 sbin/apcupsctl
-@bin sbin/smtp
 @comment share/applications/
 @group
 share/doc/apcupsd/
Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile	12 Jan 2018 14:05:10 -	1.38
+++ Makefile	28 Apr 2018 17:27:33 -
@@ -9,7 +9,7 @@ PKGNAME-main =		${DISTNAME}
 PKGNAME-cgi =		${DISTNAME:S/-/-cgi-/}
 PKGNAME-x11 =		${DISTNAME:S/-/-x11-/}
 REVISION =		1
-REVISION-main =		2
+REVISION-main =		3
 
 CATEGORIES =		sysutils
 
@@ -108,5 +108,6 @@ post-install:
 		${WRKINST}/${WEB_ROOT}/cgi-bin/apcupsd/
 	cd ${PREFIX}/share; chown -R root:wheel doc/apcupsd examples/apcupsd
 	chmod 755 ${PREFIX}/sbin/apcupsctl
+	rm -f ${PREFIX}/sbin/smtp
 
 .include 
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- /dev/null	1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE-main	28 Apr 2018 17:27:33 -
@@ -0,0 +1,2 @@
+The ${LOCALBASE}/sbin/smtp from this package is gone since OpenBSD 6.4.
+Any scripts using it should now use the /usr/bin/smtp instead.
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main	22 Jan 2015 21:23:30 -	1.9
+++ pkg/PLIST-main	28 Apr 2018 17:27:33 -
@@ -14,7 +14,6 @@
 @mode
 @owner
 sbin/apcupsctl
-@bin sbin/smtp
 @comment share/applications/
 @group
 share/doc/apcupsd/

Re: update mail/mu and take maintainership

[Jeremie Courreges-Anglas]

On Sat, Apr 28 2018, Solene Rapenne  wrote:
> mu (including mu4e for emacs) has been updated to 1.0, following diff
> updates the port and I would like to take maintainership too for it.
>
> It requires an newer automake, it was failing with 1.11. After update,
> the mu mail database should be rebuilt. Emacs tells you how once you
> want to start mu4e after upgrade mu package.
>
> mu index --maildir=/home/path/to/maildir --rebuild

Looks good except for the compiler requirements: this now needs C++14
support, and ports-gcc is not enough.  I tried overriding the autoconf
checks but the build fails later with the hack below.

--8<--
.include 

.if ${CHOSEN_COMPILER} == "ports-gcc"
CONFIGURE_ENV=  ax_cv_cxx_compile_cxx14=yes
CXXFLAGS=   -std=gnu++14
.endif
-->8--

So with

--8<--
# C++14 required
COMPILER=   base-clang ports-clang
-->8--

added, ok jca@

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

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Sat, Apr 28, 2018 at 10:58:39AM -0600, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2018/04/28 10:58:39
> 
> Modified files:
>   net/pidgin : Makefile distinfo 
>   net/pidgin/patches: patch-libpurple_plugins_ssl_Makefile_in 
>   patch-libpurple_protocols_jabber_Makefile_in 
>   patch-libpurple_protocols_oscar_Makefile_in 
>   patch-libpurple_purple-remote 
>   patch-libpurple_purple-url-handler 
>   patch-pidgin_Makefile_in 
>   patch-pidgin_gtkconv_c 
>   net/pidgin/pkg : PLIST-main 
> 
> Log message:
> Update to pidgin-2.13.0.

That was from Brad (maintainer), sorry...

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 10:58:39

Modified files:
net/pidgin : Makefile distinfo 
net/pidgin/patches: patch-libpurple_plugins_ssl_Makefile_in 
patch-libpurple_protocols_jabber_Makefile_in 
patch-libpurple_protocols_oscar_Makefile_in 
patch-libpurple_purple-remote 
patch-libpurple_purple-url-handler 
patch-pidgin_Makefile_in 
patch-pidgin_gtkconv_c 
net/pidgin/pkg : PLIST-main 

Log message:
Update to pidgin-2.13.0.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/28 10:40:26

Modified files:
net/ushare : Makefile 
net/ushare/patches: patch-configure 

Log message:
Explicitly link with libiconv since the iconv(3) functions are called
directly from the program.  Required by lld.

Re: still failing to build gcc on arm - fbracket

[Jeremie Courreges-Anglas]

On Sat, Apr 28 2018, Markus Hennecke  wrote:
> On Fri, 27 Apr 2018, s_g...@telus.net wrote:
>
>>  
>> 
>> I loaded the latest ports and src this morning.  Do some other packages need
>> to be rebuilt also?
>
> I should have checked but didn't have the time. And at first glance 
> everything looked ok. But Makefile is different to the configure shell 
> script. The problem is fixed by using $(CC) instead of $CC in the shell 
> expression:

Committed, thanks.

> Index: patches/patch-gcc_Makefile_in
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/patches/patch-gcc_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-gcc_Makefile_in
> --- patches/patch-gcc_Makefile_in   25 Apr 2018 12:56:56 -  
> 1.2
> +++ patches/patch-gcc_Makefile_in   27 Apr 2018 22:16:34 -
> @@ -9,7 +9,7 @@ Index: gcc/Makefile.in
>
>   CFLAGS-gcc.o += $(DRIVER_DEFINES)
>
> -+ISCLANG = $(shell $CC --version | grep -c clang)
> ++ISCLANG = $(shell $(CC) --version | grep -c clang)
>  +
>  +ifeq ($(ISCLANG),1)
>  +CFLAGS-insn-attrtab.o += -fbracket-depth=512
>

-- 
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.org2018/04/28 10:38:25

Modified files:
lang/gcc/4.9/patches: patch-gcc_Makefile_in 

Log message:
Fix previous

Pointed out by s_graf at telus.net, patch from Markus Hennecke (thanks!)

While here update patch comments.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/28 10:33:10

Modified files:
textproc/hunspell: Makefile distinfo 

Log message:
update to hunspell-1.6.2

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/04/28 10:31:12

Modified files:
graphics/farbfeld: Makefile distinfo 
graphics/farbfeld/patches: patch-config_mk 
Removed files:
graphics/farbfeld/patches: patch-Makefile 

Log message:
Update to farbfeld-4

>From Kaashif Hymabaccus, with input from sthen and me.

OK solene, sthen

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

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

Modified files:
sysutils/socket: Makefile distinfo 
sysutils/socket/patches: patch-io_c patch-siglist_c 
Removed files:
sysutils/socket/patches: patch-README patch-globals_h 
 patch-socket_1 patch-socket_c 
 patch-socketp_c patch-utils_c 

Log message:
update to socket-1.2

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/28 10:12:03

Modified files:
x11/motif  : Makefile distinfo 

Log message:
update to motif-2.3.8

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

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

Modified files:
www/moinmoin   : Makefile distinfo 
www/moinmoin/pkg: PLIST 

Log message:
update to moinmoin-1.9.9

Re: NEW: Spyder + UPDATE: py-rope

[Elias M. Mariani]

NEW devel/spyder added on openbsd-wip on github.
https://github.com/jasperla/openbsd-wip
Looking for OKs and someone to do the commit.
Thanks to Daniel Jakots for commiting the py-rope update.
Elias,

2018-04-26 21:29 GMT-03:00 Elias M. Mariani :
> Great!
> About NEW: devel/spyder could you assist me ? Or should I send the
> port to openbsd-wip on github to see if someone else can give the OK
> and send it to de CVS?
> Best Regards.
>
> 2018-04-26 17:34 GMT-03:00 Daniel Jakots :
>> On Thu, 26 Apr 2018 19:09:39 +, "Elias M. Mariani"
>>  wrote:
>>
>>> Sure, no problem, thanks to you for the help!
>>
>> Thanks! I committed a tweak version of your py-rope diff and added the
>> missing bits for the ports infrastructure. The overall quality of your
>> diff was pretty good ;)
>>
>> Cheers,
>> Daniel

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

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

Modified files:
net/gnaughty   : Makefile 
net/gnaughty/patches: patch-configure_in 

Log message:
fix linking with lld
kindly suggested by naddy@; at last the long awaited gnaughty commit!

also regen WANTLIB while here

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 09:58:59

Modified files:
www/nginx  : Makefile distinfo 
www/nginx/patches: patch-conf_mime_types 

Log message:
Update to nginx 1.14.0.

cf https://nginx.org/en/CHANGES-1.14

ok robert@ (MAINTAINER)

net/echoping - off-by-one intermittent core dump

[Mike]

+++ util.c  Sat Dec 10 12:29:32 2016
@@ -13,7 +13,7 @@
 {

   char *state = (char *) malloc (sizeof (char) * STATES);
-  char *result = (char *) malloc (length);
+  char *result = (char *) malloc (length + 1);
   int i, number;
   unsigned seed = (unsigned) time ((time_t *) NULL);

Re: UPDATE: graphics/farbfeld 3 -> 4

[Kaashif Hymabaccus]

On Sat, Apr 28, 2018 at 03:11:08PM +0100, Stuart Henderson wrote:
> Please don't rely on the cc wrapper. It's a hack for certain situations.
> Also it's easier to verify that a port does the right thing if CC is
> passed correctly.

OK, here is a diff that leaves the CC stuff as it was, passed in
MAKE_ENV and config.mk is patched with ?= so it gets picked up.

diff --git Makefile Makefile
index 8d499d1ad33..7a0cc01f58c 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
 
 COMMENT =  lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
 CATEGORIES =   graphics converters
 
 HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,16 @@ LIB_DEPENDS =graphics/png \
 
 RUN_DEPENDS =  graphics/ImageMagick
 
-USE_GMAKE =Yes
 MAKE_ENV = CC="${CC}"
 
 NO_TEST =  Yes
 
+do-install:
+   ${INSTALL_PROGRAM} \
+   ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+   ${PREFIX}/bin/
+   ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+   ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+   ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
 .include 
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
-   rm -rf "farbfeld-$(VERSION)"
- 
- install: all
--  mkdir -p "$(DESTDIR)$(PREFIX)/bin"
--  cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
--  for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
--  mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
--  cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
--  for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
--  mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
--  cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
--  for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+  ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+  ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+  ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+  ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+  ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+  ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
- 
- uninstall:
-   for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..b3bd00fb313 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,7 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20 
bcallah Exp $
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
- # Customize below to fit your system
- 
- # paths
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
+@@ -9,10 +9,10 @@ MANPREFIX = $(PREFIX)/share/man
  
  # flags
  CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +11,8 @@ Index: config.mk
 -LDFLAGS  = -s
 +CFLAGS   += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
 +LDFLAGS  += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
  
  # compiler and linker
 -CC = cc

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 09:37:31

Modified files:
textproc/link-grammar: Makefile distinfo 
textproc/link-grammar/patches: patch-bindings_python_Makefile_in 
   patch-link-grammar_utilities_h 
textproc/link-grammar/pkg: PLIST-main 

Log message:
Update to link-grammar-5.4.4.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/28 09:32:48

Modified files:
math/calcoo: Makefile 
Added files:
math/calcoo/patches: patch-src_Makefile_in 

Log message:
Explicitly link in libm since math functions are called from the main
program (duh!).  Required by lld.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

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

Modified files:
devel/geany: Makefile distinfo 
devel/geany/pkg: PLIST 

Log message:
update to geany-1.33

from Victor Kukshiev (new maintainer)
generous time-out of previous maintainer

Re: fix kdelibs4 mimetypes ?

[Vadim Zhukov]

сб, 28 апр. 2018 г., 13:39 Landry Breuil :

> Hi,
>
> saw this during a pkg_add w/ kdelibs4 installed:
>
> Unknown media type in type 'all/all'
> Unknown media type in type 'all/allfiles'
>
> shared-mime-info is choking on types installed by kdelibs4, which had
> been removed in kde5:
>
> https://github.com/KDE/kcoreaddons/commit/36ff1bf60c9b12c28ed4d7566abceac10cab345e
>
> the internet seems to go crazy about it and kde4 & freedesktop ppl are
> throwing the issue at each other on various places / distro bug reports:
>
> https://bugs.kde.org/show_bug.cgi?id=303627
> https://bugs.launchpad.net/ubuntu/+source/shared-mime-info/+bug/289592
> https://bugs.gentoo.org/261446
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469833
> https://bugs.freedesktop.org/show_bug.cgi?id=16816
>
> bastien nocera recently hacked shared-mime-info to not complain about it
> anymore, cf
>
> https://cgit.freedesktop.org/xdg/shared-mime-info/commit/?id=fc149b7615deecf3c3af73bcc5ee98a4b716fbac
> and
>
> https://cgit.freedesktop.org/xdg/shared-mime-info/commit/?id=553aa73de2c6a5bb221bcd9153c2425cd236c703
>
> so my understanding is that an update to this version should silence
> those errors. Some ppl are just voting for removing the mimetypes from
> the old kde4 file, and some other are saying that it'll break kde4 apps.
>
> This appeases my OCD, what are other's opinions ? Fix shared-mime-info,
> or kdelibs4 ?
>
> Landry
>

FWIW, I remember someone complaining fixing KDE nonsense in
shared-mime-info a while ago, so this idea was dropped on my side. I still
fully support it, though. :)

>

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 09:18:46

Modified files:
infrastructure/bin: update-plist 

Log message:
wrap an eval {} around new elements so that absolute stuff outside
the base prefix don't fuck us up.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 09:07:38

Modified files:
infrastructure/bin: update-plist 

Log message:
Do a lot more with empty values.

If they were already in the unsubst string, then we can put them in
the exact same location.

Re: update print/transfig

[Antoine Jacoutot]

On Sat, Apr 28, 2018 at 04:20:15PM +0200, Solene Rapenne wrote:
> Following diff updates print/transfig, so the port get synced with the
> newer version of xfig

Looks fine portwise.
OK aja


> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/print/transfig/Makefile,v
> retrieving revision 1.45
> diff -u -p -r1.45 Makefile
> --- Makefile  24 Apr 2018 12:07:26 -  1.45
> +++ Makefile  28 Apr 2018 14:18:37 -
> @@ -2,7 +2,7 @@
> 
>  COMMENT= tools to convert Xfig's .fig files  #'
> 
> -VERSION= 3.2.6
> +VERSION= 3.2.7
>  DISTNAME=fig2dev-${VERSION}
>  EXTRACT_SUFX =   .tar.xz
>  PKGNAME= transfig-${VERSION}
> @@ -25,7 +25,7 @@ CONFIGURE_STYLE=gnu
>  CONFIGURE_ARGS = --enable-transfig
>  CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
> 
> -MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
> +MAKE_FLAGS+= bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
> 
>  FLAVORS= a4
>  FLAVOR?=
> Index: distinfo
> ===
> RCS file: /cvs/ports/print/transfig/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  24 Apr 2018 12:07:26 -  1.8
> +++ distinfo  28 Apr 2018 14:18:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
> -SIZE (fig2dev-3.2.6.tar.xz) = 406288
> +SHA256 (fig2dev-3.2.7.tar.xz) = 3kWBl1L2V6t+v/5KAvyZA40SSo82vjBVCyHvT6A6o6U=
> +SIZE (fig2dev-3.2.7.tar.xz) = 508336
> cvs server: Diffing patches
> Index: patches/patch-fig2dev_Makefile_in
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_Makefile_in
> --- patches/patch-fig2dev_Makefile_in 24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_Makefile_in 28 Apr 2018 14:18:37 -
> @@ -3,22 +3,21 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
>  Index: fig2dev/Makefile.in
>  --- fig2dev/Makefile.in.orig
>  +++ fig2dev/Makefile.in
> -@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
> +@@ -128,7 +128,7 @@ PROGRAMS = $(bin_PROGRAMS)
>   am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
>   creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
> - iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
> --read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
> --getopt.$(OBJEXT)
> -+read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
> + iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
> +-read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
> ++read.$(OBJEXT) trans_spline.$(OBJEXT)
>   fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
>   LIBOBJDIR = ../fig2dev/lib/
> - fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
> -@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
> - iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
> - read.c trans_spline.h trans_spline.c pi.h getopt.c
> + am__DEPENDENCIES_1 =
> +@@ -390,7 +390,7 @@ fig2dev_SOURCES = alloc.h arrow.c bool.h bound.h bound
> + iso2tex.c localmath.h localmath.c object.h read1_3.c read.h read.c \
> + trans_spline.h trans_spline.c pi.h getopt.c
> 
> --fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
> -+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
> +-fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a $(am__append_3)
> ++fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv $(am__append_3)
>   dist_bin_SCRIPTS = fig2ps2tex pic2tpic
>   all: all-recursive
> 
> Index: patches/patch-fig2dev_fig2dev_c
> ===
> RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-fig2dev_fig2dev_c
> --- patches/patch-fig2dev_fig2dev_c   24 Apr 2018 12:07:26 -  1.1
> +++ patches/patch-fig2dev_fig2dev_c   28 Apr 2018 14:18:37 -
> @@ -3,21 +3,12 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1
>  Index: fig2dev/fig2dev.c
>  --- fig2dev/fig2dev.c.orig
>  +++ fig2dev/fig2dev.c
> -@@ -42,7 +42,7 @@
> - #include 
> - #endif
> -
> --extern int   fig_getopt(int nargc, char **nargv, char *ostr);
> -+#include 
> - extern char *optarg;
> - extern int   optind;
> - static int   parse_gridspec(char *string, float *numer, float *denom,
> -@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
> +@@ -221,7 +221,7 @@ get_args(int argc, char *argv[])
>   if (argc == 1)
> - fprintf(stderr,Usage,prog,prog);
> + fprintf(stderr, Usage, prog, prog);
>   /* sum of all arguments */
>  -while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
>  +while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
> 
> /* global (all drivers) option handling */
> -   switch (c) {
> + switch (c) {
> 

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/28 09:04:12

Modified files:
graphics/rawstudio: Makefile 
Added files:
graphics/rawstudio/patches: patch-configure 

Log message:
Explicitly pick up and link in gthreads, because g_thread_init() is
called from the program.  Required with lld.  Also found in upstream.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 09:04:29

Modified files:
devel/llvm : Makefile 
devel/llvm/patches: patch-lib_Target_Sparc_SparcInstrInfo_td 
patch-tools_lld_ELF_Writer_cpp 
Added files:
devel/llvm/patches: patch-lib_Target_Sparc_SparcISelDAGToDAG_cpp 

Log message:
- Keep the STT_FILE symbol in the table so that we know what file was used to 
compile an object
- [Sparc] Fix addressing mode when using 64-bit values in inline assembly
- [Sparc] Use synthetic instruction clr to zero register instead of sethi

from Brad (maintainer)

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:57:32

Modified files:
textproc/zathura/core: Makefile distinfo 
textproc/zathura/core/pkg: PLIST 
textproc/zathura/plugins: Makefile.inc 
textproc/zathura/plugins/cb: Makefile distinfo 
textproc/zathura/plugins/cb/pkg: PLIST 
textproc/zathura/plugins/djvu: Makefile distinfo 
textproc/zathura/plugins/djvu/pkg: PLIST 
textproc/zathura/plugins/mupdf: Makefile distinfo 
textproc/zathura/plugins/mupdf/pkg: PLIST 
textproc/zathura/plugins/poppler: Makefile distinfo 
textproc/zathura/plugins/poppler/pkg: PLIST 
textproc/zathura/plugins/ps: Makefile distinfo 
textproc/zathura/plugins/ps/pkg: PLIST 
Added files:
textproc/zathura/plugins/mupdf/patches: patch-meson_build 

Log message:
Update to zathura 0.3.9 and its plugins:

- pdf-poppler-0.2.9
- pdf-mupdf-0.3.3
- ps-0.2.6
- djvu-0.2.8
- cb-0.1.8

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:55:47

Modified files:
x11/girara : Makefile distinfo 
x11/girara/pkg : PLIST 
Added files:
x11/girara/patches: patch-tests_meson_build 
Removed files:
x11/girara/patches: patch-Makefile 

Log message:
Update to girara 0.2.9.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:54:45

Modified files:
net/pear-Net-DNS2: Makefile distinfo 
net/pear-Net-DNS2/pkg: PLIST 

Log message:
Update to pear-Net-DNS2-1.4.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:53:46

Modified files:
net/p5-SNMP-Info: Makefile distinfo 
net/p5-SNMP-Info/pkg: PLIST 

Log message:
Update to p5-SNMP-Info-3.53.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 08:52:33

Modified files:
infrastructure/bin: make-plist 

Log message:
Found where FULLPKGNAME\-  was coming from... ahaha

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:46:44

Modified files:
net/miniupnp/minissdpd: Makefile distinfo 

Log message:
Update to minissdpd-1.4.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:46:32

Modified files:
x11: Makefile 

Log message:
+qt5ct, qt5styleplugins

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:45:21

Log message:
Import qt5ct 0.34.

This program allows users to configure Qt5 settings (theme, font, icons, 
etc.)
under DE/WM without Qt integration.

Set QT_QPA_PLATFORMTHEME=qt5ct in the environment to use it.

Helps me debugging a Qt5/Gtk+3 integration issue w/ qgis running on a
Gtk desktop environment..

ok rsadowski@

Status:

Vendor Tag: landry
Release Tags:   landry_20180428

N ports/x11/qt5ct/Makefile
N ports/x11/qt5ct/distinfo
N ports/x11/qt5ct/pkg/PLIST
N ports/x11/qt5ct/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:42:50

Log message:
Import qtstyleplugins-5.0.0.20170311.

Additional style plugins for Qt, previously shipped with Qt.

ok rsadowski@

Status:

Vendor Tag: landry
Release Tags:   landry_20180428

N ports/x11/qt5styleplugins/Makefile
N ports/x11/qt5styleplugins/distinfo
N ports/x11/qt5styleplugins/pkg/PLIST
N ports/x11/qt5styleplugins/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:40:26

Modified files:
sysutils/collectd: Makefile distinfo 
sysutils/collectd/patches: patch-Makefile_in 
   patch-src_processes_c 
sysutils/collectd/pkg: PLIST-main PLIST-memcachec PLIST-mysql 
   PLIST-nut PLIST-pgsql PLIST-python 
   PLIST-riemann PLIST-rrdtool PLIST-snmp 
   PLIST-virt 
Added files:
sysutils/collectd/patches: patch-src_libcollectdclient_server_c 
sysutils/collectd/pkg: DESCR-mqtt DESCR-ping DESCR-prometheus 
   DESCR-redis PLIST-mqtt PLIST-ping 
   PLIST-prometheus PLIST-redis 
Removed files:
sysutils/collectd/patches: patch-src_Makefile_in 
   patch-src_daemon_Makefile_in 
   patch-src_email_c patch-src_exec_c 
   patch-src_tcpconns_c 
   patch-src_unixsock_c 

Log message:
Update to collectd 5.8.0.

- Cf https://collectd.org/news.shtml#news106
- enable MQTT, Prometheus & Redis plugins
- remove .la files instead of @comment-ing them in PLISTs
- subpackage ping plugin so that ppl can avoid installing liboping (with
its setuid binary)

ok danj@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 08:39:20

Modified files:
infrastructure/bin: update-plist 

Log message:
those tests are mutually exclusive

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/04/28 08:38:07

Modified files:
x11/ctwm   : Makefile distinfo 
x11/ctwm/pkg   : PLIST 
Removed files:
x11/ctwm/patches: patch-Imakefile patch-gram.y patch-session.c 

Log message:
Update to ctwm-4.0.1

>From Markus Hennecke with input from rsadowski and Matthew Fuller.

OK danj

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:37:29

Modified files:
misc/gramps: Makefile distinfo 
misc/gramps/pkg: PLIST 

Log message:
Update to gramps-4.2.8.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:36:25

Modified files:
mail/p5-Email-MIME: Makefile distinfo 
mail/p5-Email-MIME/pkg: PLIST 

Log message:
Update to p5-Email-MIME-1.946.

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2018/04/28 08:36:20

Modified files:
misc/os-test   : Makefile 
misc/os-test/files: os-test.sh 
misc/os-test/pkg: DESCR 

Log message:
Do not build html page in os-test run automatically.  This should
be an extra step.  Rework generating and reading test lists, now
it is one item per line.  Move list creation from post-build to
pre-build.  Document how installed files work in package description.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 08:35:28

Modified files:
infrastructure/bin: update-plist 

Log message:
be MUCH smarter:
if we have two variables with the same value, this means we can't decide
which one to backsubst, so just DON'T add new backsubsts

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:32:52

Modified files:
graphics/p5-SVG: Makefile distinfo 

Log message:
Update to p5-SVG-2.84.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/28 08:29:30

Modified files:
net/liboping   : Makefile distinfo 
net/liboping/pkg: PLIST 
Added files:
net/liboping/patches: patch-src_liboping_c 

Log message:
Update to libopint 1.10.

Backport a fix for https://github.com/octo/liboping/issues/34

ok danj@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:29:16

Modified files:
geo/py-owslib  : Makefile distinfo 

Log message:
Update to py-owslib-0.16.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:28:55

Modified files:
geo/py-laspy   : Makefile distinfo 
Removed files:
geo/py-laspy/patches: patch-laspy_file_py 

Log message:
Update to py-laspy-1.5.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:23:54

Removed files:
editors/subtitleeditor/patches: 

patch-plugins_actions_keyframesmanagement_mediadecoder_h 

patch-plugins_actions_waveformmanagement_mediadecoder_h 

Log message:
Forgot to cvs rm.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:24:13

Modified files:
devel/tclap: Makefile distinfo 
devel/tclap/pkg: PLIST 

Log message:
Update to tclap-1.2.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:23:04

Modified files:
editors/subtitleeditor: Makefile distinfo 
editors/subtitleeditor/patches: patch-src_document_h 

Log message:
Update to subtitleeditor-0.54.0.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2018/04/28 08:22:05

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
revert, mixed up BUILDPKGPATH and FULLPKGPATH, update-plist won't be helped

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:22:02

Modified files:
devel/pear-Console-Table: Makefile distinfo 

Log message:
Update to pear-Console-Table-1.3.1.

update print/transfig

[Solene Rapenne]

Following diff updates print/transfig, so the port get synced with the
newer version of xfig


Index: Makefile
===
RCS file: /cvs/ports/print/transfig/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile24 Apr 2018 12:07:26 -  1.45
+++ Makefile28 Apr 2018 14:18:37 -
@@ -2,7 +2,7 @@

 COMMENT=   tools to convert Xfig's .fig files  #'

-VERSION=   3.2.6
+VERSION=   3.2.7
 DISTNAME=  fig2dev-${VERSION}
 EXTRACT_SUFX = .tar.xz
 PKGNAME=   transfig-${VERSION}
@@ -25,7 +25,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS = --enable-transfig
 CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include

-MAKE_FLAGS = bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps
+MAKE_FLAGS+= bitmapsdir=${LOCALBASE}/lib/X11/xfig/bitmaps

 FLAVORS=   a4
 FLAVOR?=
Index: distinfo
===
RCS file: /cvs/ports/print/transfig/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo24 Apr 2018 12:07:26 -  1.8
+++ distinfo28 Apr 2018 14:18:37 -
@@ -1,2 +1,2 @@
-SHA256 (fig2dev-3.2.6.tar.xz) = ij0X7aQdZzOvRP2IwY6J4Ekrnvg/BcJg+A/XGXDqrsA=
-SIZE (fig2dev-3.2.6.tar.xz) = 406288
+SHA256 (fig2dev-3.2.7.tar.xz) = 3kWBl1L2V6t+v/5KAvyZA40SSo82vjBVCyHvT6A6o6U=
+SIZE (fig2dev-3.2.7.tar.xz) = 508336
cvs server: Diffing patches
Index: patches/patch-fig2dev_Makefile_in
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_Makefile_in
--- patches/patch-fig2dev_Makefile_in   24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_Makefile_in   28 Apr 2018 14:18:37 -
@@ -3,22 +3,21 @@ $OpenBSD: patch-fig2dev_Makefile_in,v 1.
 Index: fig2dev/Makefile.in
 --- fig2dev/Makefile.in.orig
 +++ fig2dev/Makefile.in
-@@ -118,8 +118,7 @@ PROGRAMS = $(bin_PROGRAMS)
+@@ -128,7 +128,7 @@ PROGRAMS = $(bin_PROGRAMS)
  am_fig2dev_OBJECTS = arrow.$(OBJEXT) bound.$(OBJEXT) colors.$(OBJEXT) \
creationdate.$(OBJEXT) fig2dev.$(OBJEXT) free.$(OBJEXT) \
-   iso2tex.$(OBJEXT) localmath.$(OBJEXT) psfonts.$(OBJEXT) \
--  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT) \
--  getopt.$(OBJEXT)
-+  read1_3.$(OBJEXT) read.$(OBJEXT) trans_spline.$(OBJEXT)
+   iso2tex.$(OBJEXT) localmath.$(OBJEXT) read1_3.$(OBJEXT) \
+-  read.$(OBJEXT) trans_spline.$(OBJEXT) getopt.$(OBJEXT)
++  read.$(OBJEXT) trans_spline.$(OBJEXT)
  fig2dev_OBJECTS = $(am_fig2dev_OBJECTS)
  LIBOBJDIR = ../fig2dev/lib/
- fig2dev_DEPENDENCIES = $(LIBOBJS) dev/libdrivers.a
-@@ -365,7 +364,7 @@ fig2dev_SOURCES = alloc.h arrow.c bound.h bound.c colo
- iso2tex.c localmath.h localmath.c object.h psfonts.c read1_3.c read.h \
- read.c trans_spline.h trans_spline.c pi.h getopt.c
+ am__DEPENDENCIES_1 =
+@@ -390,7 +390,7 @@ fig2dev_SOURCES = alloc.h arrow.c bool.h bound.h bound
+ iso2tex.c localmath.h localmath.c object.h read1_3.c read.h read.c \
+ trans_spline.h trans_spline.c pi.h getopt.c

--fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a
-+fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv
+-fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a $(am__append_3)
++fig2dev_LDADD = $(LIBOBJS) dev/libdrivers.a -liconv $(am__append_3)
  dist_bin_SCRIPTS = fig2ps2tex pic2tpic
  all: all-recursive

Index: patches/patch-fig2dev_fig2dev_c
===
RCS file: /cvs/ports/print/transfig/patches/patch-fig2dev_fig2dev_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-fig2dev_fig2dev_c
--- patches/patch-fig2dev_fig2dev_c 24 Apr 2018 12:07:26 -  1.1
+++ patches/patch-fig2dev_fig2dev_c 28 Apr 2018 14:18:37 -
@@ -3,21 +3,12 @@ $OpenBSD: patch-fig2dev_fig2dev_c,v 1.1
 Index: fig2dev/fig2dev.c
 --- fig2dev/fig2dev.c.orig
 +++ fig2dev/fig2dev.c
-@@ -42,7 +42,7 @@
- #include 
- #endif
-
--extern int fig_getopt(int nargc, char **nargv, char *ostr);
-+#include 
- extern char   *optarg;
- extern int optind;
- static int parse_gridspec(char *string, float *numer, float *denom,
-@@ -208,7 +208,7 @@ get_args(int argc, char *argv[])
+@@ -221,7 +221,7 @@ get_args(int argc, char *argv[])
if (argc == 1)
-   fprintf(stderr,Usage,prog,prog);
+   fprintf(stderr, Usage, prog, prog);
/* sum of all arguments */
 -  while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
 +  while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {

  /* global (all drivers) option handling */
- switch (c) {
+   switch (c) {

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/28 08:18:47

Modified files:
devel/p5-Type-Tiny: Makefile distinfo 

Log message:
Update to p5-Type-Tiny-1.002001.