Re: [NEW] lang/duktape

2017-03-27 Thread Landry Breuil
On Mon, Mar 27, 2017 at 07:20:37AM +0200, Jeremie Courreges-Anglas wrote:
> Frederic Cambus  writes:
> 
> > Hi ports@,
> >
> > Here is a new port: lang/duktape
> >
> > Comments? OK?
> 
> The port looks fine, but I wonder what's the use for a cli-only
> javascript interpreter?

Fwiw, netsurf uses duktape :) but i think they bundle their own copy.



NEW: geo/p5-Geo-Coordinates-OSGB

2017-03-27 Thread Stuart Henderson
ok to import?

-- -- --
An implementation of co-ordinate conversion for England, Wales, and
Scotland based on formulae and data published by the Ordnance Survey of
Great Britain.

These modules convert accurately between coordinates given in latitude
and longitude and the OSGB national grid reference system (as used for
maps of England, Wales, and Scotland).

This code is fine tuned to the British national grid system. It is of
no use outside Britain. In fact it's only really useful in the areas
covered by the OS's main series of maps, which excludes the Channel
Islands and Northern Ireland.
-- -- --



p5-Geo-Coordinates-OSGB.tgz
Description: application/tar-gz


Re: [NEW] lang/duktape

2017-03-27 Thread Frederic Cambus
On Mon, Mar 27, 2017 at 10:14:18AM +0200, Landry Breuil wrote:

> > > Here is a new port: lang/duktape
> > >
> > > Comments? OK?
> > 
> > The port looks fine, but I wonder what's the use for a cli-only
> > javascript interpreter?
> 
> Fwiw, netsurf uses duktape :) but i think they bundle their own copy.

Indeed, it seems most project using Duktape simply bundle their own
copy, as it is distributed as a single C file.

I do find value in using the standalone interpreter to validate/debug
scripts.



NEW: editors/ktikz

2017-03-27 Thread Paul Irofti
Hi,

Here is a new port for KtikZ[0].

KtikZ is a small application helping you to create TikZ (from the LaTeX
pgf package) diagrams for your publications.


I need it for work and from my initial tests it seems that in its
current state the port has full functionality.

Possible changes:
- rename from KtikZ to qtikz, I chose the initial name because
  the author calls it that way (even though the binary is qtikz)
- fix the LIB_DEPENDS warning that says poppler is not needed
  even though the Makefile CFLAGS and LDFLAGS say otherwise (as
  does the INSTALL and homepage)
- find a away to ditch WRKDIST and MAKEOBJDIR hacks

I am quite happy to commit it without changing anything so I am also
asking for OKs.

Thanks,
Paul

[0] -- http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/


ktikz.tgz
Description: application/tar-gz


Re: NEW: editors/ktikz

2017-03-27 Thread Paul Irofti
Forgot to mention that this is also available on github.

https://github.com/jasperla/openbsd-wip/tree/master/editors/ktikz



Re: NEW: geo/p5-Geo-Coordinates-OSGB

2017-03-27 Thread Paul Irofti
On Mon, Mar 27, 2017 at 10:13:27AM +0100, Stuart Henderson wrote:
> ok to import?

OK

> 
> -- -- --
> An implementation of co-ordinate conversion for England, Wales, and
> Scotland based on formulae and data published by the Ordnance Survey of
> Great Britain.
> 
> These modules convert accurately between coordinates given in latitude
> and longitude and the OSGB national grid reference system (as used for
> maps of England, Wales, and Scotland).
> 
> This code is fine tuned to the British national grid system. It is of
> no use outside Britain. In fact it's only really useful in the areas
> covered by the OS's main series of maps, which excludes the Channel
> Islands and Northern Ireland.
> -- -- --
> 




Re: [Update] games/tome4 1.4.9 -> 1.5.1

2017-03-27 Thread Solene Rapenne
This is fine for me 

