Re: [update] games/stone-soup

[Henrique N. Lengler]

Could someone give me a feedback, anything wrong?

--
Henrique N. Lengler

On Wed, Sep 14, 2016 at 02:30:21AM -0300, Henrique N. Lengler wrote:
> Hi,
> 
> This is a update to games/stone-soup to the latest version.
> 
> I'm not too experienced on porting.
> I uncommented the BROKEN lines, but I didn't test if there still problems 
> since
> I don't have that hardware, so there will be need for testing.
> 
> I only tested on amd64 and it is working well, both x11 an no_x11.
> 
> Patch attached;

> diff -u -p -N -r /usr/ports/games/stone-soup/Makefile 
> /usr/ports/mystuff/games/stone-soup/Makefile
> --- /usr/ports/games/stone-soup/Makefile  Fri Dec  4 18:47:53 2015
> +++ /usr/ports/mystuff/games/stone-soup/Makefile  Wed Sep 14 01:42:54 2016
> @@ -1,14 +1,11 @@
>  # $OpenBSD: Makefile,v 1.23 2015/12/04 20:47:53 landry Exp $
>  
> -BROKEN-hppa =ICE on dgn-shoals.cc:638
> -BROKEN-arm=  tilegen.elf loops burning cpu
> -
>  COMMENT =dungeon crawl stone soup
>  CATEGORIES = games
>  
>  HOMEPAGE =   http://crawl.develz.org/
> -MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=crawl-ref/}
> -VERSION =0.15.2
> +MASTER_SITES =   http://crawl.develz.org/release/
> +VERSION =0.18.1
>  DISTNAME=stone_soup-${VERSION}-nodeps
>  EXTRACT_SUFX=.tar.xz
>  PKGNAME= stone-soup-${VERSION}
> @@ -17,35 +14,31 @@ REVISION= 0
>  WRKDIST =${WRKDIR}/stone_soup-${VERSION}
>  WRKSRC = ${WRKDIST}/source
>  USE_GMAKE =  Yes
> -CFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
> -CXXFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
> -MAKE_FLAGS = CC="${CC}" CXX="${CXX}" \
> +CFLAGS +="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
> +CXXFLAGS +=  "-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL2"
> +MAKE_FLAGS = CC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" \
>   LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
>   LUA_LIB=${MODLUA_LIB} \
>   SQLITE_INCLUDE_DIR=/usr/include \
>   LDFLAGS=-L${LOCALBASE}/lib \
>   INSTALL_UGRP=root:wheel \
>   prefix=${PREFIX} \
> - SAVEDIR="~/.crawl" \
> - PROPORTIONAL_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf" 
> \
> - 
> MONOSPACED_FONT="${X11BASE}/lib/X11/fonts/TTF/DejaVuSansMono.ttf" \
>   NO_YACC=1 \
> - V=1
> + SAVEDIR="~/.crawl"
>  
>  MAKE_ENV +=  MODLUA_DEP_VERSION=${MODLUA_DEP_VERSION}
>  MODGCC4_ARCHS = *
>  MODGCC4_LANGS = c++
>  MODULES =gcc4 lang/lua
> +MODLUA_VERSION =  5.1
>  WANTLIB =c m ${MODLUA_WANTLIB} sqlite3
>  
> -BUILD_DEPENDS = devel/bison \
> - graphics/pngcrush
> +BUILD_DEPENDS = graphics/pngcrush
>  
> -# Almost nethack...
> -PERMIT_PACKAGE_FTP = Yes
> -PERMIT_PACKAGE_CDROM =   No gain
> +# License GPLv2+
> +PERMIT_PACKAGE_CDROM =   Yes
>  
> -FLAVORS =no_x11
> +FLAVORS = no_x11
>  FLAVOR ?=
>  
>  .if ${FLAVOR:Mno_x11}
> @@ -57,12 +50,11 @@ CFLAGS += -DUSE_TILE
>  CXXFLAGS +=  -DUSE_TILE
>  
>  MAKE_FLAGS +=TILES=y \
> - YACC=yacc \
> - LDFLAGS="-L${LOCALBASE}/lib -lSDL -lSDL_image -lpng -pthread"
> -WANTLIB +=   GL GLU SDL SDL_image freetype png pthread z
> + LDFLAGS="-L${LOCALBASE}/lib -lSDL2 -lSDL2_image -lpng -pthread"
> +WANTLIB +=   GL GLU SDL2 SDL2_image freetype png pthread z
>  RUN_DEPENDS =devel/desktop-file-utils
> -LIB_DEPENDS +=   devel/sdl \
> - devel/sdl-image \
> +LIB_DEPENDS +=   devel/sdl2 \
> + devel/sdl2-image \
>   graphics/png
>  .endif
>  
> @@ -70,13 +62,12 @@ post-install:
>   mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
>   chmod 755 ${PREFIX}/bin/crawl-ss
>   ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
> - ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs
>  .if ! ${FLAVOR:Mno_x11}
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps ${PREFIX}/share/applications
>   ${INSTALL_DATA} \
>   ${PREFIX}/share/crawl/dat/tiles/stone_soup_icon-32x32.png \
>   ${PREFIX}/share/pixmaps/stone-soup.png
> - ${INSTALL_DATA} ${FILESDIR}/stone-soup.desktop \
> + ${INSTALL_DATA} ${WRKDIST}/source/debian/crawl-tiles.desktop \
>   ${PREFIX}/share/applications
>  .endif
>  
> diff -u -p -N -r /usr/ports/games/stone-soup/distinfo 
> /usr/ports/mystuff/games/stone-soup/distinfo
> --- /usr/ports/games/stone-soup/distinfo  Tue Apr  7 07:10:28 2015
> +++ /usr/ports/mystuff/games/stone-soup/distinfo  Tue Sep 13 01:52:37 2016
> @@ -1,2 +1,2 @@
> -SHA256 (stone_soup-0.15.2-nodeps.tar.xz) = 
> 6TqCiAgB+2B5TJwFzLqwPVx+HxBeWWjSzrx2DTh6IeI=
> -SIZE (stone_soup-0.15.2-nodeps.tar.xz) = 8979684
> +SHA256 (stone_soup-0.18.1-nodeps.tar.xz) = 
> S9rXd4+IqZRwxyX/dKgUW91gAy+a5Izll/dLiueE2FA=
> +SIZE (stone_soup-0.18.1-nodeps.tar.xz) = 9716104
> diff -u -p -N -r 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/17 17:14:04

