Re: Post pkg_delete messages, change message format?

[Jeremy Evans]

On Fri, Mar 25, 2016 at 10:47 AM, Chris Bennett <
chrisbenn...@bennettconstruction.us> wrote:

> With this format, I have to copy/paste each rm -rf, groupdel, etc by hand.
> Could these messages be changed to something easier to use like:
>
>
> --- -hplip-3.16.2 ---
> You should also run
> rm -rf /usr/local/share/hplip/data/firmware
> rm -rf /usr/local/share/hplip/data/plugins
> rm -rf /usr/local/share/hplip/fax/plugins
> rm -rf /usr/local/share/hplip/prnt/plugins
> rm -rf /usr/local/share/hplip/scan/plugins
> rm -f /usr/local/share/hplip/plugin.spec
>
> This would make these commands very simple to run.
>

I agree.  The ruby ports already do this, and I think it would be a good
idea for other packages to do so as well.

Thanks,
Jeremy

Re: Post pkg_delete messages, change message format?

[Michael McConville]

Chris Bennett wrote:
> After I delete packages, especially pkg_delete -X, I get a long list
> of instructions like:

I have thought this before and it seems like a good idea to me. Patches
welcome, from my perspective.

> -2.1.3 ---
> You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
> You should also run rm -rf /var/cache/cups
> You should also run rm -rf /var/spool/cups
> --- -cups-pdf-2.6.1p0 ---
> You should also run rm -rf /var/spool/cups-pdf/
> --- -dbus-1.10.8v0 ---
> Remember to update /var/db/dbus/machine-id
> Remember to update /etc/machine-id
> --- -dconf-0.24.0p1 ---
> You should also run rm -rf /etc/dconf/db/*
> You should also run rm -rf /etc/dconf/profile/*
> --- -foo2zjs-20140627p1 ---
> You should also run rm -f /usr/local/share/foo2hbpl/icm/*
> You should also run rm -f /usr/local/share/foo2hiperc/icm/*
> You should also run rm -f /usr/local/share/foo2hp/icm/*
> You should also run rm -f /usr/local/share/foo2lava/icm/*
> You should also run rm -f /usr/local/share/foo2oak/icm/*
> You should also run rm -f /usr/local/share/foo2qpdl/icm/*
> You should also run rm -f /usr/local/share/foo2slx/icm/*
> You should also run rm -f /usr/local/share/foo2xqx/firmware/*
> You should also run rm -f /usr/local/share/foo2zjs/firmware/*
> You should also run rm -f /usr/local/share/foo2zjs/icm/*
> --- -hplip-3.16.2 ---
> You should also run rm -rf /usr/local/share/hplip/data/firmware
> You should also run rm -rf /usr/local/share/hplip/data/plugins
> You should also run rm -rf /usr/local/share/hplip/fax/plugins
> You should also run rm -rf /usr/local/share/hplip/prnt/plugins
> You should also run rm -rf /usr/local/share/hplip/scan/plugins
> You should also run rm -f /usr/local/share/hplip/plugin.spec
> --- -hplip-common-3.16.2 ---
> You should also run rm -rf /var/log/hp/tmp/*
> You should also run rm -f /var/log/hp/* 2>/dev/null || true
> --- -net-snmp-5.7.3p6 ---
> You should also run rm -rf /var/net-snmp/*
> --- -sane-backends-1.0.25p2 ---
> You should also run rm -rf /var/spool/lock/sane/*
> 
> With this format, I have to copy/paste each rm -rf, groupdel, etc by hand.
> Could these messages be changed to something easier to use like:
> 
> 
> --- -hplip-3.16.2 ---
> You should also run
> rm -rf /usr/local/share/hplip/data/firmware
> rm -rf /usr/local/share/hplip/data/plugins
> rm -rf /usr/local/share/hplip/fax/plugins
> rm -rf /usr/local/share/hplip/prnt/plugins
> rm -rf /usr/local/share/hplip/scan/plugins
> rm -f /usr/local/share/hplip/plugin.spec
> 
> This would make these commands very simple to run.
> 
> Chris Bennett
> 

Re: Where do we want PKG_ARCH in Makefile?

[Giannis Tsaraias]

On Mon, Mar 21, 2016 at 07:09:52PM +, Nigel Taylor wrote:
>
> Should portgen be updated?
> 
> Perl ports should have normally a PKG_ARCH = * added to the Makefile.
> When perl uses C or other languages PKG_ARCH = * should not be present,
> a WANTLIB += perl should.
> 
> To find which either read MANIFEST if files listed end in .xs excluding
> those under t/ xt/ inc/ or search for files using find
> 
> $ find `make show=WRKSRC`/!(inc|t|xt) -name "*.xs"
> /usr/ports/pobj/p5-Cpanel-JSON-XS-3.0213/Cpanel-JSON-XS-3.0213/XS.xs
> 
> So this port should not have PKG_ARCH = *
> needs a WANTLIB += perl in the Makefile, as a .xs file is present.
> 
>

This diff syncs portgen with the recent changes in perl ports. OK?
Index: Port.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port.pm,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Port.pm
--- Port.pm 18 Jan 2016 18:08:19 -  1.1.1.1
+++ Port.pm 25 Mar 2016 22:54:38 -
@@ -222,6 +222,7 @@ sub write_makefile
$other_stuff =~ s/^#//;
$other_stuff =~ s/(\?\?\?|$)/$value\n/;
 
+   # handle cases where replacing '???' isn't enough
if ( $other_stuff =~ /^PERMIT_PACKAGE_CDROM/ ) {
$output .= "# $self->{license}\n";
} elsif ( $other_stuff =~ /_DEPENDS/ ) {
@@ -229,6 +230,8 @@ sub write_makefile
} elsif ( $other_stuff =~ /^COMMENT/ ) {
$output .= "# original: $self->{full_comment}\n"
if $self->{full_comment};
+   } elsif ( $other_stuff =~ /^WANTLIB/ ) {
+   $other_stuff =~ s/=/+=/;
}
 
$output .= $other_stuff;
Index: Port/CPAN.pm
===
RCS file: /cvs/ports/infrastructure/lib/OpenBSD/PortGen/Port/CPAN.pm,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 CPAN.pm
--- Port/CPAN.pm18 Jan 2016 18:08:20 -  1.1.1.1
+++ Port/CPAN.pm25 Mar 2016 22:54:38 -
@@ -205,6 +205,13 @@ sub postextract
 
$self->set_descr( $self->read_descr($wrksrc) || $di->{abstract} );
$self->_find_hidden_test_deps($wrksrc);
+
+   if ( $self->_uses_xs($wrksrc) ) {
+   $self->set_other( 'WANTLIB', 'perl' );
+   }
+   else {
+   $self->set_other( 'PKG_ARCH', '*' );
+   }
 }
 
 sub try_building
@@ -266,6 +273,22 @@ sub _test_skips
return;
}
}
+}
+
+sub _uses_xs
+{
+   my ( $self, $dir ) = @_;
+   my $found_xs = 0;
+
+   find( sub {
+   if ( -d && /^(inc|t|xt)$/ ) {
+   $File::Find::prune = 1;
+   return;
+   }
+   $found_xs = 1 if -f && /\.xs$/;
+   }, $dir );
+
+   return $found_xs;
 }
 
 1;

Re: Post pkg_delete messages, change message format?

[Chris Bennett]

On Fri, Mar 25, 2016 at 04:51:40PM -0400, dan mclaughlin wrote:
> the magic of unix; you can work around this with some sed.

Funny how we never see the obvious thing right in front of us. I do
this sort of stuff all of the time, just never occurred to me to do
it here. Thanks.

That's why I always ask someone where something is when I search and
search and just can't find it. Happened earlier today, my dad just
couldn't find the spaghetti. :)

Chris

Re: update audio/py-mpd2

[Jeremie Courreges-Anglas]

Daniel Jakots  writes:

> Hi,
>
> Here's an update for py-mpd2. I tried it quickly with audio/sonata, it
> seems to work. Then I noticed they added a test suite so I added the
> test target which is OK on amd64 and i386.

Looks fine ports-wise, ok jca@

[...]

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

update net/wget

[Daniel Jakots]

Hi,

Here's a patch to update wget to latest release. Changelog is available
in their repository [0].

make test on amd64 and i386 is fine. There is no more any failed test
as in 1.16.3.

[0]: http://git.savannah.gnu.org/cgit/wget.git/tree/NEWS

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/net/wget/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile9 Apr 2015 11:32:04 -   1.69
+++ Makefile25 Mar 2016 21:15:19 -
@@ -2,8 +2,7 @@
 
 COMMENT =  retrieve files from the web via HTTP, HTTPS and FTP
 
-DISTNAME = wget-1.16.3
-REVISION = 0
+DISTNAME = wget-1.17.1
 CATEGORIES =   net
 
 HOMEPAGE = https://www.gnu.org/software/wget/
Index: distinfo
===
RCS file: /cvs/ports/net/wget/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo19 Mar 2015 20:53:43 -  1.16
+++ distinfo25 Mar 2016 21:15:19 -
@@ -1,2 +1,2 @@
-SHA256 (wget-1.16.3.tar.xz) = Z/e3sPXBTbYz47GPUxcnhsAB4VPVRc/IXYJ1nFwv+zc=
-SIZE (wget-1.16.3.tar.xz) = 1794148
+SHA256 (wget-1.17.1.tar.xz) = /lWbYeucwBY1rGIGoU4Cy1FZGDjDX6g8ekqsrgvdl8k=
+SIZE (wget-1.17.1.tar.xz) = 1894140

update editors/joe

[Daniel Jakots]

Hi,

Here's an update to the latest release. Changelog is available on SF
[0].

Quickly tested on amd64.

[0]: https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/editors/joe/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile3 Oct 2015 17:58:07 -   1.45
+++ Makefile25 Mar 2016 20:14:53 -
@@ -3,7 +3,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME=  joe-4.1
+DISTNAME=  joe-4.2
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
Index: distinfo
===
RCS file: /cvs/ports/editors/joe/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo3 Oct 2015 17:58:07 -   1.10
+++ distinfo25 Mar 2016 20:14:53 -
@@ -1,2 +1,2 @@
-SHA256 (joe-4.1.tar.gz) = gWIRsr2VH3kt42Aq/XTqS1FhL//dm8JKeAhmAFP+9ts=
-SIZE (joe-4.1.tar.gz) = 1292957
+SHA256 (joe-4.2.tar.gz) = vF2mS8VoOreyliozIUs1N+oX/2Uoo8YLoXA1njHoaXQ=
+SIZE (joe-4.2.tar.gz) = 1341048
Index: patches/patch-joe_main_c
===
RCS file: patches/patch-joe_main_c
diff -N patches/patch-joe_main_c
--- patches/patch-joe_main_c3 Oct 2015 17:58:07 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-joe_main_c,v 1.1 2015/10/03 17:58:07 jca Exp $
-
-Committed upstream
-
-  
http://sourceforge.net/p/joe-editor/mercurial/ci/e26894707ac52a56d02c55af6e412d8fd96df94d/#diff-2
-
 joe/main.c.origMon Aug 31 04:59:43 2015
-+++ joe/main.c Sat Oct  3 18:09:12 2015
-@@ -211,7 +211,7 @@ int edloop(int flg)
-   }
- 
-   /* Restore modes */
--  if (maint->curwin->watom->what & TYPETW) {
-+  if (!leave && maint->curwin->watom->what & TYPETW) {
-   bw = (BW *)maint->curwin->object;
- 
-   if (auto_off) {
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/joe/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST   3 Oct 2015 17:58:07 -   1.16
+++ pkg/PLIST   25 Mar 2016 20:14:53 -
@@ -87,6 +87,8 @@ share/joe/syntax/debian.jsf
 @sample ${SYSCONFDIR}/joe/syntax/debian.jsf
 share/joe/syntax/diff.jsf
 @sample ${SYSCONFDIR}/joe/syntax/diff.jsf
+share/joe/syntax/dockerfile.jsf
+@sample ${SYSCONFDIR}/joe/syntax/dockerfile.jsf
 share/joe/syntax/elixir.jsf
 @sample ${SYSCONFDIR}/joe/syntax/elixir.jsf
 share/joe/syntax/erb.jsf

Re: Post pkg_delete messages, change message format?

[Chris Bennett]

On Fri, Mar 25, 2016 at 09:32:19PM +0200, li...@wrant.com wrote:
> Fri, 25 Mar 2016 12:47:01 -0500 Chris Bennett
> 
> > After I delete packages, especially pkg_delete -X, I get a long list of
> > instructions like:
> > 
> You should also run rm -rf /
> >

There was a diff to prevent this. Not sure if it was committed.

> > With this format, I have to copy/paste each rm -rf, groupdel, etc by hand.
> > Could these messages be changed to something easier to use like:
> > 
> rm -rf /
> > 
> > This would make these commands very simple to run.
> 
> Mindlessly dead easy simple to run, even no need to paste, just pipe to
> xargs and don't be tempted to cut, grep or tutorial forbade sed.
> > 
> > Chris Bennett
> 
> I 'ojbect' to your strip, it got diffed off.

I run three versions of amd64.
5.7, 5.8, -current
I run three versions of i386.
5.7, 5.8, -current

Ever set PKG_PATH wrong?
Ever wanted to clean out all packages while running -current upgrading
to a new snapshot before doing a fresh install on next snapshot?

I, personally, would find this change helpful.
This change would mean a lot of work, but not need to be done urgently
at all.
This change may have very valid reasons not do it.

It never hurts to ask reasonable questions. I did not search the mailing
lists for a previous question about this. Asking this question at all
may have been a waste of time since it has been addressed before. Which
means I may have made a mistake in asking it "yet again".

On the other hand, the openbsd web pages have just such a format for
upgrades and following -current.

Chris Bennett

update databases/py-ldap

[Daniel Jakots]

Hi,

Changelog says:
Released 2.4.25 2016-01-18
Changes since 2.4.23:
(2.4.24 is missing because of foolish pypi version madness)

Lib/
* Fix for attrlist=None regression introduced in 2.4.23
  by ref count patch

Released 2.4.23 2016-01-17 35   
Changes since 2.4.22:

Modules/
* Ref count issue in attrs_from_List() was fixed
  (thanks to Elmir Jagudin)

Tests are ok on amd64 and i386.

Cheers,
Daniel

Index: Makefile
===
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile20 Mar 2016 16:12:23 -  1.42
+++ Makefile25 Mar 2016 19:20:45 -
@@ -3,7 +3,7 @@
 COMMENT-main=  LDAP client API for Python
 COMMENT-examples=  example programs for the LDAP client API for Python
 
-MODPY_EGG_VERSION =2.4.22
+MODPY_EGG_VERSION =2.4.25
 DISTNAME=  python-ldap-${MODPY_EGG_VERSION}
 PKGNAME-main=  py-ldap-${MODPY_EGG_VERSION}
 PKGNAME-examples=  py-ldap-examples-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/py-ldap/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo13 Nov 2015 08:44:53 -  1.14
+++ distinfo25 Mar 2016 19:20:45 -
@@ -1,2 +1,2 @@
-SHA256 (python-ldap-2.4.22.tar.gz) = 
nvWHKpUpLz/+UHqgnIBdfhVYsIFZ2gqBup3QSRC+ULc=
-SIZE (python-ldap-2.4.22.tar.gz) = 121397
+SHA256 (python-ldap-2.4.25.tar.gz) = 
YtANvIbz+bIb6s2bgm6PmJX5AGN6YKbU56tZoc3GTlY=
+SIZE (python-ldap-2.4.25.tar.gz) = 121573

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2016/03/25 12:33:43

Modified files:
geo/openbsd-developers: Makefile 
geo/openbsd-developers/files: OpenBSD 

Log message:
Add my self.

ok jca@ landry@

Post pkg_delete messages, change message format?

[Chris Bennett]

After I delete packages, especially pkg_delete -X, I get a long list of
instructions like:


-2.1.3 ---
You should also run rm -rf /etc/cups/*.conf.O /var/log/cups
You should also run rm -rf /var/cache/cups
You should also run rm -rf /var/spool/cups
--- -cups-pdf-2.6.1p0 ---
You should also run rm -rf /var/spool/cups-pdf/
--- -dbus-1.10.8v0 ---
Remember to update /var/db/dbus/machine-id
Remember to update /etc/machine-id
--- -dconf-0.24.0p1 ---
You should also run rm -rf /etc/dconf/db/*
You should also run rm -rf /etc/dconf/profile/*
--- -foo2zjs-20140627p1 ---
You should also run rm -f /usr/local/share/foo2hbpl/icm/*
You should also run rm -f /usr/local/share/foo2hiperc/icm/*
You should also run rm -f /usr/local/share/foo2hp/icm/*
You should also run rm -f /usr/local/share/foo2lava/icm/*
You should also run rm -f /usr/local/share/foo2oak/icm/*
You should also run rm -f /usr/local/share/foo2qpdl/icm/*
You should also run rm -f /usr/local/share/foo2slx/icm/*
You should also run rm -f /usr/local/share/foo2xqx/firmware/*
You should also run rm -f /usr/local/share/foo2zjs/firmware/*
You should also run rm -f /usr/local/share/foo2zjs/icm/*
--- -hplip-3.16.2 ---
You should also run rm -rf /usr/local/share/hplip/data/firmware
You should also run rm -rf /usr/local/share/hplip/data/plugins
You should also run rm -rf /usr/local/share/hplip/fax/plugins
You should also run rm -rf /usr/local/share/hplip/prnt/plugins
You should also run rm -rf /usr/local/share/hplip/scan/plugins
You should also run rm -f /usr/local/share/hplip/plugin.spec
--- -hplip-common-3.16.2 ---
You should also run rm -rf /var/log/hp/tmp/*
You should also run rm -f /var/log/hp/* 2>/dev/null || true
--- -net-snmp-5.7.3p6 ---
You should also run rm -rf /var/net-snmp/*
--- -sane-backends-1.0.25p2 ---
You should also run rm -rf /var/spool/lock/sane/*

With this format, I have to copy/paste each rm -rf, groupdel, etc by hand.
Could these messages be changed to something easier to use like:


--- -hplip-3.16.2 ---
You should also run
rm -rf /usr/local/share/hplip/data/firmware
rm -rf /usr/local/share/hplip/data/plugins
rm -rf /usr/local/share/hplip/fax/plugins
rm -rf /usr/local/share/hplip/prnt/plugins
rm -rf /usr/local/share/hplip/scan/plugins
rm -f /usr/local/share/hplip/plugin.spec

This would make these commands very simple to run.

Chris Bennett

Re: textproc/agrep, glimpse: new license

[Sebastien Marie]

On Fri, Mar 25, 2016 at 04:18:21PM +0100, Christian Weisgerber wrote:
> Apparently (Web)Glimpse, which covers our textproc/glimpse and
> textproc/agrep ports, has been relicensed under an ISC license
> in 2014:
> http://webglimpse.net/
> 
> This means the restriction PERMIT_PACKAGE_CDROM="no fee" can be
> removed.
> 
> However, there haven't been any new source releases.  I don't know
> how to handle this.  The tarballs still hold the old license, and
> pointing to a website (which can go away) for the new license seems
> questionable.
> 
> Ideas?
> 

Use the "official" repository on github which include the new license ?
  - https://github.com/gvelez17/glimpse
  - https://github.com/Wikinaut/agrep

so the tarballs would include the new license.

-- 
Sebastien Marie

textproc/agrep, glimpse: new license

[Christian Weisgerber]

Apparently (Web)Glimpse, which covers our textproc/glimpse and
textproc/agrep ports, has been relicensed under an ISC license
in 2014:
http://webglimpse.net/

This means the restriction PERMIT_PACKAGE_CDROM="no fee" can be
removed.

However, there haven't been any new source releases.  I don't know
how to handle this.  The tarballs still hold the old license, and
pointing to a website (which can go away) for the new license seems
questionable.

Ideas?

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

CVS: cvs.openbsd.org: ports

[Ricardo Mestre]

CVSROOT:/cvs
Module name:ports
Changes by: mes...@cvs.openbsd.org  2016/03/25 06:41:56

Modified files:
devel/cscope   : Makefile 
devel/cscope/patches: patch-src_main_c 

Log message:
The first #ifdef around pledge was totally wrong and this way this pledge was
never called. This problem was pointed out by jca@ a big thank you!
As upstream doesn't seem to be active anymore both #ifdefs around the pledges
can go away.

OK tb@

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/03/25 04:42:17

Modified files:
lang/ghc   : Makefile distinfo 

Log message:
New bootstrappers, this time for real linked against new libc and libpthread.
Fix a typo in a comment (noticed by naddy@).

CVS: cvs.openbsd.org: ports

[David Coppa]

CVSROOT:/cvs
Module name:ports
Changes by: dco...@cvs.openbsd.org  2016/03/25 04:05:06

Modified files:
databases/hs-hedis: Makefile distinfo 

Log message:
Update to hedis-0.7.9

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2016/03/25 03:31:32

Modified files:
games/naev/base: Makefile 

Log message:
lib_depends on suitesparse so naev doesn't use an embedded copy.

ok kirby@ (maintainer)

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2016/03/25 01:47:04

Modified files:
mail/thunderbird-i18n: Makefile.inc distinfo 
mail/mozilla-thunderbird: Makefile distinfo 

Log message:
Bugfix update to thunderbird 38.7.1.

See https://www.mozilla.org/en-US/thunderbird/38.7.1/releasenotes/