Le 23 mars 2017 14:56:21 GMT+01:00, Jeremie Courreges-Anglas  
a écrit :
>Jeremie Courreges-Anglas  writes:
>
>> Solene Rapenne  writes:
>>
>>> Hello,
>>
>> Hi,
>>
>>> Please find a patch to update games/tome4 to 1.5.1
>>>
>>> I updated patch-src_getself_c because the (Free)BSD code changed
>>> upstream and the previous patch wasn't applying anymore.
>>>
>>> I hope the patch doesn't get scrambled in the process.
>>
>> Ports-wise:
>>
>> - better use sysconf than yet another hand-rolled sysctl call -> the
>>   diff gets shorter.
>> - also in the updated diff below:
>>   - add V to SUBST_VARS and regen PLIST.  You'll get less changes
>when
>> updating later.
>>   - drops REVISION-foo (this should be done when updating to a newer
>> version)
>>   - rm a patched fine remnant
>
>After further discussion with Solene:
>- kill the example modules
>- add a MASTER_SITES mirror hosted by Solene, to provide a fallback if
>  upstream keeps on altering existing release tarballs.
>
>
>Index: Makefile
>===
>RCS file: /d/cvs/ports/games/tome4/Makefile,v
>retrieving revision 1.4
>diff -u -p -r1.4 Makefile
>--- Makefile   3 Mar 2017 21:29:00 -   1.4
>+++ Makefile   23 Mar 2017 13:30:31 -
>@@ -3,15 +3,13 @@
> COMMENT-main =graphical sdl rogue-like game
> COMMENT-data =data for Tales of Maj'Eyal
> 
>-V =   1.4.9
>+V =   1.5.1
> PKGNAME-main =tome4-${V}
> PKGNAME-data =tome4-data-${V}
> CATEGORIES =  games x11
> 
>-REVISION-main =   0
>-REVISION-data =   0
>-
>-MASTER_SITES =http://te4.org/dl/t-engine/
>+MASTER_SITES =http://te4.org/dl/t-engine/ \
>+  http://distfiles-openbsd.perso.pw/
> DISTNAME =t-engine4-src-${V}
> EXTRACT_SUFX =.tar.bz2
> HOMEPAGE =http://te4.org
>@@ -39,9 +37,6 @@ RUN_DEPENDS-main =   games/tome4,-data
> LIB_DEPENDS-data =
> WANTLIB-data =
> 
>-GAMEDIR = ${PREFIX}/share/tome4
>-SUBST_VARS =  GAMEDIR
>-
> # The build system hardcodes the use of the "gcc" command
> MODULES = gcc4
> MODGCC4_ARCHS =   *
>@@ -52,6 +47,9 @@ USE_GMAKE =  YES
> MAKE_FLAGS =  verbose=1
> MAKE_ENV =config=release
> 
>+GAMEDIR = ${PREFIX}/share/tome4
>+SUBST_VARS += GAMEDIR V
>+
> do-configure:
>   sed -i 's/gcc /${CC} /g' ${WRKSRC}/build/te4core.lua
>   ${SUBST_CMD} ${WRKSRC}/src/getself.c
>@@ -62,6 +60,7 @@ do-install:
>   ${INSTALL_PROGRAM} ${WRKSRC}/t-engine ${PREFIX}/bin/tome4
>   ${INSTALL_DATA_DIR} ${GAMEDIR}
>   cd ${WRKSRC}; tar cf - bootstrap game | tar xf - -C ${GAMEDIR}
>-
>+  rm -R ${GAMEDIR}/game/modules/example*
>+  rm ${GAMEDIR}/bootstrap/boot.lua.orig
> 
> .include 
>Index: distinfo
>===
>RCS file: /d/cvs/ports/games/tome4/distinfo,v
>retrieving revision 1.1.1.1
>diff -u -p -r1.1.1.1 distinfo
>--- distinfo   28 Dec 2016 18:34:57 -  1.1.1.1
>+++ distinfo   20 Mar 2017 17:21:47 -
>@@ -1,2 +1,2 @@
>-SHA256 (t-engine4-src-1.4.9.tar.bz2) =
>tKcX/jyN0qgithNCXs5iz7q9TEXn5vbg+8ToGx6oAjE=
>-SIZE (t-engine4-src-1.4.9.tar.bz2) = 354443574
>+SHA256 (t-engine4-src-1.5.1.tar.bz2) =
>er5VbR72iQ0WrlO4KSwQWSVDopR6QCS7mjtnARp00Lg=
>+SIZE (t-engine4-src-1.5.1.tar.bz2) = 421336208
>Index: patches/patch-src_getself_c
>===
>RCS file: /d/cvs/ports/games/tome4/patches/patch-src_getself_c,v
>retrieving revision 1.1.1.1
>diff -u -p -r1.1.1.1 patch-src_getself_c
>--- patches/patch-src_getself_c28 Dec 2016 18:34:57 -  1.1.1.1
>+++ patches/patch-src_getself_c20 Mar 2017 17:49:13 -
>@@ -1,29 +1,17 @@
>-$OpenBSD: patch-src_getself_c,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp
>$
> src/getself.c.origThu Jan  7 20:09:06 2016
>-+++ src/getself.c Tue Nov 29 16:38:12 2016
>-@@ -47,7 +47,8 @@ const char *get_self_executable(int argc, char
>**argv)
>+--- src/getself.c.origWed Mar  8 18:20:39 2017
> src/getself.c Mon Mar 20 18:46:27 2017
>+@@ -47,13 +47,7 @@ int get_number_cpus()
>+ const char *get_self_executable(int argc, char **argv)
>+ {
>   static char res[PATH_MAX];
>-  // Like linux, but /proc is not always mounted
>-  //  return 0 if it's not
>-- if (realpath("/proc/curproc/file", res)) return NULL;
>-+ //if (realpath("/proc/curproc/file", res)) return NULL;
>+- int mib[4];
>+- mib[0] = CTL_KERN;
>+- mib[1] = KERN_PROC;
>+- mib[2] = KERN_PROC_PATHNAME;
>+- mib[3] = -1;
>+- size_t cb = sizeof(res);
>+- sysctl(mib,4,res,&cb,NULL,0);
> + realpath("${GAMEDIR}/", res);
>   return res;
>- }
>- 
>-@@ -57,8 +58,14 @@ int get_number_cpus()
>- {
>-  int count;
>-  size_t size=sizeof(count);
>-+ int name[2];
>-+ name[0] = CTL_HW;
>-+ name[1] = HW_NCPU;
>-  
>-- if (sysctlbyname("hw.ncpu",&count,&size,NULL,0)) return 1;
>-+ if (sysc

Re: NEW: editors/ktikz

2017-03-27 Thread Paul Irofti
New version with fixes suggested by sthen:
- desktop and mime updates
- LIB_DEPENDS warning is gone by adding poppler to WANTLIB
Thanks!


ktikz.tgz
Description: application/tar-gz


Re: make an additional category in ports tree

2017-03-27 Thread Marc Espie
On Fri, Mar 17, 2017 at 05:12:51PM +0300, Sergey Bronnikov wrote:
> OpenBSD ports contains many applications useful for different kinds of
> testing: load, performance, functional, fuzzing etc.
> Load and performance tests locate in benchmarks subdir mostly,
> but other tests locate in different subdirectories:
> sysutils, net, misc, x11 and it is a bit difficult to list
> all such tests ported to OpenBSD.
> 
> Is is possible to introduce new category for this kind of applications?
> I believe it would be useful not for me only.
> 
> Sergey

Call it test, rather.

We moved from REGRESS* to TEST* in the variables. Mostly cosmetic, but test
is easier to type and figure out, and may encompass slightly more than
non-regression tests.

(I was never too fond of regress, since it implies things will fail)



Re: Question about updating packages

2017-03-27 Thread Marc Espie
On Mon, Mar 20, 2017 at 08:57:42PM -0500, mitchell wodach wrote:
> Someone correct me if I'm wrong but wouldn't you want to pkg_add -Uu. Which
> updates dependent packages also?

Nope.

pkg_add -U  exists for when you want to install a package in a hurry,
and don't want to update your whole base of installed packages (roughly
500 packages on my current laptop)

Saved our collective asses lots of time, say you run current, realize you
forgot to install magicpoint, and do a pkg_add magicpoint... figure out 
nothing matches, decide to do a pkg_add -u first, and then wait for 2 hours
until you updated the whole of texlive and the rest of your system.

So, this is exactly how pkg_add -U was born, and the scenario becomes
pkg_add -U magicpoint
which will only update the dependency tree leading to magicpoint (e.g.,
freetype), then install magicpoint and let you get a shiny new magicpoint 
in about 1 minute, knowing full well, you will reserve a few hours to 
get texlive updated later.



UPDATE: net/prosody 0.9.12

2017-03-27 Thread Henrik Friedrichsen
Attached patch updates net/prosody to 0.9.12.

Some patches in the ports tree were merged upstream so can be removed.

The update includes bug fixes.

OK?
Index: Makefile
===
RCS file: /cvs/ports/net/prosody/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile16 May 2016 12:11:48 -  1.43
+++ Makefile27 Mar 2017 17:20:53 -
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.43 2016/05/16 12:11:48 jca Exp $
 
 COMMENT=   communications server for Jabber/XMPP written in Lua
-DISTNAME=  prosody-0.9.10
-REVISION=  2
+DISTNAME=  prosody-0.9.12
 CATEGORIES=net
 MASTER_SITES=  http://prosody.im/downloads/source/
 
@@ -29,7 +28,7 @@ SUBST_VARS+=  FLAVOR MAKE_PROGRAM
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--sysconfdir="${SYSCONFDIR}/prosody" \
-   --datadir="/var/prosody" \
+   --datadir="${VARBASE}/prosody" \
--with-lua="${LOCALBASE}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
--c-compiler="${CC}" \
Index: distinfo
===
RCS file: /cvs/ports/net/prosody/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo29 Jan 2016 12:13:55 -  1.12
+++ distinfo27 Mar 2017 17:20:53 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.9.10.tar.gz) = SDbu/tTZu7Yyy6JKxb2Om8fAKaedBghLAP/HCFjRZi8=
-SIZE (prosody-0.9.10.tar.gz) = 267380
+SHA256 (prosody-0.9.12.tar.gz) = GlmjIrcZKKIZhVIqoA0OqzVSII17+eyzGFQqGy/uPo0=
+SIZE (prosody-0.9.12.tar.gz) = 267869
Index: patches/patch-certs_Makefile
===
RCS file: /cvs/ports/net/prosody/patches/patch-certs_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-certs_Makefile
--- patches/patch-certs_Makefile11 Jan 2016 12:11:36 -  1.5
+++ patches/patch-certs_Makefile27 Mar 2017 17:20:53 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-certs_Makefile,v 1.5 2016/01/11 12:11:36 sthen Exp $
 certs/Makefile.origFri Jan  8 13:07:07 2016
