[bug] gzip archives created with pkg_create have wrong data sizes

[dan mclaughlin]

the sizes of the compressed/uncompressed data are wrong. i have tested gzip
and 'tar zcf' and the values are right, but using pkg_create fails.

$ sysctl hw.machine kern.version
hw.machine=i386
kern.version=OpenBSD 5.9-current (GENERIC) #0: Thu Apr  7 17:24:30 EDT 2016
build@node04:/usr/src/sys/arch/i386/compile/GENERIC

it's not just i386 specific though, since i tested the amd64 packages as well.


$ ftp ftp://ftp3.usa.openbsd.org/pub/OpenBSD/snapshots/packages/i386/bzip2...
...
Retrieving pub/OpenBSD/snapshots/packages/i386/bzip2-1.0.6p7.tgz
...
$ ls -l bzip2-1.0.6p7.tgz
-rw-r--r--  1 user  user  125979 Apr 23 12:19 bzip2-1.0.6p7.tgz
$ gzip -l bzip2-1.0.6p7.tgz
compressed  uncompressed  ratio  uncompressed_name
   322  7680  96.0%  bzip2-1.0.6p7.tar
$ gzip -vd bzip2-1.0.6p7.tgz
bzip2-1.0.6p7.tgz:  96.0% -- replaced with bzip2-1.0.6p7.tar
322 bytes in, 7680 bytes out
$ ls -l bzip2-1.0.6p7.tar
-rw-r--r--  1 user  user  375808 Apr 23 12:19 bzip2-1.0.6p7.tar
$ gzip -v bzip2-1.0.6p7.tar
bzip2-1.0.6p7.tar:  66.6% -- replaced with bzip2-1.0.6p7.tar.gz
375808 bytes in, 125704 bytes out
$ gzip -l bzip2-1.0.6p7.tar.gz
compressed  uncompressed  ratio  uncompressed_name
125704375808  66.6%  bzip2-1.0.6p7.tar

$ pkg_create -f /var/db/pkg/bzip2-1.0.6p7/+CONTENTS
$ ls -l bzip2-1.0.6p7.tgz
-rw-r--r--  1 user  user  125891 Apr 24 00:36 bzip2-1.0.6p7.tgz
$ gzip -l bzip2-1.0.6p7.tgz
compressed  uncompressed  ratio  uncompressed_name
   319  7680  96.1%  bzip2-1.0.6p7.tar

$ tar zcf test.tgz -I list
and
$ tar cf - -I list | gzip -c >test.tgz

give the expected correct results.

i tried to track it a bit further

