Add gnutl support back after recent gnutls upgrade.

Regen wantlib & bump.

print/cups/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.57 2009/10/10 12:39:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2009/10/12 11:17:17 ajacoutot Exp $
 
 COMMENT=		Common Unix Printing System
 
 VERSION=		1.3.11
 DISTNAME=		cups-${VERSION}-source
-PKGNAME=		cups-${VERSION}p0
+PKGNAME=		cups-${VERSION}p1
 
 CATEGORIES=		print sysutils
 
@@ -22,8 +22,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += asn1 c crypto gcrypt gpg-error gssapi jpeg krb5 m
-WANTLIB += pthread z
+WANTLIB += asn1 c crypto gssapi jpeg krb5 m pthread z
 
 MASTER_SITES=		http://ftp.easysw.com/pub/cups/${VERSION}/ \
 			http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
@@ -34,8 +33,6 @@ MASTER_SITES=		http://ftp.easysw.com/pub/cups/${VERSION}/ \
 
 EXTRACT_SUFX=		.tar.bz2
 
-MODULES=		devel/gettext
-
 RUN_DEPENDS=		:desktop-file-utils-*:devel/desktop-file-utils \
 			::devel/xdg-utils
 LIB_DEPENDS=		png.>=3::graphics/png \
@@ -117,6 +114,8 @@ CONFIGURE_ARGS+=	--disable-ldap
 
 post-extract:
 	${INSTALL} -m 555 ${FILESDIR}/krb5-config ${WRKDIR}/bin
+	# XXX check on update whether this is still necessary
+	${INSTALL} -m 555 ${FILESDIR}/libgnutls-config ${WRKDIR}/bin
 
 post-configure:
 	cd ${WRKBUILD} && perl -pi -e 's|\$${DESTDIR}||g' init/cups.sh \

print/cups/files/libgnutls-config

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+usage()
+{
+	cat <<EOF
+Usage: libgnutls-config [OPTIONS]
+Options:
+	[--version]
+	[--libs]
+	[--cflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --version)
+      echo "`pkg-config --modversion gnutls`"
+      exit 0
+      ;;
+    --cflags)
+      echo "`pkg-config --cflags gnutls`"
+      ;;
+    --libs)
+      echo "`pkg-config --libs gnutls`"
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done