Added files:
www/p5-WWW-Curl/patches: patch-Makefile_PL 

Log message:
fix build with curl >=7.50.2 as suggested by ppi...@redhat.com

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/17 15:39:18

Modified files:
net/curl   : Tag: OPENBSD_5_9 Makefile 
Added files:
net/curl/patches: Tag: OPENBSD_5_9 patch-lib_escape_c 

Log message:
Security fix:
CVE-2016-7167: curl escape and unescape integer overflows

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/17 15:39:05

Modified files:
net/curl   : Tag: OPENBSD_6_0 Makefile 
Added files:
net/curl/patches: Tag: OPENBSD_6_0 patch-lib_escape_c 

Log message:
Security fix:
CVE-2016-7167: curl escape and unescape integer overflows

devel/py-coverage was [UPDATE] net/gpodder 3.1.0 to 3.9.1

[trondd]

Daniel Jakots  wrote:

> On Sat, 17 Sep 2016 12:59:01 -0400, "trondd" 
> wrote:
> 
> Yeah, our py-coverage is lagging a bit. If you want to update it, you
> should verify that ports that depend on it doesn't break. I can have a
> look at it if you don't want to do the work.
> 
> The list:
>   RUN_DEPENDS
> /usr/ports/audio/py-discogs-client
> /usr/ports/devel/py-nosexcover
> /usr/ports/devel/py-nosexcover,python3
> /usr/ports/devel/py-test-cov
> /usr/ports/devel/py-test-cov,python3
>   TEST_DEPENDS
> /usr/ports/devel/py-nose
> /usr/ports/devel/py-nose,python3
> /usr/ports/devel/py-nosexcover
> /usr/ports/devel/py-nosexcover,python3
> /usr/ports/devel/py-smmap
> /usr/ports/net/py-oauth2
> /usr/ports/security/py-oauthlib
> /usr/ports/security/py-oauthlib,python3
> /usr/ports/textproc/cdiff
> /usr/ports/textproc/py-polib
> /usr/ports/www/py-beaker
> /usr/ports/www/py-pylons
> /usr/ports/www/py-routes
> /usr/ports/www/py-webtest

