u-boot 2016.11-rc3

2016-10-31 Thread Jonathan Gray
I'll likely wait till the final release to commit something, but this is
the first u-boot release that has full support for the Allwinner A80
(with SPL), and the Cubieboard 4.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/u-boot/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Nov 2016 04:13:52 -   1.9
+++ Makefile1 Nov 2016 06:12:49 -
@@ -1,8 +1,7 @@
 #  $OpenBSD: Makefile,v 1.9 2016/11/01 04:13:52 jsg Exp $
 
 COMMENT=   U-Boot firmware
-DISTNAME=  u-boot-2016.09
-REVISION=  1
+DISTNAME=  u-boot-2016.11-rc3
 CATEGORIES=sysutils
 HOMEPAGE=  http://www.denx.de/wiki/U-Boot
 MAINTAINER=Jonathan Gray 
@@ -35,6 +34,7 @@ BOARDS=\
CHIP \
Cubieboard \
Cubieboard2 \
+   Cubieboard4 \
Cubietruck \
Lamobo_R1 \
Linksprite_pcDuino \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/u-boot/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo14 Sep 2016 05:52:25 -  1.3
+++ distinfo1 Nov 2016 06:12:49 -
@@ -1,2 +1,2 @@
-SHA256 (u-boot-2016.09.tar.bz2) = mU57ng41DZ+R9YktXlv/ANNxSkli9SD3imSkYe+VC6k=
-SIZE (u-boot-2016.09.tar.bz2) = 11790685
+SHA256 (u-boot-2016.11-rc3.tar.bz2) = 
O/Z4kGUR5dWUr8iaHNUxxuTnATI5AN/9HQVs/WK0ANU=
+SIZE (u-boot-2016.11-rc3.tar.bz2) = 12010636
Index: patches/patch-include_configs_omap3_beagle_h
===
RCS file: 
/cvs/ports/sysutils/u-boot/patches/patch-include_configs_omap3_beagle_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-include_configs_omap3_beagle_h
--- patches/patch-include_configs_omap3_beagle_h30 Oct 2016 04:16:34 
-  1.2
+++ patches/patch-include_configs_omap3_beagle_h1 Nov 2016 06:12:49 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-include_configs_omap3_beagle_h,v 1.2 2016/10/30 04:16:34 jsg 
Exp $
 include/configs/omap3_beagle.h.origTue Sep 13 00:05:51 2016
-+++ include/configs/omap3_beagle.h Sat Oct 22 13:42:04 2016
-@@ -112,9 +112,12 @@
+--- include/configs/omap3_beagle.h.origTue Nov  1 07:36:10 2016
 include/configs/omap3_beagle.h Tue Nov  1 15:34:07 2016
+@@ -106,9 +106,12 @@
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x8020\0" \
@@ -15,7 +15,7 @@ $OpenBSD: patch-include_configs_omap3_be
"usbtty=cdc_acm\0" \
"bootfile=uImage\0" \
"ramdisk=ramdisk.gz\0" \
-@@ -209,39 +212,17 @@
+@@ -203,39 +206,17 @@
"userbutton=if gpio input 173; then run userbutton_xm; " \
"else run userbutton_nonxm; fi;\0" \
"userbutton_xm=gpio input 4;\0" \
Index: patches/patch-include_configs_ti_omap5_common_h
===
RCS file: 
/cvs/ports/sysutils/u-boot/patches/patch-include_configs_ti_omap5_common_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-include_configs_ti_omap5_common_h
--- patches/patch-include_configs_ti_omap5_common_h 30 Oct 2016 04:16:34 
-  1.3
+++ patches/patch-include_configs_ti_omap5_common_h 1 Nov 2016 06:12:49 
-
@@ -1,7 +1,7 @@
 $OpenBSD: patch-include_configs_ti_omap5_common_h,v 1.3 2016/10/30 04:16:34 
jsg Exp $
 include/configs/ti_omap5_common.h.orig Tue Sep 13 00:05:51 2016
-+++ include/configs/ti_omap5_common.h  Sat Oct 22 13:42:04 2016
-@@ -64,6 +64,18 @@
+--- include/configs/ti_omap5_common.h.orig Tue Nov  1 15:44:19 2016
 include/configs/ti_omap5_common.h  Tue Nov  1 15:44:44 2016
+@@ -61,6 +61,18 @@
  #define DFUARGS
  #endif
  
@@ -17,15 +17,14 @@ $OpenBSD: patch-include_configs_ti_omap5
 +
 +#include 
 +
- #ifndef CONFIG_SPL_BUILD
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
  #define CONFIG_EXTRA_ENV_SETTINGS \
-@@ -113,21 +125,8 @@
+   DEFAULT_LINUX_BOOT_ENV \
+@@ -109,21 +121,7 @@
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
DFUARGS \
NETARGS \
-+  BOOTENV
- 
+-
 -#define CONFIG_BOOTCOMMAND \
 -  "if test ${dofastboot} -eq 1; then " \
 -  "echo Boot fastboot requested, resetting dofastboot ...;" \
@@ -40,6 +39,7 @@ $OpenBSD: patch-include_configs_ti_omap5
 -  "setenv mmcroot /dev/mmcblk0p2 rw; " \
 -  "run mmcboot;" \
 -  ""
