Merge branch 'master' of git://github.com/voidlinux/xbps-packages

common/hooks/post-install/00-compress-manpages.sh

@@ -1,30 +0,0 @@
-# This hook compresses manual pages with gzip(1).
-
-hook() {
-	local fpattern="s|${PKGDESTDIR}||g;s|^\./$||g;/^$/d"
-	local j f dirat lnkat newlnk
-
-	if [ ! -d "${PKGDESTDIR}/usr/share/man" ]; then
-		return 0
-	fi
-
-	find ${PKGDESTDIR}/usr/share/man -type f -follow | while read f
-	do
-		j=$(echo "$f"|sed -e "$fpattern")
-		[ "$j" = "" ] && continue
-		if $(echo "$j"|grep -q '.*.gz$'); then
-			continue
-		fi
-		if [ -h ${PKGDESTDIR}/"$j" ]; then
-			dirat=$(dirname "$j")
-			lnkat=$(readlink ${PKGDESTDIR}/"$j")
-			newlnk=$(basename "$j")
-			rm -f ${PKGDESTDIR}/"$j"
-			cd ${PKGDESTDIR}/"$dirat"
-			ln -s "${lnkat}".gz "${newlnk}".gz
-			continue
-		fi
-		echo "   Compressing manpage: $j..."
-		gzip -nfq9 ${PKGDESTDIR}/"$j"
-	done
-}

srcpkgs/acl/template

@@ -1,7 +1,7 @@
 # Template file for 'acl'
 pkgname=acl
 version=2.2.52
-revision=2
+revision=3
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"

srcpkgs/alsa-utils/template

@@ -1,7 +1,7 @@
 # Template build file for 'alsa-utils'.
 pkgname=alsa-utils
 version=1.0.27.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system
  --with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf"

srcpkgs/asciidoc/template

@@ -1,7 +1,7 @@
 # Template file for 'asciidoc'
 pkgname=asciidoc
 version=8.6.9
-revision=2
+revision=3
 noarch=yes
 build_style=gnu-configure
 hostmakedepends="python"

srcpkgs/man-pages/template

@@ -1,6 +1,6 @@
 # Template file for 'man-pages'
 pkgname=man-pages
-version=3.61
+version=3.62
 revision=1
 noarch="yes"
 short_desc="Linux Documentation Project (LDP) manual pages"
@@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://man7.org/linux/man-pages/index.html"
 distfiles="${KERNEL_SITE}/docs/man-pages/$pkgname-$version.tar.xz"
-checksum=c1b0608cc66fe537d055983b101182326edf5ec93f1b2579d069d20920cf01e2
+checksum=f3d550b1ecbdcd92c07d848e4196c1233dd1244c4fb7e5a86d7fb29fed5fb6df
 
 do_install() {
 	make all prefix=${DESTDIR}/usr

srcpkgs/mdocml/template

@@ -1,10 +1,9 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.12.3
-revision=2
+revision=3
 makedepends="db185"
 replaces="groff>=0 man-db>=0"
-provides="roff-${version}_1 apropos-${version}_1 whatis-${version}_1"
 short_desc="mdoc macro compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="ISC"
@@ -24,8 +23,8 @@ do_install() {
 	# remove devel stuff.
 	rm -rf ${DESTDIR}/usr/{include,lib}
 
-	# Install apropos, whatis and mandocdb.
+	# Install apropos, catman, mandocdb and whatis.
-	for f in apropos whatis mandocdb; do
+	for f in apropos catman whatis mandocdb; do
 		vinstall ${f} 755 usr/bin
 		if [ -f ${f}.1 ]; then
 			vinstall ${f}.1 644 usr/share/man/man1

srcpkgs/openbsd-man/template

@@ -0,0 +1,17 @@
+# Template file for 'openbsd-man'
+pkgname=openbsd-man
+version=20140313
+revision=1
+build_style=gnu-makefile
+make_install_args="ETCDIR=/etc"
+short_desc="The OpenBSD man(1) utility"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+homepage="http://www.openbsd.org"
+
+replaces="man-db>=0"
+conf_files="/etc/man.conf"
+
+do_fetch() {
+	git clone git://github.com/voidlinux/openbsd-man ${pkgname}-${version}
+}

srcpkgs/openssl/template

@@ -2,7 +2,7 @@
 pkgname=openssl
 _openssl_version=1.0.1
 version=${_openssl_version}f
-revision=2
+revision=3
 bootstrap=yes
 short_desc="Secure Socket Layer and cryptographic library - runtime utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -23,7 +23,6 @@ make_dirs="
 	/etc/ssl/certs 0755 root root
 	/etc/ssl/private 0750 root root"
 
-
 do_configure() {
 	local _opts
 

srcpkgs/xz/template

@@ -1,7 +1,7 @@
 # Template file for 'xz'
 pkgname=xz
 version=5.0.5
-revision=2
+revision=3
 bootstrap=yes
 replaces="chroot-xz>=0"
 build_style=gnu-configure
@@ -21,7 +21,7 @@ liblzma_package() {
 }
 
 liblzma-devel_package() {
-	depends="liblzma>=${version}"
+	depends="liblzma>=${version}_${revision}"
 	short_desc="XZ-format compression library - development files"
 	replaces="xz-devel>=0"
 	pkg_install() {

srcpkgs/zlib/template

@@ -1,7 +1,7 @@
 # Template build file for 'zlib'
 pkgname=zlib
 version=1.2.8
-revision=3
+revision=4
 bootstrap=yes
 build_style=configure
 short_desc="A compression/decompression Library"