Re: maintainer update to duplicity-0.7.10

2016-09-01 Thread Daniel Jakots
On Mon, 29 Aug 2016 13:04:35 +0200, Giovanni Bechis
 wrote:

> On Mon, Aug 29, 2016 at 12:25:20PM +0200, Giovanni Bechis wrote:
> > On 08/27/16 10:13, Daniel Jakots wrote:  
> > > Hi,
> > > 
> > > New update to duplicity. Quickly tested on amd64. As usual, feel
> > > free to test it with your preferred backend.
> > >   
> > there are some regression tests in ${WRKSRC}/testing, have you
> > tried enabling them ?  
> if they cannot be enabled because they are still hanging than ok
> giovanni@ anyway.

So I finally stop slacking, I enabled the tests, there are 3 failures
and 1 error, out of 383 tests (same on 7.09 and 7.10):
- Exception: Platform OpenBSD-6.0-amd64-64bit not supported by tar/gtar.
- AssertionError: 1 != 0
- AssertionError: ('1000:9 600', '1000:1000 600') (hint: 9 is wsrc ;))
- AssertionError: Assumption: /usr/bin is on the same filesystem as /

There's only the second one that doesn't look like bogus.

So new diff with tests enabled, still ok with you?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile9 Aug 2016 11:16:53 -   1.38
+++ Makefile2 Sep 2016 05:48:35 -
@@ -5,7 +5,7 @@
 
 COMMENT =  encrypted backup using rsync algorithm
 
-MODPY_EGG_VERSION = 0.7.09
+MODPY_EGG_VERSION = 0.7.10
 DISTNAME = duplicity-${MODPY_EGG_VERSION}
 
 CATEGORIES =   sysutils
@@ -33,13 +33,21 @@ RUN_DEPENDS +=  devel/py-pexpect \
gnupg-<2:security/gnupg \
sysutils/py-lockfile
 
-MAKE_ENV +=LIBRSYNC_DIR=${LOCALBASE}
+TEST_DEPENDS = archivers/par2cmdline \
+   devel/py-mock \
+   devel/py-pexpect \
+   sysutils/py-lockfile
 
-MODPY_ADJ_FILES = bin/duplicity bin/rdiffdir
+MAKE_ENV +=LIBRSYNC_DIR=${LOCALBASE}
 
-# Some regression tests are hanging
-# TEST_DEPENDS =   devel/py-mock
-NO_TEST =  Yes
+MODPY_ADJ_FILES =  bin/duplicity bin/rdiffdir \
+   testing/manual/backendtest \
+   testing/overrides/bin/hsi \
+   testing/overrides/bin/lftp \
+   testing/overrides/bin/ncftpget \
+   testing/overrides/bin/ncftpls \
+   testing/overrides/bin/ncftpput \
+   testing/overrides/bin/tahoe
 
 post-extract:
chmod 644 ${WRKSRC}/bin/*.1
Index: distinfo
===
RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo9 Aug 2016 11:16:53 -   1.21
+++ distinfo2 Sep 2016 05:48:35 -
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.7.09.tar.gz) = Qx5wYLobAoYF+CruIgJUNQaZjDhscAjNnf6XXpEoqLM=
-SIZE (duplicity-0.7.09.tar.gz) = 1542198
+SHA256 (duplicity-0.7.10.tar.gz) = SF/vFVJtFjwGHgDsCN4hbPfWUuZ9Qd5dw77Z+0IhSEI=
+SIZE (duplicity-0.7.10.tar.gz) = 1543523
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST   9 Aug 2016 11:16:53 -   1.17
+++ pkg/PLIST   2 Sep 2016 05:48:35 -
@@ -2,12 +2,12 @@
 bin/duplicity
 bin/rdiffdir
 lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/duplicity-0.7.9-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py
 lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so



Update www/links+ 2.12 -> 2.13

2016-09-01 Thread trondd
Take 2.  Fix WANTLIB and take MAINTAINER.
port-lib-depends-check still squawks about "Extra: iconv.6" and I am
not sure where that comes from.

Tim.

Index: Makefile
===
RCS file: /cvs/ports/www/links+/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile17 Jan 2016 17:29:10 -  1.58
+++ Makefile2 Sep 2016 00:30:16 -
@@ -1,14 +1,15 @@
 # $OpenBSD: Makefile,v 1.58 2016/01/17 17:29:10 sthen Exp $
 
 COMMENT=   graphics and text browser
-VER=   2.12
-REVISION=  0
+VER=   2.13
 DISTNAME=  links-${VER}
 PKGNAME=   links+-${VER}
 CATEGORIES=www
 
 HOMEPAGE=  http://links.twibright.com/
 
+MAINTAINER=Tim Meunier 
+
 # GPLv2+
 PERMIT_PACKAGE_CDROM=  Yes
 
@@ -33,8 +34,8 @@ LIB_DEPENDS+= graphics/jpeg \
graphics/tiff
 CONFIGURE_ARGS+= --with-x --enable-graphics
 WANTLIB+=  X11 jpeg>=62 m png>=2 tiff>=35
-WANTLIB += cairo event gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += rsvg-2
+WANTLIB+=  cairo event fontconfig gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB+=  gobject-2.0 rsvg-2
 
 MESSAGE=   ${PKGDIR}/MESSAGE.x11
 .endif
Index: distinfo
===
RCS file: /cvs/ports/www/links+/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo6 Oct 2015 22:43:50 -   1.29
+++ distinfo2 Sep 2016 00:30:16 -
@@ -1,2 +1,2 @@
-SHA256 (links-2.12.tar.gz) = Lj2mGT3p1u5xvEvqsXFp7MWNfL8uIBkqP1GO2ffyLjM=
-SIZE (links-2.12.tar.gz) = 7032939
+SHA256 (links-2.13.tar.gz) = vNBotbR/YE+RCRxUHUad8q+2vWYEzd1vBZoX7JzrdK4=
+SIZE (links-2.13.tar.gz) = 7133136
Index: patches/patch-html_c
===
RCS file: /cvs/ports/www/links+/patches/patch-html_c,v
retrieving revision 1.15
diff -u -p -r1.15 patch-html_c
--- patches/patch-html_c20 Sep 2015 08:01:09 -  1.15
+++ patches/patch-html_c2 Sep 2016 00:30:16 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-html_c,v 1.15 2015/09/20 08:01:09 landry Exp $
 html.c.origSat Jul 25 13:41:36 2015
-+++ html.c Sun Sep 20 09:33:31 2015
-@@ -970,6 +970,7 @@ static void html_a(unsigned char *a)
+--- html.c.origFri Jun 17 16:33:57 2016
 html.c Thu Sep  1 20:13:58 2016
+@@ -987,6 +987,7 @@ static void html_a(unsigned char *a)
format_.target = stracpy(format_.target_base);
}
/*format_.attr ^= AT_BOLD;*/
Index: patches/patch-https_c
===
RCS file: /cvs/ports/www/links+/patches/patch-https_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-https_c
--- patches/patch-https_c   6 Oct 2015 22:43:50 -   1.3
+++ patches/patch-https_c   2 Sep 2016 00:30:16 -
@@ -1,11 +1,12 @@
 $OpenBSD: patch-https_c,v 1.3 2015/10/06 22:43:50 sthen Exp $
 https.c.orig   Thu Sep 17 18:28:56 2015