Well right away py-nose failed make test.  There hasn't been a realease in
over a year that I can find.

Here's my py-coverage update.  Not sure how we should proceed.  Patch all
the dependecies' tests"?  Ugh.  Try to find a py-coverage that maybe works
for eveyone?  Skip tests in gPodder?  Go outside and enjoy the sunshine?

Tim.

Index: Makefile
===
RCS file: /cvs/ports/devel/py-coverage/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile29 Sep 2015 10:51:53 -  1.16
+++ Makefile17 Sep 2016 20:46:20 -
@@ -2,10 +2,9 @@
 
 COMMENT =  code coverage measurement for Python
 
-MODPY_EGG_VERSION = 3.7.1
+MODPY_EGG_VERSION = 4.2
 DISTNAME = coverage-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-coverage/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo1 May 2014 13:05:29 -   1.7
+++ distinfo17 Sep 2016 20:46:20 -
@@ -1,2 +1,2 @@
-SHA256 (coverage-3.7.1.tar.gz) = 0a6hxKphuDZtakLdNlBiL7+cY07STq9/N5yLlw5e1E4=
-SIZE (coverage-3.7.1.tar.gz) = 284735
+SHA256 (coverage-4.2.tar.gz) = 4xJ3bT7wRjLsdCzi0rcEi2NQc+AkXk9E3+iwjMUKxlY=
+SIZE (coverage-4.2.tar.gz) = 359873
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coverage/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   16 Jul 2015 21:18:48 -  1.7
+++ pkg/PLIST   17 Sep 2016 20:46:20 -
@@ -11,48 +11,41 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/coverage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
 
lib/python${MODPY_VERSION}/site-packages/coverage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coverage/__init__.py
+lib/python${MODPY_VERSION}/site-packages/coverage/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/coverage/__main__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}annotate.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}backward.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}bytecode.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}cmdline.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}codeunit.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}collector.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}control.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}data.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}execfile.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/coverage/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc

EFL / Enlightenment Port Maintainer Needed

[Al Poole]

Hi all,

Over the last six months there has been considerable effort in getting EFL
and Enlightenment building and working well on OpenBSD.

Unfortunately I do not have the time to maintain a port myself, but I'd
like to share the current situation and that is things are working good.

I've made a helper page here which *should* cover most issues:

http://enform.haxlab.org

Am hoping someone will have the time and motivation for this.

Thanks for all your good work.

Cheers!

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/17 14:22:41

Modified files:
www/lighttpd   : Makefile distinfo 
www/lighttpd/patches: patch-doc_lighttpd_8 
Added files:
www/lighttpd/patches: patch-src_connections_c 
  patch-src_fdevent_c patch-src_fdevent_h 
  patch-src_http_auth_c patch-src_mod_cgi_c 
  patch-src_mod_fastcgi_c 
  patch-src_mod_proxy_c patch-src_mod_scgi_c 
  patch-src_server_c 
Removed files:
www/lighttpd/patches: patch-src_chunk_c 

Log message:
Update to lighttpd-1.4.41.

from Brad (maintainer)

Re: sox vs libmagic

[Jan Stary]

On Sep 15 12:51:55, h...@stare.cz wrote:
> Would anyone miss the libmagic functionality
> if it was removed from audio/sox?

On Sep 15 20:36:52, s...@spacehopper.org wrote:
> I wouldn't miss it.

On Sep 16 11:04:09, a...@caoua.org wrote:
> unlikely; nowadays most (all?) files have the standard extensions
> and the remaining ones are easily handled with file(1).

So lets just drop it.

Jan


Index: Makefile
===
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile12 Sep 2016 22:20:36 -  1.65
+++ Makefile17 Sep 2016 19:43:49 -
@@ -5,6 +5,7 @@ BROKEN-hppa =   bend.c:155:12: internal co
 COMMENT=   Sound eXchange, the Swiss Army knife of audio manipulation
 
 DISTNAME=  sox-14.4.2
