Re: NEW: p5-Tcl and p5-Tkx

2015-05-07 Thread Stuart Cassoff
On 05/07/15 14:26, Stuart Henderson wrote:
> On 2015/05/07 13:23, Stuart Cassoff wrote:
>> Ok, here's the updated p5-Tcl port.
>> Also an updated p5-Tkx port with a patch to make tkx-prove use TAP::Parser 
>> instead of Test::Harness::Straps.
> 
> Thanks - OK.
> 
> The "extra" WANTLIB is because Perl XS modules *do* rely on the libperl ABI,
> but aren't shown as linking against it (because they are dlopen'd) - 
> perl.port.mk
> forces adding the WANTLIB so that we don't have to bump every port containing 
> an
> XS module when we update perl.
> 
> 

Thanks for the ok and for the explanation!


Stu



NEW: devel/hs-file-embed

2015-05-07 Thread Giannis Tsaraias
DESCR:

Use Template Haskell to read a file or all the files in a directory, and turn
them into (path, bytestring) pairs embedded in your haskell code.

OK?

-- yannis


hs-file-embed.tar.gz
Description: application/tar-gz


Re: git-2.4.0

2015-05-07 Thread Rafael Sadowski
On Thu May 07, 2015 at 08:16:53PM +0200, David Coppa wrote:
> 
> Hi!
> 
> An update to the latest git.
> 
> On amd64, I have:
> 
> for f in 'test-results'/t*-*.counts; do \
>   echo "$f"; \
> done | '/bin/sh' ./aggregate-results.sh
> fixed   2
> success 12189
> failed  0
> broken  178
> total   12645
> gmake[3]: Leaving directory '/usr/pobj/git-2.4.0/git-2.4.0/t'
> 
> Ciao,
> David
> 

for f in 'test-results'/t*-*.counts; do \
echo "$f"; \
done | '/bin/sh' ./aggregate-results.sh
fixed   2
success 12384
failed  0
broken  179
total   12752
gmake[3]: Leaving directory '/usr/ports/pobj/git-2.4.0/git-2.4.0/t'


more tests, more passed but one more broke ;) Looks okay for me.

Cheers, Rafael



UPDATE: www/uget 1.10.4 => 2.0

2015-05-07 Thread Brian Callahan
Hi ports --

Attached is a major update for uget.
Changelog is here:
http://ugetdm.com/blog/3-stable/76-uget-20-is-officially-released

Works well on amd64 and i386.

OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/www/uget/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	27 Mar 2015 08:15:04 -	1.2
+++ Makefile	2 May 2015 17:48:13 -
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.2 2015/03/27 08:15:04 ajacoutot Exp $
 
 COMMENT =	lightweight graphical download manager
-DISTNAME =	uget-1.10.4
+DISTNAME =	uget-2.0
 CATEGORIES =	www net x11
-REVISION =	0
 
 HOMEPAGE =	http://ugetdm.com/
 MAINTAINER =	Brian Callahan 
@@ -13,13 +12,16 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB += atk-1.0 c cairo cairo-gobject crypto curl fontconfig
 WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gstreamer-1.0 gthread-2.0 gtk-3 idn m notify pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread ssl z
+WANTLIB += gstreamer-1.0 gtk-3 idn m notify pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pthread ssl z
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=urlget/}
 
 MODULES =	devel/gettext \
+		lang/clang \
 		textproc/intltool
+MODCLANG_ARCHS =	*
+MODCLANG_LANGS =	c
 
 LIB_DEPENDS =	devel/libnotify \
 		multimedia/gstreamer1/core \
@@ -27,21 +29,18 @@ LIB_DEPENDS =	devel/libnotify \
 		x11/gtk+3
 
 RUN_DEPENDS =	devel/desktop-file-utils \
+		www/aria2 \
 		x11/gtk+3,-guic
 
-# You should be using aria2 if the arch has it.
-.if ${MACHINE_ARCH} != "mips64el" && ${MACHINE_ARCH} != "mips64"
-RUN_DEPENDS +=	www/aria2
-.endif
-
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 # BSD make doesn't install the localization files.
 USE_GMAKE =	Yes
+MAKE_FLAGS =	CFLAGS="${CFLAGS} -std=c11"
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/uget-gtk/UgSetting.c
+	${SUBST_CMD} ${WRKSRC}/uget/UgetAria2.c
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/uget/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	31 Aug 2014 02:06:36 -	1.1.1.1
+++ distinfo	2 May 2015 17:48:13 -
@@ -1,2 +1,2 @@
-SHA256 (uget-1.10.4.tar.gz) = olxcya9Oh6LCIgbzdv/OcGl+90OpAuzwKLUKWGGApiI=
-SIZE (uget-1.10.4.tar.gz) = 576147
+SHA256 (uget-2.0.tar.gz) = 2Fe78bs8p6mUOyalHiCkiOB1Cx4u7/cT7z/f9AMg5JY=
+SIZE (uget-2.0.tar.gz) = 832837
Index: patches/patch-po_POTFILES_in
===
RCS file: /cvs/ports/www/uget/patches/patch-po_POTFILES_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-po_POTFILES_in
--- patches/patch-po_POTFILES_in	31 Aug 2014 02:06:36 -	1.1.1.1
+++ patches/patch-po_POTFILES_in	2 May 2015 17:48:13 -
@@ -2,13 +2,13 @@ $OpenBSD: patch-po_POTFILES_in,v 1.1.1.1
 
 Fix 'make test'
 
 po/POTFILES.in.orig	Tue Jun 24 00:32:05 2014