-+++ https.cTue Oct  6 10:49:16 2015
-@@ -87,6 +87,10 @@ SSL *getSSL(void)
-   if (RAND_load_file(cast_const_char f_randfile, -1))
-   RAND_write_file(cast_const_char f_randfile);
+--- https.c.orig   Sun Jun 26 18:52:02 2016
 https.cThu Sep  1 20:15:20 2016
+@@ -89,6 +89,11 @@ SSL *getSSL(void)
+   RAND_write_file(cast_const_char 
f_randfile);
+   }
}
 +#elif defined(HAVE_RAND_FILE_NAME) && defined(HAVE_RAND_LOAD_FILE) && 
defined(HAVE_RAND_WRITE_FILE)
++  unsigned char f_randfile[PATH_MAX];
 +  const unsigned char *f = (const unsigned char 
*)RAND_file_name(cast_char f_randfile, sizeof(f_randfile));
 +  if (RAND_load_file(cast_const_char f_randfile, -1))
 +  RAND_write_file(cast_const_char f_randfile);



Re: darcs w^x trouble

2016-09-01 Thread Matthias Kilian
Hi,

On Thu, Sep 01, 2016 at 10:27:24AM +0200, Karel Gardas wrote:
> I'm not sure if USE_WXNEEDED is also applicable to Haskell-based
> ports.

Looking at /usr/local/lib/ghc/settings, it isn't. My latest changed
to lang/ghc (rev. 1.141 of lang/ghc/Makefile) added USE_WXNEEDED =
Yes and removed the explicit -Wl,-z,wxneeded from
CONF_GCC_LINKER_OPTS_STAGE{1,2}. The latter was probably wrong.

I'll check this tomorrow and revert the removal of the explicit
-Wl,-z,wxneeded if necessary.

Sorry for the inconvenience.

Ciao,
Kili



update: mail/mailman

2016-09-01 Thread Okan Demirmen
Hi,

Diff below updating mailman to 2.1.23; includes fix for CVE-2016-6893.

OK?

Thanks,
Okan

Index: Makefile
===
RCS file: /cvs/ports/mail/mailman/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- Makefile28 Apr 2016 13:02:39 -  1.85
+++ Makefile1 Sep 2016 16:56:47 -
@@ -2,7 +2,7 @@
 
 COMMENT=   mailing list manager with web interface
 
-DISTNAME=  mailman-2.1.22
+DISTNAME=  mailman-2.1.23
 CATEGORIES=mail www
 
 HOMEPAGE=  https://www.gnu.org/software/mailman/
Index: distinfo
===
RCS file: /cvs/ports/mail/mailman/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo28 Apr 2016 13:02:39 -  1.25
+++ distinfo1 Sep 2016 16:56:47 -
@@ -1,2 +1,2 @@
-SHA256 (mailman-2.1.22.tgz) = Vtr2TrfVIcvvRiPIP2JsEyRwmFRvcIVY8mfJb497isE=
-SIZE (mailman-2.1.22.tgz) = 9267810
+SHA256 (mailman-2.1.23.tgz) = sCLKb4U0YhydvlDJg5SGiLxGIyFHc7WAwseOSnrkPmk=
+SIZE (mailman-2.1.23.tgz) = 9290881
Index: patches/patch-Mailman_Defaults_py_in
===
RCS file: /cvs/ports/mail/mailman/patches/patch-Mailman_Defaults_py_in,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Mailman_Defaults_py_in
--- patches/patch-Mailman_Defaults_py_in22 Apr 2016 16:42:14 -  
1.14
+++ patches/patch-Mailman_Defaults_py_in1 Sep 2016 16:56:47 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-Mailman_Defaults_py_in,v 1.14 2016/04/22 16:42:14 okan Exp $
 Mailman/Defaults.py.in.origSun Feb 28 15:47:44 2016
-+++ Mailman/Defaults.py.in Sun Mar 20 11:21:13 2016
-@@ -554,7 +554,7 @@ SMTPPORT = 0  # de
+--- Mailman/Defaults.py.in.origSat Aug 27 09:04:42 2016
 Mailman/Defaults.py.in Thu Sep  1 11:24:12 2016
+@@ -567,7 +567,7 @@ SMTPPORT = 0  # de
  
  # Command for direct command pipe delivery to sendmail compatible program,
  # when DELIVERY_MODULE is 'Sendmail'.
 -SENDMAIL_CMD = '/usr/lib/sendmail'
 +SENDMAIL_CMD = '/usr/sbin/sendmail'
  
- # Set these variables if you need to authenticate to your NNTP server for
- # Usenet posting or reading.  If no authentication is necessary, specify None
+ # SMTP authentication for DELIVERY_MODULE = 'SMTPDirect'.  To enable SASL
+ # authentication for SMTPDirect, set SMTP_AUTH = Yes and provide appropriate
Index: patches/patch-Mailman_htmlformat_py
===
RCS file: /cvs/ports/mail/mailman/patches/patch-Mailman_htmlformat_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-Mailman_htmlformat_py
--- patches/patch-Mailman_htmlformat_py 9 Apr 2015 15:37:08 -   1.7
+++ patches/patch-Mailman_htmlformat_py 1 Sep 2016 16:56:47 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Mailman_htmlformat_py,v 1.7 2015/04/09 15:37:08 okan Exp $
 Mailman/htmlformat.py.orig Sat Feb 28 11:41:04 2015
-+++ Mailman/htmlformat.py  Sun Mar 22 11:55:07 2015
-@@ -632,12 +632,14 @@ class DefinitionList(Container):
+--- Mailman/htmlformat.py.orig Sat Aug 27 09:04:42 2016
 Mailman/htmlformat.py  Thu Sep  1 11:24:12 2016
+@@ -633,12 +633,14 @@ class DefinitionList(Container):
  from mm_cfg import MAILMAN_URL
  PYTHON_URL  = 'http://www.python.org/'
  GNU_URL = 'http://www.gnu.org/'
@@ -16,7 +16,7 @@ $OpenBSD: patch-Mailman_htmlformat_py,v 
  
  
  def MailmanLogo():
-@@ -651,7 +653,9 @@ def MailmanLogo():
+@@ -652,7 +654,9 @@ def MailmanLogo():
   logo(PYTHON_POWERED)
  gnulink = '' % \
logo(GNU_HEAD)
@@ -27,7 +27,7 @@ $OpenBSD: patch-Mailman_htmlformat_py,v 
  else:
  # use only textual links
  version = mm_cfg.VERSION
-@@ -659,7 +663,8 @@ def MailmanLogo():
+@@ -660,7 +664,8 @@ def MailmanLogo():
_('Delivered by Mailmanversion %(version)s'))
  pylink = Link(PYTHON_URL, _('Python Powered'))
  gnulink = Link(GNU_URL, _("Gnu's Not Unix"))
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/mailman/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -r1.26 PLIST
--- pkg/PLIST   22 Apr 2016 16:42:14 -  1.26
+++ pkg/PLIST   1 Sep 2016 16:56:47 -
@@ -539,7 +539,6 @@ lib/mailman/messages/ja/LC_MESSAGES/
 @mode
 lib/mailman/messages/ja/LC_MESSAGES/mailman.mo
 lib/mailman/messages/ja/LC_MESSAGES/mailman.po
-lib/mailman/messages/ja/README.ja
 @mode 775
 lib/mailman/messages/ko/
 lib/mailman/messages/ko/LC_MESSAGES/