$ grep gzip /usr/src/usr.sbin/pkg_add/OpenBSD/*
/usr/src/usr.sbin/pkg_add/OpenBSD/Paths.pm:sub gzip() { '/usr/bin/gzip' }
/usr/src/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm: $state->say("Creating gzip'd 
tar ball in '#1'", $wname)

but perl's not really my thing and so i really know where to go from here.

[FIX] py-matplotlib build failure

[Daniel Dickman]

naddy@ reported a build failure of the py3 flavor of matplotlib.

Looking at his logs, it seems like the problem might actually be in 
py3-cairo. I *think* the fix is easy and is at the bottom of this email.

While here, fix the license marker and a comment in py3-cairo.

ok?

-

Full details of the problem.

If you install py3-cairo, then run some code, it could create .pyc files. 
However these aren't in the PLIST, so when you uninstall the package 
they're left behind. Here's how to reproduce:

  cd /usr/ports/graphics/py3-cairo
  make install
  python3.4 -c "import cairo"
  make uninstall

This will show an error:
  Error deleting directory /usr/local/lib/python3.4/site-packages/cairo

Now if you try to build the py3 flavor of matplotlib you'll get an error. 
The error is due to the following test within matplotlib which checks for 
availability of the cairo package.

  import cairo
  cairo.version

(1) The import doesn't fail with an ImportError because of the 
site-packages/cairo that's left behind, causing the import to succeed.
(2) cairo.version fails with an unexpected AttributeError which causes the 
matplotlib build to fail.

-

Index: Makefile
===
RCS file: /home/cvs/ports/graphics/py3-cairo/Makefile,v
retrieving revision 1.9
diff -u -p -u -r1.9 Makefile
--- Makefile8 Oct 2015 12:02:03 -   1.9
+++ Makefile24 Apr 2016 03:18:25 -
@@ -9,13 +9,13 @@ VERSION=  1.10.0
 DISTNAME=  pycairo-${VERSION}
 PKGNAME=   py3-cairo-${VERSION}
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  2
+REVISION=  3
 
 CATEGORIES=graphics
 
 HOMEPAGE=  http://cairographics.org/pycairo/
 
-# LGPLv2.1 / MPL 1.1
+# LGPLv3
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += ${MODPY_WANTLIB}
@@ -37,7 +37,7 @@ LIB_DEPENDS=  ${MODPY_LIB_DEPENDS} \
 
 TEST_DEPENDS=devel/py-test${MODPY_FLAVOR}
 
-# du to the fact that waf extract embedded bzip2 tarball unpacked at runtime.
+# due to the fact that waf unpacks an embedded bzip2 tarball at runtime.
 # we need to call waf to create files before patching files.
 post-extract:
cd ${WRKSRC} && ${MODPY_BIN} ./waf --help 1>&2 > /dev/null
@@ -53,6 +53,10 @@ do-build:
 
 do-install:
cd ${WRKBUILD} && ${MODPY_BIN} ./waf install
+
+post-install:
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${WRKINST}${MODPY_SITEPKG}
 
 do-test: install
sed -i "s/python/python${MODPY_VERSION}/g" 
${WRKSRC}/test/examples_test.py
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/graphics/py3-cairo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST   30 Mar 2012 07:12:28 -  1.1.1.1
+++ pkg/PLIST   24 Apr 2016 02:36:57 -
@@ -8,4 +8,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/cairo/__init__.pyo
 @comment lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.a
 @comment lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.la
+lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cairo/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/cairo/_cairo.so

Re: NEW: lua-lyaml

[Jonathan Gray]

On Sat, Apr 23, 2016 at 11:33:04AM +0200, Florian Stinglmayr wrote:
> On Fri, Apr 22, 2016 at 05:54:04PM +1000, Jonathan Gray wrote:
> > Some time ago when needing to use yaml from lua I ended up with the same
> > project as this port.
> >
> > Debian calls their lyaml package lua-yaml so it isn't without precedent
> >
> > https://packages.debian.org/sid/lua-yaml
> >
> 
> Btw, here is the port again with changes from jsg@ for everyone's
> convenience. Thanks a lot for your input and help.

You missed some of the changes from the diff.  Anyway I've now committed
this port, thanks.

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/04/23 20:41:38

Modified files:
textproc   : Makefile 

Log message:
+lua-yaml

CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/04/23 20:36:45

Log message:
Import lyaml 6.0

LibYAML binding for Lua, with a fast C implementation for converting
between YAML 1.1 and Lua tables, and a low-level YAML event parser
for implementing more intricate YAML document loading.

from Florian Stinglmayr (MAINTAINER)

Status:

Vendor Tag: jsg
Release Tags:   jsg_20160424

N ports/textproc/lua-yaml/distinfo
N ports/textproc/lua-yaml/Makefile
N ports/textproc/lua-yaml/pkg/PLIST
N ports/textproc/lua-yaml/pkg/DESCR

No conflicts created by this import

Re: rrdtool-chroot pango-basic-fc.so

[Predrag Punosevac]

Stuart Henderson  wrote:

> Ah, it seems that pango got simplified again. What files did you end up
> needing to copy into the chroot? Would you be able to try it with this diff?
> 

I think you are right. I ended up doing the following 2 lines from the
script

cp -p /usr/local/bin/rrdtool /var/www/usr/local/bin
for i in $(ldd /usr/local/bin/rrdtool | grep 'lib/' | awk '{
print $7 }'
) ; do \
cp -p $i /var/www/usr/lib/
done

to get a semi-functional syweb instance at home. I am too busy until
next weekend to look this again. 


Predrag

> Index: files/rrdtool-chroot.sh
> ===
> RCS file: /cvs/ports/net/rrdtool/files/rrdtool-chroot.sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 rrdtool-chroot.sh
> --- files/rrdtool-chroot.sh   6 Apr 2014 17:01:34 -   1.2
> +++ files/rrdtool-chroot.sh   24 Apr 2016 01:03:36 -
> @@ -1,7 +1,7 @@
>  #!/bin/ksh
>  #
>  # make rrdtool(1) available in webserver chroot(8): copy in library
> -# dependencies and generate barebones pango/fontconfig/pango configuration
> +# dependencies and generate barebones fontconfig configuration
>  
>  # WARNING: /var/www/usr/libexec/ld.so and /var/www/lib/* may be shared
>  # by other executables in the chroot(8)
> @@ -12,12 +12,11 @@ if [ "$(id -u)" -ne 0 ]; then
>  fi
>  
>  do_enable() {
> - mkdir -p 
> /var/www{/etc/{pango,fonts/TTF},/usr/lib,/usr/libexec,${LOCALBASE}/bin,${X11BASE}/lib,/cache/fontconfig}
> + mkdir -p 
> /var/www{/etc/fonts/TTF,/usr/lib,/usr/libexec,${LOCALBASE}/bin,${X11BASE}/lib,/cache/fontconfig}
>   cp -p ${LOCALBASE}/bin/rrdtool /var/www${LOCALBASE}/bin
>   for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7 
> }') ; do \
>   cp -p $i /var/www/usr/lib/
>   done
> - cp -p ${LOCALBASE}/lib/pango/*/modules/pango-basic-fc.so 
> /var/www/usr/lib/
>   cp -p /usr/libexec/ld.so /var/www/usr/libexec/
>   cp -p /usr/X11R6/lib/X11/fonts/TTF/DejaVuSans.ttf /var/www/etc/fonts/TTF
>   cat << EOF > /var/www/etc/fonts/fonts.conf
> @@ -28,21 +27,16 @@ do_enable() {
>   /cache/fontconfig
>  
>  EOF
> - cat << EOF > /var/www/etc/pango/pango.modules
> -/usr/lib/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape 
> PangoRenderFc common:
> -EOF
>  }
>  
>  do_disable() {
>   rm -rf /var/www/usr/local/bin/rrdtool \
>   /var/www/usr/libexec/ld.so \
>   /var/www/etc/fonts \
> - /var/www/etc/pango \
>   /var/www/cache/fontconfig
>   for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7 
> }') ; do \
>   rm -f /var/www/usr/lib/$(basename $i | sed -e 's,\.so.*,,')*
>   done
> - rm -f /var/www/usr/lib/pango-basic-fc.so
>   rmdir 
> /var/www{/etc/fonts,${LOCALBASE}/bin,${LOCALBASE},/usr/lib,/usr/libexec,/usr} 
> 2>/dev/null
>  }
>  

Re: rrdtool-chroot pango-basic-fc.so

[Stuart Henderson]

Ah, it seems that pango got simplified again. What files did you end up
needing to copy into the chroot? Would you be able to try it with this diff?

Index: files/rrdtool-chroot.sh
===
RCS file: /cvs/ports/net/rrdtool/files/rrdtool-chroot.sh,v
retrieving revision 1.2
diff -u -p -r1.2 rrdtool-chroot.sh
--- files/rrdtool-chroot.sh 6 Apr 2014 17:01:34 -   1.2
+++ files/rrdtool-chroot.sh 24 Apr 2016 01:03:36 -
@@ -1,7 +1,7 @@
 #!/bin/ksh
 #
 # make rrdtool(1) available in webserver chroot(8): copy in library
-# dependencies and generate barebones pango/fontconfig/pango configuration
+# dependencies and generate barebones fontconfig configuration
 
 # WARNING: /var/www/usr/libexec/ld.so and /var/www/lib/* may be shared
 # by other executables in the chroot(8)