+REVISION=  0
 SHARED_LIBS += sox 4.0 # 3.0
 
 CATEGORIES=audio
@@ -20,7 +21,7 @@ WANTLIB += FLAC gsm mad id3tag mp3lame o
 WANTLIB += sndfile vorbis vorbisenc vorbisfile
 WANTLIB += opencore-amrnb opencore-amrwb
 WANTLIB += opus opusfile twolame wavpack
-WANTLIB += iconv magic png
+WANTLIB += iconv png
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sox/}
 
@@ -40,7 +41,6 @@ LIB_DEPENDS=  \
audio/twolame   \
audio/wavpack   \
converters/libiconv \
-   devel/libmagic  \
graphics/png
 
 CONFIGURE_STYLE=gnu
@@ -65,7 +65,7 @@ CONFIGURE_ARGS+=  \
 
 # Additional file formats
 CONFIGURE_ARGS+=   \
-   --with-magic\
+   --without-magic \
--with-png  \
--without-ladspa\
--with-mad  \

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2016/09/17 13:34:35

Modified files:
net/curl   : Makefile distinfo 

Log message:
Security update to 7.50.3:
CVE-2016-7167: curl escape and unescape integer overflows

Re: [UPDATE] net/gpodder 3.1.0 to 3.9.1

[Daniel Jakots]

On Sat, 17 Sep 2016 12:59:01 -0400, "trondd" 
wrote:

> The problem here is that I didn't have py-coverage installed.  They
> require a newer version than we have in ports.  I don't know if the
> newer one would be backwords compatible or not.  Can someone more
> experienced with Python ports help out here?  If I update
> py-coverage, what do I need to check for fallout?

Yeah, our py-coverage is lagging a bit. If you want to update it, you
should verify that ports that depend on it doesn't break. I can have a
look at it if you don't want to do the work.

The list:
  RUN_DEPENDS
/usr/ports/audio/py-discogs-client
/usr/ports/devel/py-nosexcover
/usr/ports/devel/py-nosexcover,python3
/usr/ports/devel/py-test-cov
/usr/ports/devel/py-test-cov,python3
  TEST_DEPENDS
/usr/ports/devel/py-nose
/usr/ports/devel/py-nose,python3
/usr/ports/devel/py-nosexcover
/usr/ports/devel/py-nosexcover,python3
/usr/ports/devel/py-smmap
/usr/ports/net/py-oauth2
/usr/ports/security/py-oauthlib
/usr/ports/security/py-oauthlib,python3
/usr/ports/textproc/cdiff
/usr/ports/textproc/py-polib
/usr/ports/www/py-beaker
/usr/ports/www/py-pylons
/usr/ports/www/py-routes
/usr/ports/www/py-webtest

Re: [UPDATE] net/gpodder 3.1.0 to 3.9.1

[trondd]