Re: UPDATE: databases/py-sqlalchemy

2016-09-01 Thread Landry Breuil
On Thu, Sep 01, 2016 at 04:27:19PM +0100, Edd Barrett wrote:
> On Thu, Sep 01, 2016 at 04:41:57PM +0200, Landry Breuil wrote:
> > edd, ok for both ?
> 
> Starting with py-sqlparse:
> 
> > # MIBSD
> > PERMIT_PACKAGE_CDROM =  Yes
> 
> Is MIBSD that a typo?

Yeah i wanted BSD only, typo.

> For new Python ports, I tend to add a Python3 FLAVOR, but I can do that
> as a later change if you want.
> 
> There is a py.test test suite which 'make test' does not currently run.
> Add a TEST_DEPEND, and a do-test target which does:
> 
> cd ${WRKSRC} && ${MODPY_BIN} -m pytest tests/

Ah, indeed. Fixed locally.

> You will need to check if the test suite needs the package installed,
> and if it does, add a self-TEST_DEPEND.
> 
> Are you sure tox is needed?

That's what README.md and Makefile says..

Landry



Re: UPDATE: databases/py-sqlalchemy

2016-09-01 Thread Edd Barrett
On Thu, Sep 01, 2016 at 04:41:57PM +0200, Landry Breuil wrote:
> edd, ok for both ?

Starting with py-sqlparse:

> # MIBSD
> PERMIT_PACKAGE_CDROM =Yes

Is MIBSD that a typo?

For new Python ports, I tend to add a Python3 FLAVOR, but I can do that
as a later change if you want.

There is a py.test test suite which 'make test' does not currently run.
Add a TEST_DEPEND, and a do-test target which does:

cd ${WRKSRC} && ${MODPY_BIN} -m pytest tests/

You will need to check if the test suite needs the package installed,
and if it does, add a self-TEST_DEPEND.

Are you sure tox is needed?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: UPDATE: databases/py-sqlalchemy

2016-09-01 Thread Landry Breuil
On Thu, Sep 01, 2016 at 12:45:46AM +0200, frantisek holop wrote:
> sqlalchemy-migrate is dead-ish,
> IIRC alembic is the "official" sqlalchemy migration
> tool (by the author of sqlalchemy)

sqlalchemy-migrate isnt dead, since it's still a requirement for
buildbot 0.8.x - it was just forked to pypi.

That said, here's an sqlachemy-migrate update to 0.10.0, including new
py-sqlparse port as a dependency. With all this and sqlachemy 1.0.x,
buildbot starts and runs fine.

edd, ok for both ? After that, that leaves fookebox and childsplay to
test.

Landry
Index: Makefile
===
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile29 Sep 2015 10:51:15 -  1.5
+++ Makefile1 Sep 2016 14:37:09 -
@@ -2,25 +2,24 @@
 
 COMMENT =  schema migration tools for SQLAlchemy
 
-MODPY_EGG_VERSION =0.7.2
+MODPY_EGG_VERSION =0.10.0
 DISTNAME = sqlalchemy-migrate-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   databases
 
-HOMEPAGE = https://code.google.com/p/sqlalchemy-migrate/
-
 # MIT
 PERMIT_PACKAGE_CDROM = Yes
 
-MASTER_SITES = https://sqlalchemy-migrate.googlecode.com/files/
-
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
+MODPY_PI = Yes
 
 RUN_DEPENDS =  databases/py-sqlalchemy \
+   databases/py-sqlparse \
+   devel/py-pbr \
devel/py-decorator \
+   devel/py-six \
www/py-tempita
 
 # test needs unported py-cfgparse & py-scripttest
Index: distinfo
===
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo19 Jul 2015 19:23:26 -  1.3
+++ distinfo1 Sep 2016 14:37:09 -
@@ -1,2 +1,2 @@
-SHA256 (sqlalchemy-migrate-0.7.2.tar.gz) = 
f1XHaO4m8UP+2xGzZaTFfDu9tSEeBJx/BLiugQfCgzM=
-SIZE (sqlalchemy-migrate-0.7.2.tar.gz) = 105862
+SHA256 (sqlalchemy-migrate-0.10.0.tar.gz) = 
+DxczpwJ5cBVJyebf+FWWzLlNTNC/zCyT1lPouWn4AM=
+SIZE (sqlalchemy-migrate-0.10.0.tar.gz) = 127356
Index: pkg/PLIST
===
RCS file: /cvs/ports/databases/py-sqlalchemy-migrate/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   19 Jul 2015 19:23:26 -  1.2
+++ pkg/PLIST   1 Sep 2016 14:37:09 -
@@ -16,6 +16,8 @@
 
lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/__init__.pyc
 
lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/firebird.py
 
lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/firebird.pyc
+lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/ibmdb2.py
+lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/ibmdb2.pyc
 lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/mysql.py
 lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/mysql.pyc
 lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/oracle.py
@@ -28,6 +30,8 @@
 
lib/python${MODPY_VERSION}/site-packages/migrate/changeset/databases/visitor.pyc
 lib/python${MODPY_VERSION}/site-packages/migrate/changeset/schema.py
 lib/python${MODPY_VERSION}/site-packages/migrate/changeset/schema.pyc
+lib/python${MODPY_VERSION}/site-packages/migrate/changeset/util.py
+lib/python${MODPY_VERSION}/site-packages/migrate/changeset/util.pyc
 lib/python${MODPY_VERSION}/site-packages/migrate/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/migrate/exceptions.pyc
 lib/python${MODPY_VERSION}/site-packages/migrate/tests/
@@ -36,6 +40,11 @@
 lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/
 lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/__init__.py
 lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/databases/
+lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/databases/__init__.py
+lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/databases/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/databases/test_ibmdb2.py
+lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/databases/test_ibmdb2.pyc
 
lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/test_changeset.py
 
lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/test_changeset.pyc
 
lib/python${MODPY_VERSION}/site-packages/migrate/tests/changeset/test_constraint.py
@@ -174,5 +183,7 @@
 
lib/python${MODPY_VERSION}/site-packages/sqlalchemy_migrate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/sqlalchemy_migrate-

Re: update: GCC 4.9.4

2016-09-01 Thread David Coppa
On Thu, Sep 1, 2016 at 4:18 PM, Pascal Stumpf  wrote:
> On Thu, 1 Sep 2016 16:13:14 +0200, David Coppa wrote:
>> On Thu, 01 Sep 2016, Christian Weisgerber wrote:
>>
>> > On 2016-08-22, Pascal Stumpf  wrote:
>> >
>> > > Last bugfix update for GCC 4.9.  Works fine here so far, but should
>> > > probably go into at least one bulk.
>> >
>> > Also needs this:
>> >
>> > Index: devel/llvm/Makefile
>> > ===
>> > RCS file: /cvs/ports/devel/llvm/Makefile,v
>> > retrieving revision 1.116
>> > diff -u -r1.116 Makefile
>> > --- devel/llvm/Makefile 31 Jul 2016 17:49:38 -  1.116
>> > +++ devel/llvm/Makefile 1 Sep 2016 09:35:21 -
>> > @@ -11,6 +11,7 @@
>> >  LLVM_V =   3.8.1
>> >  DISTNAME = llvm-${LLVM_V}.src
>> >  PKGNAME =  llvm-${LLVM_V}
>> > +REVISION = 0
>> >  CATEGORIES =   devel
>> >  DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
>> > cfe-${LLVM_V}.src${EXTRACT_SUFX}
>> > @@ -63,7 +64,7 @@
>> >  TEST_TARGET =  check
>> >
>> >  # XXX sync
>> > -GCC_VER =  4.9.3
>> > +GCC_VER =  4.9.4
>> >  .if ${MACHINE_ARCH} == "amd64"
>> >  GCC_CONFIG =   x86_64-unknown-openbsd${OSREV}
>> >  .else
>>
>>
>> Here's a rebased version of your update to gcc-4.9.4 plus my gfortran
>> patch.
>
> Not sure if we want to do the fortran thing.  I don't care either way.
> Any opinions?