@@ -12,12 +12,11 @@ if [ "$(id -u)" -ne 0 ]; then
 fi
 
 do_enable() {
-   mkdir -p 
/var/www{/etc/{pango,fonts/TTF},/usr/lib,/usr/libexec,${LOCALBASE}/bin,${X11BASE}/lib,/cache/fontconfig}
+   mkdir -p 
/var/www{/etc/fonts/TTF,/usr/lib,/usr/libexec,${LOCALBASE}/bin,${X11BASE}/lib,/cache/fontconfig}
cp -p ${LOCALBASE}/bin/rrdtool /var/www${LOCALBASE}/bin
for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7 
}') ; do \
cp -p $i /var/www/usr/lib/
done
-   cp -p ${LOCALBASE}/lib/pango/*/modules/pango-basic-fc.so 
/var/www/usr/lib/
cp -p /usr/libexec/ld.so /var/www/usr/libexec/
cp -p /usr/X11R6/lib/X11/fonts/TTF/DejaVuSans.ttf /var/www/etc/fonts/TTF
cat << EOF > /var/www/etc/fonts/fonts.conf
@@ -28,21 +27,16 @@ do_enable() {
/cache/fontconfig
 
 EOF
-   cat << EOF > /var/www/etc/pango/pango.modules
-/usr/lib/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc 
common:
-EOF
 }
 
 do_disable() {
rm -rf /var/www/usr/local/bin/rrdtool \
/var/www/usr/libexec/ld.so \
/var/www/etc/fonts \
-   /var/www/etc/pango \
/var/www/cache/fontconfig
for i in $(ldd ${LOCALBASE}/bin/rrdtool | grep 'lib/' | awk '{ print $7 
}') ; do \
rm -f /var/www/usr/lib/$(basename $i | sed -e 's,\.so.*,,')*
done
-   rm -f /var/www/usr/lib/pango-basic-fc.so
rmdir 
/var/www{/etc/fonts,${LOCALBASE}/bin,${LOCALBASE},/usr/lib,/usr/libexec,/usr} 
2>/dev/null
 }
 

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Stuart Henderson]

On 2016/04/23 16:34, patrick keshishian wrote:
> + symquotes- Build with symmetric single quotes.
> + centered_tilde   - Build with centered ASCII tilde.
> + symquotes-centered_tilde - Build with both modifications.

I think this last line is a little confusing, it suggests there's
something unusual about this port - and if you're building it from
ports it won't work like that anyway - you would specify it like
`env FLAVOR="symquotes centered_tilde" make'.

Looking at the post-patch target, we don't actually need it at
all, see the diff below. I also included upstream's patch names in
DESCR in case somebody is looking for a variant by that name, and
tweaked the text above a little.

Although I am still in two minds about this strange spelling of
the word that most English-speakers in the world know as "centred".

OK with you Daniel? (and I guess, as maintainer, you get final
choice on spelling ;-)

Index: Makefile
===
RCS file: /cvs/ports/fonts/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile10 Mar 2016 07:22:46 -  1.31
+++ Makefile24 Apr 2016 00:48:51 -
@@ -56,6 +56,9 @@
  SUBDIR += spranq-ecofont-ttf
  SUBDIR += symbola-ttf
  SUBDIR += terminus-font
+ SUBDIR += terminus-font,symquotes
+ SUBDIR += terminus-font,symquotes,centered_tilde
+ SUBDIR += terminus-font,centered_tilde
  SUBDIR += ubuntu-fonts
  SUBDIR += un-fonts
  SUBDIR += zh-arphicttf
Index: terminus-font/Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- terminus-font/Makefile  13 Nov 2015 20:18:25 -  1.10
+++ terminus-font/Makefile  24 Apr 2016 00:48:51 -
@@ -3,6 +3,7 @@
 COMMENT =  fixed width fonts especially for long hacking sessions
 
 DISTNAME = terminus-font-4.40
+REVISION = 0
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -24,13 +25,18 @@ FONTDIR =   ${PREFIX}/share/fonts/terminu
 
 USE_GMAKE =Yes
 
-FLAVORS =  symquotes
+FLAVORS =  symquotes centered_tilde
 FLAVOR ?=
 
+.if ${FLAVOR:Mcentered_tilde}
+FLAVOR_PATCHES += ${WRKSRC}/alt/td1.diff
+.endif
+
 .if ${FLAVOR:Msymquotes}
-post-patch:
-   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+FLAVOR_PATCHES += ${WRKSRC}/alt/gq2.diff
 .endif
+
+PATCH_LIST = patch-* ${FLAVOR_PATCHES}
 
 do-install:
${GZIP_CMD} ${WRKSRC}/*.pcf
Index: terminus-font/pkg/DESCR
===
RCS file: /cvs/ports/fonts/terminus-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- terminus-font/pkg/DESCR 19 Jul 2011 09:16:08 -  1.1.1.1
+++ terminus-font/pkg/DESCR 24 Apr 2016 00:48:51 -
@@ -1,5 +1,6 @@
 The Terminus font is a complete set of fixed-size fonts designed
-especially for the usage in terms.
+especially for use in terminals.
 
 Flavors:
-   symquotes - Build with symmetric single quotes.
+   symquotes   - Build with symmetric single quotes (gq2)
+   centered_tilde  - Build with centered ASCII tilde (td1)

Re: NEW: devel/stagit

[Juan Francisco Cantero Hurtado]

On Sat, Apr 23, 2016 at 01:40:15PM +0200, Michael wrote:
> > In patch-Makefile, don't remove the variables "COMPATSRC =" and
> > "COMPATOBJ =". You deleted "${COMPATSRC}" and "${COMPATOBJ}", so that
> > change is not needed. I prefer to keep the patches as small as possible.
> > 
> > In patch-stagit_c and patch-stagit-index_c, add an "#ifdef __OpenBSD__"
> > instead of delete the include. Send both patches to upstream.
> > 
> > In the Makefile:
> > - Add an space before of each "="
> > - Remove "V" and add the version number to "DISTNAME"
> 
> Thanks for the input. Attached the fixed port.
> Again, tested on latest amd64 snapshot.
> 
> Any other comments?

Thanks. I moved CATEGORIES to www and added git2 to WANTLIB.

I need an additional OK to commit the port. Anyone?


-- 
Juan Francisco Cantero Hurtado http://juanfra.info


stagit.tgz
Description: GNU Unix tar archive

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2016/04/23 18:35:10

Modified files:
x11/gnome/gvfs : Makefile 
x11/kde/base3  : Makefile 

Log message:
net/samba doesn't bring libcom_err anymore; spotted by ajacoutot@

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Michael Reed]

On 04/23/16 19:34, patrick keshishian wrote:

On 4/23/16, Michael Reed  wrote:

On 04/23/16 19:12, Christian Weisgerber wrote:

On 2016-04-23, Michael Reed  wrote:


-FLAVORS =  symquotes
+FLAVORS =  symquotes centered_tilde
   FLAVOR ?=


This (implicitly) allows combining the flavors...


   .if ${FLAVOR:Msymquotes}
   post-patch:
${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+.elif ${FLAVOR:Mcentered_tilde}
+post-patch:
+   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
   .endif


... but this doesn't.



Indeed, Patrick just pointed that out.  New patch is attached.


After sending my reply, i realized that to allow both flavors at
the same time, the post-patch needs to be a bit more sophisticated.
Not sure if make will like two targets with the same name if both
flavors are specified during make.


Are you sure your patch is needed? `man ports' says this:

More than one flavor may be specified:

   $ cd /usr/ports/mail/exim
   $ env FLAVOR="mysql ldap" make package

... which seems to work fine in practice, as mentioned by Stuart (using my most 
recent patch):

$ env FLAVOR="symquotes centered_tilde" make install

...

$ pkg_info terminus-font | head -1
Information for inst:terminus-font-4.40p0-symquotes-centered_tilde



something like attached seems to work allowing both flavors
at the same time.

--patrick


In the patch, I explicitly mention the compound flavor; should that be
done?

Re: fonts/terminus-font: Add `centered_tilde' flavor

[patrick keshishian]

On 4/23/16, Michael Reed  wrote:
> On 04/23/16 19:12, Christian Weisgerber wrote:
>> On 2016-04-23, Michael Reed  wrote:
>>
>>> -FLAVORS =  symquotes
>>> +FLAVORS =  symquotes centered_tilde
>>>   FLAVOR ?=
>>
>> This (implicitly) allows combining the flavors...
>>
>>>   .if ${FLAVOR:Msymquotes}
>>>   post-patch:
>>> ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
>>> +.elif ${FLAVOR:Mcentered_tilde}
>>> +post-patch:
>>> +   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
>>>   .endif
>>
>> ... but this doesn't.
>>
>
> Indeed, Patrick just pointed that out.  New patch is attached.

After sending my reply, i realized that to allow both flavors at
the same time, the post-patch needs to be a bit more sophisticated.
Not sure if make will like two targets with the same name if both
flavors are specified during make.

something like attached seems to work allowing both flavors
at the same time.

--patrick

> In the patch, I explicitly mention the compound flavor; should that be
> done?
Index: Makefile
===
RCS file: /cvs/obsd/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile13 Nov 2015 20:18:25 -  1.10
+++ Makefile23 Apr 2016 23:33:32 -
@@ -4,6 +4,7 @@ COMMENT =   fixed width fonts especially 
 
 DISTNAME = terminus-font-4.40
 CATEGORIES =   fonts x11
+REVISION = 0
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
 
@@ -24,12 +25,21 @@ FONTDIR =   ${PREFIX}/share/fonts/terminu
 
 USE_GMAKE =Yes
 
-FLAVORS =  symquotes
+FLAVORS =  symquotes centered_tilde
 FLAVOR ?=
 
 .if ${FLAVOR:Msymquotes}
+FLAVOR_PATCHES += ${WRKSRC}/alt/gq2.diff
+.endif
+.if ${FLAVOR:Mcentered_tilde}
+FLAVOR_PATCHES += ${WRKSRC}/alt/td1.diff
+.endif
+
+.if !empty(FLAVOR_PATCHES)
 post-patch:
-   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+   for f in ${FLAVOR_PATCHES} ; do \
+   ${PATCH} -d ${WRKSRC} < $$f ; \
+   done
 .endif
 
 do-install:
Index: pkg/DESCR
===
RCS file: /cvs/obsd/ports/fonts/terminus-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   19 Jul 2011 09:16:08 -  1.1.1.1
+++ pkg/DESCR   23 Apr 2016 23:33:32 -
@@ -2,4 +2,6 @@ The Terminus font is a complete set of f
 especially for the usage in terms.
 
 Flavors:
-   symquotes - Build with symmetric single quotes.
+   symquotes- Build with symmetric single quotes.
+   centered_tilde   - Build with centered ASCII tilde.
+   symquotes-centered_tilde - Build with both modifications.

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Michael Reed]

On 04/23/16 19:12, Christian Weisgerber wrote:

On 2016-04-23, Michael Reed  wrote:


-FLAVORS =  symquotes
+FLAVORS =  symquotes centered_tilde
  FLAVOR ?=


This (implicitly) allows combining the flavors...


  .if ${FLAVOR:Msymquotes}
  post-patch:
${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+.elif ${FLAVOR:Mcentered_tilde}
+post-patch:
+   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
  .endif


... but this doesn't.



Indeed, Patrick just pointed that out.  New patch is attached.

In the patch, I explicitly mention the compound flavor; should that be done?
Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile	13 Nov 2015 20:18:25 -	1.10
+++ Makefile	23 Apr 2016 23:14:27 -
@@ -4,6 +4,7 @@ COMMENT =		fixed width fonts especially 
 
 DISTNAME =		terminus-font-4.40
 CATEGORIES =		fonts x11
+REVISION =		0
 
 HOMEPAGE =		http://terminus-font.sourceforge.net/
 
@@ -24,12 +25,15 @@ FONTDIR =		${PREFIX}/share/fonts/terminu
 
 USE_GMAKE =		Yes
 
-FLAVORS =		symquotes
+FLAVORS =		symquotes centered_tilde
 FLAVOR ?=
 
-.if ${FLAVOR:Msymquotes}
 post-patch:
+.if ${FLAVOR:Msymquotes}
 	${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+.endif
+.if ${FLAVOR:Mcentered_tilde}
+	${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
 .endif
 
 do-install:
Index: pkg/DESCR
===
RCS file: /cvs/ports/fonts/terminus-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR	19 Jul 2011 09:16:08 -	1.1.1.1
+++ pkg/DESCR	23 Apr 2016 23:14:27 -
@@ -2,4 +2,6 @@ The Terminus font is a complete set of f
 especially for the usage in terms.
 
 Flavors:
-	symquotes - Build with symmetric single quotes.
+	symquotes- Build with symmetric single quotes.
+	centered_tilde   - Build with centered ASCII tilde.
+	symquotes-centered_tilde - Build with both modifications.

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Christian Weisgerber]

On 2016-04-23, Michael Reed  wrote:

> -FLAVORS =symquotes
> +FLAVORS =symquotes centered_tilde
>  FLAVOR ?=

This (implicitly) allows combining the flavors...

>  .if ${FLAVOR:Msymquotes}
>  post-patch:
>   ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
> +.elif ${FLAVOR:Mcentered_tilde}
> +post-patch:
> + ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
>  .endif

... but this doesn't.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: rrdtool-chroot pango-basic-fc.so

[Predrag Punosevac]

Predrag Punosevac wrote:

> I must have done something stupid during the upgrade from 5.8 to 5.9
> (amd64)
> 
> # /usr/local/share/examples/rrdtool/rrdtool-chroot enable 
> cp: /usr/local/lib/pango/*/modules/pango-basic-fc.so: No such file or
> directory
> 
> Directory /usr/local/lib/pango is indeed missing. 
> 
> # pkg_info pango
> Information for inst:pango-1.38.1
> 
> However I don't see that the package contains /usr/lib/pongo/1.8/modules
> anymore (I downloaded and extracted package manually).
> 
> To add insult to injury it seems that rrdtool-chroot is not behaving
> correctly on my machine. After commenting out the line in rrdtool-chroot
> enable which is suppose to copy pango-basic-fc.so I noticed that rrdtool
> binaries were not coppied to /var/www/bin. 
> 
> I did that manually and now I can see nice graphs in the syweb of my
> home network. The only thing I noticed about symon/symux is that it has
> problems with sensor(cpu0.temp0) data
> 
> # /usr/local/share/examples/symon/c_smrrds.sh all  
> /var/www/symon/rrds/localhost/io_cd0.rrd exists - ignoring
> /var/www/symon/rrds/localhost/io_sd2.rrd exists - ignoring
> /var/www/symon/rrds/localhost/io_sd1.rrd exists - ignoring
> /var/www/symon/rrds/localhost/io_sd0.rrd exists - ignoring
> /var/www/symon/rrds/localhost/if_em0.rrd exists - ignoring
> /var/www/symon/rrds/localhost/proc_httpd.rrd exists - ignoring
> ERROR: parsing min val - Cannot convert '-U' to float
> could not create /var/www/symon/rrds/localhost/sensor_cpu0.temp0.rrd
> /var/www/symon/rrds/localhost/mbuf.rrd exists - ignoring
> /var/www/symon/rrds/localhost/pf.rrd exists - ignoring
> /var/www/symon/rrds/localhost/if_lo0.rrd exists - ignoring
> /var/www/symon/rrds/localhost/mem.rrd exists - ignoring
> /var/www/symon/rrds/localhost/cpu0.rrd exists - ignoring
> 
> 
> Also on syweb it seems that the following layouts are broken pf and
> total_firewall (I don't get graphs but it could be very well related to
> above problem with rrdtool running in chroot).
> 
> Any ideas?
> 
> Predrag