On Sat, September 17, 2016 12:09 pm, Daniel Jakots wrote:
> On Sat, 17 Sep 2016 11:28:29 -0400, trondd 
> wrote:
>
> Any reason to remove this chunk? It doesn't package right now:
> $ make package
> `/usr/ports/pobj/gpodder-3.9.1/fake-amd64/.fake_done' is up to date.
> ===>  Building package for gpodder-3.9.1
> Create /usr/ports/packages/amd64/all/gpodder-3.9.1.tgz
> checksumming|
>| 59%
> Error: /usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpo.1
> does not exist
> Error:
> /usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpodder-migrate2tres.1
> does not exist
> Error:
> /usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpodder.1 does
> not exist
> Fatal error: can't continue
>
> so I looked for them and:
>
> /usr/ports/pobj/gpodder-3.9.1/fake-amd64$ find . -name gpo.1
> ./usr/local/share/man/man1/gpo.1
>
> With the mv, it packages again.
>

My fault.  My patch didn't include removal of patches/patch-setup_py which
breaks upstream's handling of the man paths.

>
>
> make lib-depends-check complains:
> Extra:  iconv.6 intl.6
>
> so I removed devel/gettext modules and textproc/intltool. I don't know
> if it needs to be in WANTLIB but it doesn't complain anymore at least :)
>

Thanks, forgot to check this.  intltool is a build dependency.

On that note, I'm confused when to use a *_DEPENDS and when to use
WANTLIB.  In this case it calls the intltool executable, rather than
linking to a library so maybe that's the obvious answer.

>
>
> make test fails here:
> ===>  Regression tests for gpodder-3.9.1
> LC_ALL=C PYTHONPATH=src/ /usr/local/bin/python2.7 -m gpodder.unittests
> No handlers could be found for logger "gpodder.util"
> Traceback (most recent call last):
>   File "/usr/local/lib/python2.7/runpy.py", line 174, in
> _run_module_as_main
> "__main__", fname, loader, pkg_name)
>   File "/usr/local/lib/python2.7/runpy.py", line 72, in _run_code
> exec code in run_globals
>   File
> "/usr/ports/pobj/gpodder-3.9.1/gpodder-gpodder-3.9.1/src/gpodder/unittests.py",
> line 89, in 
> cov = coverage.Coverage()
> AttributeError: 'module' object has no attribute 'Coverage'
> gmake: *** [makefile:64: unittest] Error 1
>

The problem here is that I didn't have py-coverage installed.  They
require a newer version than we have in ports.  I don't know if the newer
one would be backwords compatible or not.  Can someone more experienced
with Python ports help out here?  If I update py-coverage, what do I need
to check for fallout?

Tim.

Re: [UPDATE] net/gpodder 3.1.0 to 3.9.1

[Daniel Jakots]

On Sat, 17 Sep 2016 11:28:29 -0400, trondd 
wrote:

> - # Move manpages to the right place..darn you setup.py
> - mv ${PREFIX}/share/man/man1/*.1 ${PREFIX}/man/man1/ && \
> - rm -fr ${PREFIX}/share/man

Any reason to remove this chunk? It doesn't package right now:
$ make package
`/usr/ports/pobj/gpodder-3.9.1/fake-amd64/.fake_done' is up to date.
===>  Building package for gpodder-3.9.1
Create /usr/ports/packages/amd64/all/gpodder-3.9.1.tgz
checksumming|   
  | 59%
Error: /usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpo.1 does 
not exist
Error: 
/usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpodder-migrate2tres.1
 does not exist
Error: /usr/ports/pobj/gpodder-3.9.1/fake-amd64/usr/local/man/man1/gpodder.1 
does not exist
Fatal error: can't continue

so I looked for them and:

/usr/ports/pobj/gpodder-3.9.1/fake-amd64$ find . -name gpo.1
   
./usr/local/share/man/man1/gpo.1

With the mv, it packages again.



make lib-depends-check complains:
Extra:  iconv.6 intl.6

so I removed devel/gettext modules and textproc/intltool. I don't know
if it needs to be in WANTLIB but it doesn't complain anymore at least :)



make test fails here:
===>  Regression tests for gpodder-3.9.1
LC_ALL=C PYTHONPATH=src/ /usr/local/bin/python2.7 -m gpodder.unittests
No handlers could be found for logger "gpodder.util"
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/runpy.py", line 174, in _run_module_as_main
"__main__", fname, loader, pkg_name)
  File "/usr/local/lib/python2.7/runpy.py", line 72, in _run_code
exec code in run_globals
  File 
"/usr/ports/pobj/gpodder-3.9.1/gpodder-gpodder-3.9.1/src/gpodder/unittests.py", 
line 89, in 
cov = coverage.Coverage()
AttributeError: 'module' object has no attribute 'Coverage'
gmake: *** [makefile:64: unittest] Error 1

I don't have more time to look at it right now.

Cheers,
Daniel

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/09/17 09:33:39

Modified files:
databases/py-peewee: Makefile distinfo 
databases/py-peewee/patches: patch-setup_py 
databases/py-peewee/pkg: PLIST 

Log message:
maintenance update to py-peewee-2.8.3
while there:
- add a test target
- disable the use of cython

[UPDATE] net/gpodder 3.1.0 to 3.9.1

[trondd]