lang/gfortran is gone, so I don't see any problems... Ah, and conflict
markers are already in place.

Ciao!
David



Re: UPDATE: mail/trojita 0.7

2016-09-01 Thread Landry Breuil
On Thu, Sep 01, 2016 at 03:11:45PM +0100, Stuart Henderson wrote:
> On 2016/09/01 15:49, Landry Breuil wrote:
> > On Thu, Sep 01, 2016 at 03:44:55PM +0200, Landry Breuil wrote:
> > > On Thu, Sep 01, 2016 at 02:47:28PM +0200, Caspar Schutijser wrote:
> > > > On Tuesday, 23 August 2016 19:15:44 CEST, Caspar Schutijser wrote:
> > > > >Below is a diff that updates mail/trojita to 0.7.
> > > > 
> > > > ping
> > > 
> > > port-lib-depends-check said was missing assuan in WANTLIB, other than
> > > that built fine. Will commit it when ive runtime-tested it.
> > 
> > Aaaand it blows at runtime with wx violations.
> > trojita(30387): mmap W^X violation
> > #0  0x1b74c9a98edc in WTFCrash () from 
> > /usr/local/lib/qt5/./libQt5WebKit.so.1.1
> > 
> > So Qt5WebKit also needs to be annotated with wxneeded... and make sure
> > that applications linking against it get it too.
> 
> You can't annotate a library, only the executables that pull in that library.
> If this is done via the pc file hack as done in some of the other webkit ports
> then you need to make sure that ports using it get picked up by pkg_add -u
> (REVISION bump or lib bump or whatever).

Yes, that's what i meant :)



Re: update: GCC 4.9.4

2016-09-01 Thread David Coppa
On Thu, 01 Sep 2016, Christian Weisgerber wrote:

> On 2016-08-22, Pascal Stumpf  wrote:
> 
> > Last bugfix update for GCC 4.9.  Works fine here so far, but should
> > probably go into at least one bulk.
> 
> Also needs this:
> 
> Index: devel/llvm/Makefile
> ===
> RCS file: /cvs/ports/devel/llvm/Makefile,v
> retrieving revision 1.116
> diff -u -r1.116 Makefile
> --- devel/llvm/Makefile   31 Jul 2016 17:49:38 -  1.116
> +++ devel/llvm/Makefile   1 Sep 2016 09:35:21 -
> @@ -11,6 +11,7 @@
>  LLVM_V = 3.8.1
>  DISTNAME =   llvm-${LLVM_V}.src
>  PKGNAME =llvm-${LLVM_V}
> +REVISION =   0
>  CATEGORIES = devel
>  DISTFILES =  llvm-${LLVM_V}.src${EXTRACT_SUFX} \
>   cfe-${LLVM_V}.src${EXTRACT_SUFX}
> @@ -63,7 +64,7 @@
>  TEST_TARGET =check
>  
>  # XXX sync
> -GCC_VER =4.9.3
> +GCC_VER =4.9.4
>  .if ${MACHINE_ARCH} == "amd64"
>  GCC_CONFIG = x86_64-unknown-openbsd${OSREV}
>  .else


Here's a rebased version of your update to gcc-4.9.4 plus my gfortran
patch.

Index: 4.6/Makefile
===
RCS file: /cvs/ports/lang/gcc/4.6/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- 4.6/Makefile1 Sep 2016 11:01:32 -   1.92
+++ 4.6/Makefile1 Sep 2016 14:02:32 -
@@ -30,7 +30,7 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 PKGNAME-go =   gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc->=4.6,<4.7
 
-REVISION = 19
+REVISION = 20
 
 SHARED_LIBS =  estdc++ 14.0 \
gfortran3.0 \
@@ -232,6 +232,10 @@ post-install:
 .if ${BUILD_PACKAGES:M-ada}
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
+.endif
+.if ${BUILD_PACKAGES:M-f95}
+   ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
+   ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran 
${PREFIX}/bin/${CONFIG}-gfortran
 .endif
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include-fixed
Index: 4.6/pkg/PLIST-f95
===
RCS file: /cvs/ports/lang/gcc/4.6/pkg/PLIST-f95,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-f95
--- 4.6/pkg/PLIST-f95   29 Jun 2016 16:14:41 -  1.3
+++ 4.6/pkg/PLIST-f95   1 Sep 2016 14:02:32 -
@@ -3,7 +3,9 @@
 @conflict gfortran-*
 @conflict libgfortran-*
 @bin bin/egfortran
+bin/gfortran
 @bin bin/${CONFIG}-egfortran
+bin/${CONFIG}-gfortran
 @info info/gfortran.info
 lib/gcc/${CONFIG}/${V}/finclude/
 lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
Index: 4.9/Makefile
===
RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- 4.9/Makefile1 Sep 2016 10:56:58 -   1.35
+++ 4.9/Makefile1 Sep 2016 14:02:32 -
@@ -3,30 +3,29 @@
 ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc64
 DPB_PROPERTIES = parallel
 
-V = 4.9.3
-REVISION = 10
+V = 4.9.4
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 
-ADASTRAP_LIBC-amd64 = 80.0
+ADASTRAP_LIBC-amd64 = 88.0
 ADASTRAP_LIBM-amd64 = 9.0
 ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
-ADASTRAP_LIBC-arm = 84.1
+ADASTRAP_LIBC-arm = 88.0
 ADASTRAP_LIBM-arm = 9.0
 ADASTRAP-arm = adastrap-arm-$V-0.tar.xz
 ADASTRAP_LIBC-hppa = 80.0
 ADASTRAP_LIBM-hppa = 9.0
-ADASTRAP-hppa = adastrap-hppa-$V-0.tar.xz
+ADASTRAP-hppa = adastrap-hppa-4.9.3-0.tar.xz
 ADASTRAP_LIBC-i386 = 80.0
 ADASTRAP_LIBM-i386 = 9.0
-ADASTRAP-i386 = adastrap-i386-$V-0.tar.xz
+ADASTRAP-i386 = adastrap-i386-4.9.3-0.tar.xz
 ADASTRAP_LIBC-mips64 = 83.0
 ADASTRAP_LIBM-mips64 = 9.0
-ADASTRAP-mips64 = adastrap-mips64-$V-0.tar.xz
+ADASTRAP-mips64 = adastrap-mips64-4.9.3-0.tar.xz
 ADASTRAP_LIBC-powerpc = 83.0
 ADASTRAP_LIBM-powerpc = 9.0
