CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2013/12/24 01:18:46 Modified files: x11/gnome/libgda: Makefile distinfo x11/gnome/libgda/patches: patch-configure Log message: Update to libgda-5.2.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 01:49:51 ports/sysutils/mcollective-plugins Update of /cvs/ports/sysutils/mcollective-plugins In directory cvs.openbsd.org:/tmp/cvs-serv18340/mcollective-plugins Log Message: Directory /cvs/ports/sysutils/mcollective-plugins added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 02:19:32 Log message: MCollective agent to manage the Puppet agent ok aja@ Status: Vendor Tag: jasper Release Tags: jasper_20132412 N ports/sysutils/mcollective-plugins/puppet-agent/Makefile N ports/sysutils/mcollective-plugins/puppet-agent/distinfo N ports/sysutils/mcollective-plugins/puppet-agent/pkg/DESCR N ports/sysutils/mcollective-plugins/puppet-agent/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 02:20:38 Added files: sysutils/mcollective-plugins: Makefile Makefile.inc Log message: add common plumbing
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 02:21:05 Modified files: sysutils : Makefile Log message: +mcollective-plugins
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 02:20:00 Log message: MCollective agent to manage Packages ok aja@ Status: Vendor Tag: jasper Release Tags: jasper_20132412 N ports/sysutils/mcollective-plugins/package-agent/Makefile N ports/sysutils/mcollective-plugins/package-agent/distinfo N ports/sysutils/mcollective-plugins/package-agent/pkg/DESCR N ports/sysutils/mcollective-plugins/package-agent/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 02:20:15 Log message: MCollective agent to manage Services ok aja@ Status: Vendor Tag: jasper Release Tags: jasper_20132412 N ports/sysutils/mcollective-plugins/service-agent/Makefile N ports/sysutils/mcollective-plugins/service-agent/distinfo N ports/sysutils/mcollective-plugins/service-agent/pkg/DESCR N ports/sysutils/mcollective-plugins/service-agent/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2013/12/24 02:51:15 Modified files: net/tor: Makefile distinfo Log message: SECURITY update to 0.2.4.20. From the ChangeLog: Tor 0.2.4.20 fixes potentially poor random number generation for users who 1) use OpenSSL 1.0.0 or later, 2) set HardwareAccel 1 in their torrc file, 3) have Sandy Bridge or Ivy Bridge Intel processors, and 4) have no state file in their DataDirectory (as would happen on first start). Users who generated relay or hidden service identity keys in such a situation should discard them and generate new ones. (no CVE assigned yet)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/24 03:38:48 Modified files: x11/kde: kde.port.mk Log message: Enforcing defaults to *.kde3 dirs when building, too.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2013/12/24 04:24:52 Modified files: graphics/pngcrush: Makefile distinfo Log message: Update to pngcrush 1.7.70.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2013/12/24 05:56:19 Modified files: security/kc: Makefile distinfo security/kc/pkg: README Log message: Update to kc-2.3.2, from maintainer Levai Daniel. Drop the run-deps on p5-HTML-Parser which is only needed to run the pwsafe converter, and document that in the README. Remove redundant TEST_TARGET while here. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/24 06:03:15 Modified files: graphics/libkipi: Makefile graphics/libkipi/pkg: PLIST-icons Log message: No run-time dependency on kdelibs = should have share/apps.kde3/ itself.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2013/12/24 06:06:22 Log message: Import ttyload. Input and ok from bcallah@, who also takes maintainership. ttyload writes a color-coded graph of load averages over time, using the full width of a tty. Status: Vendor Tag: jca Release Tags: jca_2013-12-24 N ports/sysutils/ttyload/Makefile N ports/sysutils/ttyload/distinfo N ports/sysutils/ttyload/pkg/PLIST N ports/sysutils/ttyload/pkg/DESCR N ports/sysutils/ttyload/patches/patch-ttyload_h No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2013/12/24 06:08:55 Modified files: sysutils : Makefile Log message: +ttyload
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2013/12/24 06:57:18 Modified files: telephony/stuntman: Makefile distinfo Added files: telephony/stuntman/patches: patch-stuncore_stunbuilder_cpp patch-testcode_testfasthash_cpp patch-testcode_testpolling_cpp patch-testcode_testreader_cpp Log message: Update to stuntman 1.2.5, add patches to use arc4random. From maintainer Roman Kravchuk.
Re: CVS: cvs.openbsd.org: ports
Jeremie Courreges-Anglas j...@cvs.openbsd.org writes: CVSROOT: /cvs Module name: ports Changes by: j...@cvs.openbsd.org2013/12/24 06:06:22 Log message: Import ttyload. Input and ok from bcallah@, who also takes maintainership. ttyload writes a color-coded graph of load averages over time, using the full width of a tty. [...] Also ok sthen@. -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2013/12/24 07:39:56 Modified files: security/botan : Makefile distinfo Removed files: security/botan/patches: patch-src_build-data_arch_mips64_txt Log message: Update to Botan 1.10.6. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2013/12/24 08:18:38 Modified files: print/ghostscript/gnu: Makefile distinfo print/ghostscript/gnu/patches: patch-base_devs_mak patch-base_unix-dll_mak patch-base_unix-gcc_mak print/ghostscript/gnu/pkg: PLIST Removed files: print/ghostscript/gnu/patches: patch-base_jasper_mak Log message: Intermediate update to ghostscript-9.07. 9.10 will follow in a few days. Thanks to aja@ for doing some testing.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2013/12/24 08:22:55 Modified files: graphics/ffmpeg: Makefile distinfo graphics/ffmpeg/patches: patch-configure graphics/ffmpeg/pkg: PLIST x11/mplayer: Makefile Log message: Update to FFmpeg 20131216 snapshot. From 1.2 branch. ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2013/12/24 08:33:36 Modified files: lang/railo : Makefile distinfo Log message: update to Railo 4.1.2.005 (various fixes, changelog is at http://www.getrailo.org/index.cfm/download/history/)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2013/12/24 10:21:40 Modified files: games/golly: Makefile distinfo games/golly/patches: patch-gui-wx_configure_configure games/golly/pkg: PLIST Log message: Update to golly 2.6. from Donovan Watteau (maintainer).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: r...@cvs.openbsd.org2013/12/24 11:53:37 Modified files: sysutils/ansible: Makefile distinfo sysutils/ansible/pkg: PLIST Log message: Update ansible to 1.4.3 ok aja@ landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2013/12/24 13:21:42 Modified files: devel/sdl : Makefile devel/sdl/patches: patch-src_video_SDL_blit_N_c Added files: devel/sdl/patches: patch-src_video_x11_SDL_x11wm_c Log message: Some improvements from upstream.. - Use fast path for RGB 565 - 32-bit XRGB - Use _NET_WM_ICON if possible for X11's SDL_WM_SetIcon() implementation ok bcallah@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2013/12/24 13:42:34 Modified files: devel : Makefile Log message: +cpptest
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2013/12/24 13:41:49 Log message: Import cpptest-1.1.2. CppTest is a portable and powerful, yet simple, unit testing framework for handling automated tests in C++. The focus lies on usability and extendability. Several output formats, including simple text output, compiler-like output and HTML, are supported and new ones are easily added. ok sthen@ benoit@ Status: Vendor Tag: bentley Release Tags: bentley_20131224 N ports/devel/cpptest/Makefile N ports/devel/cpptest/distinfo N ports/devel/cpptest/pkg/DESCR N ports/devel/cpptest/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2013/12/24 13:43:25 Log message: Import uriparser-0.8.0. uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license. ok sthen@ benoit@ Status: Vendor Tag: bentley Release Tags: bentley_20131224 N ports/www/uriparser/Makefile N ports/www/uriparser/distinfo N ports/www/uriparser/patches/patch-tool_uriparse_c N ports/www/uriparser/pkg/DESCR N ports/www/uriparser/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/24 13:56:21 Modified files: graphics/gwenview: Makefile Log message: Switch to GNU libtool, our one could pick up KDE4 libs. This is a preparation for enabling KDE 3 4 libraries co-existance. Add SEPARATE_BUILD and sync WANTLIB while there.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/24 14:08:25 Modified files: graphics/libkipi: Makefile Log message: kde.port.mk takes care of LIBTOOL_FLAGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2013/12/24 14:08:41 Modified files: graphics/kipi-plugins: Makefile Log message: kde.port.mk takes care of LIBTOOL_FLAGS.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2013/12/24 15:31:27 Modified files: net/apache-activemq: Makefile distinfo net/apache-activemq/pkg: PLIST Log message: - update to apache-activemq 5.9 * please refer to http://activemq.apache.org/activemq-590-release.html for an overview of new features/ bugfixes, including the new hawtio console. if you updated permissions in jetty-realm.properties, apply the same in users.properties for the new hawtio console (hostname:8161/hawtio/) !
NEW: devel/cpptest
Hi, CppTest is a portable and powerful, yet simple, unit testing framework for handling automated tests in C++. The focus lies on usability and extendability. This is a dependency of uriparser (port upcoming). ok? -- Anthony J. Bentley cpptest.tar.gz Description: GNU Zip compressed data
NEW: www/uriparser
Hi, uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. uriparser is cross-platform, fast, supports Unicode and is licensed under the New BSD license. Requires the devel/cpptest port I just sent to the list. Runs fine and all tests pass on i386/amd64. ok? -- Anthony J. Bentley uriparser.tar.gz Description: GNU Zip compressed data
Re: sysutils/apupsd: switch from MESSAGE to README
On 2013/12/24 00:06, Kirill Bychkov wrote:
Hi!
This patch removes MESSAGEs in favor of READMEs.
Update my email and regen distinfo while here.
OK?
I think it would make sense to merge the two READMEs, i.e. include the
information about CGIs in README-main ..
share/doc/apcupsd/README.openbsd
+@group bin
+share/doc/pkg-readmes/${FULLPKGNAME}
+@group
is the @group necessary?
I also wonder if it's worth including any relevant parts of
README.openbsd here (and maybe not installing README.openbsd; some of
the information is good but some is just confusing when used with the
port - e.g. where it talks about /etc/rc.apcupsd)..
ftp(1) and SSL/TLS server certificate validation
Hi, CVSROOT:/cvs Module name:src Changes by: j...@cvs.openbsd.org2013/12/24 06:00:59 Modified files: usr.bin/ftp: fetch.c ftp.1 ftp_var.h main.c Log message: Add support for SSL/TLS server certificate validation, enabled by default. See the documentation for the `-S' switch. This also allows setting the preferred ciphers for the communication. Documentation bits ok'ed by jmc@, ok beck@ sthen@. This will probably break some MASTER_SITES that use https:// but have improper / unrecognized certs / CAs. Please report the offender sites so that we can fix the Makefiles. -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: NEW: sysutils/kyua
Alexandr Shadchin alexandr.shadc...@gmail.com writes: [...] Now ok for me. Does anyone have objections to import these ports ? or OK ? Those ports look fine to me too. There are a few minor glitches: - their build flags use -Wredundant-decls, this makes the build unreadable and makes it hard to detect real problems. Patching configure is enough. - kyua-cli needs a patch for 32 bits archs (attached) - lutok build fine with lua5.2 but kyua-cli has lua5.1 hardcoded in its WANTLIB. I don't know what's the way to go, forcing one version of lua for both ports, or using flavors and MODULES = /lang/lua in kyua-cli? - I modified Sergey's patch for kyua-testers so that mounting tmpfs is supported, and emulated lchmod instead instead of just removing the call (also attached). patch-utils_datetime_test_cpp Description: Binary data patch-fs_test_c Description: Binary data -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: ftp(1) and SSL/TLS server certificate validation
On 2013/12/24 14:16, Jérémie Courrèges-Anglas wrote: Hi, CVSROOT: /cvs Module name: src Changes by: j...@cvs.openbsd.org2013/12/24 06:00:59 Modified files: usr.bin/ftp: fetch.c ftp.1 ftp_var.h main.c Log message: Add support for SSL/TLS server certificate validation, enabled by default. See the documentation for the `-S' switch. This also allows setting the preferred ciphers for the communication. Documentation bits ok'ed by jmc@, ok beck@ sthen@. This will probably break some MASTER_SITES that use https:// but have improper / unrecognized certs / CAs. Please report the offender sites so that we can fix the Makefiles. ..or in some cases we may want to add the CA root to cert.pem.
Re: ftp(1) and SSL/TLS server certificate validation
Stuart Henderson st...@openbsd.org writes: On 2013/12/24 14:16, Jérémie Courrèges-Anglas wrote: Hi, CVSROOT: /cvs Module name: src Changes by: j...@cvs.openbsd.org2013/12/24 06:00:59 Modified files: usr.bin/ftp: fetch.c ftp.1 ftp_var.h main.c Log message: Add support for SSL/TLS server certificate validation, enabled by default. See the documentation for the `-S' switch. This also allows setting the preferred ciphers for the communication. Documentation bits ok'ed by jmc@, ok beck@ sthen@. This will probably break some MASTER_SITES that use https:// but have improper / unrecognized certs / CAs. Please report the offender sites so that we can fix the Makefiles. ..or in some cases we may want to add the CA root to cert.pem. Oh, that too. For example my cousin Achmed also provides nice PKI software that we could include in the ports tree, but he suggested that we should first include his CA. *runs away* (https://bugzilla.mozilla.org/show_bug.cgi?id=647959) -- jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Re: ftp(1) and SSL/TLS server certificate validation
On 2013/12/24 14:46, Jérémie Courrèges-Anglas wrote: Stuart Henderson st...@openbsd.org writes: On 2013/12/24 14:16, Jérémie Courrèges-Anglas wrote: Hi, CVSROOT: /cvs Module name: src Changes by:j...@cvs.openbsd.org2013/12/24 06:00:59 Modified files: usr.bin/ftp: fetch.c ftp.1 ftp_var.h main.c Log message: Add support for SSL/TLS server certificate validation, enabled by default. See the documentation for the `-S' switch. This also allows setting the preferred ciphers for the communication. Documentation bits ok'ed by jmc@, ok beck@ sthen@. This will probably break some MASTER_SITES that use https:// but have improper / unrecognized certs / CAs. Please report the offender sites so that we can fix the Makefiles. ..or in some cases we may want to add the CA root to cert.pem. Oh, that too. For example my cousin Achmed also provides nice PKI software that we could include in the ports tree, but he suggested that we should first include his CA. *runs away* (https://bugzilla.mozilla.org/show_bug.cgi?id=647959) I was looking for lolroot's certificate, but it looks like they're too busy, server's down..
Re: sysutils/apupsd: switch from MESSAGE to README
On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
On 2013/12/24 00:06, Kirill Bychkov wrote:
Hi!
This patch removes MESSAGEs in favor of READMEs.
Update my email and regen distinfo while here.
OK?
I think it would make sense to merge the two READMEs, i.e. include the
information about CGIs in README-main ..
I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf and
apcupsd.css to cgi), so from now -cgi is a standalone package and it have its
own README.
share/doc/apcupsd/README.openbsd
+@group bin
+share/doc/pkg-readmes/${FULLPKGNAME}
+@group
is the @group necessary?
It was added by update-plist, sorry. Removed.
I also wonder if it's worth including any relevant parts of
README.openbsd here (and maybe not installing README.openbsd; some of
the information is good but some is just confusing when used with the
port - e.g. where it talks about /etc/rc.apcupsd)..
Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
says nothing wrong nor confusing, as I can see.
Anyway, this file contains only extra information and not really needed for
Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
port's readme.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile27 Sep 2013 17:49:09 - 1.19
+++ Makefile24 Dec 2013 13:51:12 -
@@ -8,15 +8,15 @@ DISTNAME =apcupsd-3.14.10
PKGNAME-main = ${DISTNAME}
PKGNAME-cgi = ${DISTNAME:S/-/-cgi-/}
PKGNAME-x11 = ${DISTNAME:S/-/-x11-/}
-REVISION-main =1
-REVISION-cgi = 0
-REVISION-x11 = 1
+REVISION-main =2
+REVISION-cgi = 1
+REVISION-x11 = 2
CATEGORIES = sysutils
HOMEPAGE = http://www.apcupsd.com
-MAINTAINER = Kirill Bychkov ya...@linklevel.net
+MAINTAINER = Kirill Bychkov ki...@openbsd.org
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===
RCS file: /cvs/ports/sysutils/apcupsd/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo20 Sep 2011 11:26:14 - 1.3
+++ distinfo24 Dec 2013 13:51:12 -
@@ -1,5 +1,2 @@
-MD5 (apcupsd-3.14.10.tar.gz) = WSiCLYVcXPesKWVePguMIw==
-RMD160 (apcupsd-3.14.10.tar.gz) = uwFTUjLulgRe4Fit5w3dOcBLVFc=
-SHA1 (apcupsd-3.14.10.tar.gz) = Sj1VkWchIfXXYdMzB7VvENM/W2c=
SHA256 (apcupsd-3.14.10.tar.gz) = Bwe17JkW+96eROuNGAN8jY9139au71GrpUh+GJ7vIDI=
SIZE (apcupsd-3.14.10.tar.gz) = 1336852
Index: pkg/MESSAGE-cgi
===
RCS file: pkg/MESSAGE-cgi
diff -N pkg/MESSAGE-cgi
--- pkg/MESSAGE-cgi 28 Nov 2011 10:46:19 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,10 +0,0 @@
-Before using multimon and the other CGI programs, first ensure that
-apcupsd is configured to run the Network Information Server. This is
-done by setting NETSERVER on in ${SYSCONFDIR}/apcupsd.conf.
-This switch is on by default.
-To run scripts in chrooted apache (default behaviour), configuration
-files must be available to the webserver:
-# mv ${SYSCONFDIR} /var/www/${SYSCONFDIR}
-# ln -s /var/www/${SYSCONFDIR} ${BASESYSCONFDIR}/
-And some libraries must be copied in:
-# ${WEB_ROOT}/cgi-bin/apcupsd/copy-libs.sh
Index: pkg/MESSAGE-main
===
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- pkg/MESSAGE-main28 Nov 2011 10:46:19 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-To allow the system to be fully powered down (in order to preserve
-UPS battery), add the following lines to /etc/rc.shutdown:
-
-if [ -f ${SYSCONFDIR}/powerfail ]; then
- echo
- echo APCUPSD requested this system is powered down.
- echo
- powerdown=YES
- echo
- echo Please ensure that the UPS has powered off before rebooting
- echo Otherwise, the UPS may cut the power during the reboot!!!
- echo
-fi
Index: pkg/PLIST-cgi
===
RCS file: /cvs/ports/sysutils/apcupsd/pkg/PLIST-cgi,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-cgi
--- pkg/PLIST-cgi 25 May 2010 21:56:33 - 1.1.1.1
+++ pkg/PLIST-cgi 24 Dec 2013 13:51:12 -
@@ -9,3 +9,14 @@ cgi-bin/apcupsd/copy-libs.sh
@bin cgi-bin/apcupsd/upsfstats.cgi
@bin cgi-bin/apcupsd/upsimage.cgi
@bin cgi-bin/apcupsd/upsstats.cgi
+@cwd ${LOCALBASE}
+@sample share/examples/apcupsd/
+share/examples/apcupsd/etc/
+@sample ${SYSCONFDIR}/
+share/examples/apcupsd/etc/apcupsd.css
+@sample ${SYSCONFDIR}/apcupsd.css
+share/examples/apcupsd/etc/hosts.conf
+@sample ${SYSCONFDIR}/hosts.conf
+share/examples/apcupsd/etc/multimon.conf
+@sample ${SYSCONFDIR}/multimon.conf
+share/doc/pkg-readmes/${FULLPKGNAME}
Index:
Re: UPDATE: devel/quilt
On Mon, Dec 23, 2013 at 01:27:53PM -0600, Kent R. Spillner wrote:
On Mon, Dec 23, 2013 at 06:57:25PM +0100, Jérémie Courrèges-Anglas wrote:
If you want to improve this port, though, there are portability problems
that could be fixed. I noticed a few sed s/.../.../iasdf flags that
don't work with our sed. This could be dealt with patching the scritps
to use @SED@ and amending the % :: %.in rule in Makefile.in.
Thanks for pointing that out. I'll looking into fixing those portability
issues.
Here is an updated patch with the portability improvments suggested by jca@.
I'm only patching quilt/mail.in at the moment because that was the only place
where I saw non-portable flags to the substitution command (but since I was
there I decided to patch all invocations anyways). I'll send a larger diff
upstream that actually fixes every invocation.
Still only tested on amd64.
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 - 1.4
+++ Makefile14 Dec 2013 04:11:46 -
@@ -2,11 +2,11 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.60
-REVISION= 1
+DISTNAME= quilt-0.61
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
+MAINTAINER=Kent R. Spillner kspill...@acm.org
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo14 Dec 2013 03:34:38 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
-SIZE (quilt-0.60.tar.gz) = 442369
+SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
+SIZE (quilt-0.61.tar.gz) = 450552
Index: patches/patch-Makefile_in
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 24 Dec 2013 12:45:07 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.inSun Sep 2 19:19:16 2012
+$OpenBSD$
+--- Makefile.in.orig Tue Dec 24 06:44:51 2013
Makefile.inTue Dec 24 06:43:04 2013
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir := @mandir@
localedir := $(datadir)/locale
@@ -10,3 +10,11 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
+@@ -256,6 +256,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt
+ @$(SED) -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'\
+ -e 's:@PERL''@:$(PERL):g' \
+ -e 's:@BASH''@:$(BASH):g' \
++ -e 's:@SED''@:$(SED):g' \
+ -e 's:@PATCH''@:$(PATCH):g' \
+ -e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g' \
+ -e 's:@VERSION''@:$(VERSION):g' \
Index: patches/patch-quilt_mail_in
===
RCS file: patches/patch-quilt_mail_in
diff -N patches/patch-quilt_mail_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-quilt_mail_in 24 Dec 2013 14:00:44 -
@@ -0,0 +1,111 @@
+$OpenBSD$
+--- quilt/mail.in.orig Sun Dec 8 14:39:50 2013
quilt/mail.in Tue Dec 24 08:00:32 2013
+@@ -6,6 +6,8 @@
+ #
+ # See the COPYING and AUTHORS files for more details.
+
++SED=@SED@
++
+ : ${EDITOR:=vi}
+
+ # Read in library functions
+@@ -146,7 +148,7 @@ process_mail()
+ else
+ local from_date=$(LC_ALL=POSIX date +%a %b %e %H:%M:%S %Y)
+ echo From $opt_sender_address $from_date
+- sed -e 's/^From /From /' $tmpfile
++ $SED -e 's/^From /From /' $tmpfile
+ echo
+ fi
+ rm -f $tmpfile
+@@ -305,7 +307,7 @@ Could not determine the envelope sender address. Pleas
+ ;;
+ esac
+ fi
+-opt_sender_address=$(echo $opt_sender | sed -re 's:.*([^]+).*:\1:')
++opt_sender_address=$(echo $opt_sender | $SED -re 's:.*([^]+).*:\1:')
+
+ if [ -z $opt_charset ]
+ then
+@@ -360,7 +362,7 @@ then
+ # Is the first paragraph short enough to be used as the subject?
+ if [ -z $subject ]
+ then
+- local para=$(sed -e $'/^[ \t]*$/q' $tmpdir/header)
++ local
Re: UPDATE: devel/quilt
Blargh, mush-mouth! Sorry, been up since 3:00am because our furnace died... Anyhoo, what I wanted to say is: Here is an updated patch with the portability improvments suggested by jca@. ... updated *diff* ... I'm only patching quilt/mail.in at the moment because that was the only place where I saw non-portable flags to the substitution command (but since I was there I decided to patch all invocations anyways). Translation: I'm substituting every use of sed in quilt/main.in even though only one or two actually used the non-portable flags. I'll send a larger diff upstream that actually fixes every invocation. Said diff will substitute every use of sed in every script.
Re: sysutils/apupsd: switch from MESSAGE to README
On 2013/12/24 18:05, Kirill Bychkov wrote:
On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
On 2013/12/24 00:06, Kirill Bychkov wrote:
Hi!
This patch removes MESSAGEs in favor of READMEs.
Update my email and regen distinfo while here.
OK?
I think it would make sense to merge the two READMEs, i.e. include the
information about CGIs in README-main ..
I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf and
apcupsd.css to cgi),
Hmm, these ones need some more work. You need @conflict markers so
that pkg_add works (new PLIST-cgi needs @conflict apcupsd-=3.14.10p1)
and ..
Index: pkg/PLIST-cgi
..
+@cwd ${LOCALBASE}
+@sample share/examples/apcupsd/
+share/examples/apcupsd/etc/
..
Index: pkg/PLIST-main
..
-share/examples/apcupsd/
+share/doc/pkg-readmes/${FULLPKGNAME}
+@sample share/examples/apcupsd/
.. those should just be normal directories not @sample.
so from now -cgi is a standalone package and it have its
own README.
I just think the separate README is unnecessary, I don't mind too much
but now that we don't have to conserve screen space for MESSAGEs, isn't
it easier for the user if all the pkg-readme information for apcupsd
is in one place rather than split between 2 files?
I also wonder if it's worth including any relevant parts of
README.openbsd here (and maybe not installing README.openbsd; some of
the information is good but some is just confusing when used with the
port - e.g. where it talks about /etc/rc.apcupsd)..
Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
says nothing wrong nor confusing, as I can see.
Anyway, this file contains only extra information and not really needed for
Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
port's readme.
Ah I see now, I was looking in the source tarball not the installed
file, it is patched with a perl subst in pre-configure. OK this is less
confusing so I agree, don't merge.
Re: sysutils/apupsd: switch from MESSAGE to README
On Tue, December 24, 2013 18:24, Stuart Henderson wrote:
On 2013/12/24 18:05, Kirill Bychkov wrote:
On Tue, December 24, 2013 16:24, Stuart Henderson wrote:
On 2013/12/24 00:06, Kirill Bychkov wrote:
Hi!
This patch removes MESSAGEs in favor of READMEs.
Update my email and regen distinfo while here.
OK?
I think it would make sense to merge the two READMEs, i.e. include the
information about CGIs in README-main ..
I've splitted -cgi and -main in new patch (moved multimon.conf, hosts.conf
and
apcupsd.css to cgi),
Hmm, these ones need some more work. You need @conflict markers so
that pkg_add works (new PLIST-cgi needs @conflict apcupsd-=3.14.10p1)
and ..
Missed that. Added in new patch, thanks.
Index: pkg/PLIST-cgi
..
+@cwd ${LOCALBASE}
+@sample share/examples/apcupsd/
+share/examples/apcupsd/etc/
..
Index: pkg/PLIST-main
..
-share/examples/apcupsd/
+share/doc/pkg-readmes/${FULLPKGNAME}
+@sample share/examples/apcupsd/
.. those should just be normal directories not @sample.
If share/examples/apcupsd/ is not @sampled, pkg_delete apcupds gives error
about directory not empty. Or it is normal to ignore such messages in cases
when two packages use one directory for storing their files?
so from now -cgi is a standalone package and it have its
own README.
I just think the separate README is unnecessary, I don't mind too much
but now that we don't have to conserve screen space for MESSAGEs, isn't
it easier for the user if all the pkg-readme information for apcupsd
is in one place rather than split between 2 files?
Well, -cgi package could be installed standalone now (tested). So if anyone
needs only CGI scpripts for monitoring apcupsd on different hosts, why install
main package with instructions how to run CGI-scripts in chrooted apache?
I also wonder if it's worth including any relevant parts of
README.openbsd here (and maybe not installing README.openbsd; some of
the information is good but some is just confusing when used with the
port - e.g. where it talks about /etc/rc.apcupsd)..
Sorry, I can't find nothing about /etc/rc.apcupsd in README.openbsd. And it
says nothing wrong nor confusing, as I can see.
Anyway, this file contains only extra information and not really needed for
Running ${FULPKGNAME} on OpenBSD, so I think we shouldn't merge it with
port's readme.
Ah I see now, I was looking in the source tarball not the installed
file, it is patched with a perl subst in pre-configure. OK this is less
confusing so I agree, don't merge.
Re: sysutils/apupsd: switch from MESSAGE to README
On 2013/12/24 18:52, Kirill Bychkov wrote:
-share/examples/apcupsd/
+share/doc/pkg-readmes/${FULLPKGNAME}
+@sample share/examples/apcupsd/
.. those should just be normal directories not @sample.
If share/examples/apcupsd/ is not @sampled, pkg_delete apcupds gives error
about directory not empty. Or it is normal to ignore such messages in cases
when two packages use one directory for storing their files?
espie@ may like to comment, but I think it's better to have bogus warning
messages, rather than have directories under ${PREFIX} created by the
package which aren't recorded properly in the PLIST.
I think this might be a special case because it isn't in the usual PREFIX
and uses @cwd.. in normal cases you don't get these warnings if a file
provided by another package is within the directory.
Well, -cgi package could be installed standalone now (tested). So if anyone
needs only CGI scpripts for monitoring apcupsd on different hosts, why install
main package with instructions how to run CGI-scripts in chrooted apache?
Fair enough then, I'm OK with that.
UPDATE: games/golly (MAINTAINER)
Hi,
Here's an update for golly-2.6. Tested on loongson and amd64.
Merry Christmas!
Index: Makefile
===
RCS file: /cvs/ports/games/golly/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile9 Sep 2013 15:43:25 - 1.2
+++ Makefile24 Dec 2013 16:27:30 -
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = game of life simulator
-PKGNAME = golly-2.5
+PKGNAME = golly-2.6
DISTNAME = ${PKGNAME}-src
WRKSRC = ${WRKDIST}/gui-wx/configure
CATEGORIES = games math
Index: distinfo
===
RCS file: /cvs/ports/games/golly/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo9 Sep 2013 15:43:25 - 1.2
+++ distinfo24 Dec 2013 16:27:30 -
@@ -1,2 +1,2 @@
-SHA256 (golly-2.5-src.tar.gz) = t0HAsz/M3HLNYC+1/KsJnEYR0akta92Jsk10EMKLvqw=
-SIZE (golly-2.5-src.tar.gz) = 3381010
+SHA256 (golly-2.6-src.tar.gz) = H+L5gxRLyJXqoSQvlcW7STRMwBObXDMJ5rT6IZwfM9g=
+SIZE (golly-2.6-src.tar.gz) = 3545388
Index: patches/patch-gui-wx_configure_configure
===
RCS file: /cvs/ports/games/golly/patches/patch-gui-wx_configure_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-gui-wx_configure_configure
--- patches/patch-gui-wx_configure_configure9 Sep 2013 15:43:25 -
1.1
+++ patches/patch-gui-wx_configure_configure24 Dec 2013 16:27:30 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-gui-wx_configure_configu
Don't force -O2.
gui-wx/configure/configure.origWed Jun 12 21:27:20 2013
-+++ gui-wx/configure/configure Sun Aug 25 11:21:14 2013
-@@ -3820,17 +3820,9 @@ $as_echo $ac_cv_prog_cc_g 6; }
+--- gui-wx/configure/configure.origSun Dec 8 21:36:26 2013
gui-wx/configure/configure Tue Dec 24 16:44:52 2013
+@@ -3769,17 +3769,9 @@ $as_echo $ac_cv_prog_cc_g 6; }
if test $ac_test_CFLAGS = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -24,7 +24,7 @@ Don't force -O2.
fi
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $CC option to accept
ISO C89 5
$as_echo_n checking for $CC option to accept ISO C89... 6; }
-@@ -4747,17 +4739,9 @@ $as_echo $ac_cv_prog_cxx_g 6; }
+@@ -4696,17 +4688,9 @@ $as_echo $ac_cv_prog_cxx_g 6; }
if test $ac_test_CXXFLAGS = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -44,7 +44,7 @@ Don't force -O2.
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -6430,9 +6414,6 @@ $as_echo $WX_PORT 6; }
+@@ -6379,9 +6363,6 @@ $as_echo $WX_PORT 6; }
if test $DEBUG = 1; then
CXXFLAGS=$CXXFLAGS -g -O0
CFLAGS=$CFLAGS -g -O0
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/golly/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 9 Sep 2013 15:43:25 - 1.2
+++ pkg/PLIST 24 Dec 2013 16:27:30 -
@@ -112,6 +112,7 @@ share/golly/Patterns/Generations/Steeple
share/golly/Patterns/Generations/Transers.mcl
share/golly/Patterns/Generations/What-a-mess.mcl
share/golly/Patterns/HashLife/
+share/golly/Patterns/HashLife/Replicator-p237228340.mc.gz
share/golly/Patterns/HashLife/broken-lines.mc
share/golly/Patterns/HashLife/catacryst.mc
share/golly/Patterns/HashLife/gotts-dots.mc
@@ -120,6 +121,7 @@ share/golly/Patterns/HashLife/hashlife-o
share/golly/Patterns/HashLife/hexadecimal.mc.gz
share/golly/Patterns/HashLife/jagged.mc
share/golly/Patterns/HashLife/jagged2.mc
+share/golly/Patterns/HashLife/loafer-gun-p8388608-linear.mc.gz
share/golly/Patterns/HashLife/logarithmic-width.mc
share/golly/Patterns/HashLife/metacatacryst.mc
share/golly/Patterns/HashLife/metapixel-galaxy.mc.gz
@@ -197,6 +199,8 @@ share/golly/Patterns/Life/Guns/7-in-a-ro
share/golly/Patterns/Life/Guns/Cordership-gun-p784.rle
share/golly/Patterns/Life/Guns/golly-ticker.rle
share/golly/Patterns/Life/Guns/gun-p165mwss.rle
+share/golly/Patterns/Life/Guns/loafer-gun-p210.rle
+share/golly/Patterns/Life/Guns/p59-gun-with-Snark-reflectors.rle
share/golly/Patterns/Life/Guns/p690-PT-Cordership-gun.rle
share/golly/Patterns/Life/Guns/pseudo-p34-gun.rle
share/golly/Patterns/Life/Guns/vacuum-cleaner.rle
Improve rebuild script of textproc/libxml
This patch fixes the major problem: if /var/db/xmlcatalog gets empty
(after fail of the xmlcatalog(1), for example), it won't be either
accepted by xmlcatalog(1) or overwritten, causing strange errors
during calls of XML transformation tools. This, in particular, broke
my builds. Unfortunately, those tools do not say anything about this
file, I've debugged the problem by looking closely at ktrace output.
So I think in this case it's better to be safe than sorry. As an
additional feature, this scripts keeps the backup copy of database:
in this case, if the xmlcatalog(1) fails, the DB won't be altered
at all.
Comments? Okays?
--
zhuk@
Index: Makefile
===
RCS file: /cvs/ports/textproc/libxml/Makefile,v
retrieving revision 1.151
diff -u -p -r1.151 Makefile
--- Makefile25 Sep 2013 12:32:22 - 1.151
+++ Makefile24 Dec 2013 17:11:56 -
@@ -7,6 +7,8 @@ VERSION=2.9.1
DISTNAME= libxml2-${VERSION}
PKGNAME-main= libxml-${VERSION}
PKGNAME-python=py-libxml-${VERSION}
+REVISION= 0
+
SHARED_LIBS += xml2 15.1 # 11.0
CATEGORIES=textproc
MASTER_SITES= http://gd.tuwien.ac.at/pub/libxml/ \
Index: files/rebuild
===
RCS file: /cvs/ports/textproc/libxml/files/rebuild,v
retrieving revision 1.1
diff -u -p -r1.1 rebuild
--- files/rebuild 4 Sep 2005 23:38:18 - 1.1
+++ files/rebuild 24 Dec 2013 17:11:56 -
@@ -1,18 +1,44 @@
#! /bin/sh
# written by Marc Espie, 2005.
+# improvements by Vadim Zhukov, 2013.
# public domain
+set -e
+
PREFIX=@PREFIX@
dir=$PREFIX/share/libxml2
catalog=/var/db/xmlcatalog
cmd=$PREFIX/bin/xmlcatalog
+
+if [ -e $catalog ]; then
+ if [ -s $catalog ]; then
+ # create backup for extra safety
+ cp -- $catalog{,.bak}
+ else
+ # xmlcatalog fails for empty files
+ rm -- $catalog
+ fi
+fi
+
+restore_catalog() {
+ if [ -e $catalog.bak ]; then
+ mv -- $catalog{.bak,}
+ else
+ rm -f -- $catalog
+ fi
+}
+
+trap restore_catalog ERR
+
+# remove instead?
$cmd --create --noout $catalog
-for i in $dir/*.spec
-do
-# protect against no spec
-test $i = $dir/'*.spec' ||
- sed -e '/^#/d' -e s,%D,$PREFIX, $i|
- while read type read name read url; do
+
+for i in $dir/*.spec; do
+ # protect against no spec
+ test $i = $dir/*.spec break
+
+ sed -e '/^#/d' -e s,%D,$PREFIX, $i |
+ while read type read name read url; do
$cmd --noout --add $type $name $url $catalog
- done
+ done
done
sysutils/ntfs-3g: 'PAGE_SHIFT' undeclared on loongson
Hi, sysutils/ntfs-3g fails to build on loongson. $ sysctl kern.version kern.version=OpenBSD 5.4-current (GENERIC) #78: Sat Dec 21 18:03:03 MST 2013 dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC === Building for ntfs_3g-2013.1.13p1 make all-recursive Making all in include Making all in ntfs-3g Making all in fuse-lite Making all in libfuse-lite Making all in libntfs-3g /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c -o libntfs_3g_la-mft.lo `test -f 'mft.c' || echo './'`mft.c cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c mft.c -fPIC -DPIC -o .libs/libntfs_3g_la-mft.o mft.c: In function 'ntfs_mft_bitmap_find_free_rec': mft.c:495: error: 'PAGE_SHIFT' undeclared (first use in this function) mft.c:495: error: (Each undeclared identifier is reported only once mft.c:495: error: for each function it appears in.) Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c mft.c -fPIC -DPIC -o .libs/libntfs_3g_la-mft.o *** Error 1 in libntfs-3g (Makefile:550 'libntfs_3g_la-mft.lo') *** Error 1 in . (Makefile:357 'all-recursive') *** Error 1 in /home/tsomi/ports/pobj/ntfs_3g-2013.1.13/ntfs-3g_ntfsprogs-2013.1.13 (Makefile:248 'all') *** Error 1 in . (/home/tsomi/ports/infrastructure/mk/bsd.port.mk:2661 '/home/tsomi/ports/pobj/ntfs_3g-2013.1.13/.build_done') *** Error 1 in /home/tsomi/ports/sysutils/ntfs-3g (/home/tsomi/ports/infrastructure/mk/bsd.port.mk:2394 'all') libntfs-3g/mft.c uses PAGE_SIZE, which is (1 PAGE_SHIFT), but PAGE_SHIFT is in an #ifdef _KERNEL in loongson/param.h (don't know if it's intentional, maybe that's what the comment above PAGE_SHIFT explains). libntfs-3g/mft.c also has this: #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif So I don't know if it's a problem in the system headers on loongson, or if mft.c should be patched to use a 4096 PAGE_SIZE instead.
Re: NEW: sysutils/p5-Pod-Cpandoc
On Mon, Dec 23, 2013 at 04:05:15PM +0100, Ingo Schwarze wrote: Andrew Fresh wrote on Sun, Dec 22, 2013 at 06:24:17PM -0700: On Mon, Dec 23, 2013 at 01:32:54AM +0100, J'er'emie Courr`eges-Anglas wrote: I thought that this module only fetched data and fed it into our base pod formatter, but if it does more that may be a better choice indeed. As far as I know the above is correct. It overloads the standard Pod::Perldoc's -searchfor method and if it doesn't find a local document, pulls the module from metacpan into a temporary file and displays it. My point being that categorization makes most sense by purpose, and the purpose is to display manuals, and many tools to display manuals or prepare them for display live in textproc. I'd consider putting it below net because of the way it is technically working - opening a network connection to download some data - to be excessively formalistic. Devel is not only crowded, but misleading because the port is unusable for code development; it's puropose isn't even documentation development, but if it were, tools for documentation development live in textproc as well. Sysutils - well, merely displaying a manual is not really a task of system administration... I'm fine with textproc, I generally use pkg_add or cd /usr/ports/*/p5-Pod-Cpandoc so it doesn't really matter. Based on discussion and my thoughts, I would probably put it in net as primary due to the way it works, but also tagged sysutils as I think reading docs is part of system administration and the main piece of this port is /usr/local/bin/cpandoc. Again, l8rZ, -- andrew - http://afresh1.com Hey, I think I see a barn up ahead. -- The American Astronaut
Re: sysutils/ntfs-3g: 'PAGE_SHIFT' undeclared on loongson
The hiding of PAGE_SIZE is intentional. The code should be using getpagesize() or some API which asks the kernel. The reason is that PAGE_SIZE is not a standardized symbol, and on some of our architectures it changes between different processor models. sysutils/ntfs-3g fails to build on loongson. $ sysctl kern.version kern.version=OpenBSD 5.4-current (GENERIC) #78: Sat Dec 21 18:03:03 MST 2013 dera...@loongson.openbsd.org:/usr/src/sys/arch/loongson/compile/GENERIC === Building for ntfs_3g-2013.1.13p1 make all-recursive Making all in include Making all in ntfs-3g Making all in fuse-lite Making all in libfuse-lite Making all in libntfs-3g /usr/bin/libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c -o libntfs_3g_la-mft.lo `test -f 'mft.c' || echo './'`mft.c cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c mft.c -fPIC -DPIC -o .libs/libntfs_3g_la-mft.o mft.c: In function 'ntfs_mft_bitmap_find_free_rec': mft.c:495: error: 'PAGE_SHIFT' undeclared (first use in this function) mft.c:495: error: (Each undeclared identifier is reported only once mft.c:495: error: for each function it appears in.) Error while executing cc -DHAVE_CONFIG_H -I. -I.. -I/usr/local/include -I../include/ntfs-3g -O2 -pipe -Wall -MT libntfs_3g_la-mft.lo -MD -MP -MF .deps/libntfs_3g_la-mft.Tpo -c mft.c -fPIC -DPIC -o .libs/libntfs_3g_la-mft.o *** Error 1 in libntfs-3g (Makefile:550 'libntfs_3g_la-mft.lo') *** Error 1 in . (Makefile:357 'all-recursive') *** Error 1 in /home/tsomi/ports/pobj/ntfs_3g-2013.1.13/ntfs-3g_ntfsprogs-2013.1.13 (Makefile:248 'all') *** Error 1 in . (/home/tsomi/ports/infrastructure/mk/bsd.port.mk:2661 '/home/tsomi/ports/pobj/ntfs_3g-2013.1.13/.build_done') *** Error 1 in /home/tsomi/ports/sysutils/ntfs-3g (/home/tsomi/ports/infrastructure/mk/bsd.port.mk:2394 'all') libntfs-3g/mft.c uses PAGE_SIZE, which is (1 PAGE_SHIFT), but PAGE_SHIFT is in an #ifdef _KERNEL in loongson/param.h (don't know if it's intentional, maybe that's what the comment above PAGE_SHIFT explains). libntfs-3g/mft.c also has this: #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif So I don't know if it's a problem in the system headers on loongson, or if mft.c should be patched to use a 4096 PAGE_SIZE instead.