rrdtool-chroot script is broken for me on the freshly installed 5.9.
with the same error

Re: fonts/terminus-font: Add `centered_tilde' flavor

[patrick keshishian]

On 4/23/16, Michael Reed  wrote:
> On 04/23/16 17:01, patrick keshishian wrote:
>> On 4/23/16, Michael Reed  wrote:
>>> I prefer this variant of terminus, I wonder what others think.
>>
>> Just reading the description of this patch on $HOMEPAGE, I
>> wonder (as the page suggests) if this should be default?
>
> I initially agreed with that because a centered tilde seems to be
> more common in other fonts, and I personally like it more,
> but after some thought I don't think so.
>
> If a user does `pkg_add terminus', I'd think they would expect to
> get the vanilla, unpatched version of Terminus.  If upstream does
> indeed make that the default then so be it, but for now I think a
> separate flavor would be preferable for end-users.
>
> What do you think?

OK by me. Nice to have the flavor now at least.

>> Incidentally, if it remains a FLAVOR, is it mutually exclusive
>> with the symquotes flavor?
>
> If my understanding of flavors is correct, then yes.
>
> Anyway, are you suggesting there be a third flavor, something
> like `symquotes_centered_tilde'?

I was going to say instead of having the .elif ${FLAVOR:Mcentered_tilde}
just have a .if ${FLAVOR:Mcentered_tilde}

and as Stuart replied, evidently you can apply both patches.

Best,
--patrick

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/23 16:25:58

Modified files:
textproc   : Makefile 

Log message:
Add textproc/lua-lustache & textproc/lua-markdown to the build

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/23 16:23:18

Log message:
Import textproc/lua-markdown

This is an implementation of the popular text markup language Markdown
in pure Lua. Markdown can convert documents written in a simple and easy
to read text format to well-formatted HTML.

Maintained in OpenBSD by Frederic Cambus

OK abieber@

Status:

Vendor Tag: awolk
Release Tags:   awolk_20160424

N ports/textproc/lua-markdown/Makefile
N ports/textproc/lua-markdown/distinfo
N ports/textproc/lua-markdown/pkg/PLIST
N ports/textproc/lua-markdown/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Adam Wolk]

CVSROOT:/cvs
Module name:ports
Changes by: aw...@cvs.openbsd.org   2016/04/23 16:22:01

Log message:
Import textproc/lua-lustache

lustache is an implementation of the mustache template system in Lua.

Mustache is a logic-less template syntax. It can be used for HTML, config
files, source code - anything. It works by expanding tags in a template
using values provided in a hash or object.

We call it "logic-less" because there are no if statements, else clauses,
or for loops. Instead there are only tags. Some tags are replaced with a
value, some nothing, and others a series of values.

Maintained in OpenBSD by Frederic Cambus

OK abieber@

Status:

Vendor Tag: awolk
Release Tags:   awolk_20160424

N ports/textproc/lua-lustache/Makefile
N ports/textproc/lua-lustache/distinfo
N ports/textproc/lua-lustache/pkg/PLIST
N ports/textproc/lua-lustache/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/23 16:14:00

Modified files:
net/wireshark  : Makefile distinfo 

Log message:
update to wireshark-2.0.3, many fixes

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/23 15:16:30

Modified files:
math/octave: Makefile 

Log message:
use texinfo from ports for math/octave, somewhere in the Makefiles it's
trying to regenerate the files (at least for naddy and myself, but not
steven!), despite the fact that the tarball contains pregenerated ones,
and this doesn't work with the old version of texinfo from base.

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Stuart Henderson]

On 2016/04/23 14:01, patrick keshishian wrote:
> On 4/23/16, Michael Reed  wrote:
> > I prefer this variant of terminus, I wonder what others think.
> 
> Just reading the description of this patch on $HOMEPAGE, I
> wonder (as the page suggests) if this should be default?
> 
> Incidentally, if it remains a FLAVOR, is it mutually exclusive
> with the symquotes flavor?

They can both be used together, works fine here.

Re: -O3 optimization

[Christian Weisgerber]

On 2016-04-23, Michael McConville  wrote:

> Are there more than a few cases in which ports should use -O3? A good
> number still do, including Qt4 and Qt5.

None should.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: fonts/terminus-font: Add `centered_tilde' flavor