-ADASTRAP-powerpc = adastrap-powerpc-$V-0.tar.xz
-ADASTRAP_LIBC-sparc64 = 80.0
+ADASTRAP-powerpc = adastrap-powerpc-4.9.3-0.tar.xz
+ADASTRAP_LIBC-sparc64 = 88.0
 ADASTRAP_LIBM-sparc64 = 9.0
 ADASTRAP-sparc64 = adastrap-sparc64-$V-0.tar.xz
 
@@ -86,7 +85,8 @@ TEST_DEPENDS =devel/dejagnu \
${BUILD_PKGPATH},-libs>=4.9,<4.10
 
 MASTER_SITES = ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
-MASTER_SITES0 =https://spacehopper.org/mirrors/ \
+MASTER_SITES0 =http://distfiles.stumpf.co/ \
+   https://spacehopper.org/mirrors/ \
http://distfiles.tmux.org/adastrap/ \
https://distfiles.bsdfrog.org/
 MASTER_SITES1 =ftp://sources.redhat.com/pub/java/
@@ -245,6 +245,10 @@ post-install:
 .if ${BUILD_PACKAGES:M-ada}
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
+.endif
+.if ${BUILD_PACKAGES:M-f95}
+

Re: update: GCC 4.9.4

2016-09-01 Thread Pascal Stumpf
On Thu, 1 Sep 2016 16:13:14 +0200, David Coppa wrote:
> On Thu, 01 Sep 2016, Christian Weisgerber wrote:
> 
> > On 2016-08-22, Pascal Stumpf  wrote:
> > 
> > > Last bugfix update for GCC 4.9.  Works fine here so far, but should
> > > probably go into at least one bulk.
> > 
> > Also needs this:
> > 
> > Index: devel/llvm/Makefile
> > ===
> > RCS file: /cvs/ports/devel/llvm/Makefile,v
> > retrieving revision 1.116
> > diff -u -r1.116 Makefile
> > --- devel/llvm/Makefile 31 Jul 2016 17:49:38 -  1.116
> > +++ devel/llvm/Makefile 1 Sep 2016 09:35:21 -
> > @@ -11,6 +11,7 @@
> >  LLVM_V =   3.8.1
> >  DISTNAME = llvm-${LLVM_V}.src
> >  PKGNAME =  llvm-${LLVM_V}
> > +REVISION = 0
> >  CATEGORIES =   devel
> >  DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
> > cfe-${LLVM_V}.src${EXTRACT_SUFX}
> > @@ -63,7 +64,7 @@
> >  TEST_TARGET =  check
> >  
> >  # XXX sync
> > -GCC_VER =  4.9.3
> > +GCC_VER =  4.9.4
> >  .if ${MACHINE_ARCH} == "amd64"
> >  GCC_CONFIG =   x86_64-unknown-openbsd${OSREV}
> >  .else
> 
> 
> Here's a rebased version of your update to gcc-4.9.4 plus my gfortran
> patch.

Not sure if we want to do the fortran thing.  I don't care either way.
Any opinions?

