main/cups: misc fixes

- the doc files is needed for the web interface
- we need openssl for automatic https
- create lpadmin group from pre-install

main/cups/APKBUILD

@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cups
 pkgver=1.5.2
-pkgrel=0
+pkgrel=1
 pkgdesc="The CUPS Printing System"
 url="http://www.cups.org/"
 arch="all"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc libcups $pkgname-client $pkgname-lang"
 makedepends="openssl-dev libpaper-dev dbus-dev jpeg-dev>=8 zlib-dev"
-depends="cups-client poppler-utils"
-install=
+depends="cups-client poppler-utils openssl"
+install="cups.pre-install"
 pkggroups="lp lpadmin"
 pkgusers="lp"
+replaces="cups-doc"
 source="ftp://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver-source.tar.bz2
 	$pkgname.logrotate
 	cupsd.initd
@@ -37,7 +38,7 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/doc/cups \
+		--with-docdir=/usr/share/cups \
 		--with-cups-user=lp \
 		--with-cups-group=lp \
 		--with-system-groups=lpadmin \

main/cups/cups.pre-install

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+addgroup -S ldadmin 2>/dev/null
+addgroup -S lp 2>/dev/null
+adduser -S -G lp lp 2>/dev/null
+addgroup lp lp 2>/dev/null
+exit 0