Here's a patch to update gPodder to 3.9.1.  Moved the download to GitHub,
clean up build and install targets, use their environment variable to get
the man pages in the right place, and take maintainer.

This it my first time messing with GH_*, and Python.  Feedback encouraged.
Tests pass, portcheck is happy, running on amd64.

Tim.

Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile24 Nov 2015 09:11:05 -  1.9
+++ Makefile17 Sep 2016 15:03:19 -
@@ -2,19 +2,20 @@
 
 COMMENT=   media aggregator and podcast client
 
-MODPY_EGG_VERSION= 3.1.0
+MODPY_EGG_VERSION= 3.9.1
 DISTNAME=  gpodder-${MODPY_EGG_VERSION}
-REVISION=  4
 CATEGORIES=net www
 
 HOMEPAGE=  http://gpodder.org/
 
+MAINTAINER=Tim Meunier 
+
 # GPLv3+
 PERMIT_PACKAGE_CDROM=  Yes
 
-# upstream's master site doesn't play nice with ftp/DISTNAME, so just
-# mirror the distfile instead.
-MASTER_SITES=  https://distfiles.nl/
+GH_ACCOUNT=gpodder
+GH_PROJECT=gpodder
+GH_TAGNAME=${DISTNAME}
 
 MODULES=   devel/gettext \
lang/python \
@@ -33,20 +34,19 @@ TEST_DEPENDS=   devel/py-minimock \
 
 USE_GMAKE= Yes
 MAKE_FILE= makefile
-MAKE_ENV=  PYTHON=${MODPY_BIN}
+MAKE_ENV=  PYTHON=${MODPY_BIN} \
+   GPODDER_MANPATH_NO_SHARE="yes"
+ALL_TARGET=messages
 
 TEST_TARGET=   unittest
 
-# Additional targets
-post-build:
-   cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${MAKE_PROGRAM} \
-   -f ${MAKE_FILE} messages
 
 do-install:
-   cd ${WRKSRC} && ${SETENV} -i ${MAKE_ENV} ${MAKE_PROGRAM} \
+   
+   cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-f ${MAKE_FILE} install
-   # Move manpages to the right place..darn you setup.py
-   mv ${PREFIX}/share/man/man1/*.1 ${PREFIX}/man/man1/ && \
-   rm -fr ${PREFIX}/share/man
+
+post-install:
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py 
${PREFIX}/share/gpodder/extensions/
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/gpodder/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:39 -  1.2
+++ distinfo17 Sep 2016 15:03:19 -
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.1.0.tar.gz) = qyBpcxKfijjS/4CGmppP+BgiOVIvXlwWv1iRtHJsMv4=
-SIZE (gpodder-3.1.0.tar.gz) = 2060222
+SHA256 (gpodder-3.9.1.tar.gz) = zu0Fphh368dYcAwG8paODpMlYqAgWb8nmG+nEglGDbo=
+SIZE (gpodder-3.9.1.tar.gz) = 1009899
Index: patches/patch-makefile
===
RCS file: /cvs/ports/net/gpodder/patches/patch-makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-makefile
--- patches/patch-makefile  20 Apr 2012 10:51:22 -  1.1.1.1
+++ patches/patch-makefile  17 Sep 2016 15:03:19 -
@@ -1,12 +1,12 @@
 $OpenBSD: patch-makefile,v 1.1.1.1 2012/04/20 10:51:22 jasper Exp $
 makefile.orig  Tue Mar 27 01:51:22 2012
-+++ makefile   Sun Apr  8 16:20:22 2012
-@@ -84,7 +84,7 @@ $(GPODDER_DESKTOP_FILE_IN).h: $(GPODDER_DESKTOP_FILE_I
+--- makefile.orig  Wed Aug 31 15:10:41 2016
 makefile   Fri Sep 16 21:26:10 2016
+@@ -82,7 +82,7 @@ $(GPODDER_SERVICE_FILE): $(GPODDER_SERVICE_FILE_IN)
intltool-extract --quiet --type=gettext/ini $<
  
- install: messages $(GPODDER_SERVICE_FILE) $(GPODDER_DESKTOP_FILE)
--  $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
-+  $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=/${PREFIX}
- 
- ##
+ install: messages $(GPODDER_SERVICE_FILE) $(DESKTOP_FILES)
+-  $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) 
--optimize=1
++  $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=/$(PREFIX) 
--optimize=1
  
+ release-win32:
+   $(MAKE) -C tools/win32-setup
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gpodder/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   15 Jun 2012 08:32:17 -  1.2
+++ pkg/PLIST   17 Sep 2016 15:03:19 -
@@ -6,128 +6,187 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/gpodder-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/gpodder/__init__.py
 lib/python${MODPY_VERSION}/site-packages/gpodder/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/gpodder/api.py
-lib/python${MODPY_VERSION}/site-packages/gpodder/api.pyc
+lib/python${MODPY_VERSION}/site-packages/gpodder/__init__.pyo

Re: NEW: net/iperf3

[Stuart Henderson]

Hi, I'd strongly prefer a new port for this and keep the existing one as 
there are quite a few devices with built-in copies of iperf 2.



On 17 September 2016 3:19:45 p.m. Lawrence Teo  wrote:


net/iperf is at 2.0.5 and no longer maintained; its website
(http://iperf.sourceforge.net) now directs users to iperf3 instead.

A description of iperf3 is available at the top of their main
non-github site at http://software.es.net/iperf/ -- the summary is that
iperf3 is a rewritten iperf that is not backwards compatible with iperf.
The installed binary name has also changed; it is now "bin/iperf3"
instead of "bin/iperf".

I have attached the new net/iperf3 port for review.

Note: Due to the way iperf3 uses IPV6_V6ONLY
(https://github.com/esnet/iperf/issues/196), iperf3 can only listen
on IPv6 or IPv4 but not both when you start it in server mode.  If you
would like to use it in server mode with IPv4, you will need to run:

iperf3 -4 -s

Some questions:

1. Is it preferable to introduce a new port or update the existing
   net/iperf port?  I lean towards introducing a new port because of the
   backwards incompatibility, and the situation is similar to
   security/p0f and security/p0f3.

2. If it's preferable to introduce a new port, should the old net/iperf
   port be removed?

Last but not least, thanks to jca@ for prodding me about this. :)

Thoughts and reviews welcome.

Lawrence

NEW: net/iperf3

[Lawrence Teo]

net/iperf is at 2.0.5 and no longer maintained; its website
(http://iperf.sourceforge.net) now directs users to iperf3 instead.

A description of iperf3 is available at the top of their main
non-github site at http://software.es.net/iperf/ -- the summary is that
iperf3 is a rewritten iperf that is not backwards compatible with iperf.
The installed binary name has also changed; it is now "bin/iperf3"
instead of "bin/iperf".

I have attached the new net/iperf3 port for review.

Note: Due to the way iperf3 uses IPV6_V6ONLY
(https://github.com/esnet/iperf/issues/196), iperf3 can only listen
on IPv6 or IPv4 but not both when you start it in server mode.  If you
would like to use it in server mode with IPv4, you will need to run:

iperf3 -4 -s

Some questions:

1. Is it preferable to introduce a new port or update the existing
   net/iperf port?  I lean towards introducing a new port because of the
   backwards incompatibility, and the situation is similar to
   security/p0f and security/p0f3.

2. If it's preferable to introduce a new port, should the old net/iperf
   port be removed?

Last but not least, thanks to jca@ for prodding me about this. :)

Thoughts and reviews welcome.

Lawrence


iperf3-3.1.3.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/17 06:05:59

Modified files:
sysutils/google-cloud-sdk: Makefile distinfo 
sysutils/google-cloud-sdk/pkg: PLIST 

Log message:
Update to google-cloud-sdk-126.0.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/17 06:02:36

Modified files:
security/py-libnacl: Makefile distinfo 

Log message:
Update to py-libnacl-1.5.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/17 06:01:07

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.10.65.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2016/09/17 06:00:50

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.4.55.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/09/17 03:52:37

Modified files:
graphics/GraphicsMagick: Makefile distinfo 
graphics/GraphicsMagick/pkg: PLIST 

Log message:
update to GraphicsMagick 1.3.25, from Brad - CVE-2016-2317 and a few other
security-related fixes noted in changelog.