> Index: 4.6/Makefile
> ===
> RCS file: /cvs/ports/lang/gcc/4.6/Makefile,v
> retrieving revision 1.92
> diff -u -p -r1.92 Makefile
> --- 4.6/Makefile  1 Sep 2016 11:01:32 -   1.92
> +++ 4.6/Makefile  1 Sep 2016 14:02:32 -
> @@ -30,7 +30,7 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
>  PKGNAME-go = gccgo-${FULL_PKGVERSION}
>  PKGSPEC-main = gcc->=4.6,<4.7
>  
> -REVISION = 19
> +REVISION = 20
>  
>  SHARED_LIBS =estdc++ 14.0 \
>   gfortran3.0 \
> @@ -232,6 +232,10 @@ post-install:
>  .if ${BUILD_PACKAGES:M-ada}
>   chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adainclude
>   chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/adalib
> +.endif
> +.if ${BUILD_PACKAGES:M-f95}
> + ln -sf ${TRUEPREFIX}/bin/egfortran ${PREFIX}/bin/gfortran
> + ln -sf ${TRUEPREFIX}/bin/${CONFIG}-egfortran 
> ${PREFIX}/bin/${CONFIG}-gfortran
>  .endif
>   chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include
>   chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/gcc/*/$V/include-fixed
> Index: 4.6/pkg/PLIST-f95
> ===
> RCS file: /cvs/ports/lang/gcc/4.6/pkg/PLIST-f95,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-f95
> --- 4.6/pkg/PLIST-f95 29 Jun 2016 16:14:41 -  1.3
> +++ 4.6/pkg/PLIST-f95 1 Sep 2016 14:02:32 -
> @@ -3,7 +3,9 @@
>  @conflict gfortran-*
>  @conflict libgfortran-*
>  @bin bin/egfortran
> +bin/gfortran
>  @bin bin/${CONFIG}-egfortran
> +bin/${CONFIG}-gfortran
>  @info info/gfortran.info
>  lib/gcc/${CONFIG}/${V}/finclude/
>  lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
> Index: 4.9/Makefile
> ===
> RCS file: /cvs/ports/lang/gcc/4.9/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- 4.9/Makefile  1 Sep 2016 10:56:58 -   1.35
> +++ 4.9/Makefile  1 Sep 2016 14:02:32 -
> @@ -3,30 +3,29 @@
>  ONLY_FOR_ARCHS = amd64 arm hppa i386 mips64 mips64el powerpc sparc64
>  DPB_PROPERTIES = parallel
>  
> -V = 4.9.3
> -REVISION = 10
> +V = 4.9.4
>  FULL_VERSION = $V
>  FULL_PKGVERSION = $V
>  
> -ADASTRAP_LIBC-amd64 = 80.0
> +ADASTRAP_LIBC-amd64 = 88.0
>  ADASTRAP_LIBM-amd64 = 9.0
>  ADASTRAP-amd64 = adastrap-amd64-$V-0.tar.xz
> -ADASTRAP_LIBC-arm = 84.1
> +ADASTRAP_LIBC-arm = 88.0
>  ADASTRAP_LIBM-arm = 9.0
>  ADASTRAP-arm = adastrap-arm-$V-0.tar.xz
>  ADASTRAP_LIBC-hppa = 80.0
>  ADASTRAP_LIBM-hppa = 9.0
> -ADASTRAP-hppa = adastrap-hppa-$V-0.tar.xz
> +ADASTRAP-hppa = adastrap-hppa-4.9.3-0.tar.xz
>  ADASTRAP_LIBC-i386 = 80.0
>  ADASTRAP_LIBM-i386 = 9.0
> -ADASTRAP-i386 = adastrap-i386-$V-0.tar.xz
> +ADASTRAP-i386 = adastrap-i386-4.9.3-0.tar.xz
>  ADASTRAP_LIBC-mips64 = 83.0
>  ADASTRAP_LIBM-mips64 = 9.0
> -ADASTRAP-mips64 = adastrap-mips64-$V-0.tar.xz
> +ADASTRAP-mips64 = adastrap-mips64-4.9.3-0.tar.xz
>  ADASTRAP_LIBC-powerpc = 83.0
>  ADASTRAP_LIBM-powerpc = 9.0
> -ADASTRAP-powerpc = adastrap-powerpc-$V-0.tar.xz
> -ADASTRAP_LIBC-sparc64 = 80.0
> +ADASTRAP-powerpc = adastrap-powerpc-4.9.3-0.tar.xz
> +ADASTRAP_LIBC-sparc64 = 88.0
>  ADASTRAP_LIBM-sparc64 = 9.0
>  ADASTRAP-sparc64 = adastrap-sparc64-$V-0.tar.xz
>  
> @@ -86,7 +85,8 @@ TEST_DEPENDS =  devel/dejagnu \
>   ${BUILD_PKGPATH},-libs>=4.9,<4.10
>  
>  MASTER_SITES =   ${MASTER_SITE_GCC:=releases/gcc-$(FULL_VERSION)/}
> -MASTER_SITES0 =  https://spacehopper.org/mirrors/ \
> +MASTER_SITES0 =  http://distfiles.stumpf.co/ \
> + https://spacehopper.org/mirrors/ \
>   http://distfil

Re: UPDATE: mail/trojita 0.7

2016-09-01 Thread Stuart Henderson
On 2016/09/01 15:49, Landry Breuil wrote:
> On Thu, Sep 01, 2016 at 03:44:55PM +0200, Landry Breuil wrote:
> > On Thu, Sep 01, 2016 at 02:47:28PM +0200, Caspar Schutijser wrote:
> > > On Tuesday, 23 August 2016 19:15:44 CEST, Caspar Schutijser wrote:
> > > >Below is a diff that updates mail/trojita to 0.7.
> > > 
> > > ping
> > 
> > port-lib-depends-check said was missing assuan in WANTLIB, other than
> > that built fine. Will commit it when ive runtime-tested it.
> 
> Aaaand it blows at runtime with wx violations.
> trojita(30387): mmap W^X violation
> #0  0x1b74c9a98edc in WTFCrash () from 
> /usr/local/lib/qt5/./libQt5WebKit.so.1.1
> 
> So Qt5WebKit also needs to be annotated with wxneeded... and make sure
> that applications linking against it get it too.

You can't annotate a library, only the executables that pull in that library.
If this is done via the pc file hack as done in some of the other webkit ports
then you need to make sure that ports using it get picked up by pkg_add -u
(REVISION bump or lib bump or whatever).



Re: FAQ: guide.html

2016-09-01 Thread Edd Barrett
On Thu, Sep 01, 2016 at 12:47:35PM +0100, Edd Barrett wrote:
> I've tried to fix all this with the following diff. What do people
> think?

 * Tweaks from Stuart.
 * Start all sentences on a new line.

Index: guide.html
===
RCS file: /home/edd/cvsync/www/faq/ports/guide.html,v
retrieving revision 1.61
diff -u -p -r1.61 guide.html
--- guide.html  15 Aug 2016 02:22:15 -  1.61
+++ guide.html  1 Sep 2016 14:05:31 -
@@ -42,6 +42,7 @@
   Updating ports
   
 Update checklist
+ Committing port updates
   
   OpenBSD porting policy
   Security recommendations
@@ -644,8 +645,9 @@ The AMD64 systems are good because they 
 sizeof(int) != sizeof(long) on this platform.
 
 
-Sun SPARC and UltraSPARC are good because they are very common and because
-their byte order is the opposite of i386; if you developed on SPARC, of course,
+SPARC64 systems are good because they are fairly common, can be quite
+fast, and their byte order is the opposite of i386; if you developed on
+SPARC64, of course,
 you'd want it tested on i386.
 
 
@@ -654,82 +656,44 @@ Incorporate any feedback you get. Test i
 Get those who gave you feedback to test it again from your new port.
 
 
-Finally, include it in the "ports" tree.
-If you do not have CVS access, ask someone on
-mailto:ports@openbsd.org";>ports@openbsd.org to commit it.
-
-
-If you are a developer with CVS access, check it in.
-(Note that addition of new ports requires an explicit OK).
-Before commit, if using @newuser or @newgroup in the
-PLIST files, check that no users were added to
-/usr/ports/infrastructure/db/user.list since the port was created.
-We normally use cvs import for a new port, rather than adding a
-zillion (or a dozen) files individually.
-Import uses "vendor branch" version numbers like 1.1.1.1, but don't worry
-about that!
-If you make changes to a specific file (edit, then cvs commit),
-it will be 1.2, and that will be used.
+Get the port committed to CVS.
 
 
-In short, import is typically used when a port is created.
-From that point on, cvs add and cvs rm are typically used
-to add or remove files, and the normal edit->commit cycle for changes.
-You might use something like this:
+If you are not a developer with CVS access, then you will have to find
+an OpenBSD developer to do the following steps for you (ask on
+mailto:ports@openbsd.org";>ports@openbsd.org).
 
-
-$ cd /usr/ports/mystuff/lang/kaffe1
-$ make clean# you really don't want to check in all of work!
-$ cvs -d cvs.openbsd.org:/cvs -n import ports/lang/kaffe1 \
-   YourName YourName_-MMM-DD
-
-
-
--d cvs.openbsd.org:/cvs says where cvs lives.
-
-
--n says to do a 'dry run'; check the output of this, and if things
-are OK re-run the command without -n.
-
-
-ports/lang/kaffe1 is the path relative to /cvs where the port
-lives.
-Don't forget to start it with ports/.
-
-
-YourName (replaced with your login name) is the 'vendor tag'.
-You imported it so you are the vendor.
+
+Before you import anything, get at least one "OK" from another ports
+developer (the more the better).
 
-
-YourName_-MMM-DD (e.g., ian_2000-Jan-01) is the
-vendor release tag.
-This is as good as any.
-
+
+If using @newuser or @newgroup in the
+PLIST files, check that no users were added to
+/usr/ports/infrastructure/db/user.list since the port was created.
 
-
-As a real example, here is the output of checking in the kaffe1 port,
-which one of us did on September 8, 1998:
+
+For new ports we use cvs import, rather than adding new files
+individually.
+For example, to import a new lang/kaffe1 port, first do a
+dry-run import:
 
 
-$ cd kaffe1
-$ make clean >/dev/null
-$ cvs import -m 'kaffe1.0(==JDK1.1) port' ports/lang/kaffe1 ian 
ian_1998-Sep-08
-N ports/lang/kaffe1/Makefile
-cvs server: Importing /cvs/ports/lang/kaffe1/files
-N ports/lang/kaffe1/files/md5
-cvs server: Importing /cvs/ports/lang/kaffe1/pkg
-N ports/lang/kaffe1/pkg/COMMENT
-N ports/lang/kaffe1/pkg/DESCR
-N ports/lang/kaffe1/pkg/PLIST
-
-No conflicts created by this import
+$ cd /usr/ports/lang/kaffe1
+$ cvs -ndcvs.openbsd.org:/cvs import ports/lang/kaffe1 username 
username_mmdd
 
 
-In this case, -m was used to specify the commit log message
-directly on the command line; normally when you import a port, you would
-do this in the interactive editor rather than specifying it on the command
-line - include a copy of pkg/DESCR and any other (short) relevant
-information, such as who has given an OK.
+Where username is your account username, and mmdd
+is the current date.
+If this succeeds, then you can remove -n to import for real.
+Your editor will be invoked so that you can enter a commit message.
+In the commit message, at least state what you are importing and which
+developers provided OKs. Make sure the import path is correct; it always
+starts with ports/.
+
+Alternatively, you can use
+port/infrastructure/bin/portimport to import new ports (read
+the 

Re: UPDATE: mail/trojita 0.7

2016-09-01 Thread Landry Breuil
On Thu, Sep 01, 2016 at 03:44:55PM +0200, Landry Breuil wrote:
> On Thu, Sep 01, 2016 at 02:47:28PM +0200, Caspar Schutijser wrote:
> > On Tuesday, 23 August 2016 19:15:44 CEST, Caspar Schutijser wrote:
> > >Below is a diff that updates mail/trojita to 0.7.
> > 
> > ping
> 
> port-lib-depends-check said was missing assuan in WANTLIB, other than
> that built fine. Will commit it when ive runtime-tested it.

Aaaand it blows at runtime with wx violations.
trojita(30387): mmap W^X violation
#0  0x1b74c9a98edc in WTFCrash () from 
/usr/local/lib/qt5/./libQt5WebKit.so.1.1

So Qt5WebKit also needs to be annotated with wxneeded... and make sure
that applications linking against it get it too.

Landry



Re: UPDATE: mail/trojita 0.7

2016-09-01 Thread Landry Breuil
On Thu, Sep 01, 2016 at 02:47:28PM +0200, Caspar Schutijser wrote:
> On Tuesday, 23 August 2016 19:15:44 CEST, Caspar Schutijser wrote:
> >Below is a diff that updates mail/trojita to 0.7.
> 
> ping

port-lib-depends-check said was missing assuan in WANTLIB, other than
that built fine. Will commit it when ive runtime-tested it.

Landry



libreoffice online - anybody has tried to build?

2016-09-01 Thread Jiri B
Hi,

has anybody tried to build 'libreoffice online'? Is it even doable?
https://gerrit.libreoffice.org/gitweb?p=online.git;a=tree;f=loolwsd/debian;h=930c57b566f25fc508ccf4fbcf953f5747bc43a8;hb=HEAD

owncloud/nextcloud could use 'libreoffice online' from Collabora as backend
for Google Docs-like feature in their "cloud" web app. This thus does interest
me the most.

(I know owncloud/nextcloud can talk to 'libreoffice online' via network, eg.
running as Docker image provided by Collabora.)

j.



Re: UPDATE: mail/trojita 0.7

2016-09-01 Thread Caspar Schutijser

On Tuesday, 23 August 2016 19:15:44 CEST, Caspar Schutijser wrote:

Below is a diff that updates mail/trojita to 0.7.


ping



Re: update: GCC 4.9.4

2016-09-01 Thread Christian Weisgerber
On 2016-08-22, Pascal Stumpf  wrote:

> Last bugfix update for GCC 4.9.  Works fine here so far, but should
> probably go into at least one bulk.

Also needs this:

Index: devel/llvm/Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.116
diff -u -r1.116 Makefile
--- devel/llvm/Makefile 31 Jul 2016 17:49:38 -  1.116
+++ devel/llvm/Makefile 1 Sep 2016 09:35:21 -
@@ -11,6 +11,7 @@
 LLVM_V =   3.8.1
 DISTNAME = llvm-${LLVM_V}.src
 PKGNAME =  llvm-${LLVM_V}
+REVISION = 0
 CATEGORIES =   devel
 DISTFILES =llvm-${LLVM_V}.src${EXTRACT_SUFX} \
cfe-${LLVM_V}.src${EXTRACT_SUFX}
@@ -63,7 +64,7 @@
 TEST_TARGET =  check
 
 # XXX sync
-GCC_VER =  4.9.3
+GCC_VER =  4.9.4
 .if ${MACHINE_ARCH} == "amd64"
 GCC_CONFIG =   x86_64-unknown-openbsd${OSREV}
 .else
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



FAQ: guide.html

2016-09-01 Thread Edd Barrett
Hey,

Arguably this may belong on www@, but I think most of the people fit to
review this diff are here on ports@.

I went to add some port import instructions to guide.html and found that
in fact it was already somewhat documented. However:

 * I find the information is a little verbose.

 * In the porting checklist, I don't see why points 33 and 34 are
   separate.

 * The vendor tag most of us use nowerdays is "name_mmdd".

 * "Note that addition of new ports requires an explicit OK" implies
   that an update does not need an explicit OK.

 * The CVS dance for updates is mixed inside the prose for new ports.

 * It mentions "SPARC" which is being removed (right?)


I've tried to fix all this with the following diff. What do people
think?

(I've tried to only wrap new paragraphs so that you can see what I
changed in existing prose. We could wrap all the changes to 72?)


Index: guide.html
===
RCS file: /home/edd/cvsync/www/faq/ports/guide.html,v
retrieving revision 1.61
diff -u -p -r1.61 guide.html
--- guide.html  15 Aug 2016 02:22:15 -  1.61
+++ guide.html  1 Sep 2016 11:35:36 -
@@ -42,6 +42,7 @@
   Updating ports
   
 Update checklist
+ Committing port updates
   
   OpenBSD porting policy
   Security recommendations
@@ -644,8 +645,9 @@ The AMD64 systems are good because they 
 sizeof(int) != sizeof(long) on this platform.
 
 
-Sun SPARC and UltraSPARC are good because they are very common and because
-their byte order is the opposite of i386; if you developed on SPARC, of course,
+SPARC64 systems are good because they are fairly common, can be quite
+fast, and
+their byte order is the opposite of i386; if you developed on SPARC64, of 
course,
 you'd want it tested on i386.
 
 
@@ -654,82 +656,42 @@ Incorporate any feedback you get. Test i
 Get those who gave you feedback to test it again from your new port.
 
 
-Finally, include it in the "ports" tree.
-If you do not have CVS access, ask someone on
-mailto:ports@openbsd.org";>ports@openbsd.org to commit it.
-
-
-If you are a developer with CVS access, check it in.
-(Note that addition of new ports requires an explicit OK).
-Before commit, if using @newuser or @newgroup in the
-PLIST files, check that no users were added to
-/usr/ports/infrastructure/db/user.list since the port was created.
-We normally use cvs import for a new port, rather than adding a
-zillion (or a dozen) files individually.
-Import uses "vendor branch" version numbers like 1.1.1.1, but don't worry
-about that!
-If you make changes to a specific file (edit, then cvs commit),
-it will be 1.2, and that will be used.
+Get the port committed to CVS.
 
 
-In short, import is typically used when a port is created.
-From that point on, cvs add and cvs rm are typically used
-to add or remove files, and the normal edit->commit cycle for changes.
-You might use something like this:
+If you are not a developer with CVS access, then you will have to find
+an OpenBSD developer to do the following steps for you (ask on
+mailto:ports@openbsd.org";>ports@openbsd.org).
 
-
-$ cd /usr/ports/mystuff/lang/kaffe1
-$ make clean# you really don't want to check in all of work!
-$ cvs -d cvs.openbsd.org:/cvs -n import ports/lang/kaffe1 \
-   YourName YourName_-MMM-DD
-
-
-
--d cvs.openbsd.org:/cvs says where cvs lives.
-
-
--n says to do a 'dry run'; check the output of this, and if things
-are OK re-run the command without -n.
-
-
-ports/lang/kaffe1 is the path relative to /cvs where the port
-lives.
-Don't forget to start it with ports/.
-
-
-YourName (replaced with your login name) is the 'vendor tag'.
-You imported it so you are the vendor.
+
+Before you import anything, you need to get at least one "OK" another
+developer (the more the better).
 
-
-YourName_-MMM-DD (e.g., ian_2000-Jan-01) is the
-vendor release tag.
-This is as good as any.
-
+
+If using @newuser or @newgroup in the
+PLIST files, check that no users were added to
+/usr/ports/infrastructure/db/user.list since the port was created.
 
-
-As a real example, here is the output of checking in the kaffe1 port,
-which one of us did on September 8, 1998:
+
+For new ports we use cvs import, rather than adding new files
+individually. For example, to import a new lang/kaffe1 port,
+first do a dry-run import:
 
 
-$ cd kaffe1
-$ make clean >/dev/null
-$ cvs import -m 'kaffe1.0(==JDK1.1) port' ports/lang/kaffe1 ian 
ian_1998-Sep-08
-N ports/lang/kaffe1/Makefile
-cvs server: Importing /cvs/ports/lang/kaffe1/files
-N ports/lang/kaffe1/files/md5
-cvs server: Importing /cvs/ports/lang/kaffe1/pkg
-N ports/lang/kaffe1/pkg/COMMENT
-N ports/lang/kaffe1/pkg/DESCR
-N ports/lang/kaffe1/pkg/PLIST
-
-No conflicts created by this import
+$ cd /usr/ports/lang/kaffe1
+$ cvs -ndcvs.openbsd.org:/cvs import ports/lang/kaffe1 username 
username_mmdd
 
 
-In this case, -m was used to specify the commit log message
-directly on the command line; normally whe

Re: Update www/links+ 2.12 -> 2.13

2016-09-01 Thread Adam Wolk
On Tue, Aug 30, 2016 at 09:14:52AM -0400, trondd wrote:
> On Mon, August 22, 2016 9:53 am, trondd wrote:
> > On Wed, August 17, 2016 8:24 pm, tro...@kagu-tsuchi.com wrote:
> >> Here's another patch to update www/links+ from 2.12 to 2.13 including
> >> the
> >> updated patch.
> >>
> >> Thanks to Gerald Hanuer for getting the ball rolling.
> >>
> >> Tim.
> >
> > Bump.
> >
> 
> Ping one more time.  Will I have to take MAINTAINER to get some attention? :D
> 

Hi,

Grabbing the MAINTAINER is a nice idea :)

I tested the port. Seems to work fine but port-lib-depends-check
started to complain on fontconig, might want to try with an updated
ports tree and redoing the WANTLIB?

links+-2.13(www/links+):
Missing: fontconfig.11 (/usr/local/bin/links) (system lib)
Extra:  iconv.6
WANTLIB += fontconfig
*** Error 1 in target 'port-lib-depends-check' (ignored)



[NEW] devel/premake4

2016-09-01 Thread Adam Wolk
Hi ports@,

Sending in a new port for devel/premake4. This one is a dependency to an
upcoming port.

The patches in the port alter the upstream makefile to use our lang/lua instead
of the bundled lua that is distributed with upstream sources. The bundled lua
was not modified by the project and the developers moved it to a third party
dependency in premake5.

$ cat pkg/DESCR
Describe your software project just once, using Premake's simple and easy to
read syntax, and build it everywhere.

Generate project files for Visual Studio, GNU Make, Xcode, Code::Blocks, and
more across Windows, Mac OS X, and Linux. Use the full featured Lua scripting
engine to make build configuration tasks a breeze.

$ premake4 gmake
Building configurations...
Running action 'gmake'...
Generating Makefile...
Generating build/TEngine.make...
Generating build/physfs.make...
Generating build/minilua.make...
Generating build/buildvm.make...
Generating build/luajit2.make...
Generating build/luasocket.make...
Generating build/fov.make...
Generating build/lpeg.make...
Generating build/luaprofiler.make...
Generating build/tcodimport.make...
Generating build/expatstatic.make...
Generating build/lxp.make...
Generating build/luamd5.make...
Generating build/luazlib.make...
Generating build/luabitop.make...
Generating build/te4-bzip.make...
Done.
$ echo $?
0

Regards,
Adam


premake4.0.tar.gz
Description: application/tar-gz


Re: NEW: devel/py-test-xdist

2016-09-01 Thread Alexandr Shadchin
On Wed, Aug 31, 2016 at 04:22:07PM +0100, Edd Barrett wrote:
> A py-test plugin.
> 
> OK?
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk

1. Drop PKG_ARCH
2. FLAVORS spaces->tabs
3. Simplify test
4. Add setuptools_scm in bdep

-- 
Alexandr Shadchin



Re: darcs w^x trouble

2016-09-01 Thread Karel Gardas
I'm not sure if USE_WXNEEDED is also applicable to Haskell-based
ports. Anyway, this is more generally GHC's issue than darcs one, as
the issue arise from the GHC's runtime library probably. I would
recommend to read "Haskell wxneeded" thread on this mailing list for
more information about the issue.

On Thu, Sep 1, 2016 at 8:36 AM, Francisco de Borja Lopez Rio
 wrote:
> Hi everybody.
>
> Installed a fresh snapshot:
>
> kern.version=OpenBSD 6.0-current (GENERIC) #2210: Mon Aug 22 09:14:34 MDT 2016
>
> Installed darcs from packages:
>
> pkg_add -i darcs
>
> Every time I try to run "darcs record" (to record some changes in a local
> repo):
>
> darcs: internal error: setExecutable: failed to protect 0x0x2242c5000
>
> (GHC version 7.10.3 for x86_64_unknown_openbsd)
> Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug
>
> Abort trap (core dumped)
>
> And in the logs I can see:
>
> darcs(11893): mprotect W^X violation
>
> Some other commands seem to work just fine (darcs init/add/clone/pull...)
>
> This is a testing env, just a single / partition, marked with wxallowed:
>
> /dev/wd0a on / type ffs (local, wxallowed)
>
> Afterwards, I added "USE_WXNEEDED = yes" to /usr/ports/devel/darcs/Makefile
> and I built darcs from ports. Same result.
>
> There is no MAINTAINER set for this port, anybody that can help a bit with
> this?
>
> Regards.
>
> --
>
> "Do nothing which is of no use." - Miyamoto Musashi
> -
> Francisco de Borja Lopez Rio (bo...@codigo23.net)
> Soluciones Informaticas Codigo23 S.L.U.
> http://www.codigo23.net
>



Re: [PATCH] lang/sbcl - wxneeded working + version bump

2016-09-01 Thread Manuel Giraud
Solène Rapenne  writes:

> Hello,
>
> with the following patch, sbcl build and don't die because of W^X
> violation
>
> Version is also bumped from 1.2.14 to 1.3.8

Great! As you are here maybe you can try to build with "--fancy": I've
used it for months on amd64 without issue but haven't tested it on any
other arch.
-- 
Manuel Giraud



Re: NEW: devel/py-execnet

2016-09-01 Thread Alexandr Shadchin
On Wed, Aug 31, 2016 at 05:24:14PM +0100, Edd Barrett wrote:
> On Wed, Aug 31, 2016 at 04:34:43PM +0100, Edd Barrett wrote:
> >  * Fix dependencies.
> >  * Fix py-test invoke for Python 3.
> >  * Fix stray spaces in PLIST.
> 
> Items pointed out by shadchin@:
> 
>  * Simplify py-test invocation.
>  * Remove PKG_ARCH=*
> 
> OK?
> 
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk

py-setuptools_scm is bdep, not rdep.
ok shadchin@

-- 
Alexandr Shadchin