[Michael Reed]

On 04/23/16 17:01, patrick keshishian wrote:

On 4/23/16, Michael Reed  wrote:

I prefer this variant of terminus, I wonder what others think.


Just reading the description of this patch on $HOMEPAGE, I
wonder (as the page suggests) if this should be default?


I initially agreed with that because a centered tilde seems to be
more common in other fonts, and I personally like it more,
but after some thought I don't think so.

If a user does `pkg_add terminus', I'd think they would expect to
get the vanilla, unpatched version of Terminus.  If upstream does
indeed make that the default then so be it, but for now I think a
separate flavor would be preferable for end-users.

What do you think?



Incidentally, if it remains a FLAVOR, is it mutually exclusive
with the symquotes flavor?


If my understanding of flavors is correct, then yes.

Anyway, are you suggesting there be a third flavor, something
like `symquotes_centered_tilde'?



--patrick

Re: fonts/terminus-font: Add `centered_tilde' flavor

[patrick keshishian]

On 4/23/16, Michael Reed  wrote:
> I prefer this variant of terminus, I wonder what others think.

Just reading the description of this patch on $HOMEPAGE, I
wonder (as the page suggests) if this should be default?

Incidentally, if it remains a FLAVOR, is it mutually exclusive
with the symquotes flavor?

--patrick

fonts/terminus-font: Add `centered_tilde' flavor