- #endif
++BOOTENV
  
  /*
+  * SPL related defines.  The Public RAM memory map the ROM defines the
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/u-boot/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   1 Nov 2016 04:13:52 -   1.3
+++ pkg/PLIST   1 Nov 2016 06:12:49 -
@@ -50,6 +50,11 @@ share/u-boot/Cubieboard2/u-boot
 share/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin
 share/u-boot/Cubieboard2/u-boot.bin
 share/u-boot/Cubieboard2/u-boot.img
+share/u-boot/Cubieboard4/
+share/u-b

Re: building curl with gssapi disables ssl

2016-10-31 Thread William Leuschner
Try putting it after the '--with-gssapi' instruction. Configure's
arguments *shouldn't* be order-dependent, but you never know. If that
doesn't work, I'm afraid I can't offer you anything else. I'm still
pretty new at this kind of thing.

- William Leuschner

On 10/31, Jiri B wrote:
> On Thu, Oct 27, 2016 at 10:31:04AM -0400, William Leuschner wrote:
> > >   SSL support:  no  
> > > (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,axtls,winssl,darwinssl} )
> > 
> > Have you tried adding "--with-ssl" to CONFIGURE_ARGS?
> > 
> > - William
> 
> Hi,
> 
> yes, I did.
> 
> j.
> 
> $ env FLAVOR=gssapi make show=CONFIGURE_ARGS
> --with-ca-bundle=/etc/ssl/cert.pem  --with-libidn=/usr/local  
> --without-libpsl  --without-libssh2 --with-ssl 
> --with-gssapi=/usr/local/heimdal --prefix='/usr/local' --sysconfdir='/etc' 
> --mandir='/usr/local/man' --infodir='/usr/local/info' --localstatedir='/var' 
> --disable-silent-rules --disable-gtk-doc
> 
> jirib:/home/jirib/cvs/openbsd-ports/net/curl
> $ env FLAVOR=gssapi make configure 2>&1 | grep Protocols:
>   Protocols:DICT FILE FTP GOPHER HTTP IMAP POP3 RTSP SMTP TELNET TFTP



Re: luajit,lua52 uses the wrong lua abi

2016-10-31 Thread Jonathan Gray
On Mon, Oct 31, 2016 at 07:59:21PM +0100, Jeremie Courreges-Anglas wrote:
> 
> lua.port.mk doesn't automatically add lua52 and lua53 to FLAVORS any
> more.  So right now the ,lua52 package is broken and I've removed it
> from lang/Makefile.  Either it is decided to keep this FLAVOR (which
> requires explicitely declaring it in the port Makefile) or the port can
> be cleaned up.
> 
> I'd go with the latter, if this package doesn't work with any
> non-trivial lua lib I see no reason to keep it.  But I'm not a luajit
> user.

Or we remove the FLAVOR and unconditionally enable 5.2 compat
which will be with 5.1 abi still?



infrastructure/db: make cvs(1) ignore network.conf

2016-10-31 Thread Jeremie Courreges-Anglas

Since some time already cvs(1) warns me about

? infrastructure/db/network.conf

I'd like to get rid of it.  Objections / ok?


Index: infrastructure/db/.cvsignore
===
RCS file: infrastructure/db/.cvsignore
diff -N infrastructure/db/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -
+++ infrastructure/db/.cvsignore1 Nov 2016 00:10:48 -
@@ -0,0 +1 @@
+network.conf

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



Re: UPDATE: vim

2016-10-31 Thread frantisek holop

on a related note i am doubtful that what
Stuart described about the automatic upgrade process[1]
will work with the current port without additional
changes...  but i am getting out of my depth quickly...

[1] http://marc.info/?l=openbsd-ports&m=147492812506914&w=2

-f
-- 
43.3% of all statistics are meaningless.



UPDATE: vim

2016-10-31 Thread frantisek holop
this is an update to the latest patchlevel,
that does also 2 things:

- let ruby 1.8 die, move up to 2.3
  lightly tested (:ruby print RUBY_VERSION)
  so ruby users please step up

- include lua in the monster package
  lightly tested (:lua print("Hello, Vim!"))
  so lua users please step up

if i am not mistaken, this is a new flavor,
do i need to mark some conflict between ruby 1.8 vs
2.3?

-f
-- 
does the mushroom cloud have any siler lining?
Index: Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.119
diff -u -p -r1.119 Makefile
--- Makefile31 Aug 2016 23:05:40 -  1.119
+++ Makefile31 Oct 2016 22:54:53 -
@@ -63,12 +63,12 @@
  SUBDIR += vile
  SUBDIR += vim
  SUBDIR += vim,gtk2,lua
- SUBDIR += vim,gtk2,perl,python,ruby
- SUBDIR += vim,gtk2,perl,python3,ruby
+ SUBDIR += vim,gtk2,lua,perl,python,ruby
+ SUBDIR += vim,gtk2,lua,perl,python3,ruby
  SUBDIR += vim,no_x11
  SUBDIR += vim,no_x11,lua
- SUBDIR += vim,no_x11,perl,python,ruby
- SUBDIR += vim,no_x11,perl,python3,ruby
+ SUBDIR += vim,no_x11,lua,perl,python,ruby
+ SUBDIR += vim,no_x11,lua,perl,python3,ruby
  SUBDIR += vim-spell
  SUBDIR += xemacs21
  SUBDIR += xemacs21-sumo
Index: vim/Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile
--- vim/Makefile12 Oct 2016 09:31:16 -  1.154
+++ vim/Makefile31 Oct 2016 22:54:53 -
@@ -3,7 +3,7 @@
 COMMENT-main=  vi clone, many additional features
 COMMENT-lang=  vi clone, NLS subpackage
 
-V= 8.0.0027
+V= 8.0.0055
 GH_ACCOUNT=vim
 GH_PROJECT=vim
 GH_TAGNAME=v$V
@@ -90,7 +90,7 @@ ERRORS=   "Fatal: You only can select one
 
 .if ${FLAVOR:Mruby}
 MODULES+=  lang/ruby
-MODRUBY_REV=   1.8
+MODRUBY_REV=   2.3
 CONFIGURE_ARGS+= --enable-rubyinterp --with-ruby-command=${RUBY}
 LIB_DEPENDS+=  ${MODRUBY_LIB_DEPENDS}
 WANTLIB+=  m ${MODRUBY_WANTLIB}
Index: vim/distinfo
===
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.50
diff -u -p -r1.50 distinfo
--- vim/distinfo12 Oct 2016 09:31:16 -  1.50
+++ vim/distinfo31 Oct 2016 22:54:53 -
@@ -1,2 +1,2 @@
-SHA256 (vim-8.0.0027.tar.gz) = t2WT/WPOPiri4G6160nMjDWBiuVJe2g6tNv4Of4nqSM=
-SIZE (vim-8.0.0027.tar.gz) = 12929799
+SHA256 (vim-8.0.0055.tar.gz) = xTrbKefCAHjrRKWKFucSQCuojdpaPkGbZKQTnWaYKrs=
+SIZE (vim-8.0.0055.tar.gz) = 12930637
Index: vim/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/vim/pkg/PLIST-main,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST-main
--- vim/pkg/PLIST-main  26 Sep 2016 10:48:39 -  1.16
+++ vim/pkg/PLIST-main  31 Oct 2016 22:54:53 -
@@ -25,6 +25,8 @@ share/vim/${P}/autoload/ada.vim
 share/vim/${P}/autoload/adacomplete.vim
 share/vim/${P}/autoload/ccomplete.vim
 share/vim/${P}/autoload/clojurecomplete.vim
+share/vim/${P}/autoload/context.vim
+share/vim/${P}/autoload/contextcomplete.vim
 share/vim/${P}/autoload/csscomplete.vim
 share/vim/${P}/autoload/decada.vim
 share/vim/${P}/autoload/getscript.vim
@@ -90,6 +92,7 @@ share/vim/${P}/compiler/ant.vim
 share/vim/${P}/compiler/bcc.vim
 share/vim/${P}/compiler/bdf.vim
 share/vim/${P}/compiler/checkstyle.vim
+share/vim/${P}/compiler/context.vim
 share/vim/${P}/compiler/cs.vim
 share/vim/${P}/compiler/cucumber.vim
 share/vim/${P}/compiler/decada.vim
@@ -515,6 +518,7 @@ share/vim/${P}/indent/clojure.vim
 share/vim/${P}/indent/cmake.vim
 share/vim/${P}/indent/cobol.vim
 share/vim/${P}/indent/config.vim
+share/vim/${P}/indent/context.vim
 share/vim/${P}/indent/cpp.vim
 share/vim/${P}/indent/cs.vim
 share/vim/${P}/indent/css.vim
@@ -559,6 +563,7 @@ share/vim/${P}/indent/lua.vim
 share/vim/${P}/indent/mail.vim
 share/vim/${P}/indent/make.vim
 share/vim/${P}/indent/matlab.vim
+share/vim/${P}/indent/mf.vim
 share/vim/${P}/indent/mma.vim
 share/vim/${P}/indent/mp.vim
 share/vim/${P}/indent/objc.vim
@@ -650,6 +655,7 @@ share/vim/${P}/keymap/hebrewp_cp1255.vim
 share/vim/${P}/keymap/hebrewp_iso-8859-8.vim
 share/vim/${P}/keymap/hebrewp_utf-8.vim
 share/vim/${P}/keymap/kana.vim
+share/vim/${P}/keymap/kazakh-jcuken.vim
 share/vim/${P}/keymap/lithuanian-baltic.vim
 share/vim/${P}/keymap/magyar_utf-8.vim
 share/vim/${P}/keymap/mongolian_utf-8.vim


Re: building curl with gssapi disables ssl

2016-10-31 Thread Jiri B
On Thu, Oct 27, 2016 at 10:31:04AM -0400, William Leuschner wrote:
> >   SSL support:  no  
> > (--with-{ssl,gnutls,nss,polarssl,mbedtls,cyassl,axtls,winssl,darwinssl} )
> 
> Have you tried adding "--with-ssl" to CONFIGURE_ARGS?
> 
> - William

Hi,

yes, I did.

j.

$ env FLAVOR=gssapi make show=CONFIGURE_ARGS
--with-ca-bundle=/etc/ssl/cert.pem  --with-libidn=/usr/local  --without-libpsl  
--without-libssh2 --with-ssl --with-gssapi=/usr/local/heimdal 
--prefix='/usr/local' --sysconfdir='/etc' --mandir='/usr/local/man' 
--infodir='/usr/local/info' --localstatedir='/var' --disable-silent-rules 
--disable-gtk-doc

jirib:/home/jirib/cvs/openbsd-ports/net/curl
$ env FLAVOR=gssapi make configure 2>&1 | grep Protocols:
  Protocols:DICT FILE FTP GOPHER HTTP IMAP POP3 RTSP SMTP TELNET TFTP



Re: lua ports: versions/flavors handling

2016-10-31 Thread Jeremie Courreges-Anglas
Jeremie Courreges-Anglas  writes:

> j...@wxcvbn.org (Jeremie Courreges-Anglas) writes:
>
>> Some time ago I took a look at hooking lua53 flavors in the ports that
>> support it.  It turned out that some ports were already broken with
>> particular versions of lua (the most common errors are missing functions
>> at dlopen time, and module() errors), yet they were hooked up.
>>
>> So it's not just about adding lua53 flavors, but about having
>> a consistent ports tree.  In the end, I think that lua.port.mk should
>> stop populating FLAVORS automatically, so that people hacking on lua
>> have to explicitely enable the lua versions they tested.  Just like for
>> python.port.mk.
>>
>> The diff to explicitely add FLAVORS / hook them up is not ripe yet,
>> but first I'd like to know if people object to the proposal above.
>
> afaik we can stop automatically adding FLAVORS in lua.port.mk; it would
> be nice if someone could put this in a bulk to confirm.

Committed, thanks Antoine for the bulk build test.

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



Re: luajit,lua52 uses the wrong lua abi

2016-10-31 Thread Jeremie Courreges-Anglas

lua.port.mk doesn't automatically add lua52 and lua53 to FLAVORS any
more.  So right now the ,lua52 package is broken and I've removed it
from lang/Makefile.  Either it is decided to keep this FLAVOR (which
requires explicitely declaring it in the port Makefile) or the port can
be cleaned up.

I'd go with the latter, if this package doesn't work with any
non-trivial lua lib I see no reason to keep it.  But I'm not a luajit
user.

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



GSSAPI flavor for Dovecot

2016-10-31 Thread William Leuschner
Hello again, porters!

I've written a new flavor for Dovecot to add support for GSSAPI. Could
someone take a look at it?

Thanks,
William Leuschner

Index: Makefile
===
RCS file: /cvs/ports/mail/Makefile,v
retrieving revision 1.342
diff -u -p -r1.342 Makefile
--- Makefile11 Jul 2016 10:15:18 -  1.342
+++ Makefile31 Oct 2016 18:41:24 -
@@ -33,6 +33,7 @@
  SUBDIR += dkim-milter
  SUBDIR += dkimproxy
  SUBDIR += dovecot
+ SUBDIR += dovecot,gssapi
  SUBDIR += dovecot-antispam
  SUBDIR += dovecot-pigeonhole
  SUBDIR += dspam
Index: dovecot/Makefile
===
RCS file: /cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.241
diff -u -p -r1.241 Makefile
--- dovecot/Makefile5 Jul 2016 09:27:35 -   1.241
+++ dovecot/Makefile31 Oct 2016 18:41:24 -
@@ -7,7 +7,7 @@ COMMENT-postgresql= PostgreSQL authentic

 V_MAJOR=   2.2
 V_DOVECOT= 2.2.24
-REVISION=  0
+REVISION=  1

 DISTNAME=  dovecot-${V_DOVECOT}
 PKGNAME=   dovecot-${V_DOVECOT}
@@ -66,10 +66,17 @@ CONFIGURE_ARGS= --with-rundir=/var/dovec
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

+FLAVORS= gssapi
 PSEUDO_FLAVORS=no_db no_ldap no_mysql no_postgresql
 FLAVOR?=
 .if ${FLAVOR:Mno_db}
 FLAVOR+=   no_ldap no_mysql no_postgresql
+.endif
+
+.if ${FLAVOR:Mgssapi}
+CONFIGURE_ARGS+=KRB5CONFIG=/usr/local/heimdal/bin/krb5-config
+CONFIGURE_ARGS+=--with-gssapi=yes
+MODULES+=security/heimdal
 .endif

 MULTI_PACKAGES= -server -ldap -mysql -postgresql
Index: dovecot/pkg/DESCR-server
===
RCS file: /cvs/ports/mail/dovecot/pkg/DESCR-server,v
retrieving revision 1.6
diff -u -p -r1.6 DESCR-server
--- dovecot/pkg/DESCR-server28 May 2011 19:40:41 -  1.6
+++ dovecot/pkg/DESCR-server31 Oct 2016 18:41:24 -
@@ -4,3 +4,6 @@ several coding techniques to avoid most
 can work with standard mbox and maildir formats and it's fully compatible
 with UW-IMAP and Courier IMAP servers as well as mail clients accessing
 the mailboxes directly.
+
+Flavors:
+gssapi: support for GSSAPI authentication in Dovecot



Update to scapy-2.3.3

2016-10-31 Thread Daniel Jakots
Hi,

Scapy recently released their yearly version (a bit earlier than usual
though). Here's a diff to update it. The diff is quite long because
it's mainly some patches that were upstreamed/from upstream.

There is currently a minor nit: when you run scapy it greets with
"Welcome to Scapy (unknown.version)". I opened an issue on their
github, will updated the diff if needed.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/net/scapy/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile31 Jan 2016 23:21:37 -  1.21
+++ Makefile31 Oct 2016 17:48:44 -
@@ -2,7 +2,7 @@
 
 COMMENT=   powerful interactive packet manipulation in python
 
-MODPY_EGG_VERSION= 2.3.2
+MODPY_EGG_VERSION= 2.3.3
 DISTNAME=  scapy-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT=secdev
Index: distinfo
===
RCS file: /cvs/ports/net/scapy/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo31 Jan 2016 23:21:37 -  1.7
+++ distinfo31 Oct 2016 17:48:44 -
@@ -1,4 +1,4 @@
 SHA256 (ethertypes-20120703) = 7Tj51kS+/IfrQahknDEAcyQNmozXWy+cEVtdnX5dAzw=
-SHA256 (scapy-2.3.2.tar.gz) = G4qG1of+uO0BEUwMAWtChnTL/sBOPrb1JJoBjEJ8T2o=
+SHA256 (scapy-2.3.3.tar.gz) = Z2Qs97gG4C2u3dWIV3WIyuvdw0Jtt5BOeZmgsDNKY7U=
 SIZE (ethertypes-20120703) = 1362
-SIZE (scapy-2.3.2.tar.gz) = 1166056
+SIZE (scapy-2.3.3.tar.gz) = 1459132
Index: patches/patch-scapy_arch_unix_py
===
RCS file: patches/patch-scapy_arch_unix_py
diff -N patches/patch-scapy_arch_unix_py
--- patches/patch-scapy_arch_unix_py31 Jan 2016 23:21:37 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-scapy_arch_unix_py,v 1.2 2016/01/31 23:21:37 sthen Exp $
-
-Merged upstream
-https://github.com/secdev/scapy/commit/3ecf379e52214aa742d09a15b13694e7d2c6d469
-
 scapy/arch/unix.py.origFri Jan 15 14:10:59 2016
-+++ scapy/arch/unix.py Sun Jan 24 11:03:12 2016
-@@ -155,14 +155,30 @@ def in6_getifaddr():
- """
- 
- # List all network interfaces
--try:
--  f = os.popen("%s -l" % conf.prog.ifconfig)
--except OSError,msg:
--  log_interactive.warning("Failed to execute ifconfig.")
--  return []
-+if scapy.arch.OPENBSD:
-+try:
-+f = os.popen("%s" % conf.prog.ifconfig)
-+except OSError,msg:
-+  log_interactive.warning("Failed to execute ifconfig.")
-+  return []
- 
--# Get the list of network interfaces
--splitted_line = f.readline().rstrip().split()
-+# Get the list of network interfaces
-+splitted_line = []
-+for l in f:
-+if "flags" in l:
-+iface = l.split()[0].rstrip(':')
-+splitted_line.append(iface)
-+
-+else: # FreeBSD, NetBSD or Darwin
-+try:
-+  f = os.popen("%s -l" % conf.prog.ifconfig)
-+except OSError,msg:
-+  log_interactive.warning("Failed to execute ifconfig.")
-+  return []
-+
-+# Get the list of network interfaces
-+splitted_line = f.readline().rstrip().split()
-+
- ret = []
- for i in splitted_line:
-   ret += _in6_getifaddr(i)
Index: patches/patch-scapy_config_py
===
RCS file: /cvs/ports/net/scapy/patches/patch-scapy_config_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scapy_config_py
--- patches/patch-scapy_config_py   31 Jan 2016 23:21:37 -  1.2
+++ patches/patch-scapy_config_py   31 Oct 2016 17:48:44 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-scapy_config_py,v 1.2 2016/01/31 23:21:37 sthen Exp $
 scapy/config.py.orig   Fri Jan 15 14:10:59 2016
-+++ scapy/config.pyThu Jan 21 19:49:16 2016
-@@ -374,7 +374,7 @@ extensions_paths: path or list of paths where extensio
- load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "hsrp", 
"inet6", "ir", "isakmp", "l2tp",
-"mgcp", "mobileip", "netbios", "netflow", "ntp", "ppp", 
"radius", "rip", "rtp",
-"sebek", "skinny", "smb", "snmp", "tftp", "x509", 
"bluetooth", "dhcp6", "llmnr", "sctp", "vrrp",
--   "ipsec" ]
-+   "ipsec", "loop" ]
- 
+--- scapy/config.py.orig   Tue Oct 18 10:44:43 2016
 scapy/config.pyMon Oct 31 10:36:06 2016
+@@ -385,7 +385,7 @@ contribs: a dict which can be used by contrib layers t
+"mobileip", "netbios", "netflow", "ntp", "ppp",
+"radius", "rip", "rtp", "skinny", "smb", "snmp",
+"tftp", "x509", "bluetooth", "dhcp6", "llmnr",
+-   "sctp", "vrrp", "ipsec", "lltd", "vxlan"]
++   "sctp", "vrrp", "ipsec", "lltd", "vxlan", "loop"]
+ contribs = dict()
+ 
  
- if not Conf.ipv6_enabled:
Index: 

Remove databases/{dbic++,ruby-swift}

2016-10-31 Thread Jeremy Evans
databases/dbic++ was added by me in 2010 to support
databases/ruby-swift.  In 2012, swift changed to using it's own C-based
drivers (databases/ruby-swift-db-*) instead of dbic++. dbic++
development stopped in 2012, and swift development stopped in 2014.
Neither dbic++ nor swift has any users as far as I know.

Can I please get an OK to send dbic++ and ruby-swift to the Attic?
ruby-swift-db-* can stay as other software in the tree can use those
drivers (e.g. databases/ruby-sequel).

Thanks,
Jeremy



Re: [update] pekwm-0.1.17

2016-10-31 Thread Antoine Jacoutot
On Sun, Oct 30, 2016 at 09:01:26AM +0200, Timo Myyrä wrote:
> Hi,
> 
> Here is an update to pekwm. This was previously attempted a while ago:
> http://marc.info/?t=14222171711&r=1&w=2
> 
> Previous attempt got stuck on distfile issue as pekwm's site used untrusted 
> SSL
> CA. Currently it seems to use Let's Encrypt for SSL so fetching distfiles is 
> no
> longer an issue.
> 
> Other changes, I switched the port to use GNU Make as otherwise all the 
> scripts
> weren't generated by the build. This could probably worked around with bit of
> patching.
> 
> Thanks to Antoine and Stuart on their help on fixing the PLIST file.

Committed, thanks.


> 
> Timo
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/pekwm/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile  28 Aug 2016 11:07:14 -  1.27
> +++ Makefile  30 Oct 2016 06:42:43 -
> @@ -2,13 +2,12 @@
>  
>  COMMENT= aewm++ based pretty themable window manager
>  
> -DISTNAME=pekwm-0.1.15
> -REVISION=1
> +DISTNAME=pekwm-0.1.17
>  CATEGORIES=  x11
>  
> -HOMEPAGE=http://pekwm.org/
> +HOMEPAGE=https://www.pekwm.org/
>  
> -MAINTAINER=  Nicholas Marriott 
> +MAINTAINER=  Timo Myyra 
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -16,13 +15,15 @@ PERMIT_PACKAGE_CDROM= Yes
>  WANTLIB += ICE SM X11 Xext Xft Xinerama Xpm Xrandr c iconv jpeg m png
>  WANTLIB += stdc++
>  
> -MASTER_SITES=${HOMEPAGE}projects/pekwm/files/
> +MASTER_SITES=${HOMEPAGE}/files/
>  EXTRACT_SUFX=.tar.bz2
>  LIB_DEPENDS= converters/libiconv \
>   graphics/jpeg \
>   graphics/png
>  
>  NO_TEST= Yes
> +
> +USE_GMAKE=   Yes
>  
>  CONFIGURE_STYLE=gnu
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/pekwm/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo  12 Nov 2012 10:03:21 -  1.10
> +++ distinfo  30 Oct 2016 06:42:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (pekwm-0.1.15.tar.bz2) = VtQFuH89hY68U6In5N4juScwZ3ByURRckK8I01vHWC8=
> -SIZE (pekwm-0.1.15.tar.bz2) = 395557
> +SHA256 (pekwm-0.1.17.tar.bz2) = ih/Tv5846Me7KyhkwJD5hrYM7CKB7PG7pGLRIPsyfQA=
> +SIZE (pekwm-0.1.17.tar.bz2) = 405742
> Index: patches/patch-data_scripts_pekwm_screenshot_sh
> ===
> RCS file: patches/patch-data_scripts_pekwm_screenshot_sh
> diff -N patches/patch-data_scripts_pekwm_screenshot_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-data_scripts_pekwm_screenshot_sh30 Oct 2016 06:42:43 
> -
> @@ -0,0 +1,76 @@
> +$OpenBSD$
> +No need for bash here, use /bin/sh
> +--- data/scripts/pekwm_screenshot.sh.origSun May 26 15:01:18 2013
>  data/scripts/pekwm_screenshot.sh Tue Mar 22 09:16:26 2016
> +@@ -1,30 +1,30 @@
> +-#!/usr/bin/env bash
> ++#!/bin/sh
> + #
> + # Copyright © 2013 the pekwm development team
> + #
> + 
> +-function screenshot_scrot
> ++screenshot_scrot()
> + {
> + scrot -z "$1"
> + }
> + 
> +-function screenshot_xwd_netpbm
> ++screenshot_xwd_netpbm()
> + {
> + xwd -root | xwdtopnm 2>/dev/null | pnmtopng > "$1"
> + }
> + 
> +-function screenshot_imagemagick
> ++screenshot_imagemagick()
> + {
> + import -window root "$1"
> + }
> + 
> +-function is_in_path
> ++is_in_path()
> + {
> + which $1 >/dev/null 2>&1
> + return $?
> + }
> + 
> +-function detect_command
> ++detect_command()
> + {
> + is_in_path "scrot"
> + if test $? -eq 0; then
> +@@ -45,7 +45,7 @@ function detect_command
> + fi
> + }
> + 
> +-function usage
> ++usage()
> + {
> + echo "usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] 
> [-o output.png]"
> + echo ""
> +@@ -61,7 +61,7 @@ function usage
> + exit 0
> + }
> + 
> +-function usage_command
> ++usage_command()
> + {
> + echo "Unable to find any supported commands for taking screenshots"
> + echo ""
> +@@ -74,7 +74,7 @@ function usage_command
> + exit 1
> + }
> + 
> +-function main
> ++main()
> + {
> + # Initialize for strict mode
> + command=""
> +@@ -146,6 +146,6 @@ function main
> + exit 0
> + }
> + 
> +-OPTIONS=$(getopt -o c:d:ho: -n 'pekwm_screenshot.sh' -- "$@")
> ++OPTIONS=$(getopt c:d:ho: $*)
> + main
> + 
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/pekwm/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 12 Nov 2012 10:03:21 -  1.7
> +++ pkg/PLIST 30 Oct 2016 06:42:43 -
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.7 2012/11/12 10:03:21 jasper Exp $
> +@comment $OpenBSD$
>  @bin bin/pekwm
>  @man man/man1/pekwm.1
>  share/examples/pekwm/
> @@ -6,11 +6,11 @@ share/examples/pekwm/
>  share/examples/pekwm/autoproperties
>  @sample ${SYSCONFDIR}/pekwm/autoprop

Re: [MAINTAINER UPDATE] x11/lumina 1.1.0

2016-10-31 Thread Bryan C. Everly
Antoine,

Thank you so much for your help in this.



Re: [MAINTAINER UPDATE] x11/lumina 1.1.0

2016-10-31 Thread Antoine Jacoutot
Thanks, committing in a few with the sed substitutions put back.

On Fri, Oct 28, 2016 at 02:30:54PM -0400, Bryan Everly wrote:
> 
> > +V=  1.1.0
> > +GH_ACCOUNT= trueos
> > +GH_PROJECT=lumina
> > +GH_TAGNAME= v${V}
> > +DISTNAME=   ${GH_PROJECT}-${V}
> > 
> > These 5 lines are equivalent to
> > 
> > +GH_ACCOUNT=trueos
> > +GH_PROJECT=lumina
> > +GH_TAGNAME=v1.1.0
> > 
> > Missing DISTNAME is then generated as ${GH_PROJECT}-${GH_TAGNAME:v%=%}.
> > 
> > Also, We normally don't expand tabs.
> > 
> > +CATEGORIES ?=   x11 x11/lumina
> > 
> > There is no need for '?=' - it is not a Makefile.inc any more.  Also,
> > category x11/lumina does not make sense since it contains only one port.
> > 
> > +MODULES=   x11/qt5
> > [...]
> > +do-configure:
> > +   cd ${WRKSRC} && ${LOCALBASE}/bin/qmake-qt5 CONFIG+="configure WITH_I18N"
> > 
> > You should use CONFIGURE_STYLE and CONFIGURE_ARGS instead:
> > 
> > +MODULES=   devel/qmake \
> > x11/qt5
> > +CONFIGURE_STYLE=   qmake
> > +CONFIGURE_ARGS=CONFIG+="configure WITH_I18N"
> > 
> > This is more readable and more consistent with other ports.
> > 
> > +MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION}
> > 
> > Why do you need this?  There is LIBLuminaUtils_VERSION variable in Lumina's
> > build infrastructure?
> > 
> > +pre-configure:
> > +   sed -i 's,/usr/local,${LOCALBASE},g' \
> > +${WRKSRC}/src-qt5/core/libLumina/LuminaXDG.cpp \
> > +${WRKSRC}/src-qt5/core/lumina-desktop/SettingsMenu.cpp
> > +   sed -i 's,/etc/luminaDesktop.conf,${SYSCONFDIR}/luminaDesktop.conf,g' \
> > +${WRKSRC}/src-qt5/core/libLumina/LuminaUtils.cpp
> > 
> > This doesn't look right.  Files 
> > "src-qt5/core/lumina-desktop/SettingsMenu.cpp"
> > and "src-qt5/core/libLumina/LuminaUtils.cpp" don't contain paths you are
> > trying to clean out, and even if they did, replacing them with
> > preprocessor macros and fixing build infrastructure would make more
> > sense.  Upstream could even use your fixes then.
> > 
> > +# BSD
> > +PERMIT_PACKAGE_CDROM =  Yes
> > +
> > +NO_TEST=Yes
> > 
> > Better place these variables to the positions where people would expect
> > them.  There is no obvious reason to have them at the bottom of the
> > Makefile.
> > 
> > 
> > In PLIST you've left out
> > 
> >@exec %D/bin/update-desktop-database
> >@unexec-delete %D/bin/update-desktop-database
> > 
> > And since you move your port from one pkgpath to another you need
> > 
> >@pkgpath x11/lumina/lumina
> >@pkgpath x11/lumina/i18n
> > 
> > markers.
> > 
> > --
> > Dmitrij D. Czarkoff
> Dmitri,
> 
> Thank you for your excellent suggestions.  I was able to incorporate all but
> two of them.  Unfortunately the MAKE_FLAGS part is required, else the build
> infrastructure for Lumina will not produce the shared library.  The second
> thing that I have to keep in place is the do_configure make target.  Due to
> the fact that there are many embedded relative paths in various files in the
> Lumina build infrastructure, the directory change is necessary to make the
> relative pathing work out.  I'll try to work with upstream to see if I can
> get this further refined in a future update.
> 
> I have attached three files.  The first is a diff showing the directory
> restructuring (as you may recall, they combined the lumina/i18n and
> lumina/lumina components with this release), the second is a tarball of the
> x11/lumina directory with the deletes preserved in the ./CVS directories.
> The third file is a tarball of the "clean" directory with all empty
> subdirectories and CVS directories removed.
> 
> If someone could please look this over and, if OK, commit it on my behalf I
> would appreciate it.  I'd like to get people access to Lumina 1.1 because it
> has some really nice new features.
> 
> Thanks!

> Index: Makefile
> ===
> RCS file: /home/cvs/ports/x11/lumina/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile  12 Aug 2015 06:26:34 -  1.19
> +++ Makefile  28 Oct 2016 18:06:24 -
> @@ -1,7 +1,45 @@
>  # $OpenBSD: Makefile,v 1.19 2015/08/12 06:26:34 ajacoutot Exp $
>  
> - SUBDIR =
> - SUBDIR += i18n
> - SUBDIR += lumina
> +COMMENT= Lumina Desktop Environment
>  
> -.include 
> +GH_ACCOUNT=  trueos
> +GH_PROJECT=  lumina
> +GH_TAGNAME=  v1.1.0
> +
> +SHARED_LIBS +=   LuminaUtils 1.1 # 1.1
> +
> +CATEGORIES=  x11
> +MAINTAINER=  Bryan C. Everly 
> +HOMEPAGE=http://lumina-desktop.org/
> +
> +WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Multimedia Qt5MultimediaWidgets
> +WANTLIB += Qt5Network Qt5Svg Qt5Widgets Qt5X11Extras Xdamage c
> +WANTLIB += m pthread xcb xcb-composite xcb-damage xcb-

[new] gradio, an internet radio browser and player

2016-10-31 Thread Landry Breuil
Hi,

saw this recently, was easy to port, runs fine - see
http://www.omgubuntu.co.uk/2016/07/gradio-radio-player-app-ubuntu for
more details, github page (https://github.com/haecker-felix/gradio) is
... bah, nobody does websites those days. The nice thing in this project
is that it fetches radio stations directly from a crowdsourced website
(http://www.radio-browser.info/gui/) so, its not a
static-always-outdated list like audio/radiotray..

ok to import ? tweaks, comments ?

Landry


gradio-5.0.0b2.tgz
Description: application/tar-gz


Re: NEW net/pbgpp

2016-10-31 Thread Stuart Henderson
On 2016/10/30 19:08, Peter Hessler wrote:
> DE-CIX developed a PCAP parser to decode BGP messages collected with
> tcpdump. The parser reads PCAP input from file system, stdin, or by
> listening on a network interface. Furthermore, the parser is able to use
> several output filters and pipes to tailor the output for your
> individual needs. Therefore, we decided to develop PCAP BGP Parser aka
> pbgpp. The filters and pipes can be easily extended - we are happy to
> include your extensions any time :)
> 
> HOMEPAGE: https://github.com/de-cix/pbgp-parser
> 
> depends on r1.59 of net/bpf.h and the "update net/py-pcapy" patch
> 
> OK?
> 
> 
> -- 
> A successful [software] tool is one that was used to do something
> undreamed of by its author.
>   -- S. C. Johnson



| LIB_DEPENDS =   net/py-pcapy,python3 \

- Should be BUILD+RUN_DEPENDS, the LIB_DEPENDS will get stripped from
packages because there's no matching WANTLIB entry (this would trigger a
"LIB_DEPENDS  not needed for " when packaging).

- I think we settled on using path/port${MODPY_FLAVOR} for all of these,
even with explicit MODPY_VERSION=${MODPY_DEFAULT_whatever}

| devel/py-setuptools

- Added automatically by python.port.mk (and with the right py3 flavour).

DESCR reads a bit strangely for a package.



Re: update net/py-pcapy

2016-10-31 Thread Jeremie Courreges-Anglas
Jeremie Courreges-Anglas  writes:

> Peter Hessler  writes:
>
>> On 2016 Oct 30 (Sun) at 20:21:29 +0100 (+0100), Rafael Sadowski wrote:
>> :On Sun Oct 30, 2016 at 08:16:12PM +0100, Rafael Sadowski wrote:
>> :> On Sun Oct 30, 2016 at 07:28:42PM +0100, Peter Hessler wrote:
>> :> > On 2016 Oct 30 (Sun) at 14:37:19 +0100 (+0100), Peter Hessler wrote:
>> :> > :I would like to use pcapy in a python3 module, so we need to update it.
>> :> > 
>> :> > Updated version that can install both the python2 and python3 versions
>> :> > at the same time.
>> :> > 
>> :> > depends on r1.59 of sys/net/bpf.h that I committed recently.
>> :> > 
>> :> > OK?
>> :> > 
>> :> 
>> :> Maybe with GH_?
>> :> 
>> :
>> :... and cleanup WANTLIB
>>
>> Yes, these look good to me.
>
> Looks fine to me too, except for the end of PLIST which contains:
>
>> :+share/doc/${MODPY_PY_PREFIX}pcapy/tests/96pings.pcap
>> :+SHare/doc/${MODPY_PY_PREFIX}pcapy/tests/pcapytests.py
>
> Without those bits, ok jca@

Erm, this update strips "py-" from PKGNAME, which prevents upgrades and
python[23] packages coexistence.

I suggest leaving the DISTNAME and PKGNAME lines alone.  With this
addressed, ok jca@


Index: Makefile
===
RCS file: /d/cvs/ports/net/py-pcapy/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile17 Apr 2015 16:15:59 -  1.11
+++ Makefile31 Oct 2016 16:00:12 -
@@ -2,25 +2,27 @@
 
 COMMENT =  libpcap module for Python
 
-MODPY_EGG_VERSION =0.10.5
+MODPY_EGG_VERSION =0.10.10
+GH_ACCOUNT =   CoreSecurity
+GH_PROJECT =   pcapy
+GH_TAGNAME =   ${MODPY_EGG_VERSION}
 DISTNAME = pcapy-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 7
 
 CATEGORIES =   net devel
 
-HOMEPAGE = http://oss.coresecurity.com/projects/pcapy.html
+HOMEPAGE = 
https://www.coresecurity.com/corelabs-research/open-source-tools/pcapy
 
 # Apache
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += ${MODPY_WANTLIB} m stdc++ pcap pthread util
-
-MASTER_SITES = http://oss.coresecurity.com/repo/
+WANTLIB += ${MODPY_WANTLIB} m stdc++ pcap
 
 MODULES =  lang/python
+MODPY_SETUPTOOLS = Yes
 
-NO_TEST =  Yes
+FLAVORS =  python3
+FLAVOR ?=
 
 MAKE_ENV +=LDSHARED="${CC} -shared -fPIC"
 MAKE_ENV +=LDFLAGS="-L${LOCALBASE}/lib"
@@ -28,5 +30,8 @@ MAKE_ENV +=   LDFLAGS="-L${LOCALBASE}/lib
 # fix msdos line-endings
 pre-patch:
cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/setup.py
 
 .include 
Index: distinfo
===
RCS file: /d/cvs/ports/net/py-pcapy/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:51 -  1.2
+++ distinfo30 Oct 2016 20:27:40 -
@@ -1,2 +1,2 @@
-SHA256 (pcapy-0.10.5.tar.gz) = gKdj2RgUg24M0eV7Y1GdxgITtCujxIbUeUyrrjD9elc=
-SIZE (pcapy-0.10.5.tar.gz) = 18884
+SHA256 (pcapy-0.10.10.tar.gz) = NEdTmoUWrhkIR1ZBqA/6EvaYanY1eW/Uz1ayJ4C7bok=
+SIZE (pcapy-0.10.10.tar.gz) = 28332
Index: patches/patch-pcap_pkthdr_cc
===
RCS file: /d/cvs/ports/net/py-pcapy/patches/patch-pcap_pkthdr_cc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-pcap_pkthdr_cc
--- patches/patch-pcap_pkthdr_cc3 Apr 2009 15:45:41 -   1.1.1.1
+++ patches/patch-pcap_pkthdr_cc30 Oct 2016 20:27:40 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-pcap_pkthdr_cc,v 1.1.1.1 2009/04/03 15:45:41 sthen Exp $
 pcap_pkthdr.cc.origFri Apr  3 11:52:32 2009
-+++ pcap_pkthdr.cc Fri Apr  3 11:52:36 2009
-@@ -24,7 +24,7 @@
+--- pcap_pkthdr.cc.origSun Oct 30 14:05:35 2016
 pcap_pkthdr.cc Sun Oct 30 14:05:35 2016
+@@ -23,7 +23,7 @@
  // internal pcapobject
  typedef struct {
PyObject_HEAD
Index: patches/patch-setup_py
===
RCS file: /d/cvs/ports/net/py-pcapy/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-setup_py
--- patches/patch-setup_py  25 Dec 2011 23:59:06 -  1.1
+++ patches/patch-setup_py  30 Oct 2016 20:27:40 -
@@ -1,12 +1,15 @@
 $OpenBSD: patch-setup_py,v 1.1 2011/12/25 23:59:06 fgsch Exp $
 setup.py.orig  Mon Dec 12 08:57:21 2011
-+++ setup.py   Mon Dec 12 08:57:34 2011
-@@ -60,7 +60,7 @@ setup(name = PACKAGE_NAME,
-   include_dirs = include_dirs,
-   library_dirs = library_dirs,
-   libraries = libraries)],
--  data_files = [(os.path.join('share', 'doc', PACKAGE_NAME),
-+  data_files = [(os.path.join('share', 'doc', 'py-%s' % PACKAGE_NAME),
-  ['README', 'LICENSE', 'pcapy.html'])],
+--- setup.py.orig  Sun Oct 30 19:18:00 2016
 setup.py   Sun

Re: update net/py-pcapy

2016-10-31 Thread Stuart Henderson
On 2016/10/30 20:16, Rafael Sadowski wrote:
> On Sun Oct 30, 2016 at 07:28:42PM +0100, Peter Hessler wrote:
> > On 2016 Oct 30 (Sun) at 14:37:19 +0100 (+0100), Peter Hessler wrote:
> > :I would like to use pcapy in a python3 module, so we need to update it.
> > 
> > Updated version that can install both the python2 and python3 versions
> > at the same time.
> > 
> > depends on r1.59 of sys/net/bpf.h that I committed recently.
> > 
> > OK?
> > 
> 
> Maybe with GH_?

I think it would be better to fetch it from pypi with MODPY_PI=Yes,
it's usually a bit more reliable than github, and portroach handles it
much better.



Re: update net/py-pcapy

2016-10-31 Thread Jeremie Courreges-Anglas
Peter Hessler  writes:

> On 2016 Oct 30 (Sun) at 20:21:29 +0100 (+0100), Rafael Sadowski wrote:
> :On Sun Oct 30, 2016 at 08:16:12PM +0100, Rafael Sadowski wrote:
> :> On Sun Oct 30, 2016 at 07:28:42PM +0100, Peter Hessler wrote:
> :> > On 2016 Oct 30 (Sun) at 14:37:19 +0100 (+0100), Peter Hessler wrote:
> :> > :I would like to use pcapy in a python3 module, so we need to update it.
> :> > 
> :> > Updated version that can install both the python2 and python3 versions
> :> > at the same time.
> :> > 
> :> > depends on r1.59 of sys/net/bpf.h that I committed recently.
> :> > 
> :> > OK?
> :> > 
> :> 
> :> Maybe with GH_?
> :> 
> :
> :... and cleanup WANTLIB
>
> Yes, these look good to me.

Looks fine to me too, except for the end of PLIST which contains:

> :+share/doc/${MODPY_PY_PREFIX}pcapy/tests/96pings.pcap
> :+SHare/doc/${MODPY_PY_PREFIX}pcapy/tests/pcapytests.py

Without those bits, ok jca@

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



powerpc bulk build report

2016-10-31 Thread landry
bulk build on macppc-1.ports.openbsd.org
started on  Tue Oct 18 14:16:38 MDT 2016
finished at Mon Oct 31 07:49:14 MDT 2016
lasted 13D10h32m
done with kern.version=OpenBSD 6.0-current (GENERIC.MP) #0: Tue Oct 18 11:00:38 
MDT 2016

built packages:7886
Oct 18:530
Oct 19:339
Oct 20:555
Oct 21:411
Oct 22:335
Oct 23:329
Oct 24:344
Oct 25:304
Oct 26:458
Oct 27:458
Oct 28:466
Oct 29:488
Oct 30:941
Oct 31:1927



build failures: 10
http://build-failures.rhaalovely.net//powerpc/2016-10-18/audio/moc.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/devel/llvm.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/devel/reposurgeon.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/editors/emacs21.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/graphics/openimageio.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/lang/guile2.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/lang/node.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/plan9/drawterm.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/sysutils/u-boot.log
http://build-failures.rhaalovely.net//powerpc/2016-10-18/www/gnash.log

recurrent failures
 failures/devel/reposurgeon.log
 failures/editors/emacs21.log
 failures/graphics/openimageio.log
 failures/lang/node.log
 failures/plan9/drawterm.log
 failures/sysutils/u-boot.log
 failures/www/gnash.log
new failures
+++ ls-failures Mon Oct 31 07:49:39 2016
+failures/lang/guile2.log
resolved failures
--- ../old/powerpc/last//ls-failuresMon Oct 17 01:53:20 2016
-failures/www/pear.log
Base libs:
curses.14.0 edit.5.2 event.4.1 expat.11.0 form.6.0 formw.6.0 fuse.1.1
iberty.12.0 menu.6.0 menuw.6.0 ncurses.14.0 ncursesw.14.0 objc.6.0
ossaudio.4.0 panel.6.0 panelw.6.0 perl.17.1 readline.4.0 rpcsvc.2.0
skey.6.0 radius.1.0 sndio.6.1 stdc++.57.0 termcap.14.0 .14.0 z.5.0
usbhid.7.0 util.12.1 pcap.8.1 crypto.38.1 pthread.23.0 ssl.39.1 tls.11.4
c.89.2 c.89.2.a kvm.16.2 m.10.0

X libs:
EGL.1.0 FS.10.0 GLESv1_CM.1.0 GLU.9.0 GLw.6.0 ICE.10.0 SM.9.0
X11-xcb.2.0 X11.16.1 XRes.5.0 Xau.10.0 Xaw.15.0 Xaw7.15.0 Xcomposite.4.0
Xcursor.5.0 Xdamage.4.0 Xdmcp.11.0 Xext.13.0 Xfixes.6.0 Xfontcache.5.0
Xi.12.1 Xinerama.6.0 Xmu.11.0 Xmuu.6.0 Xpm.9.0 Xrender.6.0 Xss.6.0
Xt.11.0 Xtst.11.0 Xv.6.0 XvMC.6.0 XvMCW.2.0 Xxf86dga.6.0 dmx.2.0
Xxf86misc.6.0 Xxf86vm.6.0 fontenc.4.0 epoxy.2.0 gbm.0.0 pciaccess.2.0
pixman-1.32.6 pthread-stubs.2.0 txc_dxtn.0.0 xcb-composite.1.0
xcb-damage.1.0 xcb-dpms.1.0 xcb-dri2.1.1 xcb-dri3.0.0 xcb-ewmh.2.0
xcb-cursor.0.0 xcb-icccm.4.0 xcb-image.2.0 xcb-res.1.1 xcb-keysyms.3.0
xkbui.5.0 xcb-shm.1.1 xcb-xevie.1.0 xcb-xf86dri.2.0 xcb-util.0.0
xcb-xinerama.1.0 xcb-xtest.1.0 xcb-xvmc.1.0 xkbfile.6.0 Xrandr.7.1
XvMCr600.1.0 xcb-render-util.2.0 drm_amdgpu.1.1 drm_nouveau.3.0
drm_radeon.4.0 GL.17.0 GLESv2.1.1 OSMesa.10.0 Xfont.13.0 Xft.10.0
glapi.0.2 fontconfig.11.0 freetype.26.0 xcb-glx.1.1 xcb-randr.2.2
xcb-present.0.1 xcb-record.1.1 xcb-render.1.1 xcb-screensaver.1.1
xcb-shape.1.1 xcb-sync.1.2 xcb-xfixes.1.2 xcb-xkb.0.1 xcb-xprint.3.0
xcb-xv.1.1 xcb.4.0 drm.7.2



Fwd: Re: [Patch] lang/sbcl version bump + threads flavor

2016-10-31 Thread Solène RAPENNE
Solène Rapenne writes:
>> "Solène Rapenne"  writes:
>> 
>> Hello,
>> 
>> Please find a version bump for sbcl and a flavor which enable thread.
>> There is no support for threads in sbcl for macppc and they are 
>> considered
>> experimental on OpenBSD, so it should not be the default, hence a 
>> thread
>> flavor.
>> 
>
> Patch in attachment

up ?

Index: Makefile
===
RCS file: /cvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile	3 Sep 2016 15:10:12 -	1.28
+++ Makefile	21 Oct 2016 09:30:03 -
@@ -6,8 +6,7 @@ USE_WXNEEDED =		Yes
 
 COMMENT=		compiler and runtime system for ANSI Common Lisp
 
-V =			1.2.14
-REVISION =		1
+V =			1.3.10
 DISTNAME=		sbcl-${V}-source
 PKGNAME=		sbcl-${V}
 WRKDIST=		${WRKDIR}/sbcl-${V}
@@ -28,9 +27,16 @@ MODGCC4_LANGS=		c
 
 WANTLIB=		c m util
 
-PSEUDO_FLAVORS=		native_bootstrap
+FLAVORS=		threads
 FLAVOR?=
 
+EXTRA_PARAMS=		
+.if ${FLAVOR:Mthreads}
+EXTRA_PARAMS=		--with-sb-threads
+.endif
+
+PSEUDO_FLAVORS=		native_bootstrap
+
 .if ${FLAVOR:Mnative_bootstrap}
 BUILD_DEPENDS+=		lang/sbcl
 BOOTSTRAP_CMD=		${LOCALBASE}/bin/sbcl \
@@ -63,7 +69,7 @@ pre-configure:
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} /bin/sh make.sh \
-		--prefix=${PREFIX} --xc-host="${BOOTSTRAP_CMD}"
+		--prefix=${PREFIX} --xc-host="${BOOTSTRAP_CMD}" ${EXTRA_PARAMS}
 	cd ${WRKSRC}/doc/manual && touch sbcl.texinfo && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} asdf.info sbcl.info
 
Index: distinfo
===
RCS file: /cvs/ports/lang/sbcl/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo	11 Aug 2015 21:41:04 -	1.12
+++ distinfo	21 Oct 2016 09:30:03 -
@@ -1,2 +1,2 @@
-SHA256 (sbcl-1.2.14-source.tar.bz2) = uRRt1kYMBbylCPbdqDADWAkRgz7t1R28CdjsqAsPXAY=
-SIZE (sbcl-1.2.14-source.tar.bz2) = 5565538
+SHA256 (sbcl-1.3.10-source.tar.bz2) = SlZ6rZGzFsIut1bdjlAs/ZqVpMZg+x+i6x5Q4Am4V3c=
+SIZE (sbcl-1.3.10-source.tar.bz2) = 5763563


Re: update www/py-httpie and switch to py3

2016-10-31 Thread Stuart Henderson
On 2016/10/31 13:04, Daniel Jakots wrote:
> Hi,
> 
> Here's an update to latest py-httpie release. I also switched it to
> python3 (for no particular reason other than it's 2016).
> 
> Comments? OK?

This changes the PKGNAME stem, so it needs a quirks entry.

Because it seems like it's an end-user program rather than a module for
other programs to use, and because you have to rename it anyway, it might
be better to switch to "httpie-0.9.6" rather than "py3-httpie-0.9.6" as
your diff does.



Re: NEW: sass

2016-10-31 Thread Jeremy Evans
On Sat, Oct 29, 2016 at 3:22 PM, frantisek holop  wrote:

> it's that time of (another) year again:
> i am submitting sass again :]
>
> please test and commit.
> let's have at least one style extension language
> processor that doesn't need a billion node js packages.
>

Looks good and tests fine with an scss file in one of my apps.

The gem ships with tests, and we can enable tests via:

MODRUBY_TEST =  ruby
MODRUBY_TEST_TARGET =   -I lib -e 'ARGV.each{|f| require f}' test/sass/*.rb

Can I get an OK from another developer to import this with the support for
tests added?

Thanks,
Jeremy


Re: firefox stuck in thrsleep

2016-10-31 Thread Jan Stary
It's still there with the Oct 29 snapshot and firefox-49.0.2

Jan

On Oct 24 14:08:29, h...@stare.cz wrote:
> This is current/amd64 (dmesg below) running firefox-49.0.1.
> With a few tabs, it runs OK, but with many tabs opened simultaneously,
> firefox gets stuck in thrsleep:
> 
>   PID USERNAME PRI NICE  SIZE   RES STATE WAIT  TIMECPU COMMAND
> 27149 hans  280  426M  442M onprocthrslee   0:45 82.42% firefox
> 
> The process does not react to nothing and needs to be pkilled.
> ktrace says that it's trying to 
> 
> 27149 firefox  CALL  clock_gettime(CLOCK_MONOTONIC,0x18d2ebbc2a48)
> 27149 firefox  STRU  struct timespec { 250151.035332742 }
> 27149 firefox  RET   clock_gettime 0
> 27149 firefox  CALL __thrsleep(0x18d2847bae38,CLOCK_MONOTONIC,0x18d2ebbc2a38,0
>   x18d2882a3000,0x18d2847baf04)
> 
> over and over again - see last 1000 lines of kdump below.
> 
> nptd is running and no other application seems to have
> a problem getting the time.
> 
> Is anyone seeing the same?
> 
>   Jan
> 
> 
> OpenBSD 6.0-current (GENERIC.MP) #0: Fri Oct 21 15:47:02 CEST 2016
> h...@biblio.stare.cz:/sys/arch/amd64/compile/GENERIC.MP
> real mem = 8486649856 (8093MB)
> avail mem = 8224915456 (7843MB)
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xf0100 (36 entries)
> bios0: vendor Award Software International, Inc. version "F2" date 04/20/2011
> bios0: Gigabyte Technology Co., Ltd. Z68MX-UD2H-B3
> acpi0 at bios0: rev 0
> acpi0: sleep states S0 S3 S4 S5
> acpi0: tables DSDT FACP HPET MCFG ASPT SSPT EUDS MATS TAMG APIC SSDT MATS
> acpi0: wakeup devices PEX0(S5) PEX1(S5) PEX2(S5) PEX3(S5) PEX4(S5) PEX5(S5) 
> PEX6(S5) PEX7(S5) HUB0(S5) UAR1(S3) USBE(S3) USE2(S3) AZAL(S5) PCI0(S5)
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpihpet0 at acpi0: 14318179 Hz
> acpimcfg0 at acpi0 addr 0xf400, bus 0-63
> acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 3193.16 MHz
> cpu0: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
> cpu0: 256KB 64b/line 8-way L2 cache
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 10 var ranges, 88 fixed ranges
> cpu0: apic clock running at 99MHz
> cpu0: mwait min=64, max=64, C-substates=0.2.1.1, IBE
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 3192.75 MHz
> cpu1: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
> cpu1: 256KB 64b/line 8-way L2 cache
> cpu1: smt 0, core 1, package 0
> cpu2 at mainbus0: apid 4 (application processor)
> cpu2: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 3192.75 MHz
> cpu2: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
> cpu2: 256KB 64b/line 8-way L2 cache
> cpu2: smt 0, core 2, package 0
> cpu3 at mainbus0: apid 6 (application processor)
> cpu3: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz, 3192.75 MHz
> cpu3: 
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE,SSE3,PCLMUL,DTES64,MWAIT,DS-CPL,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PDCM,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,NXE,LONG,LAHF,PERF,ITSC,SENSOR,ARAT
> cpu3: 256KB 64b/line 8-way L2 cache
> cpu3: smt 0, core 3, package 0
> ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins
> acpiprt0 at acpi0: bus 0 (PCI0)
> acpiprt1 at acpi0: bus 1 (PEG0)
> acpiprt2 at acpi0: bus -1 (PEG1)
> acpiprt3 at acpi0: bus 2 (PEX0)
> acpiprt4 at acpi0: bus -1 (PEX1)
> acpiprt5 at acpi0: bus -1 (PEX2)
> acpiprt6 at acpi0: bus 3 (PEX3)
> acpiprt7 at acpi0: bus 4 (PEX4)
> acpiprt8 at acpi0: bus 5 (PEX5)
> acpiprt9 at acpi0: bus 6 (PEX6)
> acpiprt10 at acpi0: bus 7 (PEX7)
> acpicpu0 at acpi0: C3(350@96 mwait.1@0x20), C2(500@64 mwait.1@0x10), 
> C1(1000@1 mwait.1), PSS
> acpicpu1 at acpi0: C3(350@96 mwait.1@0x20), C2(500@64 mwait.1@0x10), 
> C1(1000@1 mwait.1), PSS
> acpicpu2 at acpi0: C3(350@96 mwait.1@0x20), C2(500@64 mwait.1@0x10), 
> C1(1000@1 mwait.1), PSS
> acpicpu3 at acpi0: C3(350@96 mwait.1@0x20), C2(500@64 mwait.1@0x10), 
> C1(1000@1 mwait.1), PSS
> acpibtn0 at acpi0: PWRB
> "PNP0501" at acpi0 not configured
> "PNP0303" at acpi0 not configured
> "ICD0001" at acpi0 not configured
> "pnp0c14" at acpi

update www/py-httpie and switch to py3

2016-10-31 Thread Daniel Jakots
Hi,

Here's an update to latest py-httpie release. I also switched it to
python3 (for no particular reason other than it's 2016).

Comments? OK?

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/www/py-httpie/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile	22 Jan 2016 08:41:35 -	1.6
+++ Makefile	31 Oct 2016 12:02:22 -
@@ -2,7 +2,7 @@
 
 COMMENT =	command-line HTTP client
 
-MODPY_EGG_VERSION =	0.9.3
+MODPY_EGG_VERSION =	0.9.6
 GH_TAGNAME =	${MODPY_EGG_VERSION}
 GH_ACCOUNT =	jkbrzt
 GH_PROJECT =	httpie
@@ -18,12 +18,15 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =	lang/python
 MODPY_SETUPTOOLS =	Yes
-RUN_DEPENDS =	www/py-requests \
-		textproc/py-pygments
+
+MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
+
+RUN_DEPENDS =	www/py-requests${MODPY_FLAVOR} \
+		textproc/py-pygments${MODPY_FLAVOR}
 TEST_DEPENDS =	${RUN_DEPENDS} \
-		devel/py-test \
-		devel/py-test-httpbin \
-		devel/py-mock
+		devel/py-test${MODPY_FLAVOR} \
+		devel/py-test-httpbin${MODPY_FLAVOR} \
+		devel/py-mock${MODPY_FLAVOR}
 PORTHOME =	${WRKSRC}
 
 pre-test:
Index: distinfo
===
RCS file: /cvs/ports/www/py-httpie/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	22 Jan 2016 08:23:40 -	1.3
+++ distinfo	31 Oct 2016 12:02:22 -
@@ -1,2 +1,2 @@
-SHA256 (httpie-0.9.3.tar.gz) = Kgx89qaRRiDuvC13AOjnpXqr3mK9Ys1/po+LIWwLI0A=
-SIZE (httpie-0.9.3.tar.gz) = 256586
+SHA256 (httpie-0.9.6.tar.gz) = pwR1aQ4DDMjGJ83hWGR/MF3DyaVMLTwe1bq41Fh/0Pw=
+SIZE (httpie-0.9.6.tar.gz) = 265020
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-httpie/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST	20 Sep 2015 10:31:19 -	1.2
+++ pkg/PLIST	31 Oct 2016 12:02:22 -
@@ -9,55 +9,57 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/httpie-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/httpie-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/httpie/__init__.py
-lib/python${MODPY_VERSION}/site-packages/httpie/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/__main__.py
-lib/python${MODPY_VERSION}/site-packages/httpie/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}downloads.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}input.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/cli.py
-lib/python${MODPY_VERSION}/site-packages/httpie/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/client.py
-lib/python${MODPY_VERSION}/site-packages/httpie/client.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/compat.py
-lib/python${MODPY_VERSION}/site-packages/httpie/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/config.py
-lib/python${MODPY_VERSION}/site-packages/httpie/config.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/context.py
-lib/python${MODPY_VERSION}/site-packages/httpie/context.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/core.py
-lib/python${MODPY_VERSION}/site-packages/httpie/core.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/downloads.py
-lib/python${MODPY_VERSION}/site-packages/httpie/downloads.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/input.py
-lib/python${MODPY_VERSION}/site-packages/httpie/input.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/models.py
-lib/python${MODPY_VERSION}/site-packages/httpie/models.pyc
 lib/python${MODPY_VERSION}/site-packages/httpie/output/
 lib/python${MODPY_VERSION}/site-packages/httpie/output/__init__.py
-lib/python${MODPY_VE

Re: [UPDATE] Adobe Source (Code|Sans) Pro

2016-10-31 Thread Frederic Cambus
On Wed, Oct 26, 2016 at 09:26:00AM +0200, Nils Reu??e wrote:

> here is an update to the source code/sans pro fonts to their latest releases. 
>  Works for me on amd64.

Commited, thanks!



Re: UPDATE: sysutils/borgbackup

2016-10-31 Thread Daniel Jakots
On Sat, 29 Oct 2016 15:31:57 +0200, Björn Ketelaars
 wrote:

> Hello,
> 
> Included is a diff for sysutils/borgbackup bringing it to 1.0.8. This
> release fixes a couple of bugs. Changelog can be found at
> https://github.com/borgbackup/borg/blob/1.0.8/docs/changes.rst
> 
> OK?
> 

Committed, thanks!