-+++ po/POTFILES.in	Tue Jun 24 00:32:12 2014
-@@ -16,6 +16,7 @@ uglib/UgRunning.c
- uglib/UgStdio.c
- uglib/UgUri.c
- uglib/UgUtils.c
-+uglib/pwmd.c
- uget-gtk/UgApp-gtk.c
- uget-gtk/UgApp-gtk-aria2.c
- uget-gtk/UgApp-gtk-callback.c
+--- po/POTFILES.in.orig	Fri Mar 27 17:19:55 2015
 po/POTFILES.in	Fri Mar 27 17:20:10 2015
+@@ -1,6 +1,7 @@
+ uget/UgetApp.c
+ uget/UgetEvent.c
+ uget/UgetPluginAria2.c
++uget/pwmd.c
+ ui-gtk/UgtkAboutDialog.c
+ ui-gtk/UgtkApp-main.c
+ ui-gtk/UgtkApp-timeout.c
Index: patches/patch-uget-gtk_UgSetting_c
===
RCS file: patches/patch-uget-gtk_UgSetting_c
diff -N patches/patch-uget-gtk_UgSetting_c
--- patches/patch-uget-gtk_UgSetting_c	31 Aug 2014 02:06:36 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-uget-gtk_UgSetting_c,v 1.1.1.1 2014/08/31 02:06:36 bcallah Exp $
 uget-gtk/UgSetting.c.orig	Tue Jun 24 00:37:31 2014
-+++ uget-gtk/UgSetting.c	Tue Jun 24 00:38:02 2014
-@@ -512,7 +512,7 @@ void	ug_setting_init (UgSetting* setting)
- 	setting->plugin.aria2.enable = FALSE;
- 	setting->plugin.aria2.launch = TRUE;
- 	setting->plugin.aria2.shutdown = TRUE;
--	setting->plugin.aria2.path = g_strdup ("aria2c");
-+	setting->plugin.aria2.path = g_strdup ("${TRUEPREFIX}/bin/aria2c");
- 	setting->plugin.aria2.args = g_strdup ("--enable-rpc=true -D --check-certificate=false");
- 	setting->plugin.aria2.uri  = g_strdup ("http://localhost:6800/rpc";);
- 
Index: patches/patch-uget_UgetAria2_c
===
RCS file: patches/patch-uget_UgetAria2_c
diff -N patches/patch-uget_UgetAria2_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-uget_UgetAria2_c	2 May 2015 17:48:13 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- uget/UgetAria2.c.orig	Fri Mar 27 17:14:20 2015
 uget/UgetAria2.c	Fri Mar 27 17:15:01 2015
+@@ -52,7 +52,7 @@
+ #define RPC_URI  "http://localhost:6800/jsonrpc";
+ #define RPC

gitolite crashes on -stable

2015-05-07 Thread Sören Tempel
Hey,

There is a problem with the gitolite -stable port. When trying to setup
a new gitolite instance using: gitolite -pk . I get the
following error:

Initialized empty Git repository in
/home/git/repositories/gitolite-admin.git/
Initialized empty Git repository in /home/git/repositories/testing.git/
WARNING: /home/git/.ssh missing; creating a new one
(this is normal on a brand new install)
WARNING: /home/git/.ssh/authorized_keys missing; creating a new one
(this is normal on a brand new install)
FATAL: fingerprinting failed for 'keydir/admin.pub'

However, ssh-keygen(1) doesn't complain about the public key when
invoked with '-l -f ' meaning that it is a valid ssh public
key. I did some research and I found out that this is actually caused by
the fact that gitolite 3.6.2 isn't compatible with OpenSSH 6.8. This is
the case because the output format of ssh-keygen was changed in OpenSSH
6.8 thus breaking verification of fingerprints in gitolite.

Upstream published two patches to fix this issue:

- 
https://github.com/sitaramc/gitolite/commit/ed807a40c6683960e357bc995b3acf721ec088b4
- 
https://github.com/sitaramc/gitolite/commit/a80da842f353ebc2294ec83e0037dc5bdd850958

Modified versions of those patches seem to be included in -current.
However, they were not backported to -stable meaning that gitolite
doesn't work on -stable. Would it be possible to also ship those patches
for the -stable gitolite port thus making it work on -stable as well?

I already wrote Jasper an Email regarding this issue a few days ago.
Since he did respond I figured I might send this here…

Sören.



Re: [NEW] security/apktool