[Michael Reed]

I prefer this variant of terminus, I wonder what others think.
Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile	13 Nov 2015 20:18:25 -	1.10
+++ Makefile	23 Apr 2016 20:28:22 -
@@ -4,6 +4,7 @@ COMMENT =		fixed width fonts especially 
 
 DISTNAME =		terminus-font-4.40
 CATEGORIES =		fonts x11
+REVISION =		0
 
 HOMEPAGE =		http://terminus-font.sourceforge.net/
 
@@ -24,12 +25,15 @@ FONTDIR =		${PREFIX}/share/fonts/terminu
 
 USE_GMAKE =		Yes
 
-FLAVORS =		symquotes
+FLAVORS =		symquotes centered_tilde
 FLAVOR ?=
 
 .if ${FLAVOR:Msymquotes}
 post-patch:
 	${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+.elif ${FLAVOR:Mcentered_tilde}
+post-patch:
+	${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/td1.diff
 .endif
 
 do-install:
Index: pkg/DESCR
===
RCS file: /cvs/ports/fonts/terminus-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR	19 Jul 2011 09:16:08 -	1.1.1.1
+++ pkg/DESCR	23 Apr 2016 20:28:22 -
@@ -2,4 +2,5 @@ The Terminus font is a complete set of f
 especially for the usage in terms.
 
 Flavors:
-	symquotes - Build with symmetric single quotes.
+	symquotes  - Build with symmetric single quotes.
+	centered_tilde - Build with centered ASCII tilde.

-O3 optimization

[Michael McConville]

Are there more than a few cases in which ports should use -O3? A good
number still do, including Qt4 and Qt5.

Someone referred me to this past thread:

https://marc.info/?t=13560113402=1=2

But I couldn't find annotations in the Makefiles of ports still using
-O3.

Thanks for your time,
Mike

Re: pledge() sysutils/colortree

[David Dahlberg]

Am Saturday, den 23.04.2016, 16:21 +0200 schrieb Sebastien Marie:
> On Sat, Apr 23, 2016 at 03:29:33PM +0200, David Dahlberg wrote:

> > BTW, how do I cvs diff over new files?
> 1. cp file{,.orig}
> 2. edit file, and save
> 3. cd /usr/ports/.../ && make update-patches

Yes, that's documented in the Porter's Handbook. I was more looking for
Stuart's hint: "cvs add", probably was too straigt forward for me ;-)

> So I think the pledge promises are incomplete and/or the pledge call
> is
> misplaced.
[..]
> I will try to (re?)present differents ways to efficiently adds pledge
> a
> program:
[..]

Thanks a lot for your comprehensive instructions. I leaned a lot and
will have to continue to do so (esp.the mapping symbols to pledge(2)
promises part).

With what you described as the "dynamic approach", I found at least the
missing "getpw", though I seem to have skipped the "-o" argument for
some reason.

Attached is a patch that has a first pledge after setlocale, and a
second call the command line parsing, which removes write access.

I bid somebody with better C skills in using debuggers and reading
symbols than me to check, whether this should be sufficient. Steve,
didn't you volunteer? ;-) 

Cheers,
David

Index: Makefile
===
RCS file: /cvs/ports/sysutils/colortree/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile23 Apr 2016 14:08:41 -  1.3
+++ Makefile23 Apr 2016 18:32:23 -
@@ -6,7 +6,7 @@ V = 1.7.0
 DISTNAME = tree-$V
 PKGNAME=   colortree-$V
 CATEGORIES =   sysutils
-REVISION = 1
+REVISION = 2
 
 HOMEPAGE = http://mama.indstate.edu/users/ice/tree/
 
@@ -15,6 +15,7 @@ MAINTAINER =  David Dahlberg 

Re: sysutils/borgbackup: update 1.0.2

[Michael Reed]

On 04/17/16 16:55, Michael Reed wrote:

On 04/17/16 16:50, Michael Reed wrote:

Release notes: https://github.com/borgbackup/borg/blob/1.0.2/docs/changes.rst


In addition to just the update, this patch also:

- enables the py-test-benchmark portion of the tests
- removes a patch, made unnecessary due to the recent py-sphinx update

(thanks to Alexander Shadchin for both of those changes)


Also if someone knows how to accomplish the test target in a less hacky
way then please let me know.



Any comments?

All the tests pass for me, and I've been using this since the date of
the original post with no issues.

Re: pledge() sysutils/colortree

[Sebastien Marie]

On Sat, Apr 23, 2016 at 03:29:33PM +0200, David Dahlberg wrote:
> Am Friday, den 22.04.2016, 11:07 +0200 schrieb David Dahlberg:
> > Am Freitag, den 22.04.2016, 09:52 +0100 schrieb Stuart Henderson:
> > > >  MAINTAINER =   David Dahlberg 
> > > And please CC maintainer for ports diffs, thank you :)
> > I have seen it. Will have a deeper look at it over the week-end.
> 
> Did some style changes and added "getpw" to pledge for getgrgid(3) etc.
> BTW, how do I cvs diff over new files?

1. cp file{,.orig}
2. edit file, and save
3. cd /usr/ports/.../ && make update-patches

> $OpenBSD$
> --- tree.c.orig   Sat Apr 23 14:04:39 2016
> +++ tree.cSat Apr 23 14:05:33 2016
> @@ -103,6 +103,11 @@ int main(int argc, char **argv)
>dirs[0] = 0;
>Level = -1;
>  
> +  if (pledge("stdio rpath getpw", NULL) == -1){
> +fprintf(stderr, "%s: pledge\n", argv[0]);
> +exit(1);
> +  }
> +
>setlocale(LC_CTYPE, "");
>setlocale(LC_COLLATE, "");
>  

The common idiom is to place pledge(2) at least after setlocale().

I looked very quickly at tree.c code. I saw:
  - tree.c : outfile = fopen(outfilename,"w");
  - html.c : system(hcmd);

So I think the pledge promises are incomplete and/or the pledge call is
misplaced.

$ tree -o test
Abort trap (core dumped)


I will try to (re?)present differents ways to efficiently adds pledge a
program:

  - static approch from code: read all the code and understand it. It is
the more efficient way, but it could also take lot of time.

  - static approch from binary: read the list of symbols and libraries
the program will need. It is only a partial view as it will not
make differencies between fopen("foo", "r") and fopen("foo", "w")
for example, neither differenciate between syscalls before pledge(2)
and after.

but it could permit to quickly check if the first method was
exhaustive or not.

libraries: readelf -d foo | grep NEED
symbols: nm foo | grep U

  - dynamic approch: the more easy, but also the more error prone :)