-+++ certs/Makefile Mon Jan 11 12:01:57 2016
+--- certs/Makefile.origMon Dec  5 13:54:23 2016
 certs/Makefile Mon Mar 27 19:18:16 2017
 @@ -2,13 +2,13 @@
  keysize=2048
  
@@ -19,11 +19,9 @@ $OpenBSD: patch-certs_Makefile,v 1.5 201
  # to generate a self signed certificate.
  
  .PRECIOUS: %.cnf %.key
-@@ -27,4 +27,6 @@ keysize=2048
- 
+@@ -28,3 +28,5 @@ keysize=2048
  %.key:
umask 0077 && openssl genrsa -out $@ $(keysize)
--  @chmod 400 $@ -c
-+  @chmod 400 $@
+   @chmod 400 $@
 +  @chown _prosody $@ || \
 +  echo "***WARNING***: You will need to 'chown _prosody $@'"
Index: patches/patch-prosody
===
RCS file: patches/patch-prosody
diff -N patches/patch-prosody
--- patches/patch-prosody   24 Mar 2016 12:28:42 -  1.6
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-prosody,v 1.6 2016/03/24 12:28:42 jca Exp $
 prosody.orig   Wed Jan 27 14:06:11 2016
-+++ prosodyWed Mar 23 09:11:59 2016
-@@ -43,6 +43,11 @@ if CFG_DATADIR then
-   end
- end
- 
-+-- luasec 0.6 fix
-+_G.ssl = require("ssl");
-+_G.ssl.context = require("ssl.context");
-+_G.ssl.x509 = require("ssl.x509");
-+
- -- Global 'prosody' object
- local prosody = { events = require "util.events".new(); };
- _G.prosody = prosody;


UPDATE: Varnish-5.1.1

2017-03-27 Thread Gonzalo L. Rodriguez
Hello,

Update for Varnish to 5.1.1:

https://www.varnish-cache.org/docs/trunk/whats-new/changes-5.1.html

Ok? Comments?

Cheers.-

-- 
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/varnish/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile16 Mar 2017 15:44:06 -  1.28
+++ Makefile27 Mar 2017 18:04:43 -
@@ -2,7 +2,7 @@
 
 COMMENT =  high-performance HTTP accelerator
 
-DISTNAME = varnish-5.1.0
+DISTNAME = varnish-5.1.1
 CATEGORIES =   www
 
 SHARED_LIBS =  varnishapi  1.0
Index: distinfo
===
RCS file: /cvs/ports/www/varnish/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo16 Mar 2017 15:44:06 -  1.13
+++ distinfo27 Mar 2017 18:04:43 -
@@ -1,2 +1,2 @@
-SHA256 (varnish-5.1.0.tar.gz) = vYyGp0kuvV4ss4aIg8ryt8EHuc7oaWgHfYw2tQrm5Zk=
-SIZE (varnish-5.1.0.tar.gz) = 2589085
+SHA256 (varnish-5.1.1.tar.gz) = b0uFtSqCfyizlk++ahEpbi7VAVbHDVEcEP7/GUWUk64=
+SIZE (varnish-5.1.1.tar.gz) = 2589250


Update databases/ruby-pg 0.19.0 -> 0.20.0

2017-03-27 Thread Jeremy Evans
Simple update to latest version of ruby-pg.  Only a small number of
bugfixes:

- Update error codes to PostgreSQL-9.6
- Use secure JSON methods for JSON (de)serialisation
- Fix Result#inspect on a cleared result

Tested on amd64.  Will be committing in a couple days unless I hear
objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/databases/ruby-pg/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile4 Nov 2016 21:26:37 -   1.33
+++ Makefile15 Mar 2017 20:59:16 -
@@ -2,8 +2,7 @@
 
 COMMENT =  PostgreSQL database interface for ruby
 
-DISTNAME = pg-0.19.0
-REVISION = 0
+DISTNAME = pg-0.20.0
 CATEGORIES =   databases
 
 MAINTAINER =   Jeremy Evans 
Index: distinfo
===
RCS file: /cvs/ports/databases/ruby-pg/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo25 Sep 2016 15:23:32 -  1.19
+++ distinfo15 Mar 2017 20:59:18 -
@@ -1,2 +1,2 @@
-SHA256 (pg-0.19.0.gem) = knxBxdEDkiwbJJJBmALukgV6USLHpFBk4xs50I7Y9C4=
-SIZE (pg-0.19.0.gem) = 228864
+SHA256 (pg-0.20.0.gem) = hV96D4souy73HBs7BWEr5VFFLb3CdRmQjl05oyV/rA8=
+SIZE (pg-0.20.0.gem) = 230400



Re: [update] textproc/multimarkdown

2017-03-27 Thread attila

attila  writes:

> attila  writes:
>
>> attila  writes:
>>
>>> attila  writes:
>>>
 Michael McConville  writes:

> attila wrote:
>> Ping.
>>
>> Just tested that the diff works against recentish i386 snap (22 May).
>> Patch attached.
>
> I can't comment on all of the changes, but this builds and runs fine for
> me.
>

 Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
 Aug.  It shuffles the patches around because the source tree was
 rearranged and adds support for tests.  Sadly, the tests don't all
 pass.  I think I need a t-dep for something LaTeXish but I'm not sure
 what is best, nor am I sure if that's the only reason for the
 failures.  If anyone has a spare cycle or two to look at it I'd
 appreciate it.  If not I'll get back to it by the end of the week.

 Pax, -A
