UPDATE: netatalk 2.2.3
Here is an update to netatalk 2.2.3.
Index: Makefile
===
RCS file: /home/cvs/ports/net/netatalk/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile22 Apr 2012 13:44:09 - 1.39
+++ Makefile28 May 2012 02:29:43 -
@@ -4,8 +4,7 @@ SHARED_ONLY=Yes
COMMENT= AFP file and print services for IP networks
-DISTNAME= netatalk-2.2.2
-REVISION= 0
+DISTNAME= netatalk-2.2.3
CATEGORIES=net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===
RCS file: /home/cvs/ports/net/netatalk/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo11 Apr 2012 18:39:13 - 1.5
+++ distinfo28 May 2012 02:29:47 -
@@ -1,5 +1,5 @@
-MD5 (netatalk-2.2.2.tar.bz2) = vUK2huxyCdmrR72OLiQxxA==
-RMD160 (netatalk-2.2.2.tar.bz2) = ze3V/0uLrnz5D4xETDnbhQ/CEOc=
-SHA1 (netatalk-2.2.2.tar.bz2) = 1Dx10EpmrVnFsMeX/6Hm4+E7IQU=
-SHA256 (netatalk-2.2.2.tar.bz2) = RDAxuQ2d1icNmGWdIQ9AhDfY5x6AlNbwtxcGpcSB46A=
-SIZE (netatalk-2.2.2.tar.bz2) = 1239433
+MD5 (netatalk-2.2.3.tar.bz2) = C1oGRYNhg7DlSMz71cAi+A==
+RMD160 (netatalk-2.2.3.tar.bz2) = QNHdK22jheSN5fwPnMqFzbEwswk=
+SHA1 (netatalk-2.2.3.tar.bz2) = 1tDPKnToso4Hb3aHJi8pc7VaB88=
+SHA256 (netatalk-2.2.3.tar.bz2) = sIjmzGI3962Yr2WBKnS8yDCi1K6+6nHP2TKs6O+TEyw=
+SIZE (netatalk-2.2.3.tar.bz2) = 1288642
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/net/netatalk/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 11 Apr 2012 18:39:13 - 1.2
+++ patches/patch-configure 28 May 2012 03:58:31 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2012/04/11 18:39:13 sthen Exp $
configure.orig Thu Jan 12 04:11:55 2012
-+++ configure Mon Jan 16 16:35:56 2012
-@@ -25308,8 +25308,8 @@ for ac_lib in '' pthread; do
+--- configure.orig Sun May 27 23:01:21 2012
configure Sun May 27 23:04:06 2012
+@@ -14154,8 +14154,8 @@ for ac_lib in '' pthread; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -10,5 +10,14 @@ $OpenBSD: patch-configure,v 1.2 2012/04/
+ac_res=-$ac_lib
+LIBS="-$ac_lib $ac_func_search_save_LIBS"
fi
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (ac_try="$ac_link"
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_pthread_sigmask=$ac_res
+@@ -15761,7 +15761,7 @@ fi
+ for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header"
"$ac_includes_default"
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "#include
"
+ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
Index: patches/patch-etc_uams_Makefile_in
===
RCS file: patches/patch-etc_uams_Makefile_in
diff -N patches/patch-etc_uams_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-etc_uams_Makefile_in 28 May 2012 07:05:30 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- etc/uams/Makefile.in.orig Mon May 28 03:04:55 2012
etc/uams/Makefile.in Mon May 28 03:05:16 2012
+@@ -893,7 +893,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+
+ install-am: all-am
+- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-data-am install-exec-am
+
+ installcheck: installcheck-recursive
+ install-strip:
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
patch: nit for packing-list entries
This changes the external representation of
@comment subdir=... cdrom=... ftp=...
into
@comment pkgpath=... cdrom=... ftp=...
thus, making the vocabulary more consistent.
(especially since what's stored there is attained thru -DFULLPKGPATH=...
which is already a "normalized" version of SUBDIR (flavors, subpackage,
and gory details taken care of).
Since *all* official tools reuse this code, this should be totally
transparent (in particular, register-plist is completely happy with this)
Index: OpenBSD/PackingElement.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm,v
retrieving revision 1.205
diff -u -p -r1.205 PackingElement.pm
--- OpenBSD/PackingElement.pm 15 May 2012 08:14:29 - 1.205
+++ OpenBSD/PackingElement.pm 28 May 2012 09:32:08 -
@@ -684,7 +684,7 @@ sub add
if ($args =~ m/^\$OpenBSD.*\$\s*$/o) {
return OpenBSD::PackingElement::CVSTag->add($plist, $args);
- } elsif ($args =~ m/^subdir\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) {
+ } elsif ($args =~
m/^(?:subdir|pkgpath)\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) {
return OpenBSD::PackingElement::ExtraInfo->add($plist, $1, $2,
$3);
} elsif ($args eq 'no checksum') {
$plist->{state}->{nochecksum} = 1;
@@ -940,7 +940,7 @@ sub stringize
{
my $self = shift;
return join(' ',
- "subdir=".$self->{subdir},
+ "pkgpath=".$self->{subdir},
"cdrom=".may_quote($self->{cdrom}),
"ftp=".may_quote($self->{ftp}));
}
Re: patch: nit for packing-list entries
Fixed version below, forgot about the fast path in PackingList.pm
On Mon, May 28, 2012 at 11:35:08AM +0200, Marc Espie wrote:
> This changes the external representation of
> @comment subdir=... cdrom=... ftp=...
> into
> @comment pkgpath=... cdrom=... ftp=...
>
>
> thus, making the vocabulary more consistent.
> (especially since what's stored there is attained thru -DFULLPKGPATH=...
> which is already a "normalized" version of SUBDIR (flavors, subpackage,
> and gory details taken care of).
>
> Since *all* official tools reuse this code, this should be totally
> transparent (in particular, register-plist is completely happy with this)
>
Index: OpenBSD/PackingElement.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm,v
retrieving revision 1.205
diff -u -p -r1.205 PackingElement.pm
--- OpenBSD/PackingElement.pm 15 May 2012 08:14:29 - 1.205
+++ OpenBSD/PackingElement.pm 28 May 2012 09:57:04 -
@@ -684,7 +684,7 @@ sub add
if ($args =~ m/^\$OpenBSD.*\$\s*$/o) {
return OpenBSD::PackingElement::CVSTag->add($plist, $args);
- } elsif ($args =~ m/^subdir\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) {
+ } elsif ($args =~
m/^(?:subdir|pkgpath)\=(.*?)\s+cdrom\=(.*?)\s+ftp\=(.*?)\s*$/o) {
return OpenBSD::PackingElement::ExtraInfo->add($plist, $1, $2,
$3);
} elsif ($args eq 'no checksum') {
$plist->{state}->{nochecksum} = 1;
@@ -940,7 +940,7 @@ sub stringize
{
my $self = shift;
return join(' ',
- "subdir=".$self->{subdir},
+ "pkgpath=".$self->{subdir},
"cdrom=".may_quote($self->{cdrom}),
"ftp=".may_quote($self->{ftp}));
}
Index: OpenBSD/PackingList.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackingList.pm,v
retrieving revision 1.119
diff -u -p -r1.119 PackingList.pm
--- OpenBSD/PackingList.pm 15 May 2012 08:14:29 - 1.119
+++ OpenBSD/PackingList.pm 28 May 2012 09:57:04 -
@@ -237,7 +237,7 @@ sub ExtraInfoOnly
my ($fh, $cont) = @_;
my $_;
while (<$fh>) {
- if (m/^\@(?:name|pkgpath|comment\s+subdir\=)\b/o) {
+ if (m/^\@(?:name|pkgpath|comment\s+(?:subdir|pkgpath)\=)\b/o) {
&$cont($_);
# XXX optimization
} elsif (m/^\@(?:depend|wantlib|newgroup|newuser|cwd)\b/o) {
@@ -259,7 +259,7 @@ sub UpdateInfoOnly
}
return;
}
- if
(m/^\@(?:name|depend|wantlib|conflict|option|pkgpath|url|arch|comment\s+subdir\=)\b/o)
{
+ if
(m/^\@(?:name|depend|wantlib|conflict|option|pkgpath|url|arch|comment\s+(?:subdir|pkgpath)\=)\b/o)
{
&$cont($_);
# XXX optimization
} elsif (m/^\@(?:newgroup|newuser|cwd)\b/o) {
building LibreOffice?
I built a new system yesterday using the 25 May i386 snapshot followed by building a number of ports. LibreOffice gets midway through its build when I get the following error below. What is the "unpack" mentioned? Thanks. =8<--- = (44/140) Building module librsvg = Entering /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg dmake: Error: -- `./ unxobsd.pro/misc/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.unpack' not found, and can't be made --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg it seems that the error is inside 'librsvg', please re-run build inside this module to isolate the error and/or test your fix: --- /usr/local/bin/bash cd /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2 source ./Env.Host.sh cd librsvg rm -Rf /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg/ unxobsd.pro # optional module 'clean' build when the problem is isolated and fixed exit and re-run 'make' from the top-level gmake[1]: *** [build] Error 1 gmake[1]: Leaving directory `/usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2' gmake: *** [source-env-and-recurse] Error 2 *** Error code 2 Stop in /usr/ports/editors/libreoffice (line 2469 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/editors/libreoffice (line 1692 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/editors/libreoffice (line 2238 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/editors/libreoffice (line 2218 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/editors/libreoffice (line 1713 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/editors/libreoffice (line 2218 of /usr/ports/infrastructure/mk/bsd.port.mk). #
Re: building LibreOffice?
On 2012/05/28 07:46, James Hartley wrote: > I built a new system yesterday using the 25 May i386 snapshot followed by > building a number of ports. LibreOffice gets midway through its build when > I get the following error below. > > What is the "unpack" mentioned? > > Thanks. > > =8<--- > > = > (44/140) Building module librsvg > = > Entering > /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg > > dmake: Error: -- `./ > unxobsd.pro/misc/d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.unpack' > not found, and can't be made > > --- > Oh dear - something failed during the build - sorry ! > For more help with debugging build errors, please see the section in: > http://wiki.documentfoundation.org/Development If you open this URL there is a link to a "How to build" page which has a section entitled "The Build Failed... What can I do?" which shows you where you can look. > internal build errors: > > ERROR: error 65280 occurred while making > /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg > > it seems that the error is inside 'librsvg', please re-run build > inside this module to isolate the error and/or test your fix: > --- > > /usr/local/bin/bash > cd /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2 > source ./Env.Host.sh > cd librsvg > rm -Rf /usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2/librsvg/ > unxobsd.pro # optional module 'clean' > build > > when the problem is isolated and fixed exit and re-run 'make' from the > top-level > gmake[1]: *** [build] Error 1 > gmake[1]: Leaving directory > `/usr/ports/pobj/libreoffice-3.5.3.2/libreoffice-core-3.5.3.2' > gmake: *** [source-env-and-recurse] Error 2 > *** Error code 2 > > Stop in /usr/ports/editors/libreoffice (line 2469 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/editors/libreoffice (line 1692 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/editors/libreoffice (line 2238 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/editors/libreoffice (line 2218 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/editors/libreoffice (line 1713 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/editors/libreoffice (line 2218 of > /usr/ports/infrastructure/mk/bsd.port.mk). > #
Re: [PATCH] add -zip extension for php
On 2012/05/27 22:34, wen heping wrote:
> 2012/5/27 Antoine Jacoutot
>
> > On Sun, May 27, 2012 at 09:35:13PM +0800, wen heping wrote:
> > > I found no ports depends on pecl-zip in portstree. But I suggest add
> >
> > There are at least photoshow and owncloud that depend on it.
> >
>
> You are right.
> And now I am sure only photoshow and owncloud that depend on it :)
> Thanks!
>
> I attached revised patch.
>
> wen
Nearly done, but there are still a couple of issues:
> Index: archivers/pecl-zip/Makefile
This needs unhooking from archivers/Makefile too
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ lang/php/5.2/pkg/PLIST-zip27 May 2012 12:53:48 -
> @@ -0,0 +1,7 @@
> +@comment $OpenBSD$
> +@option no-default-conflict
> +@conflict php-zip->=5.2,<5.3
> +@pkgpath www/php5/extensions,-zip
@pkgpath should be on archivers/pecl-zip, and it requires an
@conflict marker on pecl-zip as well as the one you've already added.
> +++ lang/php/5.3/pkg/PLIST-zip27 May 2012 12:53:48 -
> @@ -0,0 +1,6 @@
> +@comment $OpenBSD$
> +@option no-default-conflict
> +@conflict php-zip->=5.3,<5.4
> +lib/php-${PV}/modules/zip.so
> +share/examples/php-${PV}/zip.ini
> +@sample ${SYSCONFDIR}/php-${PV}.sample/zip.ini
Missing @pkgpath, and it requires an @conflict marker on
pecl-zip as well as the one you've already added.
> --- www/owncloud/Makefile 3 May 2012 07:20:42 - 1.5
> +++ www/owncloud/Makefile 27 May 2012 14:28:26 -
> @@ -38,7 +38,7 @@
> TINSTDIR=${TRUEPREFIX}/owncloud
> SUBST_VARS= INSTDIR TINSTDIR
>
> -RUN_DEPENDS= archivers/pecl-zip \
> +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-zip \
> lang/php/${MODPHP_VERSION},-curl \
> lang/php/${MODPHP_VERSION},-gd
Missing REVISION bump
> Index: www/photoshow/Makefile
> ===
> RCS file: /cvs/ports/www/photoshow/Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile
> --- www/photoshow/Makefile15 Mar 2012 13:38:33 - 1.3
> +++ www/photoshow/Makefile27 May 2012 14:30:42 -
> @@ -27,7 +27,7 @@
> TINSTDIR=${TRUEPREFIX}/photoshow
> SUBST_VARS= INSTDIR TINSTDIR
>
> -RUN_DEPENDS= archivers/pecl-zip
> +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-zip
>
> do-install:
> cp -R ${WRKSRC} ${INSTDIR}
Also missing REVISION bump
Re: [Update]www/py-beautifulsoup
On Sun, May 27, 2012 at 3:51 PM, wen heping wrote: > Hi, > > Here is a patch for www/py-beautifulsoup to update to 4.0.5. > > It build and regress both OK on i386. > > OK? Comments? > > wen Just looked at the diff and I'm not so sure. You changed the name of the packag to py-beautifulsoup4. Any reason for that? I'd rather stick with the existing one. f.-
Re: powerpoint viewer
You could install Chrome and try the Docs PDF/PowerPoint viewer. - Reply message - From: "Brett" To: Subject: powerpoint viewer Date: Sun, May 27, 2012 20:41 Hi ports, Just wondering if there is any port that can display ppt with the proper page formatting, apart from the bloated LibreOffice. If I "make search" the ports tree for powerpoint or ppt only catdoc and xlhtml come up, and these both lose the formatting. LibreOffice does not come up in the search, so I'm just wondering if are other viewers hidden away? Or does anyone know of something not in the ports tree that can be built to display powerpoint slides? Thanks, Brett.
NEW: net/ttg
"TTG is a small command-line utility to display the throughput (bandwidth usage) on an interface of a remote device such as a router, switch, etc., over SNMP. Unlike tools like MRTG which sample bandwidth over a relatively long interval (often 5 minutes), TTG is normally used to display throughput over as little as one second." OK? (depends on Net-SNMP) $ ttg $somehost public list 1 : "em0" [up/unkn] 2 : "em1" [up/unkn] 3 : "bge0" [up/up] 4 : "enc0" [down/down] 5 : "lo0" [up/unkn] 6 : "trunk0" [up/up] 7 : "vlan2" [up/up] 8 : "vlan3666" [up/up] 9 : "vlan5" [up/up] 10 : "pflog0" [up/unkn] $ ttg $somehost public trunk0 Found "trunk0" at index 6: [21:47:24] current throughput: in1.2 kB/s out 478.0 B/s [21:47:25] current throughput: in2.5 kB/s out 380.0 B/s [21:47:26] current throughput: in 12.9 MB/s out 453.7 kB/s [21:47:27] current throughput: in 29.0 MB/s out 930.6 kB/s [21:47:28] current throughput: in 58.2 MB/s out1.8 MB/s [21:47:29] current throughput: in 58.6 MB/s out1.8 MB/s [21:47:30] current throughput: in 48.0 MB/s out1.5 MB/s [21:47:31] current throughput: in 48.9 MB/s out6.8 MB/s [21:47:32] current throughput: in 39.2 MB/s out 24.7 MB/s [21:47:33] current throughput: in 31.2 MB/s out 32.7 MB/s [21:47:34] current throughput: in 20.5 MB/s out 38.9 MB/s [21:47:35] current throughput: in 26.0 MB/s out 37.0 MB/s [21:47:36] current throughput: in 17.1 MB/s out 46.7 MB/s [21:47:37] current throughput: in 18.1 MB/s out 50.7 MB/s [21:47:38] current throughput: in 23.4 MB/s out 22.7 MB/s [21:47:40] current throughput: in 13.0 MB/s out 37.5 MB/s [21:47:41] current throughput: in1.4 MB/s out 58.0 MB/s [21:47:42] current throughput: in1.5 MB/s out 63.1 MB/s [21:47:43] current throughput: in1.5 MB/s out 65.5 MB/s [21:47:44] current throughput: in1.4 MB/s out 62.3 MB/s [21:47:45] current throughput: in1.4 MB/s out 62.4 MB/s ^C ttg statistics in out maximum throughput: 58.6 MB/s 65.5 MB/s average throughput: 21.5 MB/s 29.3 MB/s minimum throughput:1.2 kB/s 380.0 B/s ttg.tgz Description: application/tar-gz
Re: net/snort update to 2.9.2.3
On 2012/05/28 23:47, Markus Lude wrote: > I dropped the flexresp flavor, configure param --enable-flexresp3 is now > default. I need some help with pkg markers to deal with this. just "@pkgpath net/snort,flexresp" should be enough; to test: build a new package including this marker, copy it to some directory (e.g. /tmp), install the old snort-flexresp package, "PKG_PATH=/tmp/ sudo pkg_add -u" and check that it gets updated.
Re: [Update]www/py-beautifulsoup
2012/5/29 Federico Schwindt > On Sun, May 27, 2012 at 3:51 PM, wen heping wrote: > > Hi, > > > > Here is a patch for www/py-beautifulsoup to update to 4.0.5. > > > > It build and regress both OK on i386. > > > > OK? Comments? > > > > wen > > Just looked at the diff and I'm not so sure. You changed the name of > the packag to py-beautifulsoup4. > upstream did the name change. There is big differenc between beautifulsoup and beautifulsoup4. wen > Any reason for that? I'd rather stick with the existing one. > > f.- >