found the place for add pledge(2) (after initialisation), add a
minimal pledge call, and try to run the program...

it is error prone as you have to reach every code path from the
command-line: so testing all options, all configuration options (and
combinaison of them).

eventually, the message from kernel is partial: when you need "tty",
the kernel will report "ioctl" as "tty" is a subset of "ioctl".

The best is a mix of all these methods :)
-- 
Sebastien Marie

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/23 08:11:14

Modified files:
textproc/jq: Makefile 
Added files:
textproc/jq/patches: patch-jv_parse_c 

Log message:
Fix off-by-one leading to heap buffer overflow in textproc/jq,
triggered by JSON-encoded numbers longer than 256 bytes. CVE-2015-8863

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/23 08:08:41

Modified files:
sysutils/colortree: Makefile 
Removed files:
sysutils/colortree/patches: patch-tree_c 

Log message:
backout previous, semarie found problems

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2016/04/23 08:02:50

Modified files:
sysutils/colortree: Makefile 
Added files:
sysutils/colortree/patches: patch-tree_c 

Log message:
use pledge in colortree; from steve latif, updated by David Dahlberg
(maintainer).

Re: pledge() sysutils/colortree

[Stuart Henderson]

On 2016/04/23 15:29, David Dahlberg wrote:
> Am Friday, den 22.04.2016, 11:07 +0200 schrieb David Dahlberg:
> > Am Freitag, den 22.04.2016, 09:52 +0100 schrieb Stuart Henderson:
> > > >  MAINTAINER =   David Dahlberg 
> > > And please CC maintainer for ports diffs, thank you :)
> > I have seen it. Will have a deeper look at it over the week-end.
> 
> Did some style changes and added "getpw" to pledge for getgrgid(3) etc.
> BTW, how do I cvs diff over new files?

As long as the patches subdirectory already exists (as it does
here), you can "cvs add [file]" and "cvs diff -uNp".

> Anybody wanting to OK/commit?

Thanks, committed (I also added a "uses pledge" comment in the
Makefile so we can track these down more easily).

Re: pledge() sysutils/colortree

[David Dahlberg]

Am Friday, den 22.04.2016, 11:07 +0200 schrieb David Dahlberg:
> Am Freitag, den 22.04.2016, 09:52 +0100 schrieb Stuart Henderson:
> > >  MAINTAINER =   David Dahlberg 
> > And please CC maintainer for ports diffs, thank you :)
> I have seen it. Will have a deeper look at it over the week-end.

Did some style changes and added "getpw" to pledge for getgrgid(3) etc.
BTW, how do I cvs diff over new files?

Anybody wanting to OK/commit?

Cheers,

David

? patches/patch-tree_c
Index: Makefile
===
RCS file: /cvs/ports/sysutils/colortree/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile17 Aug 2015 09:07:22 -  1.1.1.1
+++ Makefile23 Apr 2016 12:52:09 -
@@ -6,6 +6,7 @@ V = 1.7.0
 DISTNAME = tree-$V
 PKGNAME=   colortree-$V
 CATEGORIES =   sysutils
+REVISION = 0
 
 HOMEPAGE = http://mama.indstate.edu/users/ice/tree/
 $OpenBSD$
--- tree.c.orig Sat Apr 23 14:04:39 2016
+++ tree.c  Sat Apr 23 14:05:33 2016
@@ -103,6 +103,11 @@ int main(int argc, char **argv)
   dirs[0] = 0;
   Level = -1;
 