>>>
>>> I finally got back to this.  It turns out there wasn't much standing
>>> in the way of the tests working other than me.  Attached is a patch
>>> that brings textproc/multimarkdown up to the latest release (5.4.0
>>> released 5 Aug).  Notable changes:
>>>
>>> * Switched to CMake;
>>> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
>>> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
>>>   I might get them upstream;
>>> * Added pledge;
>>> * make test now passes all tests.
>>>
>>> Tested on amd64.
>>>
>>> Comments, feedback most welcome.
>>>
>>> Pax, -A
>>
>> Ping.
>
> I reinstated the strcat/sprintf-related patches but done slightly
> better.  Tests pass on amd64.  Updated patch attached.
>
> Feedback, comments most welcome.
>
> Pax, -A

Finally getting back to this.  Version 5.4.0 is still the latest
stable release (6.0.x exists but is considered beta).  Just tried my
update on the most recent snap and it passess tests and seems to work
for me.  Patch attached.

Feedback most welcome.

Pax, -A
--
https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
Index: Makefile
===
RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	5 Apr 2015 13:31:15 -	1.2
+++ Makefile	1 Oct 2016 18:11:36 -
@@ -1,34 +1,45 @@
 # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $
 
-V =		4.7.1
+V =		5.4.0
 COMMENT =	marked-up plain text to formatted document converter
 DISTNAME =	${GH_PROJECT}-${V}
-PKGNAME =	multimarkdown-${V}
+PKGNAME =	multimarkdown-${V:C/-/./}
 CATEGORIES =	textproc
 
 GH_ACCOUNT =	fletcher
-GH_PROJECT =	MultiMarkdown-4
+GH_PROJECT =	MultiMarkdown-5
 GH_TAGNAME =	${V}
 
+TESTS_COMMIT =	8d5ad66e3bbaeb0de8646783bfe964261ddb39c7
+DIST_SUBDIR =	multimarkdown
+MASTER_SITES_GITHUB =	https://github.com/fletcher/MMD-Test-Suite/archive/
+DISTFILES =	${DISTNAME}${EXTRACT_SUFX} ${TESTS_COMMIT}${EXTRACT_SUFX}
 HOMEPAGE =	http://fletcherpenney.net/multimarkdown/
 MAINTAINER =	Sean Levy 
 
 # Dual licensed: MIT and GPLv2+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB += c
+# uses pledge()
+WANTLIB += 	c
 
 BUILD_DEPENDS =	devel/greg
 
-USE_GMAKE =	Yes
-ALL_TARGET =	ALL
-MAKE_FLAGS =	CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \
-		GREG=${LOCALBASE}/bin/greg
+MODULES =	devel/cmake
 