2015-05-07 Thread Vadim Zhukov
2015-05-07 16:33 GMT+03:00 Remi Pointel :
> On 07-05-2015 14:28, Stuart Henderson wrote:
>>
>> "# Setting PERMIT_PACKAGE_CDROM=Yes defaults other PERMIT_* variables to
>> Yes."
>>
>> this should be a license marker instead :)
>>
>> Please use javapathhelper in the wrapper script, you can borrow an example
>> from geo/josm (don't forget the run depend).
>
>
> Thanks,
>
> it should be good now.
>
> ok?

This is definitely a tool that is nice to have. Some comments on the
port, though:

1. I think "devel" worths being added to the CATEGORIES (not as the
first one, though, we already have too much stuff there).

2. Two do-install targets?! Also, we usually try to put variables
before targets.

3. Use just a ${SUBST_PROGRAM}, no need to copy that file one time more before.

4. I'd better write last line of files/apktool like that:
exec "${JAVA_CMD}" -jar ${TRUEPREFIX}/share/apktool/${DISTNAME}.jar "$@"

5. Typo in DESCR: "smali".

--
  WBR,
  Vadim Zhukov



git-2.4.0

2015-05-07 Thread David Coppa

Hi!

An update to the latest git.

On amd64, I have:

for f in 'test-results'/t*-*.counts; do \
echo "$f"; \
done | '/bin/sh' ./aggregate-results.sh
fixed   2
success 12189
failed  0
broken  178
total   12645
gmake[3]: Leaving directory '/usr/pobj/git-2.4.0/git-2.4.0/t'

Ciao,
David

Index: Makefile
===
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile28 Apr 2015 11:52:44 -  1.127
+++ Makefile7 May 2015 18:16:21 -
@@ -4,7 +4,7 @@ COMMENT-main =  GIT - Tree History Storag
 COMMENT-svn =  GIT - subversion interoperability tools
 COMMENT-x11 =  GIT - graphical tools
 
-V =2.3.7
+V =2.4.0
 DISTNAME = git-${V}
 PKGNAME-main = ${DISTNAME}
 PKGNAME-svn =  git-svn-${V}
Index: distinfo
===
RCS file: /cvs/ports/devel/git/distinfo,v
retrieving revision 1.97
diff -u -p -u -p -r1.97 distinfo
--- distinfo28 Apr 2015 11:52:44 -  1.97
+++ distinfo7 May 2015 18:16:21 -
@@ -1,4 +1,4 @@
-SHA256 (git-2.3.7.tar.gz) = JQ6/GcdYvPhI8j9CvGMigrqIKLiWWjBq0Aa/s2rBSZo=
-SHA256 (git-manpages-2.3.7.tar.gz) = 
B5/Na42tEklgV4/pGWShGFyZzfAkFJrVC94UFgCyFig=
-SIZE (git-2.3.7.tar.gz) = 5209194
-SIZE (git-manpages-2.3.7.tar.gz) = 591527
+SHA256 (git-2.4.0.tar.gz) = 1Yx2aoDYal4YRsBMdGGOmL/sFYc0+hqJBMZHQLcrURo=
+SHA256 (git-manpages-2.4.0.tar.gz) = 
qz8IJODRe9nOUHWWQ1CwqxO7iZHoWof32CK+iCs6EC4=
+SIZE (git-2.4.0.tar.gz) = 5337678
+SIZE (git-manpages-2.4.0.tar.gz) = 593306
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/devel/git/patches/patch-Makefile,v
retrieving revision 1.52
diff -u -p -u -p -r1.52 patch-Makefile
--- patches/patch-Makefile  7 Feb 2015 18:19:41 -   1.52
+++ patches/patch-Makefile  7 May 2015 18:16:21 -
@@ -4,9 +4,9 @@ No need for librt on OpenBSD
 
 Workaround for ar(1) not having 's' on VAX by calling ranlib
 
 Makefile.orig  Thu Feb  5 15:40:08 2015
-+++ Makefile   Fri Feb  6 02:50:36 2015
-@@ -1407,7 +1407,6 @@ endif
+--- Makefile.orig  Thu Apr 30 21:12:02 2015
 Makefile   Thu May  7 13:26:20 2015
+@@ -1426,7 +1426,6 @@ endif
  
  ifdef HAVE_CLOCK_GETTIME
BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@@ -14,7 +14,7 @@ Workaround for ar(1) not having 's' on V
  endif
  
  ifdef HAVE_CLOCK_MONOTONIC
-@@ -1959,13 +1958,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
+@@ -1982,13 +1981,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walk
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
  $(LIB_FILE): $(LIB_OBJS)
@@ -31,7 +31,7 @@ Workaround for ar(1) not having 's' on V
  
  export DEFAULT_EDITOR DEFAULT_PAGER
  
-@@ -2146,7 +2145,7 @@ export TEST_NO_MALLOC_CHECK
+@@ -2169,7 +2168,7 @@ export TEST_NO_MALLOC_CHECK
  
  ### Testing rules
  
Index: patches/patch-t_test-lib_sh
===
RCS file: /cvs/ports/devel/git/patches/patch-t_test-lib_sh,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-t_test-lib_sh
--- patches/patch-t_test-lib_sh 22 Apr 2015 05:56:23 -  1.8
+++ patches/patch-t_test-lib_sh 7 May 2015 18:16:21 -
@@ -5,8 +5,8 @@ wants it badly.
 
 Fix sum() function
 
 t/test-lib.sh.orig Tue Apr 21 23:09:37 2015
-+++ t/test-lib.sh  Wed Apr 22 07:43:41 2015
+--- t/test-lib.sh.orig Thu Apr 30 21:12:02 2015
 t/test-lib.sh  Thu May  7 13:26:20 2015
 @@ -51,6 +51,11 @@ fi
  . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
  export PERL_PATH SHELL_PATH
@@ -19,7 +19,7 @@ Fix sum() function
  # if --tee was passed, write the output not only to the terminal, but
  # additionally to the file test-results/$BASENAME.out, too.
  case "$GIT_TEST_TEE_STARTED, $* " in
-@@ -925,6 +930,12 @@ case $(uname -s) in
+@@ -941,6 +946,12 @@ case $(uname -s) in
test_set_prereq CYGWIN
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-main,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 PLIST-main
--- pkg/PLIST-main  29 Nov 2014 07:28:40 -  1.62
+++ pkg/PLIST-main  7 May 2015 18:16:21 -
@@ -407,6 +407,7 @@ share/locale/it/LC_MESSAGES/git.mo
 share/locale/pt_PT/
 share/locale/pt_PT/LC_MESSAGES/
 share/locale/pt_PT/LC_MESSAGES/git.mo
+share/locale/ru/LC_MESSAGES/git.mo
 share/locale/sv/LC_MESSAGES/git.mo
 share/locale/vi/LC_MESSAGES/git.mo
 share/locale/zh_CN/LC_MESSAGES/git.mo
Index: pkg/PLIST-x11
===
RCS file: /cvs/ports/devel/git/pkg/PLIST-x11,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST-x11
--- pkg/PLIST-x11   19 Aug 2014 19:44:39 -  1.12
+++ pkg/PLIST-x11   7 May 2015 18:16:21 -
@@ -47,6 +47,7 @

Re: don't include CFLAGS in CXXFLAGS

2015-05-07 Thread Jérémie Courrèges-Anglas
Christian Weisgerber  writes:

> Jonathan Gray:
>
>> > sys.mk automatically gets included by make(1) and sets CXXFLAGS to
>> > CFLAGS.  If a Makefile defines additional CFLAGS they will then be
>> > passed to the C++ compiler.  Which creates problems with flags
>> > that should only be used by the C compiler in Makefiles that
>> > deal with both C and C++ (like Mesa).
>> > 
>> > Fix this situation by not initialising CXXFLAGS with CFLAGS.
>> > No problems building src/xenocara with the following diff:
>> 
>> Here is the diff again.  If there are concerns on the ports
>> side could someone doing ports bulk builds give this a try?
>
> These ports failed in an amd64 bulk build:

Shortened list:

> net/zeromq
> security/encfs

Both fixes use CONFIGURE_ENV for CPPFLAGS/CXXFLAGS.
The encfs diff includes additional fixes (erroneous format string* +
s/fusermount/umount/).

* May  7 19:56:06 ritchie encfs: Unmounting filesystem /tmp/m/ failed:
  Resource temporarily unavailable

Index: net/zeromq/Makefile
===
RCS file: /cvs/ports/net/zeromq/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- net/zeromq/Makefile 25 Jan 2015 09:36:55 -  1.14
+++ net/zeromq/Makefile 7 May 2015 18:03:57 -
@@ -7,7 +7,7 @@ SHARED_ONLY =   Yes
 COMMENT =  open source message queue optimised for performance
 
 DISTNAME = zeromq-4.0.5
-REVISION = 0
+REVISION = 1
 
 SHARED_LIBS +=  zmq  4.0  # 4.0
 
@@ -27,11 +27,10 @@ LIB_DEPENDS =   security/libsodium
 
 USE_GMAKE =Yes
 
-# XXX libsodium: https://github.com/jedisct1/libsodium/pull/104
-CFLAGS +=  -Wno-long-long
-
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   ${CONFIGURE_SHARED} \
--with-libsodium=${LOCALBASE}
+# XXX libsodium: https://github.com/jedisct1/libsodium/pull/104
+CONFIGURE_ENV =CXXFLAGS="-Wno-long-long ${CXXFLAGS}"
 
 .include 
Index: security/encfs/Makefile
===
RCS file: /cvs/ports/security/encfs/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- security/encfs/Makefile 21 Jan 2014 15:41:27 -  1.3
+++ security/encfs/Makefile 7 May 2015 18:03:57 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fuse-based cryptographic filesystem
 DISTNAME = encfs-1.7.4
-REVISION = 0
+REVISION = 1
 SHARED_LIBS =  encfs   0.0 # 6.1
 CATEGORIES =   security
 HOMEPAGE = http://www.arg0.net/encfs
@@ -25,10 +25,8 @@ CONFIGURE_ARGS +=${CONFIGURE_SHARED} \
--with-boost-serialization=boost_serialization \
--with-boost-filesystem=boost_filesystem \
--with-boost-system=boost_system
-
 # TODO convert code to use utimensat() instead of lutimes()
-CFLAGS =   -Dlutimes=utimes \
-   -D_DIRENT_HAVE_D_TYPE
+CONFIGURE_ENV +=   CPPFLAGS="-Dlutimes=utimes -D_DIRENT_HAVE_D_TYPE"
 
 do-test:
${WRKSRC}/encfs/test
Index: security/encfs/patches/patch-encfs_encfssh
===
RCS file: security/encfs/patches/patch-encfs_encfssh
diff -N security/encfs/patches/patch-encfs_encfssh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ security/encfs/patches/patch-encfs_encfssh  7 May 2015 18:03:57 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+- no fusermount(1) on OpenBSD, umount(8) is enough
+
+--- encfs/encfssh.orig Sun Nov 29 23:04:12 2009
 encfs/encfssh  Thu May  7 19:58:09 2015
+@@ -63,5 +63,5 @@ orig_dir=$(pwd)
+ cd $unenc_dir
+ 
+ # Set the shell up
+-exec /bin/sh -c "$SHELL ; cd $orig_dir ; fusermount -u $unenc_dir ; if ! 
$unenc_dir_given; then rmdir $unenc_dir; fi"
++exec /bin/sh -c "$SHELL ; cd $orig_dir ; umount $unenc_dir ; if ! 
$unenc_dir_given; then rmdir $unenc_dir; fi"
+ 
Index: security/encfs/patches/patch-encfs_main_cpp
===
RCS file: /cvs/ports/security/encfs/patches/patch-encfs_main_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-encfs_main_cpp
--- security/encfs/patches/patch-encfs_main_cpp 21 Jan 2014 15:41:27 -  
1.2
+++ security/encfs/patches/patch-encfs_main_cpp 7 May 2015 18:03:57 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-encfs_main_cpp,v 1.2 2014/01/21 15:41:27 syl Exp $
 --- encfs/main.cpp.origSun Nov 29 23:04:12 2009
-+++ encfs/main.cpp Mon Jan 13 13:45:50 2014
 encfs/main.cpp Thu May  7 19:19:29 2015
 @@ -28,6 +28,8 @@
  #include 
  #include 
@@ -30,7 +30,7 @@ $OpenBSD: patch-encfs_main_cpp,v 1.2 201
 +  if (unmount( arg->mountPoint.c_str(), MNT_FORCE ) != 0)
 +  {
 +  rWarning(_("Unmounting filesystem %s failed: %s"),
-+  strerror(errno) );
++  arg->mountPoint.c_str(), strerror(errno) );
 +  

update: devel/gkpk

2015-05-07 Thread Okan Demirmen
Hi,

Update glpk to 4.55, based on a diff from Ingo Feinerer.

OK?

Thanks,
Okan

Index: Makefile
===
RCS file: /home/open/cvs/ports/devel/glpk/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Mar 2015 18:07:40 -  1.9
+++ Makefile7 May 2015 17:06:51 -
@@ -2,9 +2,8 @@
 
 COMMENT=   GNU Linear Programming Kit
 
-DISTNAME=  glpk-4.44
-REVISION=  1
-SHARED_LIBS=   glpk6.0 # 29.0
+DISTNAME=  glpk-4.55
+SHARED_LIBS=   glpk7.0 # 37.2
 
 CATEGORIES=devel
 HOMEPAGE=  https://www.gnu.org/software/glpk/index.html
@@ -15,15 +14,13 @@ MAINTAINER= Okan Demirmen =7 z
+WANTLIB=   c m gmp>=7
 
 LIB_DEPENDS=   devel/gmp
 
-
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ARGS=${CONFIGURE_SHARED} \
-   --with-gmp \
-   --with-zlib
+   --with-gmp
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 
Index: distinfo
===
RCS file: /home/open/cvs/ports/devel/glpk/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:13:12 -  1.4
+++ distinfo7 May 2015 16:28:12 -
@@ -1,2 +1,2 @@
-SHA256 (glpk-4.44.tar.gz) = KJpDZgQe5zYLVSPb/csINId0M1e5ZSnkryR3plo8fm0=
-SIZE (glpk-4.44.tar.gz) = 3229434
+SHA256 (glpk-4.55.tar.gz) = NwkNfxZ5bsEDRJbhgqOdXMi7fJ+13EijixPWIL8rHec=
+SIZE (glpk-4.55.tar.gz) = 3424345
Index: pkg/PLIST
===
RCS file: /home/open/cvs/ports/devel/glpk/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   16 Mar 2015 18:07:40 -  1.4
+++ pkg/PLIST   7 May 2015 16:56:50 -
@@ -5,9 +5,10 @@ lib/libglpk.a
 lib/libglpk.la
 @lib lib/libglpk.so.${LIBglpk_VERSION}
 share/doc/glpk/
+share/doc/glpk/cnfsat.pdf
 share/doc/glpk/glpk.pdf
-share/doc/glpk/glpk_faq.txt
 share/doc/glpk/gmpl.pdf
+share/doc/glpk/gmpl_es.pdf
 share/doc/glpk/graphs.pdf
 share/doc/glpk/miplib2.txt
 share/doc/glpk/miplib3.txt
@@ -16,9 +17,6 @@ share/doc/glpk/notes/
 share/doc/glpk/notes/dfeas.pdf
 share/doc/glpk/notes/gomory.pdf
 share/doc/glpk/notes/keller.pdf
-share/doc/glpk/notes/prepro.pdf
 share/doc/glpk/notes/scaling.pdf
-share/doc/glpk/notes/subset.pdf
-share/doc/glpk/notes/updating.pdf
-share/doc/glpk/opb.txt
-share/doc/glpk/tables.pdf
+share/doc/glpk/notes/scf.pdf
+share/doc/glpk/notes/simplex.pdf



Re: NEW: p5-Tcl and p5-Tkx

2015-05-07 Thread Stuart Cassoff
On 05/07/15 11:54, Stuart Henderson wrote:
> On 2015/05/07 11:39, Stuart Cassoff wrote:
>> On 05/07/15 06:27, Stuart Henderson wrote:
>>> On 2015/05/07 11:27, Stuart Henderson wrote:
 On 2015/05/07 01:57, Stuart Cassoff wrote:
> On 01/05/10 09:00, Stuart Cassoff wrote:
>> Better.
>>
>
> Newer.
>


 p5-Tcl needs SHARED_ONLY=Yes.
>>>
>>> (and regen the plist which will fold PFRAG.shared into PLIST).
>>>
>>>
>>
>> Ok, but now I have this situation:
>>
>> $ make port-lib-depends-check
>>
>> p5-Tcl-1.02(devel/p5-Tcl):
>> Extra:  perl.17
>>
> 
> That is correct.
> 

Ok, here's the updated p5-Tcl port.
Also an updated p5-Tkx port with a patch to make tkx-prove use TAP::Parser 
instead of Test::Harness::Straps.





p5-Tcl-1.02-port.tar.gz
Description: application/gzip


p5-Tkx-1.09-port-tar.gz
Description: application/gzip


Re: [UPDATE] devel/p5-YAML to 1.15

2015-05-07 Thread Andrew Fresh
Just a bump, still wondering if I need conflict markers or anything on
this due to moving ${P5SITE}/Test/YAML.pm into it's own distribution.

On Sun, May 03, 2015 at 04:17:11PM -0700, Andrew Fresh wrote:
> Very similar to the last update, requires the p5-Test-YAML import, just
> a new version number to "fix issue".
> 
> https://metacpan.org/changes/distribution/YAML
> 
> http://marc.info/?l=openbsd-ports&m=142825792718561&w=2
> 
> The question I have is whether there is something special that needs to
> be done because p5-Test-YAML used to be part of this package but is now
> a separate distribution.  Some sort of conflict markers or something?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/p5-YAML/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- Makefile  26 May 2013 15:30:10 -  1.16
> +++ Makefile  3 May 2015 23:12:25 -
> @@ -1,13 +1,25 @@
>  # $OpenBSD: Makefile,v 1.16 2013/05/26 15:30:10 sthen Exp $
>  
> -COMMENT= YAML ain't a markup language
> +COMMENT =YAML Ain't Markup Language
>  
> -MODULES= cpan
> +MODULES =cpan
>  
> -DISTNAME=YAML-0.84
> -CATEGORIES=  devel
> +DISTNAME =   YAML-1.15
> +CATEGORIES = devel
> +
> +MAINTAINER = Andrew Fresh 
>  
>  # Perl
> -PERMIT_PACKAGE_CDROM=Yes
> +PERMIT_PACKAGE_CDROM =   Yes
> +
> +TEST_DEPENDS =   devel/p5-Test-YAML>=1.05 \
> + devel/p5-Test-Pod
> +MAKE_ENV +=  RELEASE_TESTING=1
> +
> +.include 
> +.if !${PROPERTIES:Mno_shared}
> +RUN_DEPENDS +=   devel/p5-YAML-XS
> +.endif
>  
>  .include 
> +
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/p5-YAML/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo  26 May 2013 15:30:10 -  1.10
> +++ distinfo  3 May 2015 23:12:25 -
> @@ -1,2 +1,2 @@
> -SHA256 (YAML-0.84.tar.gz) = CjUfCncVJspKRIxXOngWFN691Slv0IMjlvyJ8YVNZAw=
> -SIZE (YAML-0.84.tar.gz) = 121150
> +SHA256 (YAML-1.15.tar.gz) = gPSVMi+nveWQlA8ZjCA75eccQg/vhEtb3Gdpwf4NnRs=
> +SIZE (YAML-1.15.tar.gz) = 80702
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/p5-YAML/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- pkg/PLIST 26 May 2013 15:30:10 -  1.6
> +++ pkg/PLIST 3 May 2015 23:12:25 -
> @@ -1,22 +1,30 @@
>  @comment $OpenBSD: PLIST,v 1.6 2013/05/26 15:30:10 sthen Exp $
> -${P5SITE}/Test/
> -${P5SITE}/Test/YAML.pm
>  ${P5SITE}/YAML/
>  ${P5SITE}/YAML.pm
> +${P5SITE}/YAML.pod
>  ${P5SITE}/YAML/Any.pm
> +${P5SITE}/YAML/Any.pod
>  ${P5SITE}/YAML/Dumper/
>  ${P5SITE}/YAML/Dumper.pm
> +${P5SITE}/YAML/Dumper.pod
>  ${P5SITE}/YAML/Dumper/Base.pm
> +${P5SITE}/YAML/Dumper/Base.pod
>  ${P5SITE}/YAML/Error.pm
> +${P5SITE}/YAML/Error.pod
>  ${P5SITE}/YAML/Loader/
>  ${P5SITE}/YAML/Loader.pm
> +${P5SITE}/YAML/Loader.pod
>  ${P5SITE}/YAML/Loader/Base.pm
> +${P5SITE}/YAML/Loader/Base.pod
>  ${P5SITE}/YAML/Marshall.pm
> +${P5SITE}/YAML/Marshall.pod
>  ${P5SITE}/YAML/Mo.pm
>  ${P5SITE}/YAML/Node.pm
> +${P5SITE}/YAML/Node.pod
>  ${P5SITE}/YAML/Tag.pm
> +${P5SITE}/YAML/Tag.pod
>  ${P5SITE}/YAML/Types.pm
> -@man man/man3p/Test::YAML.3p
> +${P5SITE}/YAML/Types.pod
>  @man man/man3p/YAML.3p
>  @man man/man3p/YAML::Any.3p
>  @man man/man3p/YAML::Dumper.3p
> 

-- 
andrew - http://afresh1.com

I'm impatient with stupidity.
  -- Klaatu



Re: NEW: p5-Tcl and p5-Tkx

2015-05-07 Thread Stuart Henderson
On 2015/05/07 11:39, Stuart Cassoff wrote:
> On 05/07/15 06:27, Stuart Henderson wrote:
> > On 2015/05/07 11:27, Stuart Henderson wrote:
> >> On 2015/05/07 01:57, Stuart Cassoff wrote:
> >>> On 01/05/10 09:00, Stuart Cassoff wrote:
>  Better.
> 
> >>>
> >>> Newer.
> >>>
> >>
> >>
> >> p5-Tcl needs SHARED_ONLY=Yes.
> > 
> > (and regen the plist which will fold PFRAG.shared into PLIST).
> > 
> > 
> 
> Ok, but now I have this situation:
> 
> $ make port-lib-depends-check
> 
> p5-Tcl-1.02(devel/p5-Tcl):
> Extra:  perl.17
> 

That is correct.



Re: NEW: p5-Tcl and p5-Tkx

2015-05-07 Thread Stuart Cassoff
On 05/07/15 06:27, Stuart Henderson wrote:
> On 2015/05/07 11:27, Stuart Henderson wrote:
>> On 2015/05/07 01:57, Stuart Cassoff wrote:
>>> On 01/05/10 09:00, Stuart Cassoff wrote:
 Better.

>>>
>>> Newer.
>>>
>>
>>
>> p5-Tcl needs SHARED_ONLY=Yes.
> 
> (and regen the plist which will fold PFRAG.shared into PLIST).
> 
> 

Ok, but now I have this situation:

$ make port-lib-depends-check

p5-Tcl-1.02(devel/p5-Tcl):
Extra:  perl.17



Re: new: sslmate-1.0.1

2015-05-07 Thread James Turner
On Fri, May 01, 2015 at 04:46:18PM -0400, James Turner wrote:
> Attached is a new port for sslmate-1.0.1. Tested on amd64 with
> https://sandbox.sslmate.com and httpd(8). Everything works nicely.
> 
> I was able to buy, list and revoke a certificate without issue. httpd(8)
> also worked with the sandboxed chained certificate without issue.
> 
> One thing to note, while it's MIT they have an extra-bit about using
> their name to promote your own products, is it ok to package or does
> this make it unpackagable like tarsnap?
> 
> ok?
> 
> Information for inst:sslmate-1.0.1
> 
> Comment:
> client for the sslmate.com online certificate service
> 
> Description:
> SSLMate makes it easy to buy, deploy, and manage you SSL certs. With a
> single command you can buy, import, renew, reissue and revoke
> cetificates all from the comfort of the command line.
> 
> See https://sslmate.com for details or to sign up for this service.
> 
> Maintainer: James Turner 
> 
> WWW: https://sslmate.com
> 
> -- 
> James Turner

ping

-- 
James Turner



Re: [NEW] security/apktool

2015-05-07 Thread Remi Pointel

On 07-05-2015 14:28, Stuart Henderson wrote:
"# Setting PERMIT_PACKAGE_CDROM=Yes defaults other PERMIT_* variables 
to Yes."


this should be a license marker instead :)