+  if (pledge("stdio rpath getpw", NULL) == -1){
+fprintf(stderr, "%s: pledge\n", argv[0]);
+exit(1);
+  }
+
   setlocale(LC_CTYPE, "");
   setlocale(LC_COLLATE, "");
 

CVS: cvs.openbsd.org: ports

[Steven Mestdagh]

CVSROOT:/cvs
Module name:ports
Changes by: ste...@cvs.openbsd.org  2016/04/23 06:44:14

Modified files:
math/octave: Makefile distinfo 
math/octave/patches: patch-configure 

Log message:
update to 4.0.2

Re: NEW: devel/stagit

[Michael]

In patch-Makefile, don't remove the variables "COMPATSRC =" and
"COMPATOBJ =". You deleted "${COMPATSRC}" and "${COMPATOBJ}", so that
change is not needed. I prefer to keep the patches as small as possible.

In patch-stagit_c and patch-stagit-index_c, add an "#ifdef __OpenBSD__"
instead of delete the include. Send both patches to upstream.

In the Makefile:
- Add an space before of each "="
- Remove "V" and add the version number to "DISTNAME"


Thanks for the input. Attached the fixed port.
Again, tested on latest amd64 snapshot.

Any other comments?

Regards,

Michael


stagit.tgz
Description: application/tar-gz

UPDATE: textproc/py-numpydoc 0.6.0

[Alexandr Shadchin]

Hi,

This diff updates py-numpydoc to the latest release.
Add py3 flavor and take maintainer.
Tested on amd64.

Comments ? OK ?

-- 
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-numpydoc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile23 Nov 2015 14:32:16 -  1.3
+++ Makefile23 Apr 2016 10:48:53 -
@@ -2,12 +2,14 @@
 
 COMMENT =  Sphinx extension to support docstrings in Numpy format
 
-MODPY_EGG_VERSION =0.5
+MODPY_EGG_VERSION =0.6.0
 DISTNAME = numpydoc-${MODPY_EGG_VERSION}
 PKGNAME =  py-numpydoc-${MODPY_EGG_VERSION}
 CATEGORIES =   textproc devel
 HOMEPAGE = https://github.com/numpy/numpydoc
 
+MAINTAINER =   Alexandr Shadchin 
+
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
@@ -15,13 +17,16 @@ MODPY_PI =  Yes
 
 MODULES =  lang/python
 
-RUN_DEPENDS =  graphics/py-matplotlib \
-   textproc/py-sphinx
+RUN_DEPENDS =  graphics/py-matplotlib${MODPY_FLAVOR} \
+   textproc/py-sphinx${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/py-nose${MODPY_FLAVOR}
+
+FLAVORS =  python3
+FLAVOR ?=
 
-TEST_DEPENDS = ${BASE_PKGPATH} \
-   devel/py-nose \
-   devel/py-test
 do-test:
-   cd ${WRKSRC} && py.test -v
+   cd ${WRKSRC} && \
+   ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} 
--first-package-wins
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-numpydoc/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo23 Nov 2015 14:32:16 -  1.2
+++ distinfo23 Apr 2016 10:48:53 -
@@ -1,2 +1,2 @@
-SHA256 (numpydoc-0.5.tar.gz) = k/BQvOtSSJ2S+Fw0aYHxliyGfAHyM9MlKJTOrly0jTQ=
-SIZE (numpydoc-0.5.tar.gz) = 32051
+SHA256 (numpydoc-0.6.0.tar.gz) = HsVz6R9thoqZQNkKZZnz6DSi1sBkAw++B42SLuIdz6E=
+SIZE (numpydoc-0.6.0.tar.gz) = 32464
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/py-numpydoc/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   23 Nov 2015 14:32:16 -  1.2
+++ pkg/PLIST   23 Apr 2016 10:48:53 -
@@ -2,33 +2,35 @@
 lib/python${MODPY_VERSION}/site-packages/numpydoc/
 
lib/python${MODPY_VERSION}/site-packages/numpydoc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/numpydoc/__init__.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}comment_eater.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}compiler_unparse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}docscrape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}docscrape_sphinx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}linkcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}numpydoc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}phantom_import.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}plot_directive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/numpydoc/${MODPY_PYCACHE}traitsdoc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/comment_eater.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/comment_eater.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/compiler_unparse.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/compiler_unparse.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/docscrape.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/docscrape.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/docscrape_sphinx.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/docscrape_sphinx.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/linkcode.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/linkcode.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/numpydoc.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/numpydoc.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/phantom_import.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/phantom_import.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/plot_directive.py
-lib/python${MODPY_VERSION}/site-packages/numpydoc/plot_directive.pyc
 lib/python${MODPY_VERSION}/site-packages/numpydoc/tests/

Re: NEW: lua-lyaml

[Florian Stinglmayr]

On Fri, Apr 22, 2016 at 05:54:04PM +1000, Jonathan Gray wrote:
> Some time ago when needing to use yaml from lua I ended up with the same
> project as this port.
>
> Debian calls their lyaml package lua-yaml so it isn't without precedent
>
> https://packages.debian.org/sid/lua-yaml
>

Btw, here is the port again with changes from jsg@ for everyone's
convenience. Thanks a lot for your input and help.


lua-yaml.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2016/04/23 02:02:06

Modified files:
net/syncthing  : Makefile 
net/syncthing/pkg: PLIST syncthing.rc 

Log message:
net/syncthing: fix a few bits.

pexp not needed in rc script, @extraunexec in PLIST, fix manuals.

Noticed by ajacoutot@, input sthen@, OK ajacoutot@. Thanks.

NEW: games/endless-sky

[Ingo Feinerer]

Hi,

please find attached a port for Endless Sky, a space exploration and
combat game: https://endless-sky.github.io/

- It needs a few scons.port.mk changes to build:
  https://marc.info/?l=openbsd-ports=146125722620300=2
- libjpeg-turbo is preferred which we do not have. Although there is a
  simple patch (remove one line via patch-source_ImageBuffer_cpp) I have
  some display problems with pictures. I assume that is related to this
  patch.
- SDL_GetBasePath() returns NULL on OpenBSD (currently fixed by
  hardcoding the path). That should be properly fixed by awolk@'s patch
  to sdl2: https://marc.info/?l=openbsd-ports=145911271603693=2

Enjoy!

Best regards,
Ingo


endless-sky.tar.gz
Description: application/tar-gz