-# Test files aren't included in distfile.
-NO_TEST =	Yes
+CFLAGS +=	-DHAVE_SRAND_DETERMINISTIC
+
+CONFIGURE_ARGS += -DGREG=${LOCALBASE}/bin/greg
+
+post-extract:
+	rm -rf ${WRKSRC}/submodules/MarkdownTest
+	cp -r ${WRKDIR}/MMD-Test-Suite-${TESTS_COMMIT} \
+		${WRKSRC}/submodules/MarkdownTest
+
+pre-configure:
+	touch ${WRKBUILD}/README.html
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKBUILD}/multimarkdown ${PREFIX}/bin/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	24 Mar 2015 19:16:13 -	1.1.1.1
+++ distinfo	1 Oct 2016 18:11:36 -
@@ -1,2 +1,4 @@
-SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU=
-SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896
+SHA256 (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = xGdoX+aZ/y+8ND+LXK24XSgNCccYJV9S6qAW2NI/DKw=
+SHA256 (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = HMA4X/1sghwmXpcPgcxOwAnH7Lv7EuDhFce7WzPQmoM=
+SIZE (multimarkdown/8d5ad66e3bbaeb0de8646783bfe964261ddb39c7.tar.gz) = 185408
+SIZE (multimarkdown/MultiMarkdown-5-5.4.0.tar.gz) = 136693
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt	1 Oct 2016 18:11:36 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Use installed greg
+--- CMakeLis

[UPDATE] graphics/cstitch 0.9.7 => 0.9.8

2017-03-27 Thread mulander
Hi ports@,

attaching a trivial bump for graphics/cstitch.

Please note that upstream bumped the version number post tagging the actual
release hence the 'About' menu still shows version 0.9.7.83 instead of 0.9.8.84
I can of course @sed the version in main.cpp if someone finds this annoying.

Looking for feedback and OK's :)

Regards,
Adam

Commit post tagging:
https://github.com/kleintom/Cstitch/commit/d9a8b1fbc9b66de3ce5990cebdde26acea8b1a3f

Upstream changelog:

---
Beta version 0.9.8 released on March 20, 2017:
* Added options during pattern saving for specifying the width of a color border
  around each symbol in the pdf pattern, and for specifying how often the
  bold/heavier lines should appear in the pdf pattern grid.
* DMC/Anchor color codes and names are now displayed in the main windows
(instead
  of RGB).
* Added the ability to specify fabric of a particular squares per inch/cm in the
  dimensions computer.
* We should now do better at finding a pdf viewer to auto-display saved pdf
  patterns.
* More settings are remembered so that they don't need to be reconfigured each
  time the program is run.
* Bug fixes.

This is the first version for which the downloadable executable for Windows does
not run on Windows XP.
---

? cstitch-0.9.8.diff
Index: Makefile
===
RCS file: /cvs/ports/graphics/cstitch/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile25 Dec 2016 14:34:39 -  1.3
+++ Makefile27 Mar 2017 20:27:43 -
@@ -4,8 +4,7 @@ COMMENT =   convert images to cross stitc
 
 GH_ACCOUNT =   kleintom
 GH_PROJECT =   cstitch
-GH_TAGNAME =   0.9.7
-REVISION = 0
+GH_TAGNAME =   0.9.8
 
 DISTFILES= ${DISTNAME}.tar.gz ${DISTNAME}-icons{icons}.zip:0
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/cstitch/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo15 Mar 2016 21:45:11 -  1.1.1.1
+++ distinfo27 Mar 2017 20:27:43 -
@@ -1,4 +1,4 @@
-SHA256 (cstitch-0.9.7-icons.zip) = k5Daa+IY6tOF8dV4kRKLyOWT+XooYCbbfgUpyjywJOI=
-SHA256 (cstitch-0.9.7.tar.gz) = rsAWrdnuz0OjnVVqVu3NDhRJeeKcOlBMCKtNml4MVHg=
-SIZE (cstitch-0.9.7-icons.zip) = 45348
-SIZE (cstitch-0.9.7.tar.gz) = 330707
+SHA256 (cstitch-0.9.8-icons.zip) = k5Daa+IY6tOF8dV4kRKLyOWT+XooYCbbfgUpyjywJOI=
+SHA256 (cstitch-0.9.8.tar.gz) = 5Ce4+jjlmAtUN7d+6XPBxNHWZXIvGJztukuqrsKlkkk=
+SIZE (cstitch-0.9.8-icons.zip) = 45348
+SIZE (cstitch-0.9.8.tar.gz) = 337685


Re: make an additional category in ports tree

2017-03-27 Thread Sergey Bronnikov
On 14:50 Mon 27 Mar , Marc Espie wrote:
> On Fri, Mar 17, 2017 at 05:12:51PM +0300, Sergey Bronnikov wrote:
> > OpenBSD ports contains many applications useful for different kinds of
> > testing: load, performance, functional, fuzzing etc.
> > Load and performance tests locate in benchmarks subdir mostly,
> > but other tests locate in different subdirectories:
> > sysutils, net, misc, x11 and it is a bit difficult to list
> > all such tests ported to OpenBSD.
> > 
> > Is is possible to introduce new category for this kind of applications?
> > I believe it would be useful not for me only.
> > 
> > Sergey
> 
> Call it test, rather.

Attached updated patch.

> We moved from REGRESS* to TEST* in the variables. Mostly cosmetic, but test
> is easier to type and figure out, and may encompass slightly more than
> non-regression tests.
> 
> (I was never too fond of regress, since it implies things will fail)
diff --git a/devel/afl/Makefile b/devel/afl/Makefile
index 0ea5ac6..693f150 100644
--- a/devel/afl/Makefile
+++ b/devel/afl/Makefile
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= i386 amd64
 COMMENT=   instrumented fuzzer
 DISTNAME=  afl-2.39b
 EXTRACT_SUFX=  .tgz
-CATEGORIES=devel
+CATEGORIES=devel test
 
 HOMEPAGE=  http://lcamtuf.coredump.cx/afl
 MASTER_SITES=  ${HOMEPAGE}/releases/
diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
index 34896c9..391ca88 100644
--- a/devel/csmith/Makefile
+++ b/devel/csmith/Makefile
@@ -5,7 +5,7 @@ COMMENT=fuzzer for C compilers
 DISTNAME=  csmith-2.2.0
 REVISION=  0
 
-CATEGORIES=devel
+CATEGORIES=devel test
 
 MAINTAINER=Daniel Dickman 
 
diff --git a/misc/vttest/Makefile b/misc/vttest/Makefile
index 6ee7716..c4ce20f 100644
--- a/misc/vttest/Makefile
+++ b/misc/vttest/Makefile
@@ -3,7 +3,7 @@
 COMMENT=   test VT100-type terminal
 
 DISTNAME=  vttest-20140305
-CATEGORIES=misc
+CATEGORIES=misc test
 HOMEPAGE=  http://invisible-island.net/vttest/vttest.html
 
 MAINTAINER=Christian Weisgerber 
diff --git a/misc/zzuf/Makefile b/misc/zzuf/Makefile
index dfc53ae..67a7fa6 100644
--- a/misc/zzuf/Makefile
+++ b/misc/zzuf/Makefile
@@ -7,7 +7,7 @@ COMMENT=transparent application input fuzzer
 VERSION=   0.14
 DISTNAME=  zzuf-${VERSION}
 REVISION=  0
-CATEGORIES=misc security
+CATEGORIES=misc security test
 
 MAINTAINER=Michael McConville 
 
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 0aedcb2..f3dc68a 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -4,7 +4,7 @@ COMMENT=tool for measuring maximum TCP and UDP bandwidth
 
 DISTNAME=  iperf-2.0.5
 REVISION=  4
-CATEGORIES=net
+CATEGORIES=net test
 
 HOMEPAGE=  http://sourceforge.net/projects/iperf/
 
diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile
index cf3bdd1..d3a38e8 100644
--- a/net/iperf3/Makefile
+++ b/net/iperf3/Makefile
@@ -12,7 +12,7 @@ GH_TAGNAME=   ${V}
 
 SHARED_LIBS += iperf0.0  # 0.0
 
-CATEGORIES=net
+CATEGORIES=net regress
 
 HOMEPAGE=  http://software.es.net/iperf/
 
diff --git a/security/isic/Makefile b/security/isic/Makefile
index 2ef1f76..a7417cf 100644
--- a/security/isic/Makefile
+++ b/security/isic/Makefile
@@ -4,7 +4,7 @@ COMMENT=IP stack integrity checker
 
 DISTNAME=  isic-0.07
 REVISION = 0
-CATEGORIES=security
+CATEGORIES=security regress
 
 HOMEPAGE=  http://isic.sourceforge.net/
 
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
index f878169..9b02b5b 100644
--- a/sysutils/crashme/Makefile
+++ b/sysutils/crashme/Makefile
@@ -7,7 +7,7 @@ DISTNAME =  crashme-2.4
 
 REVISION = 1
 
-CATEGORIES =   sysutils
+CATEGORIES =   sysutils test
 
 # BSD
 PERMIT_PACKAGE_CDROM = without fee
diff --git a/sysutils/fsstress/Makefile b/sysutils/fsstress/Makefile
index 1de77a9..d2e4d33 100644
--- a/sysutils/fsstress/Makefile
+++ b/sysutils/fsstress/Makefile
@@ -5,7 +5,7 @@ COMMENT=file system/VFS layer stress tester
 DISTNAME=  fsstress-1.0
 REVISION = 1
 EXTRACT_SUFX=  .tgz
-CATEGORIES=sysutils
+CATEGORIES=sysutils regress
 
 MAINTAINER=Bob Beck 
 
diff --git a/sysutils/iogen/Makefile b/sysutils/iogen/Makefile
index cfae980..1a392c7 100644
--- a/sysutils/iogen/Makefile
+++ b/sysutils/iogen/Makefile
@@ -8,7 +8,7 @@ GH_TAGNAME= IOGEN_${V:S/./_/g}
 GH_ACCOUNT=conformal
 GH_PROJECT=iogen
 DISTNAME=  ${GH_PROJECT}-${V}
-CATEGORIES=sysutils
+CATEGORIES=sysutils test
 
 HOMEPAGE=  https://github.com/conformal/iogen
 
diff --git a/sysutils/memtest86+/Makefile b/sysutils/memtest86+/Makefile
index fd239c3..cb9a0b7 100644
--- a/sysutils/memtest86+/Makefile
+++ b/sysutils/memtest86+/Makefile
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386
 COMMENT=   thorough, stand alone memory test
 VE

Re: NEW: sysutils/pick

2017-03-27 Thread mitchell wodach
builds and runs fine on amd64.

On Fri, Mar 17, 2017 at 3:37 AM, Anton Lindqvist
 wrote:
> On Thu, Mar 16, 2017 at 10:57:18PM -0600, Anthony J. Bentley wrote:
>> Anton Lindqvist writes:
>> > On Mon, Mar 06, 2017 at 08:54:36PM +0100, Anton Lindqvist wrote:
>> > > The pick(1) utility allows users to select from a set of choices using
>> > > an interface with fuzzy search functionality. The choices are read from
>> > > stdin, and the selected choice written to stdout.
>> > >
>> > > I'm a contributor and maintainer of pick. This port has been
>> > > submitted[1] earlier but not committed. I've talked to Mike about this
>> > > re-submission and on taking over as the maintainer. Notable changes
>> > > since the last submission: pledge:d and a test-suite is in place.
>> > >
>> > > https://github.com/calleerlandsson/pick
>> > >
>> > > [1] http://marc.info/?l=openbsd-ports&m=142547614218768&w=2
>> >
>> > Ping
>>
>> This will need a @conflict with mail/nmh.
>
> Already present:
>
> $ cat pkg/PLIST
> @comment $OpenBSD$
> @conflict nmh-*
> @bin bin/pick
> @man man/man1/pick.1
>



Re: UPDATE: textproc/discount 2.1.8a -> 2.2.2

2017-03-27 Thread Jeremie Courreges-Anglas
Daniel Jakots  writes:

> On Fri, 27 Jan 2017 03:03:24 +0400, Andrey Elizarov
>  wrote:
>
>> Hi ports@,
>> 
>> update discount to most recent 2.2.2 version.
>> Now with GitHub's "fencedcode" support! :)
>> Working on amd64.
>
> This diff was done against -stable tree. Here's one done against
> current (not tested).

Looks like no one picked up your updated diff.  ok jca@ if you feel like
committing it.

> Cheers,
> Daniel
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/discount/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile  2 Sep 2016 22:20:50 -   1.13
> +++ Makefile  26 Jan 2017 23:12:41 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =fast C implementation of Markdown
>  
> -DISTNAME =   discount-2.2.0
> +DISTNAME =   discount-2.2.2
>  
>  CATEGORIES = textproc
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/discount/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  2 Sep 2016 22:20:50 -   1.5
> +++ distinfo  26 Jan 2017 23:12:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (discount-2.2.0.tar.bz2) = 
> slOVwpwsCINhmesuroe1bmtUXnf1+/khZ4qh3A3aufM=
> -SIZE (discount-2.2.0.tar.bz2) = 88387
> +SHA256 (discount-2.2.2.tar.bz2) = 
> 7HkWcx4++FFjNjM/i3qp4q9R5XwAF7HgP6Q/G6aXj2Q=
> +SIZE (discount-2.2.2.tar.bz2) = 89288
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/textproc/discount/patches/patch-Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile_in
> --- patches/patch-Makefile_in 16 Jun 2015 12:14:43 -  1.4
> +++ patches/patch-Makefile_in 26 Jan 2017 23:12:41 -
> @@ -1,16 +1,16 @@
>  $OpenBSD: patch-Makefile_in,v 1.4 2015/06/16 12:14:43 jca Exp $
>  Makefile.in.orig Sat Jun 13 15:27:59 2015
> -+++ Makefile.in  Sat Jun 13 15:28:45 2015
> -@@ -9,7 +9,7 @@ MANDIR=@mandir@
> - LIBDIR=@libdir@
> +--- Makefile.in.orig Wed Jan 18 21:42:06 2017
>  Makefile.in  Thu Jan 26 18:11:47 2017
> +@@ -10,7 +10,7 @@ LIBDIR=@libdir@
>   INCDIR=@prefix@/include
> + @MK_PKGCONFIG@PKGDIR=$(LIBDIR)/pkgconfig
>   
>  -PGMS=markdown
>  +PGMS=discount
>   SAMPLE_PGMS=mkd2html makepage
>   @THEME@SAMPLE_PGMS+= theme
>   MKDLIB=libmarkdown
> -@@ -52,7 +52,8 @@ install.man:
> +@@ -56,7 +56,8 @@ install.man:
>   @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7
>   @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7
>   @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
> @@ -20,7 +20,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2015/0
>   
>   install.everything: install install.man
>   
> -@@ -84,8 +85,8 @@ blocktags: mktags
> +@@ -91,8 +92,8 @@ blocktags: mktags
>   mkd2html:  mkd2html.o $(MKDLIB) mkdio.h
>   $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
>   
> Index: patches/patch-markdown_3
> ===
> RCS file: /cvs/ports/textproc/discount/patches/patch-markdown_3,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-markdown_3
> --- patches/patch-markdown_3  2 Sep 2016 22:20:50 -   1.4
> +++ patches/patch-markdown_3  26 Jan 2017 23:12:41 -
> @@ -1,7 +1,7 @@
>  $OpenBSD: patch-markdown_3,v 1.4 2016/09/02 22:20:50 jasper Exp $
>  markdown.3.orig  Sun Feb 21 17:11:34 2016
> -+++ markdown.3   Fri Sep  2 23:18:46 2016
> -@@ -130,7 +130,7 @@ and
> +--- markdown.3.orig  Wed Jan 18 21:42:06 2017
>  markdown.3   Thu Jan 26 18:11:47 2017
> +@@ -131,7 +131,7 @@ and
>   .Fn mkd_string
>   functions return a MMIOT* on success, null on failure.
>   .Sh SEE ALSO
>

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



Re: [update] textproc/multimarkdown

2017-03-27 Thread Micah Muer


On Mon, Mar 27, 2017, at 11:27, attila wrote:
> 
> attila  writes:
> 
> > attila  writes:
> >
> >> attila  writes:
> >>
> >>> attila  writes:
> >>>
>  Michael McConville  writes:
> 
> > attila wrote:
> >> Ping.
> >>
> >> Just tested that the diff works against recentish i386 snap (22 May).
> >> Patch attached.
> >
> > I can't comment on all of the changes, but this builds and runs fine for
> > me.
> >
> 
>  Attached is an update that brings us from 4.7.1 to 5.4.0, released 8
>  Aug.  It shuffles the patches around because the source tree was
>  rearranged and adds support for tests.  Sadly, the tests don't all
>  pass.  I think I need a t-dep for something LaTeXish but I'm not sure
>  what is best, nor am I sure if that's the only reason for the
>  failures.  If anyone has a spare cycle or two to look at it I'd
>  appreciate it.  If not I'll get back to it by the end of the week.
> 
>  Pax, -A
> >>>
> >>> I finally got back to this.  It turns out there wasn't much standing
> >>> in the way of the tests working other than me.  Attached is a patch
> >>> that brings textproc/multimarkdown up to the latest release (5.4.0
> >>> released 5 Aug).  Notable changes:
> >>>
> >>> * Switched to CMake;
> >>> * Ditched the patches I tried and failed to upstream (strcat/sprintf);
> >>> * Reworked two remaining patches (HAVE_SRAND_DETERMINISTIC) in the hope
> >>>   I might get them upstream;
> >>> * Added pledge;
> >>> * make test now passes all tests.
> >>>
> >>> Tested on amd64.
> >>>
> >>> Comments, feedback most welcome.
> >>>
> >>> Pax, -A
> >>
> >> Ping.
> >
> > I reinstated the strcat/sprintf-related patches but done slightly
> > better.  Tests pass on amd64.  Updated patch attached.
> >
> > Feedback, comments most welcome.
> >
> > Pax, -A
> 
> Finally getting back to this.  Version 5.4.0 is still the latest
> stable release (6.0.x exists but is considered beta).  Just tried my
> update on the most recent snap and it passess tests and seems to work
> for me.  Patch attached.
> 
> Feedback most welcome.

For what it's worth I've been using this diff (on amd64 -current ) for
almost six months. No issues at all, and I am using multimarkdown almost
every day.

Thanks for your work on the diff!

> 
> Pax, -A
> --
> https://haqistan.net/~attila | attila@{stalphonsos.com,haqistan.net}
> pgp: 0x62A729CF | C2CE 2487 03AC 4C2F 101D  09C1 4068 D5D5 62A7 29CF
> Email had 1 attachment:
> + mmd-5.4.0-bbis.patch
>   21k (text/x-patch)



[update] kawa-2.3

2017-03-27 Thread Timo Myyrä
Hi,

Here's updated port for kawa.
Added dependency on print/texinfo so the kawa info packages compile. Info files
are great to have when working with Emacs.

I'm not sure if the JAVA_TOOL_OPTIONS is the right way of fixing:
`unmappable character for encoding ASCII' errors but it seems to work.

Timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile6 Dec 2015 20:01:33 -   1.10
+++ Makefile28 Mar 2017 04:11:02 -
@@ -4,7 +4,7 @@ BROKEN-i386= java
 
 COMMENT=   Scheme and language framework for the Java platform
 
-DISTNAME=  kawa-2.1
+DISTNAME=  kawa-2.3
 CATEGORIES=lang java
 
 HOMEPAGE=  https://www.gnu.org/software/kawa/
@@ -17,28 +17,40 @@ MASTER_SITES=   ${MASTER_SITE_GNU:=kawa/}
 MODULES=   java
 MODJAVA_VER=   1.7+
 
-TEST_DEPENDS=  ${BUILD_DEPENDS}
-
 USE_GMAKE= Yes
 
-WANTLIB += c ncurses readline
+BUILD_DEPENDS= print/texinfo \
+   devel/autoconf/2.69 \
+   devel/automake/1.15
+TEST_DEPENDS=  ${BUILD_DEPENDS}
+
+WANTLIB+=  c ncurses readline
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ARGS+=   --enable-kawa-frontend
-CONFIGURE_ENV= JAVAC=${JAVA_HOME}/bin/javac \
-   JAVA=${JAVA_HOME}/bin/java
+CONFIGURE_ENV+=AUTOMAKE=/usr/local/bin/automake-1.15 \
+   AUTOCONF=/usr/local/bin/autoconf-2.69
+   
+MAKE_FLAGS=JAVAC=${JAVA_HOME}/bin/javac \
+   JAVA=${JAVA_HOME}/bin/java \
+   MAKEINFO=/usr/local/bin/gmakeinfo \
+   AUTOCONF_VERSION=2.69
 
 .include 
 # fails with this on i386, fails without this on amd64, unsure about
 # other arch but lp64 is probably not a bad indicator.
 .if ${PROPERTIES:Mlp64}
-MAKE_ENV=  SLIB_JAVAFLAGS=-Xmx1200M
+MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx1200M
 .else
-MAKE_ENV=  SLIB_JAVAFLAGS=-Xmx800M
+MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx800M
 .endif
 
+# use UTF-8 encoding to avoid following errors:
+# unmappable character for encoding ASCII
+MAKE_ENV+= JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
 pre-patch:
find ${WRKSRC} -type f | \
-   xargs perl -pi -e 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'
+   xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo6 Dec 2015 20:01:33 -   1.3
+++ distinfo28 Mar 2017 04:11:02 -
@@ -1,2 +1,2 @@
-SHA256 (kawa-2.1.tar.gz) = yvjrAfvv6C8+RLWtCNQ1buVjNdp5SZ2cyityD30E/Tk=
-SIZE (kawa-2.1.tar.gz) = 3015953
+SHA256 (kawa-2.3.tar.gz) = 7N2ysUnkH3wWFMMAkThVa5VOjMajE1qVPrl+fobcR/4=
+SIZE (kawa-2.3.tar.gz) = 3273722
Index: patches/patch-doc_Makefile_am
===
RCS file: patches/patch-doc_Makefile_am
diff -N patches/patch-doc_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-doc_Makefile_am   28 Mar 2017 04:11:02 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- doc/Makefile.am.orig   Sat Mar 25 12:33:43 2017
 doc/Makefile.amSat Mar 25 12:34:24 2017
+@@ -29,12 +29,11 @@ TEXI2PDF = texi2pdf
+ 
+ man_MANS = kawa.1 qexo.1
+ kawa.1: $(srcdir)/kawa.man
+-  nroff -man $(srcdir)/kawa.man > tpm-kawa.1
+-  mv tpm-kawa.1 kawa.1
++  cp $(srcdir)/kawa.man kawa.1
+ 
++
+ qexo.1: $(srcdir)/qexo.man
+-  nroff -man $(srcdir)/qexo.man > tpm-qexo1
+-  mv tpm-qexo1 qexo.1
++  cp $(srcdir)/qexo.man qexo.1
+ 
+ ../kawa-doc-$(VERSION).tar.gz: kawa.info $(KAWA_HTMLDIR)/index.html kawa.pdf
+   tar cf - $(KAWA_HTMLDIR)/*.html kawa.pdf|gzip -c --best >$@
Index: patches/patch-doc_Makefile_in
===
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in   6 Dec 2015 20:01:33 -   1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2015/12/06 20:01:33 jasper Exp $
-
-our makeinfo(1) is too old, so don't install .info files
-kawa.texi:5: warning: unrecognized encoding name `UTF-8'.
-kawa.texi:10: Unknown command `codequoteundirected'.
-kawa.texi:11: Unknown command `codequotebacktick'.
-kawa.texi:1847: Unknown command `part'.
-kawa.texi:3009: Unknown command `backslashchar'.
-kawa.texi:3009: Misplaced {.
-
 doc/Makefile.in.orig   Sun Dec  6 20:50:27 2015
-+++ doc/Makefile.inSun Dec  6 20:50:28 2015
-@@ -573,7 +573,7 @@ distdir: $(DISTFILES)
- dist-info
- check-am: all-am
- check: check-am
--all-am: 

Re: make an additional category in ports tree

2017-03-27 Thread Antoine Jacoutot
On Tue, Mar 28, 2017 at 01:20:06AM +0300, Sergey Bronnikov wrote:
> On 14:50 Mon 27 Mar , Marc Espie wrote:
> > On Fri, Mar 17, 2017 at 05:12:51PM +0300, Sergey Bronnikov wrote:
> > > OpenBSD ports contains many applications useful for different kinds of
> > > testing: load, performance, functional, fuzzing etc.
> > > Load and performance tests locate in benchmarks subdir mostly,
> > > but other tests locate in different subdirectories:
> > > sysutils, net, misc, x11 and it is a bit difficult to list
> > > all such tests ported to OpenBSD.
> > > 
> > > Is is possible to introduce new category for this kind of applications?
> > > I believe it would be useful not for me only.
> > > 
> > > Sergey
> > 
> > Call it test, rather.
> 
> Attached updated patch.

Now there's a mix of test and regress.
That's not good.

> 
> > We moved from REGRESS* to TEST* in the variables. Mostly cosmetic, but test
> > is easier to type and figure out, and may encompass slightly more than
> > non-regression tests.
> > 
> > (I was never too fond of regress, since it implies things will fail)

> diff --git a/devel/afl/Makefile b/devel/afl/Makefile
> index 0ea5ac6..693f150 100644
> --- a/devel/afl/Makefile
> +++ b/devel/afl/Makefile
> @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= i386 amd64
>  COMMENT= instrumented fuzzer
>  DISTNAME=afl-2.39b
>  EXTRACT_SUFX=.tgz
> -CATEGORIES=  devel
> +CATEGORIES=  devel test
>  
>  HOMEPAGE=http://lcamtuf.coredump.cx/afl
>  MASTER_SITES=${HOMEPAGE}/releases/
> diff --git a/devel/csmith/Makefile b/devel/csmith/Makefile
> index 34896c9..391ca88 100644
> --- a/devel/csmith/Makefile
> +++ b/devel/csmith/Makefile
> @@ -5,7 +5,7 @@ COMMENT=  fuzzer for C compilers
>  DISTNAME=csmith-2.2.0
>  REVISION=0
>  
> -CATEGORIES=  devel
> +CATEGORIES=  devel test
>  
>  MAINTAINER=  Daniel Dickman 
>  
> diff --git a/misc/vttest/Makefile b/misc/vttest/Makefile
> index 6ee7716..c4ce20f 100644
> --- a/misc/vttest/Makefile
> +++ b/misc/vttest/Makefile
> @@ -3,7 +3,7 @@
>  COMMENT= test VT100-type terminal
>  
>  DISTNAME=vttest-20140305
> -CATEGORIES=  misc
> +CATEGORIES=  misc test
>  HOMEPAGE=http://invisible-island.net/vttest/vttest.html
>  
>  MAINTAINER=  Christian Weisgerber 
> diff --git a/misc/zzuf/Makefile b/misc/zzuf/Makefile
> index dfc53ae..67a7fa6 100644
> --- a/misc/zzuf/Makefile
> +++ b/misc/zzuf/Makefile
> @@ -7,7 +7,7 @@ COMMENT=  transparent application input fuzzer
>  VERSION= 0.14
>  DISTNAME=zzuf-${VERSION}
>  REVISION=0
> -CATEGORIES=  misc security
> +CATEGORIES=  misc security test
>  
>  MAINTAINER=  Michael McConville 
>  
> diff --git a/net/iperf/Makefile b/net/iperf/Makefile
> index 0aedcb2..f3dc68a 100644
> --- a/net/iperf/Makefile
> +++ b/net/iperf/Makefile
> @@ -4,7 +4,7 @@ COMMENT=  tool for measuring maximum TCP and UDP bandwidth
>  
>  DISTNAME=iperf-2.0.5
>  REVISION=4
> -CATEGORIES=  net
> +CATEGORIES=  net test
>  
>  HOMEPAGE=http://sourceforge.net/projects/iperf/
>  
> diff --git a/net/iperf3/Makefile b/net/iperf3/Makefile
> index cf3bdd1..d3a38e8 100644
> --- a/net/iperf3/Makefile
> +++ b/net/iperf3/Makefile
> @@ -12,7 +12,7 @@ GH_TAGNAME= ${V}
>  
>  SHARED_LIBS +=   iperf0.0  # 0.0
>  
> -CATEGORIES=  net
> +CATEGORIES=  net regress
>  
>  HOMEPAGE=http://software.es.net/iperf/
>  
> diff --git a/security/isic/Makefile b/security/isic/Makefile
> index 2ef1f76..a7417cf 100644
> --- a/security/isic/Makefile
> +++ b/security/isic/Makefile
> @@ -4,7 +4,7 @@ COMMENT=  IP stack integrity checker
>  
>  DISTNAME=isic-0.07
>  REVISION =   0
> -CATEGORIES=  security
> +CATEGORIES=  security regress
>  
>  HOMEPAGE=http://isic.sourceforge.net/
>  
> diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
> index f878169..9b02b5b 100644
> --- a/sysutils/crashme/Makefile
> +++ b/sysutils/crashme/Makefile
> @@ -7,7 +7,7 @@ DISTNAME =crashme-2.4
>  
>  REVISION =   1
>  
> -CATEGORIES = sysutils
> +CATEGORIES = sysutils test
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM =   without fee
> diff --git a/sysutils/fsstress/Makefile b/sysutils/fsstress/Makefile
> index 1de77a9..d2e4d33 100644
> --- a/sysutils/fsstress/Makefile
> +++ b/sysutils/fsstress/Makefile
> @@ -5,7 +5,7 @@ COMMENT=  file system/VFS layer stress tester
>  DISTNAME=fsstress-1.0
>  REVISION =   1
>  EXTRACT_SUFX=.tgz
> -CATEGORIES=  sysutils
> +CATEGORIES=  sysutils regress
>  
>  MAINTAINER=  Bob Beck 
>  
> diff --git a/sysutils/iogen/Makefile b/sysutils/iogen/Makefile
> index cfae980..1a392c7 100644
> --- a/sysutils/iogen/Makefile
> +++ b/sysutils/iogen/Makefile
> @@ -8,7 +8,7 @@ GH_TAGNAME=   IOGEN_${V:S/./_/g}
>  GH_ACCOUNT=  conformal
>  GH_PROJECT=  iogen
>  DISTNAME=${GH_PROJECT}-${V}
> -CATEGORIES=  sysutils
> +CATEGORIES=  sysutils te