Please use javapathhelper in the wrapper script, you can borrow an 
example

from geo/josm (don't forget the run depend).


Thanks,

it should be good now.

ok?

Cheers,

Remi.

apktool.tar.gz
Description: GNU Zip compressed data


Re: [NEW] security/apktool

2015-05-07 Thread Stuart Henderson
On 2015/05/07 14:06, Remi Pointel wrote:
> Hi,
> 
> this is the port of apktool version 2.0.0.
> 
> $ pkg_info apktool
> Information for inst:apktool-2.0.0
> 
> Comment:
> tool for reverse engineering Android apk files
> 
> Description:
> apktool is a tool for reverse engineering 3rd party, closed, binary
> Android apps. It can decode resources to nearly original form and
> rebuild them after making some modifications; it makes possible to debug
> smali code step by step. Also it makes working with app easier because
> of project-like files structure and automation of some repetitive tasks
> like building apk, etc.
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: http://ibotpeaches.github.io/Apktool/
> 
> Any ok?
> 
> Cheers,
> 
> Remi.



"# Setting PERMIT_PACKAGE_CDROM=Yes defaults other PERMIT_* variables to Yes."

this should be a license marker instead :)

Please use javapathhelper in the wrapper script, you can borrow an example
from geo/josm (don't forget the run depend).



[NEW] security/apktool

2015-05-07 Thread Remi Pointel

Hi,

this is the port of apktool version 2.0.0.

$ pkg_info apktool
Information for inst:apktool-2.0.0

Comment:
tool for reverse engineering Android apk files

Description:
apktool is a tool for reverse engineering 3rd party, closed, binary
Android apps. It can decode resources to nearly original form and
rebuild them after making some modifications; it makes possible to debug
smali code step by step. Also it makes working with app easier because
of project-like files structure and automation of some repetitive tasks
like building apk, etc.

Maintainer: The OpenBSD ports mailing-list 

WWW: http://ibotpeaches.github.io/Apktool/

Any ok?

Cheers,

Remi.

apktool.tar.gz
Description: GNU Zip compressed data


Re: UPDATE: sysutils/stow 2.2.0

2015-05-07 Thread Jérémie Courrèges-Anglas
Andreas Kusalananda Kähäri  writes:

> Hi,
>
> Here's an update for GNU Stow that brings it up from version 1.3.3 to
> version 2.2.0.  This updated version has been around since early 2012
> and I've been using it successfully on other systems.
>
> Works well on amd64, and the port passes "make test" tests.
>
> I have also updated my email address in the Makefile.

Committed, thanks.

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



update: libinotify-20150426

2015-05-07 Thread David Coppa

Please try with net/mirall the following update (distfile attached).

testsuite hangs most of the times, but it's the same with
libinotify-20141104 thus I think it's caused by some changes in our
kernel.

When this happens, the 'check_libinotify' process brings the CPU
to 100% and it seems it's stuck in a sched_yield() loop:

 10843  EMUL  "native"
   160  EMUL  "native"
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
   160 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
   160 check_libinotify RET   sched_yield 0
   160 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
   160 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
   160 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
   160 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
   160 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify RET   sched_yield 0
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify CALL  sched_yield()
 10843 check_libinotify RET   sched_yield 0
...
...
...


Too much for my skills :(

Index: Makefile
===
RCS file: /cvs/ports/devel/libinotify/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile6 Nov 2014 13:11:28 -   1.5
+++ Makefile7 May 2015 09:09:19 -
@@ -2,9 +2,9 @@
 
 COMMENT =  kevent based inotify
 
-DISTNAME = libinotify-20141104
+DISTNAME = libinotify-20150426
 
-SHARED_LIBS =  inotify 0.0
+SHARED_LIBS =  inotify 1.0
 
 CATEGORIES =   devel
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM =Yes
 WANTLIB =  pthread
 
 MASTER_SITES = https://distfiles.bsdfrog.org/
-WRKDIST =  ${WRKDIR}/dmatveev-libinotify-kqueue-eb214de
+WRKDIST =  ${WRKDIR}/dmatveev-libinotify-kqueue-f4a092a
 
 BUILD_DEPENDS =devel/libtool \
${MODGNU_AUTOCONF_DEPENDS} \
Index: distinfo
===
RCS file: /cvs/ports/devel/libinotify/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo6 Nov 2014 13:11:28 -   1.3
+++ distinfo7 May 2015 09:09:19 -
@@ -1,2 +1,2 @@
-SHA256 (libinotify-20141104.tar.gz) = 
A/nKIkp7vdW5qVr82F30cW6D/yIO3lVZF1/pHH8JI8U=
-SIZE (libinotify-20141104.tar.gz) = 34508
+SHA256 (libinotify-20150426.tar.gz) = 
1GyNS1SLszBGvW3CrVFHdTaBwDdFVkVmTRqdjFuQdHg=
+SIZE (libinotify-20150426.tar.gz) = 42572
Index: patches/patch-tests_symlink_test_cc
===
RCS file: patches/patch-tests_symlink_test_cc
diff -N patches/patch-tests_symlink_test_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tests_symlink_test_cc 7 May 2015 09:09:19 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+'touch -h' is a gnuism
+
+--- tests/symlink_test.cc.orig Thu May  7 10:25:34 2015
 tests/symlink_test.cc  Thu May  7 10:25:51 2015
+@@ -209,7 +209,7 @@ void symlink_test::run ()
+ cons.output.reset ();
+ cons.input.receive ();
+ 
+-system ("touch -h slt-wd3/baz");
++system ("touch slt-wd3/baz");
+ 
+ cons.output.wait ();
+ received = cons.output.registered ();


libinotify-20150426.tar.gz
Description: application/tar-gz